@webresto/graphql 1.3.1 → 1.3.4

package/lib/eventHelper.js

@@ -8,6 +8,7 @@ exports.default = {
     sendAction
 };
 function sendMessage(orderId, message) {
+    console.log({ orderId, message });
     const pubsub = graphql_1.default.getPubsub();
     pubsub.publish("message", { orderId, message });
 }

package/lib/eventHelper.ts

@@ -11,6 +11,7 @@ export {
 }
 
 function sendMessage(orderId: String, message: any) {
+    console.log({orderId, message})
     const pubsub = graphql.getPubsub();
     pubsub.publish("message", {orderId, message});
 }

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.1"
+  "version": "1.3.4"
 }

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];
@@ -70,7 +70,7 @@ exports.additionalResolver = {
                 });
                 dataloaders.set(info.fieldNodes, dl);
             }
-            return dl.load(parent.parentGroup);
+            return await dl.load(parent.parentGroup);
         },
         images: async (parent, args, context, info) => {
             if (!parent.id)
@@ -87,7 +87,7 @@ exports.additionalResolver = {
                 });
                 dataloaders.set(info.fieldNodes, dl);
             }
-            return dl.load(parent.id);
+            return await dl.load(parent.id);
         }
     },
     Group: {
@@ -108,7 +108,35 @@ exports.additionalResolver = {
                 });
                 dataloaders.set(info.fieldNodes, dl);
             }
-            return dl.load(parent.parentGroup);
+            return await dl.load(parent.parentGroup);
         }
-    }
+    },
+    Order: {
+        dishes: async (parent, args, context, info) => {
+            if (typeof parent.dishes === "object") {
+                return parent.dishes;
+            }
+            return await OrderDish.find({ order: parent.id });
+        },
+    },
+    OrderDish: {
+        dish: async (parent, args, context, info) => {
+            if (!parent.dish)
+                return;
+            if (!context.dataloaders)
+                context.dataloaders = new WeakMap();
+            const dataloaders = context.dataloaders;
+            if (typeof parent.dish === "object") {
+                return parent.dish;
+            }
+            let dl = dataloaders.get(info.fieldNodes);
+            if (!dl) {
+                dl = new DataLoader(async (dishId) => {
+                    return await Dish.find({ id: dishId }).sort('id ASC');
+                });
+                dataloaders.set(info.fieldNodes, dl);
+            }
+            return await dl.load(parent.dish);
+        },
+    },
 };

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];
@@ -68,7 +68,7 @@ export const additionalResolver = {
         });
         dataloaders.set(info.fieldNodes, dl);
       }
-      return dl.load(parent.parentGroup);
+      return await dl.load(parent.parentGroup);
     },
     images: async (parent, args, context, info) => {
       if (!parent.id) return;
@@ -84,7 +84,7 @@ export const additionalResolver = {
         });
         dataloaders.set(info.fieldNodes, dl);
       }
-      return dl.load(parent.id);
+      return await dl.load(parent.id);
     }
   },
   Group: {
@@ -105,7 +105,40 @@ export const additionalResolver = {
         });
         dataloaders.set(info.fieldNodes, dl);
       }
-      return dl.load(parent.parentGroup);
+      return  await dl.load(parent.parentGroup);
     }
-  }
+  },
+  Order: {
+    dishes: async (parent, args, context, info) => {
+      if (typeof parent.dishes === "object") {
+        return parent.dishes;
+      }
+
+      return await OrderDish.find({order: parent.id});
+        
+    },
+
+  },
+  OrderDish: {
+    dish: async (parent, args, context, info) => {
+      
+      if (!parent.dish) return;
+      if (!context.dataloaders) context.dataloaders = new WeakMap();
+      const dataloaders = context.dataloaders;
+
+      if (typeof parent.dish === "object") {
+        return parent.dish;
+      }
+
+      let dl = dataloaders.get(info.fieldNodes);
+      if (!dl) {
+        dl = new DataLoader(async (dishId: string) => {
+          return await Dish.find({id: dishId}).sort('id ASC');
+        });
+        dataloaders.set(info.fieldNodes, dl);
+      }
+      return await dl.load(parent.dish);
+    },
+    
+  },
 }

package/src/graphql.js

@@ -98,6 +98,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 +121,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

@@ -110,6 +110,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 +136,36 @@ 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;
             },
         },
     },
@@ -65,7 +67,10 @@ exports.default = {
                     }
                 }
                 await Order.addDish(order.id, args.dishId, args.amount, args.modifiers || [], args.comment, args.from, args.replace, args.orderDishId);
-                return await Order.countCart(order);
+                await Order.countCart(order);
+                let fullOrder = await Order.populate(order.id);
+                getEmitter_1.default().emit("http-api:before-response-order-add-dish", fullOrder);
+                return fullOrder;
             },
         },
         orderReplaceDish: {
@@ -82,7 +87,10 @@ exports.default = {
                     order = await getNewCart();
                 }
                 await Order.addDish(order.id, args.dishId, args.amount, args.modifiers || [], args.comment, args.from, args.replace, args.orderDishId);
-                return await Order.countCart(order);
+                await Order.countCart(order);
+                let fullOrder = await Order.populate(order.id);
+                getEmitter_1.default().emit("http-api:before-response-order-replace-dish", fullOrder);
+                return fullOrder;
             },
         },
         orderRemoveDish: {
@@ -99,7 +107,10 @@ exports.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_1.default().emit("http-api:before-response-order-remove-dish", fullOrder);
+                return fullOrder;
             },
         },
         orderSetDishAmount: {
@@ -120,7 +131,10 @@ exports.default = {
                 if (!dish.dish)
                     throw new errorWrapper_1.Error(0, "ERROR", `Dish in OrderDish with id ${args.orderDishId} not found`);
                 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_1.default().emit("http-api:before-response-order-set-dish-amount", fullOrder);
+                return fullOrder;
             },
         },
         orderSetDishComment: {
@@ -147,7 +161,10 @@ exports.default = {
                     throw new errorWrapper_1.Error(0, "ERROR", `Dish with id ${dishId} not found`);
                 }
                 await order.setComment(dish, comment);
-                return await Order.countCart(order);
+                await Order.countCart(order);
+                let fullOrder = await Order.populate(order.id);
+                getEmitter_1.default().emit("http-api:before-response-order-set-dish-comment", fullOrder);
+                return fullOrder;
             },
         },
         orderUpdate: {
@@ -157,7 +174,10 @@ exports.default = {
                 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_1.default().emit("http-api:before-response-order-update", fullOrder);
+                return fullOrder;
             },
         },
     },