@webresto/graphql 1.3.2 → 1.3.5

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
       },
     },
   },
@@ -96,7 +99,10 @@ export default {
           args.orderDishId
         );
         await Order.countCart(order);
-        return await Order.populate(order.id);
+
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-add-dish", fullOrder);
+        return fullOrder
       },
     },
     orderReplaceDish: {
@@ -128,7 +134,9 @@ export default {
           args.orderDishId
         );
         await Order.countCart(order);
-        return await Order.populate(order.id);
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-replace-dish", fullOrder);
+        return fullOrder
       },
     },
     orderRemoveDish: {
@@ -153,7 +161,9 @@ export default {
 
         await Order.removeDish(order.id, orderDish, args.amount, false);
         await Order.countCart(order);
-        return await Order.populate(order.id);
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-remove-dish", fullOrder);
+        return fullOrder
       },
     },
     orderSetDishAmount: {
@@ -191,7 +201,9 @@ export default {
 
         await Order.setCount(order.id, dish, args.amount);
         await Order.countCart(order);
-        return await Order.populate(order.id);
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-set-dish-amount", fullOrder);
+        return fullOrder
       },
     },
     orderSetDishComment: {
@@ -228,8 +240,9 @@ export default {
 
         await order.setComment(dish, comment);
         await Order.countCart(order);
-        return await Order.populate(order.id);
-      },
+        let fullOrder = await Order.populate(order.id);
+        getEmitter().emit("http-api:before-response-order-set-dish-comment", fullOrder);
+        return fullOrder      },
     },
 
     orderUpdate: {
@@ -240,7 +253,9 @@ export default {
         if (!order.id) throw "order.id field is required"
         await Order.update({id: order.id}, {trifleFrom: order.trifleFrom})
         await Order.populate(order.id);
-        return 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.js

@@ -62,11 +62,11 @@ exports.default = {
                         order.customData.callback = data.customData.callback;
                     }
                     await Order.update({ id: order.id }, order).fetch();
-                    let success;
-                    success = await Order.check(order.id, data.customer, isSelfService, data.address, data.paymentMethodId);
-                    order = await Order.findOne(data.orderId).populateAll();
+                    await Order.check(order.id, data.customer, isSelfService, data.address, data.paymentMethodId);
+                    order = await Order.findOne(data.orderId);
+                    console.log(order.dishes);
                     let message;
-                    if (success && order.state === "CHECKOUT") {
+                    if (order.state === "CHECKOUT") {
                         message = {
                             type: "info",
                             title: "Внимание",
@@ -77,16 +77,17 @@ exports.default = {
                     }
                     else {
                         if (order.message) {
-                            return eventHelper.sendMessage(args.orderId, {
+                            message = {
                                 type: "error",
                                 title: "Внимание",
                                 message: order.message
                                     ? order.message
                                     : "Не удалось проверить заказ.",
-                            });
+                            };
                         }
                     }
-                    return { order: order };
+                    eventHelper.sendMessage(args.orderId, message);
+                    return { message: message, order: order };
                 }
                 catch (e) {
                     let message = {
@@ -203,6 +204,7 @@ exports.default = {
                     //   }
                     // }
                     await Order.order(order.id);
+                    order = await Order.findOne({ id: data.orderId });
                     const message = {
                         type: "info",
                         title: "Успешно",

package/src/resolvers/checkout.ts

@@ -42,6 +42,7 @@ export default {
               message: "Корзина уже заказана",
             });
           }
+
           if (data.paymentMethodId) {
             if (!PaymentMethod.checkAvailable(data.paymentMethodId)) {
               return eventHelper.sendMessage(args.orderId, {
@@ -70,19 +71,20 @@ export default {
 
           await Order.update({ id: order.id }, order).fetch();
 
-          let success: boolean;
-
-          success = await Order.check(
+          await Order.check(
             order.id,
             data.customer,
             isSelfService,
             data.address,
             data.paymentMethodId
           );
-          order = await Order.findOne(data.orderId).populateAll();
+
+          order = await Order.findOne(data.orderId);
+          console.log(order.dishes)
+          
           let message;
 
-          if (success && order.state === "CHECKOUT") {
+          if (order.state === "CHECKOUT") {
             message = {
               type: "info",
               title: "Внимание",
@@ -90,19 +92,22 @@ export default {
                 ? order.message
                 : "Заказ готов к оформлению",
             };
+
           } else {
             if (order.message) {
-              return eventHelper.sendMessage(args.orderId, {
+              message = {
                 type: "error",
                 title: "Внимание",
                 message: order.message
                   ? order.message
                   : "Не удалось проверить заказ.",
-              });
+              }
             }
           }
 
-          return { order: order };
+          eventHelper.sendMessage(args.orderId, message);
+
+          return { message: message, order: order };
         } catch (e) {
           let message = {
             type: "error",
@@ -218,7 +223,7 @@ export default {
           // }
 
           await Order.order(order.id);
-
+          order = await Order.findOne({ id: data.orderId })
           const message = {
             type: "info",
             title: "Успешно",

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

@@ -2,6 +2,9 @@ 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);

package/test/fixture/.sailsrc

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

package/test/fixture/app-export.js

@@ -1,73 +1,73 @@
-/**
- * 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.
- *
- * For example:
- *   => `node app.js`
- *   => `forever start app.js`
- *   => `node debug app.js`
- *   => `modulus deploy`
- *   => `heroku scale`
- *
- *
- * The same command-line arguments are supported, e.g.:
- * `node app.js --silent --port=80 --prod`
- */
-
-
-// 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);
-
-// Attempt to import `sails`.
-var sails;
-try {
-  sails = require('sails');
-} catch (e) {
-  console.error('To run an app using `node app.js`, you usually need to have a version of `sails` installed in the same directory as your app.');
-  console.error('To do that, run `npm install sails`');
-  console.error('');
-  console.error('Alternatively, if you have sails installed globally (i.e. you did `npm install -g sails`), you can use `sails lift`.');
-  console.error('When you run `sails lift`, your app will still use a local `./node_modules/sails` dependency if it exists,');
-  console.error('but if it doesn\'t, the app will run with the global sails instead!');
-  return;
-}
-
-// --•
-// Try to get `rc` dependency (for loading `.sailsrc` files).
-var rc;
-try {
-  rc = require('rc');
-} catch (e0) {
-  try {
-    rc = require('sails/accessible/rc');
-  } catch (e1) {
-    console.error('Could not find dependency: `rc`.');
-    console.error('Your `.sailsrc` file(s) will be ignored.');
-    console.error('To resolve this, run:');
-    console.error('npm install rc --save');
-    rc = function () { return {}; };
-  }
-}
-
-
-
-// function sails() {
-//   return new Promise(function (resolve, reject) {
-//     sails.lift(rc('sails'), (err, _sails) => {
-//       if (err) { return done(err); }
-//       resolve(_sails);
-//     });
-//   })
-// }
-
-
-module.exports = {
-  sails: sails,
-  rc: rc('sails')
-}
+/**
+ * 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.
+ *
+ * For example:
+ *   => `node app.js`
+ *   => `forever start app.js`
+ *   => `node debug app.js`
+ *   => `modulus deploy`
+ *   => `heroku scale`
+ *
+ *
+ * The same command-line arguments are supported, e.g.:
+ * `node app.js --silent --port=80 --prod`
+ */
+
+
+// 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);
+
+// Attempt to import `sails`.
+var sails;
+try {
+  sails = require('sails');
+} catch (e) {
+  console.error('To run an app using `node app.js`, you usually need to have a version of `sails` installed in the same directory as your app.');
+  console.error('To do that, run `npm install sails`');
+  console.error('');
+  console.error('Alternatively, if you have sails installed globally (i.e. you did `npm install -g sails`), you can use `sails lift`.');
+  console.error('When you run `sails lift`, your app will still use a local `./node_modules/sails` dependency if it exists,');
+  console.error('but if it doesn\'t, the app will run with the global sails instead!');
+  return;
+}
+
+// --•
+// Try to get `rc` dependency (for loading `.sailsrc` files).
+var rc;
+try {
+  rc = require('rc');
+} catch (e0) {
+  try {
+    rc = require('sails/accessible/rc');
+  } catch (e1) {
+    console.error('Could not find dependency: `rc`.');
+    console.error('Your `.sailsrc` file(s) will be ignored.');
+    console.error('To resolve this, run:');
+    console.error('npm install rc --save');
+    rc = function () { return {}; };
+  }
+}
+
+
+
+// function sails() {
+//   return new Promise(function (resolve, reject) {
+//     sails.lift(rc('sails'), (err, _sails) => {
+//       if (err) { return done(err); }
+//       resolve(_sails);
+//     });
+//   })
+// }
+
+
+module.exports = {
+  sails: sails,
+  rc: rc('sails')
+}

package/test/fixture/app.js

@@ -1,56 +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'));
+/**
+ * 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";
+process.env.PORT = 42776;
+
+// 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

@@ -1,3 +1,25 @@
-module.exports.adminpanel = {
-    // auth: true
-}
+'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: {
+    }
+};