Log error redirect

.gitignore

@@ -0,0 +1,17 @@
+# IntelliJ Idea project settings folder
+.idea
+
+# NPM package manager temporary files and folders
+node_modules
+npm-debug.log
+package-lock.json
+
+# ModelGen output folders
+migrations
+models
+models-webservice
+resolvers
+schemas
+test
+validations
+patches

Dockerfile.graphql_server

@@ -0,0 +1,15 @@
+FROM node:11.12.0-stretch-slim
+
+# Create app directory
+WORKDIR /usr/ScienceDbStarterPack/graphql-server
+
+# Copy generated code into the skeleton GraphQL-Server
+COPY . .
+
+# Clone the skeleton project and install dependencies
+RUN chmod u+x ./migrateDbAndStartServer.sh && \
+  rm .git* && \
+  mv ./config/config_postgres_docker.json ./config/config.json && \
+  npm install
+
+EXPOSE 3000

README.md

@@ -1,9 +1,9 @@
 # GraphQL backend
 Skeleton NodeJS project for a graphQL server.
 
-This package integrates the code generated by [code-generator](https://github.com/vsuaste/express_graphql_model_gen).
+This package integrates the code generated by [code-generator](https://github.com/ScienceDb/graphql-server-model-codegen).
 
-[Code-generator](https://github.com/vsuaste/express_graphql_model_gen) will generate four folders with the models' information:
+[Code-generator](https://github.com/ScienceDb/graphql-server-model-codegen) will generate four folders with the models' information:
 * models
 * schemas
 * resolvers
@@ -12,18 +12,26 @@ This package integrates the code generated by [code-generator](https://github.co
 After getting ready the generated code for the models, proceed with the server set up.
 
 ## Set up
+
 Clone the repository and run:
 ```
 $ npm install
 $ node_modules/.bin/sequelize db:migrate
-$ node server.js
+$ npm start
 ```
 
 ``` $ node_modules/.bin/sequelize db:migrate ``` command will create the tables specified in the ```migrations``` folder.
 With credential as in ``` config/config.json``` file.
+### ENVIRONMENT VARIABLES
+
+* `PORT` - The port where the app is listening, default value is `3000`
+* `ALLOW_ORIGIN` - In development mode we need to specify the header `Access-Control-Allow-Origin` so the SPA application can communicate with the server, default value `http://localhost:8080`.
+
+## NOTE 
+A data base should be already configured locally as in `config/config.json`
 
 ## Example of use
-If you followed the example for generating the code described [here](https://github.com/vsuaste/express_graphql_model_gen), you can try the next queries and mutations. Otherwise, just adapt the same queries and mutations for your own models generated.
+If you followed the example for generating the code described [here](https://github.com/ScienceDb/graphql-server-model-codegen), you can try the next queries and mutations. Otherwise, just adapt the same queries and mutations for your own models generated.
 
 We will add the next 4 people to our table ``people``.
 
@@ -65,7 +73,7 @@ curl -XPOST http://localhost:3000/graphql -H 'Content-Type: application/graphql'
 We'll search people with 'science' as substring of their email and as result we'll get only their name and last name.
 
 ```
-curl -XPOST http://localhost:3000/graphql -H 'Content-Type: application/graphql' -d '{ searchPerson(input:{field:email, value:{value:"%science%"}, operator:like}){ firstName lastName}}'
+curl -XPOST http://localhost:3000/graphql -H 'Content-Type: application/graphql' -d '{ people(search:{field:email, value:{value:"%science%"}, operator:like}){ firstName lastName}}'
 ```
 The result will be:
 

acl_rules.js

@@ -1,8 +1,8 @@
 module.exports = {
   aclRules: [{
-    roles: 'administrator',
+    roles: 'admin',
     allows: [{
-      resources: '*',
+      resources: ['users', 'roles'],
       permissions: '*'
     }]
   },

config/config.json

@@ -4,20 +4,23 @@
     "password": "test_code_gen",
     "database": "test_code_gen",
     "host": "127.0.0.1",
-    "dialect": "postgres"
+    "dialect": "postgres",
+    "operatorsAliases": false
   },
   "test": {
-    "username": "test_code_gen",
-    "password": "test_code_gen",
-    "database": "test_code_gen",
-    "host": "127.0.0.1",
-    "dialect": "postgres"
+    "username": "sciencedb",
+    "password": "sciencedb",
+    "database": "sciencedb_test",
+    "host": "postgres",
+    "dialect": "postgres",
+    "operatorsAliases": false
   },
   "production": {
-    "username": "test_code_gen",
-    "password": "test_code_gen",
-    "database": "test_code_gen",
-    "host": "127.0.0.1",
-    "dialect": "postgres"
+    "username": "sciencedb",
+    "password": "sciencedb",
+    "database": "sciencedb_production",
+    "host": "postgres",
+    "dialect": "postgres",
+    "operatorsAliases": false
   }
 }

config/config_postgres_docker.json

@@ -0,0 +1,26 @@
+{
+  "development": {
+    "username": "sciencedb",
+    "password": "sciencedb",
+    "database": "sciencedb_development",
+    "host": "sdb_postgres",
+    "dialect": "postgres",
+    "operatorsAliases": false
+  },
+  "test": {
+    "username": "sciencedb",
+    "password": "sciencedb",
+    "database": "sciencedb_test",
+    "host": "sdb_postgres",
+    "dialect": "postgres",
+    "operatorsAliases": false
+  },
+  "production": {
+    "username": "sciencedb",
+    "password": "sciencedb",
+    "database": "sciencedb_production",
+    "host": "sdb_postgres",
+    "dialect": "postgres",
+    "operatorsAliases": false
+  }
+}

config/globals.js

@@ -0,0 +1,10 @@
+module.exports = {
+  LIMIT_RECORDS : process.env.LIMIT_RECORDS || 10000,
+  PORT : process.env.PORT || 3000,
+  ALLOW_ORIGIN: process.env.ALLOW_ORIGIN || "http://localhost:8080",
+  REQUIRE_SIGN_IN: process.env.REQUIRE_SIGN_IN || "true",
+  MAIL_SERVICE: "gmail",
+  MAIL_HOST: "smtp.gmail.com",
+  MAIL_ACCOUNT: "[email protected]",
+  MAIL_PASSWORD: "SciDbServiceQAZ"
+}

connection.js

@@ -1,23 +1,23 @@
-Sequelize = require('sequelize');
+const env = process.env.NODE_ENV || 'development';
+const path = require('path')
+const config = require(path.join(__dirname, 'config', 'config.json'))[env];
+const Sequelize = require('sequelize');
+
 const Op = Sequelize.Op;
-const operatorsAliases = {
+config.operatorsAliases = {
   $eq: Op.eq,
   $and: Op.and,
   $or: Op.or,
   $like: Op.like,
   $between: Op.between,
-  $in: Op.in
+  $in: Op.in,
+  $gt: Op.gt,
+  $gte: Op.gte,
+  $lt: Op.lt,
+  $lte: Op.lte,
+  $ne: Op.ne
 };
 
-sequelize = new Sequelize(
-  'test_code_gen',
-  'test_code_gen',
-  'test_code_gen',
-  {
-    dialect: 'postgres',
-    host: '127.0.0.1'
-  },
-  {operatorsAliases}
-);
+sequelize = new Sequelize(config);
 
 module.exports = sequelize;

migrateDbAndStartServer.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Wait until the relational database-server up and running
+waited=0
+until node ./utils/testSequelizeDbServerAvailable.js
+do
+	if [ $waited == 240 ]; then
+		echo -e '\nERROR: Time out reached while waiting for relational database server to be available.\n'
+		exit 1
+	fi
+	sleep 2
+	waited=$(expr $waited + 2)
+done
+
+# Run the migrations 
+if ! ./node_modules/.bin/sequelize db:migrate; then
+	echo -e '\nERROR: Migrating the relational database(s) caused an error.\n'
+	exit 1
+fi
+
+# Run seeders if needed
+if [ -d ./seeders ]; then
+	if ! ./node_modules/.bin/sequelize db:seed:all; then
+		echo -e '\nERROR: Seeding the relational database(s) caused an error.\n'
+		exit 1
+	fi
+fi
+
+# Start GraphQL-server
+npm start 2> /usr/src/app/error_server.log # acl

models_index.js

@@ -0,0 +1,64 @@
+const fs = require('fs');
+const path = require('path');
+const Sequelize = require('sequelize');
+sequelize = require('./connection');
+
+var models = {};
+module.exports = models;
+
+// **********************************************************************************
+// IMPORT SEQUEILIZE MODELS
+
+//grabs all the models in your models folder, adds them to the models object
+fs.readdirSync("./models")
+    .filter(function(file) {
+        return (file.indexOf('.') !== 0) && (file !== 'index.js') && (file.slice(-3) === '.js');
+    })
+    .forEach(function(file) {
+        console.log(file);
+        let model_file = require(path.join(__dirname,'models', file));
+        let model = model_file.init(sequelize, Sequelize);
+
+
+        let validator_patch = path.join('./validations', file);
+        if(fs.existsSync(validator_patch)){
+            model = require(`./${validator_patch}`).validator_patch(model);
+        }
+
+        let patches_patch = path.join('./patches', file);
+        if(fs.existsSync(patches_patch)){
+            model = require(`./${patches_patch}`).logic_patch(model);
+        }
+
+        if(models[model.name])
+            throw Error(`Duplicated model name ${model.name}`);
+
+        models[model.name] = model;
+
+    });
+//Important: creates associations based on associations defined in associate function in the model files
+Object.keys(models).forEach(function(modelName) {
+    if (models[modelName].associate) {
+        models[modelName].associate(models);
+    }
+});
+//update tables with association (temporary, just for testing purposes)
+//this part is suppose to be done in the migration file
+//sequelize.sync({force: true});
+
+
+// **********************************************************************************
+// IMPORT WEBSERVICES
+
+fs.readdirSync("./models-webservice")
+    .filter(function(file) {
+        return (file.indexOf('.') !== 0) && (file !== 'index.js') && (file.slice(-3) === '.js');
+    })
+    .forEach(function(file) {
+        let model = require(`./${path.join("./models-webservice", file)}`);
+
+        if(models[model.name])
+            throw Error(`Duplicated model name ${model.name}`);
+
+        models[model.name] = model;
+    });