@webresto/graphql 1.3.2 → 1.3.3

package/package.json

@@ -60,5 +60,5 @@
     "test:js": "mocha test/bootstrap.js './test/{,!(fixture)/**}/*.test.js' --exit",
     "test:init": "cd ./test/fixture && npm i --no-package-lock --prefix ./ && cd -"
   },
-  "version": "1.3.2"
+  "version": "1.3.3"
 }

package/src/additionalResolvers.js

@@ -46,7 +46,7 @@ exports.additionalResolver = {
     },
     OrderModifier: {
         dish: async (parent, args, context, info) => {
-            return (await Dish.find({ id: parent.id, balance: { "!": 0 }, isDeleted: false }).populateAll())[0];
+            return (await Dish.find({ id: parent.id, balance: { "!=": 0 }, isDeleted: false }).populateAll())[0];
         },
         group: async (parent, args) => {
             return (await Group.find({ id: parent.groupId, isDeleted: false }).populateAll())[0];

package/src/additionalResolvers.ts

@@ -43,7 +43,7 @@ export const additionalResolver = {
 
   OrderModifier: {
     dish: async (parent, args, context, info) => {
-      return (await Dish.find({id: parent.id, balance: { "!": 0 }, isDeleted: false}).populateAll())[0];
+      return (await Dish.find({id: parent.id, balance: { "!=": 0 }, isDeleted: false}).populateAll())[0];
     },
     group: async (parent, args) => {
       return (await Group.find({id: parent.groupId, isDeleted: false}).populateAll())[0];

package/src/graphql.js

@@ -65,6 +65,11 @@ exports.default = {
       type: String
       message: String
     }
+    type Street {
+      id: String
+      name: String
+      customData: Json
+    }
     type Action {
       type: String
       data: Json
@@ -98,6 +103,13 @@ exports.default = {
       type Subscription {
         _root: String
       }`);
+        /**
+        * Discount fields global support
+        */
+        helper.addCustomField("Dish", "discountAmount: Float");
+        helper.addCustomField("Dish", "discountType: String");
+        helper.addCustomField("Dish", "oldPrice: Float");
+        helper.addCustomField("Group", "discount: String");
         const { typeDefs, resolvers } = helper.getSchema();
         getEmitter_1.default().on('core-order-after-count', 'graphql', function (order) {
             pubsub.publish("order-changed", order);
@@ -114,30 +126,36 @@ exports.default = {
         getEmitter_1.default().on("core-maintenance-disabled", "graphql", function () {
             pubsub.publish("maintenance", null);
         });
-        const apolloServer = new ApolloServer({
-            typeDefs,
-            resolvers: [resolvers, AdditionalResolvers],
-            subscriptions: {
-                onConnect: (connectionParams, webSocket) => {
-                    let exContext = {};
-                    if (connectionParams) {
-                        if (!connectionParams['authorization'] && connectionParams['Authorization'])
-                            connectionParams['authorization'] = connectionParams['Authorization'];
-                        exContext['connectionParams'] = connectionParams;
-                    }
-                    exContext['pubsub'] = pubsub;
-                    return exContext;
+        let apolloServer;
+        try {
+            apolloServer = new ApolloServer({
+                typeDefs,
+                resolvers: [resolvers, AdditionalResolvers],
+                subscriptions: {
+                    onConnect: (connectionParams, webSocket) => {
+                        let exContext = {};
+                        if (connectionParams) {
+                            if (!connectionParams['authorization'] && connectionParams['Authorization'])
+                                connectionParams['authorization'] = connectionParams['Authorization'];
+                            exContext['connectionParams'] = connectionParams;
+                        }
+                        exContext['pubsub'] = pubsub;
+                        return exContext;
+                    },
                 },
-            },
-            context: async ({ req, connection }) => {
-                if (connection) {
-                    return connection.context;
-                }
-                else {
-                    return { ...req };
+                context: async ({ req, connection }) => {
+                    if (connection) {
+                        return connection.context;
+                    }
+                    else {
+                        return { ...req };
+                    }
                 }
-            }
-        });
+            });
+        }
+        catch (error) {
+            console.error("GraphQL start error: ", error);
+        }
         server = apolloServer;
         return apolloServer;
     }

package/src/graphql.ts

@@ -74,6 +74,11 @@ export default {
       type: String
       message: String
     }
+    type Street {
+      id: String
+      name: String
+      customData: Json
+    }
     type Action {
       type: String
       data: Json
@@ -110,6 +115,14 @@ export default {
       type Subscription {
         _root: String
       }`);
+  
+      /**
+      * Discount fields global support
+      */
+      helper.addCustomField("Dish", "discountAmount: Float")
+      helper.addCustomField("Dish", "discountType: String")
+      helper.addCustomField("Dish", "oldPrice: Float")
+      helper.addCustomField("Group", "discount: String")
 
     const { typeDefs, resolvers } = helper.getSchema();
 
@@ -128,31 +141,35 @@ export default {
     getEmitter().on("core-maintenance-disabled", "graphql", function () {
       pubsub.publish("maintenance", null);
     });
-
-    const apolloServer = new ApolloServer({
-      typeDefs,
-      resolvers: [resolvers, AdditionalResolvers],
-      subscriptions: {
-        onConnect: (connectionParams, webSocket) => {
-          let exContext = {}
-          if (connectionParams) {
-            if (!connectionParams['authorization'] && connectionParams['Authorization'])
-              connectionParams['authorization'] = connectionParams['Authorization'];
-
-            exContext['connectionParams'] = connectionParams
-          }
-            exContext['pubsub'] = pubsub;
-            return exContext;
-        },
-      },
-      context: async ({ req , connection}) => {
-        if (connection) {
-          return connection.context;
-        } else {
-          return { ...req };
-        }
-      }
-    });
+    let apolloServer
+    try {
+      apolloServer = new ApolloServer({
+        typeDefs,
+        resolvers: [resolvers, AdditionalResolvers],
+        subscriptions: {
+          onConnect: (connectionParams, webSocket) => {
+            let exContext = {}
+              if (connectionParams) {
+                if (!connectionParams['authorization'] && connectionParams['Authorization'])
+                  connectionParams['authorization'] = connectionParams['Authorization'];
+                  
+                  exContext['connectionParams'] = connectionParams
+                }
+                exContext['pubsub'] = pubsub;
+                return exContext;
+              },
+            },
+            context: async ({ req , connection}) => {
+              if (connection) {
+                return connection.context;
+              } else {
+                return { ...req };
+              }
+            }
+          });
+    } catch (error) {
+      console.error("GraphQL start error: ", error)
+    }
 
     server = apolloServer;
     return apolloServer;

package/src/resolvers/cart.d.ts

@@ -6,7 +6,6 @@ declare const _default: {
                 id: string;
                 shortId: string;
                 dishes: number[] | import("@webresto/core/models/OrderDish").default[];
-                discount: any;
                 paymentMethod: any;
                 paymentMethodTitle: string;
                 paid: {
@@ -53,23 +52,243 @@ declare const _default: {
     Mutation: {
         orderAddDish: {
             def: string;
-            fn: (parent: any, args: any, context: any) => Promise<import("@webresto/core/models/Order").default>;
+            fn: (parent: any, args: any, context: any) => Promise<{
+                id: string;
+                shortId: string;
+                dishes: number[] | import("@webresto/core/models/OrderDish").default[];
+                paymentMethod: any;
+                paymentMethodTitle: string;
+                paid: {
+                    type: string;
+                    defaultsTo: boolean;
+                };
+                isPaymentPromise: boolean;
+                dishesCount: number;
+                uniqueDishes: number;
+                modifiers: any;
+                customer: any;
+                address: any;
+                comment: string;
+                personsCount: string;
+                date: string;
+                problem: boolean;
+                rmsDelivered: boolean;
+                rmsId: string;
+                rmsOrderNumber: string;
+                rmsOrderData: any;
+                rmsDeliveryDate: string;
+                rmsErrorMessage: string;
+                rmsErrorCode: string;
+                rmsStatusCode: string;
+                deliveryStatus: string;
+                selfService: boolean;
+                deliveryDescription: string;
+                message: string;
+                deliveryItem: any;
+                deliveryCost: number;
+                totalWeight: number;
+                trifleFrom: number;
+                bonusesTotal: number;
+                total: number;
+                orderTotal: number;
+                discountTotal: number;
+                orderDate: string;
+                customData: any;
+                state: string;
+                toJSON(): any;
+            }>;
         };
         orderReplaceDish: {
             def: string;
-            fn: (parent: any, args: any, context: any) => Promise<import("@webresto/core/models/Order").default>;
+            fn: (parent: any, args: any, context: any) => Promise<{
+                id: string;
+                shortId: string;
+                dishes: number[] | import("@webresto/core/models/OrderDish").default[];
+                paymentMethod: any;
+                paymentMethodTitle: string;
+                paid: {
+                    type: string;
+                    defaultsTo: boolean;
+                };
+                isPaymentPromise: boolean;
+                dishesCount: number;
+                uniqueDishes: number;
+                modifiers: any;
+                customer: any;
+                address: any;
+                comment: string;
+                personsCount: string;
+                date: string;
+                problem: boolean;
+                rmsDelivered: boolean;
+                rmsId: string;
+                rmsOrderNumber: string;
+                rmsOrderData: any;
+                rmsDeliveryDate: string;
+                rmsErrorMessage: string;
+                rmsErrorCode: string;
+                rmsStatusCode: string;
+                deliveryStatus: string;
+                selfService: boolean;
+                deliveryDescription: string;
+                message: string;
+                deliveryItem: any;
+                deliveryCost: number;
+                totalWeight: number;
+                trifleFrom: number;
+                bonusesTotal: number;
+                total: number;
+                orderTotal: number;
+                discountTotal: number;
+                orderDate: string;
+                customData: any;
+                state: string;
+                toJSON(): any;
+            }>;
         };
         orderRemoveDish: {
             def: string;
-            fn: (parent: any, args: any, context: any) => Promise<import("@webresto/core/models/Order").default>;
+            fn: (parent: any, args: any, context: any) => Promise<{
+                id: string;
+                shortId: string;
+                dishes: number[] | import("@webresto/core/models/OrderDish").default[];
+                paymentMethod: any;
+                paymentMethodTitle: string;
+                paid: {
+                    type: string;
+                    defaultsTo: boolean;
+                };
+                isPaymentPromise: boolean;
+                dishesCount: number;
+                uniqueDishes: number;
+                modifiers: any;
+                customer: any;
+                address: any;
+                comment: string;
+                personsCount: string;
+                date: string;
+                problem: boolean;
+                rmsDelivered: boolean;
+                rmsId: string;
+                rmsOrderNumber: string;
+                rmsOrderData: any;
+                rmsDeliveryDate: string;
+                rmsErrorMessage: string;
+                rmsErrorCode: string;
+                rmsStatusCode: string;
+                deliveryStatus: string;
+                selfService: boolean;
+                deliveryDescription: string;
+                message: string;
+                deliveryItem: any;
+                deliveryCost: number;
+                totalWeight: number;
+                trifleFrom: number;
+                bonusesTotal: number;
+                total: number;
+                orderTotal: number;
+                discountTotal: number;
+                orderDate: string;
+                customData: any;
+                state: string;
+                toJSON(): any;
+            }>;
         };
         orderSetDishAmount: {
             def: string;
-            fn: (parent: any, args: any, context: any) => Promise<import("@webresto/core/models/Order").default>;
+            fn: (parent: any, args: any, context: any) => Promise<{
+                id: string;
+                shortId: string;
+                dishes: number[] | import("@webresto/core/models/OrderDish").default[];
+                paymentMethod: any;
+                paymentMethodTitle: string;
+                paid: {
+                    type: string;
+                    defaultsTo: boolean;
+                };
+                isPaymentPromise: boolean;
+                dishesCount: number;
+                uniqueDishes: number;
+                modifiers: any;
+                customer: any;
+                address: any;
+                comment: string;
+                personsCount: string;
+                date: string;
+                problem: boolean;
+                rmsDelivered: boolean;
+                rmsId: string;
+                rmsOrderNumber: string;
+                rmsOrderData: any;
+                rmsDeliveryDate: string;
+                rmsErrorMessage: string;
+                rmsErrorCode: string;
+                rmsStatusCode: string;
+                deliveryStatus: string;
+                selfService: boolean;
+                deliveryDescription: string;
+                message: string;
+                deliveryItem: any;
+                deliveryCost: number;
+                totalWeight: number;
+                trifleFrom: number;
+                bonusesTotal: number;
+                total: number;
+                orderTotal: number;
+                discountTotal: number;
+                orderDate: string;
+                customData: any;
+                state: string;
+                toJSON(): any;
+            }>;
         };
         orderSetDishComment: {
             def: string;
-            fn: (parent: any, args: any, context: any) => Promise<import("@webresto/core/models/Order").default>;
+            fn: (parent: any, args: any, context: any) => Promise<{
+                id: string;
+                shortId: string;
+                dishes: number[] | import("@webresto/core/models/OrderDish").default[];
+                paymentMethod: any;
+                paymentMethodTitle: string;
+                paid: {
+                    type: string;
+                    defaultsTo: boolean;
+                };
+                isPaymentPromise: boolean;
+                dishesCount: number;
+                uniqueDishes: number;
+                modifiers: any;
+                customer: any;
+                address: any;
+                comment: string;
+                personsCount: string;
+                date: string;
+                problem: boolean;
+                rmsDelivered: boolean;
+                rmsId: string;
+                rmsOrderNumber: string;
+                rmsOrderData: any;
+                rmsDeliveryDate: string;
+                rmsErrorMessage: string;
+                rmsErrorCode: string;
+                rmsStatusCode: string;
+                deliveryStatus: string;
+                selfService: boolean;
+                deliveryDescription: string;
+                message: string;
+                deliveryItem: any;
+                deliveryCost: number;
+                totalWeight: number;
+                trifleFrom: number;
+                bonusesTotal: number;
+                total: number;
+                orderTotal: number;
+                discountTotal: number;
+                orderDate: string;
+                customData: any;
+                state: string;
+                toJSON(): any;
+            }>;
         };
         orderUpdate: {
             def: string;
@@ -77,7 +296,6 @@ declare const _default: {
                 id: string;
                 shortId: string;
                 dishes: number[] | import("@webresto/core/models/OrderDish").default[];
-                discount: any;
                 paymentMethod: any;
                 paymentMethodTitle: string;
                 paid: {

package/src/resolvers/cart.js

@@ -27,7 +27,9 @@ exports.default = {
                     sails.log.error("GQL > order resolver error: ", `order with id ${args.orderId} . Trying make new cart.`);
                     order = await getNewCart(args.orderId);
                 }
-                return await Order.populate(order.id);
+                let fullOrder = await Order.populate(order.id);
+                getEmitter_1.default().emit("http-api:before-response-order", fullOrder);
+                return fullOrder;
             },
         },
     },
@@ -66,7 +68,9 @@ exports.default = {
                 }
                 await Order.addDish(order.id, args.dishId, args.amount, args.modifiers || [], args.comment, args.from, args.replace, args.orderDishId);
                 await Order.countCart(order);
-                return await Order.populate(order.id);
+                let fullOrder = await Order.populate(order.id);
+                getEmitter_1.default().emit("http-api:before-response-order-add-dish", fullOrder);
+                return fullOrder;
             },
         },
         orderReplaceDish: {
@@ -84,7 +88,9 @@ exports.default = {
                 }
                 await Order.addDish(order.id, args.dishId, args.amount, args.modifiers || [], args.comment, args.from, args.replace, args.orderDishId);
                 await Order.countCart(order);
-                return await Order.populate(order.id);
+                let fullOrder = await Order.populate(order.id);
+                getEmitter_1.default().emit("http-api:before-response-order-replace-dish", fullOrder);
+                return fullOrder;
             },
         },
         orderRemoveDish: {
@@ -102,7 +108,9 @@ exports.default = {
                 const orderDish = await OrderDish.findOne({ id: args.orderDishId });
                 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_1.default().emit("http-api:before-response-order-remove-dish", fullOrder);
+                return fullOrder;
             },
         },
         orderSetDishAmount: {
@@ -124,7 +132,9 @@ exports.default = {
                     throw new errorWrapper_1.Error(0, "ERROR", `Dish in OrderDish with id ${args.orderDishId} not found`);
                 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_1.default().emit("http-api:before-response-order-set-dish-amount", fullOrder);
+                return fullOrder;
             },
         },
         orderSetDishComment: {
@@ -152,7 +162,9 @@ exports.default = {
                 }
                 await order.setComment(dish, comment);
                 await Order.countCart(order);
-                return await Order.populate(order.id);
+                let fullOrder = await Order.populate(order.id);
+                getEmitter_1.default().emit("http-api:before-response-order-set-dish-comment", fullOrder);
+                return fullOrder;
             },
         },
         orderUpdate: {
@@ -163,7 +175,9 @@ exports.default = {
                     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_1.default().emit("http-api:before-response-order-update", fullOrder);
+                return fullOrder;
             },
         },
     },

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.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

@@ -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);