Fix input object type, no properties object schema

Fix #219

Signed-off-by: Alan Cha <[email protected]>

Author: Alan-Cha

packages/openapi-to-graphql/lib/oas_3_tools.js

@@ -229,6 +229,7 @@ function createOrReuseOt({
         typeof schema.description !== 'undefined'
           ? schema.description
           : 'No description available.'
+
       def.ot = new GraphQLObjectType({
         name: def.otName,
         description,
@@ -248,7 +249,7 @@ function createOrReuseOt({
     }
     // CASE: mutation - create or reuse IOT
   } else {
-    if (typeof def.iot !== 'undefined') {
+    if (def.iot && typeof def.iot !== 'undefined') {
       translationLog(
         `Reuse Input Object Type '${def.iotName}'` +
           (typeof operation === 'object'
@@ -264,6 +265,28 @@ function createOrReuseOt({
             : '')
       )
 
+      /**
+       * If the schema does not contain any properties, then OpenAPI-to-GraphQL
+       * cannot create a GraphQL Object Type for it because in GraphQL, all Object
+       * Type properties must be named.
+       *
+       * Instead, store response in an arbitray JSON type.
+       */
+      if (typeof def.schema.properties === 'undefined') {
+        handleWarning({
+          typeKey: 'OBJECT_MISSING_PROPERTIES',
+          message:
+            `The operation ` +
+            `'${operation.operationString}' contains ` +
+            `a object schema ${JSON.stringify(def)} with no properties. ` +
+            `GraphQL objects must have well-defined properties so a one to ` +
+            `one conversion cannot be achieved.`,
+          data,
+          log: translationLog
+        })
+        return GraphQLJSON
+      }
+
       schema.description =
         typeof schema.description !== 'undefined'
           ? schema.description

packages/openapi-to-graphql/lib/oas_3_tools.js.map

@@ -1260,13 +1260,14 @@ test('Content property in parameter object', () => {
   })
 })
 
+// TODO: Change trashcans2 to trashcans
 test('Handle objects without defined properties with arbitrary GraphQL JSON type', () => {
   const query = `{
     trashcan(username:"arlene") {
       brand,
       contents
     }
-    trashcans {
+    trashcans2 {
       contents
     }
   }`
@@ -1286,7 +1287,7 @@ test('Handle objects without defined properties with arbitrary GraphQL JSON type
             }
           ]
         },
-        trashcans: [
+        trashcans2: [
           {
             contents: [
               {
@@ -1324,6 +1325,43 @@ test('Handle objects without defined properties with arbitrary GraphQL JSON type
   })
 })
 
+test('Handle input objects without defined properties with arbitrary GraphQL JSON type', () => {
+  const query = `mutation {
+    postOfficeTrashCan(trashcansInput: {
+      type: "sandwich",
+      message: "moldy",
+      tasteRating: 0
+    }, username: "arlene") {
+      brand
+      contents
+    }
+  }`
+  return graphql(createdSchema, query).then(result => {
+    expect(result).toEqual({
+      data: {
+        postOfficeTrashCan: {
+          brand: 'Garbage Emporium',
+          contents: [
+            {
+              type: 'apple',
+              message: 'Half-eaten'
+            },
+            {
+              type: 'sock',
+              message: 'Lost one'
+            },
+            {
+              type: 'sandwich',
+              message: 'moldy',
+              tasteRating: 0
+            }
+          ]
+        }
+      }
+    })
+  })
+})
+
 test('Generate "Equivalent to..." messages', () => {
   const options: Options = {
     // Used to simplify test. Otherwise viewers will polute query/mutation fields.

packages/openapi-to-graphql/lib/schema_builder.js

@@ -231,7 +231,7 @@ function startServer(PORT) {
     }
   }
 
-  const Trash = {
+  const TrashCans = {
     arlene: {
       brand: 'Garbage Emporium',
       contents: [
@@ -673,13 +673,28 @@ function startServer(PORT) {
 
   app.get('/api/trashcans', (req, res) => {
     console.log(req.method, req.path)
-    res.send(Array.from(Object.values(Trash)))
+    res.send(Array.from(Object.values(TrashCans)))
   })
 
   app.get('/api/trashcans/:username', (req, res) => {
     console.log(req.method, req.path)
     if (req.params.username in Users) {
-      res.send(Trash[req.params.username])
+      res.send(TrashCans[req.params.username])
+    } else {
+      res.status(404).send({
+        message: 'Wrong username.'
+      })
+    }
+  })
+
+  app.post('/api/trashcans/:username', (req, res) => {
+    console.log(req.method, req.path)
+    const trashItem = req.body
+
+    if (req.params.username in Users) {
+      const trashCan = TrashCans[req.params.username]
+      trashCan.contents.push(trashItem)
+      res.send(TrashCans[req.params.username])
     } else {
       res.status(404).send({
         message: 'Wrong username.'

packages/openapi-to-graphql/lib/schema_builder.js.map

@@ -924,6 +924,42 @@
             }
           }
         }
+      },
+      "post": {
+        "operationId": "postOfficeTrashCan",
+        "description": "Add new contents to the trashcan of a specific owner",
+        "parameters": [
+          {
+            "name": "username",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "Identifier of a user."
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "A trashcan",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/trashcan"
+                }
+              }
+            }
+          }
+        }
       }
     },
     "/trashcans": {