[POSTMAN] Process request with array of string (#18159)

* Process JSON array

* Update test file

* Regenerate samples

* Add CI test

Author: gcatanese

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PostmanCollectionCodegen.java

@@ -756,6 +756,8 @@ private String traverseMap(LinkedHashMap<String, Object> linkedHashMap, String r
             } else if (value instanceof LinkedHashMap) {
                 String in = ret + JSON_ESCAPE_DOUBLE_QUOTE + key + JSON_ESCAPE_DOUBLE_QUOTE + ": ";
                 ret = traverseMap(((LinkedHashMap<String, Object>) value),  in);
+            } else if (value instanceof ArrayList<?>) {
+                ret = ret + JSON_ESCAPE_DOUBLE_QUOTE + key + JSON_ESCAPE_DOUBLE_QUOTE + ": " + getJsonArray((ArrayList<Object>) value);
             } else {
                 LOGGER.warn("Value type unrecognised: " + value.getClass());
             }
@@ -772,6 +774,38 @@ private String traverseMap(LinkedHashMap<String, Object> linkedHashMap, String r
         return ret;
     }
 
+    String getJsonArray(ArrayList<Object> list) {
+        String ret = "";
+
+        for(Object element: list) {
+            if(element instanceof String) {
+                ret = ret + getStringArrayElement((String) element) + ", ";
+            } else if(element instanceof LinkedHashMap) {
+                ret = traverseMap((LinkedHashMap<String, Object>) element, ret) + ", ";
+            }
+        }
+
+        if(ret.endsWith(", ")) {
+            ret = ret.substring(0, ret.length() - 2);
+        }
+
+        return "[" + ret + "]";
+    }
+
+    String getStringArrayElement(String element) {
+        String ret = "";
+
+        if(element.startsWith("{")) {
+            // isJson (escape all double quotes)
+            ret = ret + element.replace("\"", JSON_ESCAPE_DOUBLE_QUOTE);
+        } else {
+            // string element (add escaped double quotes)
+            ret = ret + JSON_ESCAPE_DOUBLE_QUOTE + element + JSON_ESCAPE_DOUBLE_QUOTE;
+        }
+
+        return ret;
+    }
+
     public String getPostmanType(CodegenProperty codegenProperty) {
         if(codegenProperty.isNumeric) {
             return "number";

modules/openapi-generator/src/test/java/org/openapitools/codegen/postman/PostmanCollectionCodegenTest.java

@@ -633,6 +633,46 @@ public void convertNestedLinkedHashMapToJson() {
 
     }
 
+    @Test
+    public void convertNestedArrayListToJson() {
+
+        final String EXPECTED =
+                "{\\n " +
+                        "\\\"id\\\": 1,\\n \\\"city\\\": \\\"Amsterdam\\\",\\n " +
+                        "\\\"tags\\\": [\\\"ams\\\", \\\"adam\\\"]" +
+                        "\\n}";
+
+        LinkedHashMap<String, Object> city = new LinkedHashMap<>();
+        city.put("id", 1);
+        city.put("city", "Amsterdam");
+        ArrayList<String> tags = new ArrayList<>();
+        tags.add("ams");
+        tags.add("adam");
+        city.put("tags", tags);
+
+        assertEquals(EXPECTED, new PostmanCollectionCodegen().convertToJson(city));
+
+    }
+
+    @Test
+    public void convertNestedEmptyArrayListToJson() {
+
+        final String EXPECTED =
+                "{\\n " +
+                        "\\\"id\\\": 1,\\n \\\"city\\\": \\\"Amsterdam\\\",\\n " +
+                        "\\\"tags\\\": []" +
+                        "\\n}";
+
+        LinkedHashMap<String, Object> city = new LinkedHashMap<>();
+        city.put("id", 1);
+        city.put("city", "Amsterdam");
+        ArrayList<String> tags = new ArrayList<>();
+        city.put("tags", tags);
+
+        assertEquals(EXPECTED, new PostmanCollectionCodegen().convertToJson(city));
+
+    }
+
     @Test
     public void testAddToList()  {
 

modules/openapi-generator/src/test/resources/3_0/postman-collection/SampleProject.yaml

@@ -322,6 +322,11 @@ components:
           format: date
           description: The date that the user was created.
           example: '2019-08-24'
+        tags:
+          type: array
+          items:
+            type: string
+            description: Tags assigned to the user
       required:
         - id
         - firstName
@@ -353,6 +358,10 @@ components:
         dateOfBirth: '1997-10-31'
         emailVerified: true
         createDate: '2019-08-24'
+        tags:
+          - user
+          - admin
+          - guest
 tags:
   - name: basic
     description: Basic tag

samples/schema/postman-collection/postman.json

@@ -345,7 +345,7 @@
                                     ],
                                     "body": {
                                         "mode": "raw",
-                                        "raw": "{\n  \"id\" : 777,\n  \"firstName\" : \"Alotta\",\n  \"lastName\" : \"Rotta\",\n  \"email\" : \"alotta.rotta@gmail.com\",\n  \"dateOfBirth\" : \"1997-10-31\",\n  \"emailVerified\" : true,\n  \"createDate\" : \"2019-08-24\"\n}",
+                                        "raw": "{\n  \"id\" : 777,\n  \"firstName\" : \"Alotta\",\n  \"lastName\" : \"Rotta\",\n  \"email\" : \"alotta.rotta@gmail.com\",\n  \"dateOfBirth\" : \"1997-10-31\",\n  \"emailVerified\" : true,\n  \"createDate\" : \"2019-08-24\",\n  \"tags\" : [ \"user\", \"admin\", \"guest\" ]\n}",
                                         "options": {
                                             "raw": {
                                                 "language": "json"

samples/schema/postman-collection/python/test/test_endpoints.py

@@ -29,6 +29,16 @@ def test_request_from_inline_examples(self):
         self.assertEqual(item['request']["method"], 'PATCH')
         self.assertEqual(item['request']["body"]["raw"], '{\n  "firstName" : "Rebecca"\n}')
 
+    def test_request_with_array_strings(self):
+        # item
+        item = self.json_data['item'][2]['item'][0]['item'][0]
+        self.assertEqual(item['request']["method"], 'POST')
+        data = json.loads(item['request']["body"]["raw"])
+        # check is list
+        self.assertTrue(isinstance(data.get("tags"), list))
+        # check values
+        self.assertTrue(set(data.get("tags")) == {"user", "admin", "guest"})
+
 
 if __name__ == '__main__':
     unittest.main()