Add models directory for new generators

generators/connection/templates/sequelize.js

@@ -6,6 +6,22 @@ module.exports = function() {
   const app = this;
   const connectionString = app.get('sequelize');
   const sequelize = new Sequelize(connectionString);
+  const oldSetup = app.setup;
 
   app.set('sequelizeClient', sequelize);
+
+  app.setup = function(...args) {
+    // Set up data relationships
+    const models = sequelize.models;
+    Object.keys(models).forEach(name => {
+      if ('associate' in models[name]) {
+        models[name].associate(models);
+      }
+    });
+
+    // Sync to the database
+    sequelize.sync();
+
+    return oldSetup.apply(this, args);
+  }
 };

generators/service/index.js

@@ -158,7 +158,7 @@ module.exports = class ServiceGenerator extends Generator {
       // Copy the model
       this.fs.copyTpl(
         this.templatePath('model', `${type}.js`),
-        this.destinationPath(this.libDirectory, 'services', kebabName, `${kebabName}.model.js`),
+        this.destinationPath(this.libDirectory, 'models', `${context.modelName}.js`),
         context
       );
     }

generators/service/templates/model/sequelize.js

@@ -11,9 +11,14 @@ module.exports = function(app) {
       type: Sequelize.STRING,
       allowNull: false
     }
+  }, {
+    classMethods: {
+      associate (models) {
+      	// Define associations here
+        // See http://docs.sequelizejs.com/en/latest/docs/associations/
+      }
+    }
   });
 
-  <%= camelName %>.sync();
-
   return <%= camelName %>;
 };

generators/service/templates/service.js

@@ -1,8 +1,8 @@
 'use strict';
 
 // Initializes the `<%= name %>` service on path `/<%= path %>`
-const createService = require('<%= serviceModule %>');
-<% if(modelName) { %>const createModel = require('./<%= modelName %>');<% } %>
+const createService = require('<%= serviceModule %>');<% if(modelName) { %>
+const createModel = require('../../models/<%= modelName %>');<% } %>
 const hooks = require('./<%= kebabName %>.hooks');
 const filters = require('./<%= kebabName %>.filters');
 
@@ -11,7 +11,8 @@ module.exports = function() {
   const Model = createModel(app);<% } %>
   const paginate = app.get('paginate');
 
-  const options = {<% if(modelName) { %>
+  const options = {
+    name: '<%= kebabName %>',<% if(modelName) { %>
     Model,<% } %>
     paginate
   };