1. routingTests.js runs through all operations described in openapi.yaml and tries calling them, expecting 200 in return. Currently not all tests pass - not supporting xml, and problems with formData (#3442)

2. Removed old testing files.
3. Added model files - contain data and structure as defined in openapi.yaml. Model.js has static methods relevant to all model files.
4. Changed openapi.yaml to allow running tests easily.

Author: wing328

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

@@ -93,7 +93,6 @@ public NodeJSExpressServerCodegen() {
         supportingFiles.add(new SupportingFile("utils" + File.separator + "writer.mustache", "utils", "writer.js"));
 
         // controllers folder
-        supportingFiles.add(new SupportingFile("controllers" + File.separator + "test.mustache", "controllers", "TestController.js"));
         supportingFiles.add(new SupportingFile("controllers" + File.separator + "index.mustache", "controllers", "index.js"));
         supportingFiles.add(new SupportingFile("controllers" + File.separator + "Controller.mustache", "controllers", "Controller.js"));
         // service folder

samples/server/petstore/nodejs-express-server/api/openapi.yaml

@@ -8,7 +8,15 @@ info:
   title: OpenAPI Petstore
   version: 1.0.0
 servers:
-- url: http://petstore.swagger.io/v2
+- url: http://localhost:{port}/api/{basePath}
+  variables:
+    port:
+      enum:
+        - '3000'
+        - '3009'
+      default: '3000'
+    basePath:
+      default: 'v2'
 tags:
 - description: Everything about your Pets
   name: pet

samples/server/petstore/nodejs-express-server/controllers/TestController.js

@@ -1,11 +1,9 @@
 const PetController = require('./PetController');
 const StoreController = require('./StoreController');
 const UserController = require('./UserController');
-const TestController = require('./TestController');
 
 module.exports = {
   PetController,
   StoreController,
   UserController,
-  TestController,
 };

samples/server/petstore/nodejs-express-server/controllers/index.js

@@ -0,0 +1,21 @@
+const ono = require('ono');
+const Model = require('./Model');
+
+class Category {
+  constructor(name, id) {
+    const validationErrors = (Model.validateModel(Category, {name, id}));
+    if (validationErrors.length === 0) {
+      this.id = id;
+      this.name = name;
+    } else {
+      throw ono('Tried to create an invalid Category instance', {errors: validationErrors});
+    }
+  }
+}
+
+Category.types = {
+  id: 'integer',
+  name: 'string',
+};
+
+module.exports = Category;

samples/server/petstore/nodejs-express-server/models/Category.js

@@ -0,0 +1,47 @@
+class Model {
+  static validateModel(modelClass, variables) {
+    const invalidArray = [];
+    Object.entries(variables).forEach(([key, value]) => {
+      const typeToCheck = modelClass.types[key];
+      switch (typeToCheck) {
+        case 'string':
+          if (!(typeof value === 'string' || value instanceof String)) {
+            invalidArray.push({ key, expectedType: typeToCheck, value });
+          }
+          break;
+        case 'number':
+        case 'integer':
+          if (!(typeof value === 'number' && !Number.isNaN(value))) {
+            invalidArray.push({ key, expectedType: typeToCheck, value });
+          }
+          break;
+        case 'array':
+          if (!(value && typeof value === 'object' && value.constructor === Array)) {
+            invalidArray.push({ key, expectedType: typeToCheck, value });
+          }
+          break;
+        case 'object':
+          if (!(value && typeof value === 'object' && value.constructor === Array)) {
+            invalidArray.push({ key, expectedType: typeToCheck, value });
+          }
+          break;
+        case 'boolean':
+          if (!(typeof value === 'boolean')) {
+            invalidArray.push({ key, expectedType: typeToCheck, value });
+          }
+          break;
+        default:
+          break;
+      }
+    });
+    modelClass.required.forEach((requiredFieldName) => {
+      if (variables[requiredFieldName] === undefined || variables[requiredFieldName] === '') {
+        invalidArray.push(
+          { field: requiredFieldName, required: true, value: variables[requiredFieldName] },
+        );
+      }
+    });
+    return invalidArray;
+  }
+}
+module.exports = Model;

samples/server/petstore/nodejs-express-server/models/Model.js

@@ -0,0 +1,35 @@
+const ono = require('ono');
+const Model = require('./Model');
+const Tag = require('./Tag');
+const Category = require('./Category');
+
+class Pet {
+  constructor(photoUrls, name, id, tags, status, category) {
+    const validationErrors = Model.validateModel(Pet, {
+      photoUrls, name, id, tags, status, category,
+    });
+    if (validationErrors.length === 0) {
+      this.photoUrls = photoUrls;
+      this.name = name;
+      this.id = id;
+      this.tags = tags.map(t => new Tag(...t));
+      this.status = status;
+      this.category = new Category(category);
+    } else {
+      throw ono('Tried to create an invalid Pet instance', { errors: validationErrors });
+    }
+  }
+}
+
+Pet.types = {
+  photoUrls: 'array',
+  name: 'string',
+  id: 'string',
+  tags: 'array',
+  status: 'string',
+  category: 'object',
+};
+
+Pet.required = ['name', 'photoUrls'];
+
+module.exports = Pet;

samples/server/petstore/nodejs-express-server/models/Pet.js

@@ -0,0 +1,17 @@
+const ono = require('ono');
+const Model = require('./Model');
+
+class Tag {
+  constructor(name, id) {
+    const validationErrors = Model.validateModel(Tag,
+      { name, id });
+    if (validationErrors.length === 0) {
+      this.name = name;
+      this.id = id;
+    } else {
+      throw ono('Tried to create an invalid Tag instance', { errors: validationErrors });
+    }
+  }
+}
+
+module.exports = Tag;

samples/server/petstore/nodejs-express-server/models/Tag.js

@@ -0,0 +1,9 @@
+const CategoryModel = require('./Category');
+const PetModel = require('./Pet');
+const TagModel = require('./Tag');
+
+module.exports = {
+  CategoryModel,
+  PetModel,
+  TagModel,
+};

samples/server/petstore/nodejs-express-server/models/index.js

@@ -8,7 +8,8 @@
     "start": "node index.js"
   },
   "keywords": [
-    "openapi-generator", "openapi"
+    "openapi-generator",
+    "openapi"
   ],
   "license": "Unlicense",
   "private": true,
@@ -20,6 +21,9 @@
     "express": "^4.16.4",
     "express-openapi-validator": "^1.0.0",
     "js-yaml": "^3.3.0",
+    "jstoxml": "^1.5.0",
+    "ono": "^5.0.1",
+    "openapi-sampler": "^1.0.0-beta.15",
     "swagger-express-middleware": "^2.0.2",
     "swagger-tools": "^0.10.4",
     "swagger-ui-express": "^4.0.2",
@@ -35,5 +39,10 @@
     "eslint-plugin-import": "^2.17.2",
     "form-data": "^2.3.3",
     "mocha": "^6.1.4"
+  },
+  "eslintConfig": {
+    "env": {
+      "node": true
+    }
   }
 }