Merge branch 'development' into route_rate_school

src/libs/middlewares/downloadDatabase.js

@@ -48,9 +48,11 @@ module.exports = function download(table, mappingTable) {
                                 let dl = new Download({
                                     userId: req.user._id,
                                     table,
+                                    name: req.query.name,
                                     mappingTable,
                                     query: req.sql.toString()
                                 });
+                                console.log(dl);
                                 dl.save((err) => {
                                     if(err) log.error(err);
                                 });
@@ -59,9 +61,11 @@ module.exports = function download(table, mappingTable) {
                             download = new Download({
                                 userId: req.user._id,
                                 table,
+                                name: req.query.name,
                                 mappingTable,
                                 query: req.sql.toString()
                             });
+                            console.log(download);
                         }
 
                         download.save((err) => {

src/libs/models/download.js

@@ -14,6 +14,10 @@ let Download = new Schema({
         type: String,
         required: true
     },
+    name: {
+        type: String,
+        required: true
+    },
     mappingTable: {
         type: String,
         required: true

src/libs/routes/simulation.js

@@ -58,7 +58,7 @@ simulationApp.put('/pqr', passport.authenticate('bearer', { session: false }), (
             res.statusCode = 401;
             return next({err: { msg: 'Unauthorized'}});
         }
-        pqr.content = req.body.content | pqr.content;
+        pqr.content = req.body.content || pqr.content;
         pqr.save((err) => {
             if(err) {
                 log.error(err);

src/server.js

@@ -14,7 +14,7 @@ if (!compatVersion()) {
 if(cluster.isMaster) {
     log.info(`Master ${process.pid} is running`);
 
-    const numCPUs = require('os').cpus().length;
+    const numCPUs = (process.env.NODE_ENV != 'development') ? require('os').cpus().length : 1;
     log.info(`Master will create ${numCPUs} workers`);
     for(let i=0; i < numCPUs; ++i) {
         cluster.fork();