@webresto/graphql 1.3.0 → 1.3.3

package/src/resolvers/cart.ts

@@ -32,7 +32,10 @@ export default {
           );
           order = await getNewCart(args.orderId);
         }
-        return await Order.populate(order.id);
+
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order", fullOrder);
+        return fullOrder
       },
     },
   },
@@ -95,7 +98,11 @@ export default {
           args.replace,
           args.orderDishId
         );
-        return await Order.countCart(order);
+        await Order.countCart(order);
+
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-add-dish", fullOrder);
+        return fullOrder
       },
     },
     orderReplaceDish: {
@@ -126,7 +133,10 @@ export default {
           args.replace,
           args.orderDishId
         );
-        return await Order.countCart(order);
+        await Order.countCart(order);
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-replace-dish", fullOrder);
+        return fullOrder
       },
     },
     orderRemoveDish: {
@@ -150,7 +160,10 @@ export default {
         const orderDish = await OrderDish.findOne({ id: args.orderDishId });
 
         await Order.removeDish(order.id, orderDish, args.amount, false);
-        return await Order.countCart(order);
+        await Order.countCart(order);
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-remove-dish", fullOrder);
+        return fullOrder
       },
     },
     orderSetDishAmount: {
@@ -187,7 +200,10 @@ export default {
           );
 
         await Order.setCount(order.id, dish, args.amount);
-        return await Order.countCart(order);
+        await Order.countCart(order);
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-set-dish-amount", fullOrder);
+        return fullOrder
       },
     },
     orderSetDishComment: {
@@ -223,8 +239,10 @@ export default {
         }
 
         await order.setComment(dish, comment);
-        return await Order.countCart(order);
-      },
+        await Order.countCart(order);
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-set-dish-comment", fullOrder);
+        return fullOrder      },
     },
 
     orderUpdate: {
@@ -234,7 +252,10 @@ export default {
         let order = args.order;
         if (!order.id) throw "order.id field is required"
         await Order.update({id: order.id}, {trifleFrom: order.trifleFrom})
-        return await Order.populate(order.id);
+        await Order.populate(order.id);
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-update", fullOrder);
+        return fullOrder   
       },
     },
   },

package/src/resolvers/checkout.ts

@@ -90,6 +90,7 @@ export default {
                 ? order.message
                 : "Заказ готов к оформлению",
             };
+
           } else {
             if (order.message) {
               return eventHelper.sendMessage(args.orderId, {

package/test/{_bootstrap.js → bootstrap.js}

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("mocha");
-var Sails = require('./fixtures/v0.12-app/node_modules/sails').Sails;
+require("dotenv").config();
+var Sails = require("./fixture/node_modules/sails").Sails;
+process.env.DEV = "TRUE";
+process.env.LOG_LEVEL = 'silent';
 before(function (done) {
-    let rc = require('./fixtures/v0.12-app/app').rc;
+    require("./fixture/app-export");
     this.timeout(50000);
-    Sails().lift(rc, function (err, _sails) {
+    Sails().lift({}, function (err, _sails) {
         if (err)
             return done(err);
         global.sails = _sails;
-        // console.log(_sails);
         return done();
     });
 });
@@ -18,12 +20,9 @@ after(function (done) {
         return global.sails.lower(function (err) {
             if (err) {
                 done();
-                return process.exit(2);
             }
             done();
-            return process.exit(0);
         });
     }
     done();
-    return process.exit(2);
 });

package/test/bootstrap.ts

@@ -0,0 +1,36 @@
+import "mocha";
+require("dotenv").config();
+var Sails = require("./fixture/node_modules/sails").Sails;
+
+process.env.DEV = "TRUE"
+process.env.LOG_LEVEL= 'silent'
+
+before(function (done) {
+  require("./fixture/app-export");
+  this.timeout(50000);
+  Sails().lift({}, function (err: any, _sails: any) {
+    if (err) return done(err);
+    global.sails = _sails;
+    return done();
+  });
+});
+
+after(function (done) {
+  if (global.sails) {
+    return global.sails.lower(function (err) {
+      if (err) {
+        done();
+      }
+      done();
+    });
+  }
+  done();
+});
+
+declare global {
+  namespace NodeJS {
+    interface Global {
+      sails: any;
+    }
+  }
+}

package/test/fixture/.sailsrc

@@ -0,0 +1,14 @@
+{
+  "generators": {
+    "modules": {}
+  },
+  "hooks": {
+    "grunt": false,
+    ".ci": false,
+    "sockets":false,
+    "pubsub": false
+  },
+  "paths": {
+    "hooks": "modules"
+  }
+}

package/test/{fixtures/v0.12-app/app.js → fixture/app-export.js}

@@ -45,7 +45,7 @@ try {
   rc = require('rc');
 } catch (e0) {
   try {
-    rc = require('sails/node_modules/rc');
+    rc = require('sails/accessible/rc');
   } catch (e1) {
     console.error('Could not find dependency: `rc`.');
     console.error('Your `.sailsrc` file(s) will be ignored.');
@@ -70,4 +70,4 @@ try {
 module.exports = {
   sails: sails,
   rc: rc('sails')
-} 
+}

package/test/fixture/app.js

@@ -0,0 +1,56 @@
+/**
+ * app.js
+ *
+ * Use `app.js` to run your app without `sails lift`.
+ * To start the server, run: `node app.js`.
+ *
+ * This is handy in situations where the sails CLI is not relevant or useful,
+ * such as when you deploy to a server, or a PaaS like Heroku.
+ *
+ * For example:
+ *   => `node app.js`
+ *   => `npm start`
+ *   => `forever start app.js`
+ *   => `node debug app.js`
+ *
+ * The same command-line arguments and env vars are supported, e.g.:
+ * `NODE_ENV=production node app.js --port=80 --verbose`
+ *
+ * For more information see:
+ *   https://sailsjs.com/anatomy/app.js
+ */
+
+
+// Ensure we're in the project directory, so cwd-relative paths work as expected
+// no matter where we actually lift from.
+// > Note: This is not required in order to lift, but it is a convenient default.
+process.chdir(__dirname);
+
+process.env.DEV = "TRUE";
+
+
+// Attempt to import `sails` dependency, as well as `rc` (for loading `.sailsrc` files).
+var sails;
+var rc;
+try {
+  sails = require('sails');
+  rc = require('sails/accessible/rc');
+} catch (err) {
+  console.error('Encountered an error when attempting to require(\'sails\'):');
+  console.error(err.stack);
+  console.error('--');
+  console.error('To run an app using `node app.js`, you need to have Sails installed');
+  console.error('locally (`./node_modules/sails`).  To do that, just make sure you\'re');
+  console.error('in the same directory as your app and run `npm install`.');
+  console.error();
+  console.error('If Sails is installed globally (i.e. `npm install -g sails`) you can');
+  console.error('also run this app with `sails lift`.  Running with `sails lift` will');
+  console.error('not run this file (`app.js`), but it will do exactly the same thing.');
+  console.error('(It even uses your app directory\'s local Sails install, if possible.)');
+  return;
+}//-•
+
+console.log(rc('sails'))
+
+// Start server
+sails.lift(rc('sails'));

package/test/fixture/config/adminpanel.js

@@ -0,0 +1,25 @@
+'use strict';
+
+
+setTimeout(() => {
+    sails.after(["hook:orm:loaded"], () => {
+        Object.keys(sails.models).forEach((modelname) => {
+            let modelName = sails.models[modelname].globalId;
+            sails.config.adminpanel.instances["dev" + modelName] = {
+                title: "dev" + modelName,
+                icon: 'cube',
+                model: modelName,
+                fields: {
+                    createdAt: false,
+                    updatedAt: false
+                }
+            };
+        });
+    });
+}, 5000);
+
+
+module.exports.adminpanel = {
+    instances: {
+    }
+};

package/test/fixture/config/bootstrap.js

@@ -0,0 +1,161 @@
+maintenanceSeed = [
+  {
+    id: "maintenance1",
+    title: "Сайт временно не работает",
+    description: "<div>\r\n<p>По техническим причинам доставка сейчас не осуществляется</p>\r\n</div>",
+    enable: false,
+    startDate: "2019-12-31T21:00:00.000Z",
+    stopDate: "2020-12-31T21:00:00.000Z",
+  },
+];
+
+const fs = require("fs");
+const path = require("path");
+
+module.exports.bootstrap = async function () {
+  sails.config.paths.app = process.cwd();
+
+  /**
+   * # Bootsrap seeds from seeds folder
+   * Magic: filename.json where filename is model name
+   */
+
+  if (sails.config.models.migrate === "drop" || process.env.FORCE_SEED === "TRUE") {
+    sails.log.info("Seeding 🌱 process start")
+    try {
+      let seedsDir = process.env.SEED_PATH ? process.env.SEED_PATH : __dirname + "/../seeds/";
+      // load JSON data
+      let seeds = fs.readdirSync(seedsDir).filter(function (file) {
+        return path.extname(file).toLowerCase() === ".json";
+      });
+
+      for await (let seed of seeds) {
+        try {
+          let seedFile = seedsDir + seed;
+          let model = seed.split(".")[0].toLowerCase();
+          let json_seed_data = require(seedFile);
+
+          sails.log.info("🌱 Bootstrap > Seed for model: ", model);
+
+          if (sails.models[model]) {
+            await sails.models[model].destroy({}).fetch();
+            if (Array.isArray(json_seed_data)) {
+              for await (seed_item of json_seed_data) {
+                cleanSeedItem(seed_item);
+                await sails.models[model].create(seed_item).fetch();
+              }
+              sails.log.debug(`🌱 Bootstrap seed ${model}: > count: ${json_seed_data.length}`);
+            } else {
+              sails.log.debug(`🌱 Bootstrap seed ${model}: > one item`);
+              cleanSeedItem(seed_item);
+              await sails.models[model].create(json_seed_data).fetch();
+            }
+            sails.log.info(`Bootstrap seed model: > ${model} was seeded, count: ${json_seed_data.length}`);
+          } else {
+            sails.log.warn(`Bootstrap seed model: > ${model} SKIPED (model not present in sails)`);
+          }
+        } catch (error) {
+          sails.log.error(`🌱 Seeding error: ${error}`);
+        }
+      }
+
+      // Load JS files
+      seeds = fs.readdirSync(seedsDir).filter(function (file) {
+        return path.extname(file).toLowerCase() === ".js";
+      });
+
+      /**
+       * If file .queue exist then sort seedqueue by this file
+       */
+
+      if (fs.existsSync(seedsDir + ".queue")) {
+        var queuelist = fs
+          .readFileSync(seedsDir + ".queue")
+          .toString()
+          .split("\n");
+        let _seeds = [...seeds];
+        seeds = [];
+
+        // Build head loadlist of js seeds files
+        queuelist.forEach((qItem) => {
+          _seeds.forEach((sItem) => {
+            if (sItem.includes(qItem) && !isCommented(qItem)) {
+              seeds.push(sItem);
+            }
+          });
+        });
+
+        // Build foot
+        seeds = [...seeds, ..._seeds.filter((n) => !seeds.includes(n))];
+      }
+
+      for await (let seed of seeds) {
+        let seedFile = seedsDir + seed;
+        if (fs.existsSync(seedFile)) {
+          let bootstrap_model_seed = require(seedFile);
+          await bootstrap_model_seed.default(sails);
+        }
+      }
+    } catch (error) {
+      console.error("Bootstrap seeds error: > ", error);
+    }
+  }
+
+  await Settings.set("enableIikoSimpleDiscounts", true);
+  //////////////////////////////////////////////////////////
+
+  setTimeout(() => {
+    console.log("ADMINPANEL", sails.config.adminpanel.instances.discount)
+  }, 10000)
+
+  if (sails.config.models.migrate === "drop") {
+    // create init params for webresto
+    try {
+      if ((await Maintenance.count()) === 0) {
+        sails.log.verbose("BOOTSTRAP > Start Import Maintenance SEED");
+        await Maintenance.createEach(maintenanceSeed).fetch();
+      }
+
+      process.env.TZ = (await Settings.use("timezone")) ? await Settings.use("timezone") : process.env.TZ;
+
+      return
+    } catch (error) {
+      console.log(error);
+    }
+  } else {
+    process.env.TZ = (await Settings.use("timezone")) ? await Settings.use("timezone") : process.env.TZ;
+    return
+  }
+  return
+};
+
+function isCommented(str) {
+  return (Boolean(str) && (
+    str
+      .split(" ")
+      .filter((a) => {
+        return Boolean(a);
+      })[0]
+      .charAt(0) === "#"
+  ));
+}
+
+
+function cleanSeedItem(item) {
+
+  if(item.createdAt) delete(item.createdAt)
+  if(item.updatedAt) delete(item.updatedAt)
+  if(typeof item.id === "number") delete(item.id)
+
+  for (const [key, value] of Object.entries(item)) {
+    if (value === null || value === undefined)  {
+      delete(item[key])
+    } else {
+      try {
+        let json_value = JSON.parse(value);
+        item[key] = json_value
+      } catch (e) {
+      }
+    }
+  }
+}

package/test/fixture/config/connections.js

@@ -0,0 +1,9 @@
+module.exports.connections = {
+    // postgres: {
+    //     adapter: 'sails-postgresql',
+    //     host: process.env.PG_HOST === undefined ? '127.0.0.1' : process.env.PG_HOST,
+    //     user: process.env.PG_USER === undefined ? 'postgres' : process.env.PG_USER, 
+    //     password: process.env.PG_PASSWORD === undefined ? 'postgres' : process.env.PG_PASSWORD, 
+    //     database: process.env.PG_DATABASE === undefined ? 'testdb' : process.env.PG_DATABASE 
+    //   }
+};

package/test/fixture/config/env/development.js

@@ -0,0 +1,10 @@
+module.exports = {
+  // models: {
+  //  connection: 'postgres'
+   
+  // },
+  port: process.env.PORT === undefined ? 42772 : process.env.PORT,
+  log: {
+    level: process.env.LOG_LEVEL === undefined ? 'verbose' : process.env.PORT
+   }
+};

package/test/{fixtures/v0.12-app → fixture}/config/env/production.js

@@ -1,8 +1,8 @@
 module.exports = {
-  models: {
-    connection: 'memory',
-    migrate: 'safe'
-  },
+  // models: {
+  //   connection: 'postgres',
+  //   migrate: 'safe'
+  // },
   adminpanel:{
     auth: true
   },
@@ -11,6 +11,6 @@ module.exports = {
   },
   port: process.env.PORT === undefined ? 42772 : process.env.PORT,
   log: {
-   level: "silent"
+   level: "verbose"
   }
 };

package/test/fixture/config/globals.js

@@ -0,0 +1,16 @@
+/**
+ * THIS FILE WAS ADDED AUTOMATICALLY by the Sails 1.0 app migration tool.
+ * The original file was backed up as `config/globals-old.js.txt`
+ */
+
+ module.exports.globals = {
+
+  _: require('lodash'),
+
+  async: require('async'),
+
+  models: true,
+
+  sails: true
+
+};

package/test/{fixtures/v0.12-app → fixture}/config/log.js

@@ -24,6 +24,6 @@ module.exports.log = {
   *                                                                          *
   ***************************************************************************/
 
-   level: 'verbose'
+   level: 'debug'
 
 };

package/test/fixture/config/models.js

@@ -0,0 +1,9 @@
+module.exports.models = {
+   migrate: 'drop',
+   attributes: {
+      id: { type: 'number', autoIncrement: true, },
+      createdAt: { type: 'number', autoCreatedAt: true, },
+      updatedAt: { type: 'number', autoUpdatedAt: true, }
+    },
+    
+};

package/test/fixture/config/modulemanager.js

@@ -0,0 +1,22 @@
+module.exports.modulemanager = {
+    navbar: [
+        {
+            id: "1",
+            name: "Мои модули",
+            link: `/admin/modules/my`,
+            icon: "home"
+        },
+        {
+            id: "2",
+            name: "Обновления",
+            link: `/admin/modules/updates`,
+            icon: "cloud-download-alt"
+        },
+        {
+            id: "3",
+            name: "Маркетплейс",
+            link: `/admin/modules/market`,
+            icon: "shopping-order"
+        }
+    ]
+}

package/test/fixture/hacks/waterline.js

@@ -0,0 +1,39 @@
+/**
+ * WRONG SAILS HACK
+ */
+
+console.warn("WRONG SAILS HACK v0.2");
+let PWD = process.cwd()
+const replace = require("replace-in-file");
+
+/**
+ * 1.
+ * Patch for allow unknow types
+ * bash equals: find $PWD/node_modules/waterline-schema/ -type f -print0 | xargs -0 sed -i 's|if (_.indexOf(validProperties, propertyName) < 0) {|if (false) {|g'
+ */
+console.log(PWD + "/../**/sails-hook-orm/lib/validate-model-def.js",);
+const results = replace.sync({
+  files: [
+    //for test system
+    PWD + "/../**/sails-hook-orm/lib/validate-model-def.js", 
+    PWD + "/../**/waterline-schema/schema.js",
+    PWD + "/../**/sails-disk/index.js",
+    PWD + "/../**/query/private/normalize-value-to-set.js", 
+ 
+  ], 
+  from: [
+    "(_.isFunction(val.defaultsTo))",
+    "(_.indexOf(validProperties, propertyName) < 0)",
+    "(_.has(attribute, 'defaultsTo') && _.isNull(attribute.defaultsTo))",
+    "(_.has(primaryKeyAttribute, 'defaultsTo') && !_.isUndefined(primaryKeyAttribute, 'defaultsTo'))",
+    "(attribute.required && _.has(attribute, 'defaultsTo') && !_.isUndefined(attribute, 'defaultsTo'))",
+    "(_.has(attribute, 'defaultsTo'))",
+    "(isProvidingNullForIncompatibleOptionalAttr)",
+    "(primaryKeyAttr.required !== true && (!primaryKeyAttr.autoMigrations || primaryKeyAttr.autoMigrations.autoIncrement !== true))"
+  ],
+  to: "(false)",
+});
+
+console.log(results);
+
+// Stranger things

package/test/fixture/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "test-app",
+  "private": true,
+  "version": "0.0.0",
+  "description": "Sails test application",
+  "keywords": [],
+  "dependencies": {
+    "@webresto/core": "file:../../node_modules/@webresto/core",
+    "@webresto/graphql": "file:../..",
+    "@webresto/worktime": "file:../../node_modules/@webresto/worktime",
+    "replace-in-file": "^6.3.2",
+    "include-all": "^1.0.8",
+    "rc": "^1.0.1",
+    "request": "^2.88.2",
+    "sails": "^1.5.0",
+    "sails-hook-orm": "^2.1.1",
+    "sails-hook-stateflow": "^1.0.6",
+    "connect-flash": "^0.1.1",
+    "sails-memory": "^0.10.7"
+  },
+  "scripts": {
+    "debug": "node debug app.js",
+    "start": "node app.js",
+    "postinstall": "node ./hacks/waterline.js"
+  },
+  "main": "app.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/webresto/app.git"
+  },
+  "author": "webresto",
+  "license": "MIT"
+}