@webresto/graphql 1.3.7 → 1.3.8

package/src/resolvers/checkout.ts

@@ -1,12 +1,74 @@
 import * as eventHelper from "../../lib/eventHelper";
-import { Error } from "../../lib/errorWrapper";
+import { Action, Message } from "../../types/primitives";
+import Order from "@webresto/core/models/Order"
+
+type CheckResponse = {
+  order?: Order
+  message: Message
+  action?: Action
+}
+
+import graphqlHelper from "../../lib/graphqlHelper";
+import Address from "@webresto/core/interfaces/Address";
+import Customer from "@webresto/core/interfaces/Customer";
+import { SpendBonus } from "@webresto/core/interfaces/SpendBonus";
+import { JWTAuth } from "../../lib/jwt";
+
+
+interface InputOrderCheckout {
+  orderId: string 
+  paymentMethodId: string 
+  selfService?: boolean
+  pickupPointId?: string 
+  address?: Address
+  locationId: string
+  customer: Customer 
+  date?: string
+  personsCount?: number
+  comment: string
+  spendBonus: SpendBonus
+  customData:{[key: string]: string | number}
+}
+
+graphqlHelper.addType(`#graphql    
+  input InputOrderCheckout {
+    orderId: String! 
+    paymentMethodId: String!
+    customer: Customer! 
+    spendBonus: InputSpendBonus 
+    selfService: Boolean
+    pickupPointId: String 
+    locationId: String
+    address: Address
+    date: String
+    comment: String 
+    personsCount: Int
+    customData: Json
+  }
+`);
+
+graphqlHelper.addType(`#graphql    
+  input InputSpendBonus {
+    bonusProgramId: String!
+    amount: Int!
+    adapter: String!
+    bonusProgramName: String!
+  } 
+`);
+
+
 
 export default {
   Mutation: {
     checkOrder: {
-      def: "checkOrder(orderId: String!, paymentMethodId: String!, selfService: Boolean, address: Address, customer: Customer!, date: String, comment: String, customData: Json): CheckResponse",
-      fn: async function (parent, args, context) {
-        let data = args;
+      def: `#graphql
+        checkOrder(orderCheckout: InputOrderCheckout): CheckResponse`,
+      fn: async function (parent, args: { orderCheckout: InputOrderCheckout }, context): Promise<CheckResponse> {
+        let data = args.orderCheckout;
+
+        if (!context.connectionParams.deviceId) {
+          throw `Missed deviceId`
+        }
 
         // if (data.date) {
         //     let date = moment(data.date)
@@ -19,53 +81,79 @@ export default {
 
         let isSelfService: boolean;
 
-        //@ts-ignore
-        if (data.selfService || data.selfDelivery) {
-          isSelfService = true;
-        } else {
-          if(!data.address) throw `Address is required for non self service orders`
-        }
 
+        let message;
         try {
           var order = await Order.findOne(data.orderId);
-
+          const shouldSendSucessMessage = order.state !== "CHECKOUT"
           if (!order) {
-            return eventHelper.sendMessage(args.orderId, {
+            message = eventHelper.sendMessage({
+              deviceId: context.connectionParams.deviceId,
               type: "error",
-              title: "Order not found",
-              message: `Order with id ${data.orderId} not found`,
+              title: context.i18n.__("Order not found"),
+              message: context.i18n.__("Order with id %s not found", data.orderId),
             });
           }
 
+          //@ts-ignore
+          if (data.selfService) {
+            isSelfService = true;
+            order.pickupPoint = data.pickupPointId;
+          } else {
+            order.pickupPoint = null;
+            if(!data.address && !data.locationId) throw `Address is required for non self service orders`
+          }
+
           if (order.state === "ORDER") {
-            return eventHelper.sendMessage(args.orderId, {
+            message = eventHelper.sendMessage({
+              deviceId: context.connectionParams.deviceId,
               type: "error",
-              title: "Ошибка",
-              message: "Корзина уже заказана",
+              title: context.i18n.__("Error"),
+              message: context.i18n.__("Cart was ordered"),
             });
           }
 
           if (data.paymentMethodId) {
             if (!PaymentMethod.checkAvailable(data.paymentMethodId)) {
-              return eventHelper.sendMessage(args.orderId, {
+              message = eventHelper.sendMessage({
+                deviceId: context.connectionParams.deviceId,
                 type: "error",
-                title: "Ошибка",
-                message: "Проверка платежной системы завершилась неудачей",
+                title: context.i18n.__("Error"),
+                message: context.i18n.__("Checking the payment system ended in failure"),
               });
             }
           }
 
-          if (data.address) {
-            data.address.city =
-              data.address.city || (await Settings.use("city"));
+
+          if (data.locationId) {
+            var address: Address = await UserLocation.findOne({id: data.locationId}) as Address;
+            if (!address) throw `locationId not found`
+          } else {
+            if (data.address) {
+              var address: Address = data.address;
+            }
+          }
+          
+          address = {
+            city: address.city || (await Settings.use("city") as string),
+            street: address.street,
+            ...address.streetId && {streetId: address.streetId},
+            home: address.home,
+            ...address.housing && {housing: address.housing},
+            ...address.apartment && {apartment: address.apartment},
+            ...address.index && {index: address.index},
+            ...address.entrance && {entrance: address.entrance},
+            ...address.floor && {floor: address.floor},
+            ...address.apartment && {apartment: address.apartment},
+            ...address.comment && {comment: address.comment},
           }
 
-          order.personsCount = data.personsCount ? data.personsCount : "";
+          order.personsCount =  data.personsCount ? data.personsCount+"" : "";
           if (data.comment) order.comment = data.comment;
 
-          if (data.date) order.date = data.date;
+          order.date = data.date;
 
-          // callback: boolean - перезвонить для уточнения деталей
+          // callback: boolean -call back to clarify details
           if (data.customData && data.customData.callback) {
             if (!order.customData) order.customData = {};
             order.customData.callback = data.customData.callback;
@@ -73,140 +161,162 @@ export default {
 
           await Order.update({ id: order.id }, order).fetch();
 
+          let userId = null;
+          if (context && context.connectionParams.authorization) {
+            userId = (await JWTAuth.verify(context.connectionParams.authorization)).userId;
+          }
+
           await Order.check(
-            order.id,
+            {id: order.id},
             data.customer,
             isSelfService,
             data.address,
-            data.paymentMethodId
+            data.paymentMethodId,
+            userId,
+            data.spendBonus !== undefined && userId !== null ? data.spendBonus : null
           );
 
           order = await Order.findOne(data.orderId);
           
-          let message;
-
-          if (order.state === "CHECKOUT") {
+          if (order.state === "CHECKOUT" && shouldSendSucessMessage) {
             message = {
+              deviceId: context.connectionParams.deviceId,
               type: "info",
-              title: "Внимание",
+              title: context.i18n.__("Attention"),
               message: order.message
-                ? order.message
-                : "Заказ готов к оформлению",
+                ? context.i18n.__(order.message)
+                : context.i18n.__("Ready for order"),
             };
 
           } else {
             if (order.message) {
               message = {
+                deviceId: context.connectionParams.deviceId,
                 type: "error",
-                title: "Внимание",
+                title: "Attention",
                 message: order.message
-                  ? order.message
-                  : "Не удалось проверить заказ.",
+                  ? context.i18n.__(order.message)
+                  : context.i18n.__("It was not possible to check the order"),
               }
             }
           }
 
-          eventHelper.sendMessage(args.orderId, message);
-          return { message: message, order: order };
+          if(message){
+            eventHelper.sendMessage(message);
+          }
+
+          return { 
+            order: order, 
+           ...message && { message: message } 
+          };
         } catch (e) {
           let message = {
             type: "error",
-            title: "Ошибка",
+            title: context.i18n.__("Error"),
             message: "",
-          };
+          } as Message;
           if (e.code === 1) {
-            message.message = "Введите имя заказчика";
+            message.message = context.i18n.__("Enter the name of the customer");
           } else if (e.code === 2) {
-            message.message = "Введите телефон заказчика";
+            message.message = context.i18n.__("Enter the customer's phone");
           } else if (e.code === 3) {
-            message.message = "Неверный формат имени заказчика";
+            message.message = context.i18n.__("The wrong format of the name of the customer");
           } else if (e.code === 4) {
-            message.message = "Неверный формат номера заказчика";
+            message.message = context.i18n.__("The wrong format of the customer number");
           } else if (e.code === 5) {
-            message.message = "Не указана улица";
+            message.message = context.i18n.__("No point of Street");
           } else if (e.code === 6) {
-            message.message = "Не указан номер дома";
+            message.message = context.i18n.__("Not indicated the house number");
           } else if (e.code === 7) {
-            message.message = "Не указан город";
+            message.message = context.i18n.__("The city is not indicated");
           } else if (e.code === 8) {
-            message.message = "Платежная система недоступна";
+            message.message = context.i18n.__("The payment system is not available");
+          } else if (e.code === 11) {
+            message.message = context.i18n.__(order.delivery.message) ;
           } else if (e.code === 10) {
-            message.message = "Дата выполнения заказа не верная";
+            message.message = context.i18n.__("The date of execution of the order is not true");
+          } else if (e.code === 15) {
+              message.message = context.i18n.__("Ordering for a date in the past is not possible");
           } else {
             message.message = e.error
               ? e.error
-              : `Проблема при проверки заказа: ${e}`;
+              : context.i18n.__(`Problem when checking the order: %s`, e);
           }
 
-          eventHelper.sendMessage(args.orderId, message);
+          order = await Order.findOne(data.orderId);
           sails.log.error(e)
-          return { message: message };
+          eventHelper.sendMessage(message);
+          return { 
+            order: order,
+            message: message 
+          };
         }
       },
     },
     sendOrder: {
       def: "sendOrder(orderId: String!): CheckResponse",
       fn: async function (parent, args, context) {
+        if (!context.connectionParams.deviceId) {
+            throw `Missed deviceId`;
+        }
         let data = args;
-
-        try {
-          var order = await Order.findOne({ id: data.orderId });
-          if (!order) {
-            const errorMessage = `Order with id ${data.orderId} not found`;
-            eventHelper.sendMessage(args.orderId, {
-              type: "error",
-              title: "Order not found",
-              message: errorMessage,
+        
+        var order = await Order.findOne({ id: data.orderId });
+        if (!order) {
+            const errorMessage = context.i18n.__(`Order with id %s not found`, data.orderId);
+            eventHelper.sendMessage({
+                deviceId: context.connectionParams.deviceId,
+                type: "error",
+                title: context.i18n.__("Order not found"),
+                message: errorMessage,
             });
-            sails.log.error(`${errorMessage}`)
-            throw new Error(0,errorMessage);
-          }
-
-          if (!(await PaymentMethod.isPaymentPromise(order.paymentMethod))) {
-              try {
-                let paymentResponse = await Order.payment({id: order.id});
-                
+            sails.log.error(`${errorMessage}`);
+            throw new Error(errorMessage);
+        }
+        if (!order.isPaymentPromise) {
+            try {
+                let paymentResponse = await Order.payment({ id: order.id });
                 const action = {
-                  type: "PaymentRedirect",
-                  data: {
-                    redirectLink: paymentResponse.redirectLink,
-                  },
+                    deviceId: context.connectionParams.deviceId,
+                    type: "Redirect",
+                    data: {
+                        link: paymentResponse.redirectLink,
+                    },
                 };
-                eventHelper.sendAction(args.orderId, action);
-                order = await Order.populate(order.id);
+                eventHelper.sendAction(action);
+                order = await Order.populate({ id: order.id });
                 return { order: order, action: action };
-              } catch (e) {
-                eventHelper.sendMessage(args.orderId, {
-                  type: "error",
-                  title: "Ошибка",
-                  message: "Попытка регистрации платежа завершилась неудачно",
+            }
+            catch (e) {
+                eventHelper.sendMessage({
+                    deviceId: context.connectionParams.deviceId,
+                    type: "error",
+                    title: context.i18n.__("Error"),
+                    message: context.i18n.__("The payment of the payment has ended unsuccessfully"),
                 });
-
-                sails.log.error(e);
-                throw new Error(JSON.stringify(e));
-              }
+                const error = `External payment: ${e}`
+                sails.log.error(error);
+                throw new Error(error);
             }
+        }
 
-          await Order.order(order.id);
-          order = await Order.findOne({ id: data.orderId })
-          const message = {
-            type: "info",
-            title: "Успешно",
-            message: "Ваш заказ принят в обработку",
-          };
-          eventHelper.sendMessage(args.orderId, message);
-          return { order: order, message: message };
-        } catch (e) {
-          eventHelper.sendMessage(args.orderId, {
-            type: "error",
-            title: "Ошибка",
-            message: e,
-          });
-
-          sails.log.error("sendOrder error :", e);
-          throw new Error(0,`${e}`);
+        try {
+            await Order.order({ id: order.id });
+            order = await Order.findOne({ id: data.orderId });
+            const message = {
+                type: "info",
+                title: context.i18n.__("Successfully"),
+                message: context.i18n.__("Your order is accepted for processing"),
+            };
+            // eventHelper.sendMessage(message);
+            return { order: order, message: message };
+        }
+        catch (e) {
+            const error = `Order finalize error:, ${e}`
+            sails.log.error(error);
+            throw new Error(error);
         }
       },
     },
   },
-};
+}

package/src/resolvers/dishAndModifier.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const graphqlHelper_1 = require("@webresto/graphql/lib/graphqlHelper");
 // init
-graphqlHelper_1.addToReplaceList("Dish.modifiers", "modifiers: [GroupModifier]");
-graphqlHelper_1.addToReplaceList("OrderDish.modifiers", "modifiers: [OrderModifier]");
-graphqlHelper_1.addType(`
+(0, graphqlHelper_1.addToReplaceList)("Dish.modifiers", "modifiers: [GroupModifier]");
+(0, graphqlHelper_1.addToReplaceList)("OrderDish.modifiers", "modifiers: [OrderModifier]");
+(0, graphqlHelper_1.addType)(`
 type GroupModifier {
+  "rmsId"
+  id: String
   maxAmount: Int
   minAmount: Int
   modifierId: String
@@ -14,6 +16,8 @@ type GroupModifier {
   group: Group
 }
 type Modifier {
+  "rmsId"
+  id: String
   modifierId: String
   maxAmount: Int
   minAmount: Int
@@ -22,7 +26,7 @@ type Modifier {
   dish: Dish
 }
 `);
-graphqlHelper_1.addType(`
+(0, graphqlHelper_1.addType)(`
 type OrderModifier {
   id: String
   dish: Dish

package/src/resolvers/dishAndModifier.ts

@@ -6,6 +6,8 @@ addToReplaceList("OrderDish.modifiers", "modifiers: [OrderModifier]");
 
 addType(`
 type GroupModifier {
+  "rmsId"
+  id: String
   maxAmount: Int
   minAmount: Int
   modifierId: String
@@ -14,6 +16,8 @@ type GroupModifier {
   group: Group
 }
 type Modifier {
+  "rmsId"
+  id: String
   modifierId: String
   maxAmount: Int
   minAmount: Int

package/src/resolvers/error.d.ts

@@ -0,0 +1,9 @@
+declare const _default: {
+    Query: {
+        errorCheck: {
+            def: string;
+            fn: () => Promise<boolean>;
+        };
+    };
+};
+export default _default;

package/src/resolvers/error.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    Query: {
+        errorCheck: {
+            def: 'errorCheck: Boolean',
+            fn: async () => {
+                throw new Error(`modifier required (amount, id) for dish: amount: `);
+                // await Order.check(
+                //   {id: "order.id"}
+                // );
+                // try {
+                // } catch (error) {
+                //   console.log(JSON.stringify(error), error.trace())
+                //   throw error;
+                // }
+                return true;
+            }
+        }
+    },
+};

package/src/resolvers/error.ts

@@ -0,0 +1,21 @@
+export default {
+  Query: {
+    errorCheck: {
+      def: 'errorCheck: Boolean',
+      fn: async () => {
+        throw new Error(        
+          `modifier required (amount, id) for dish: amount: `
+        );
+        // await Order.check(
+        //   {id: "order.id"}
+        // );
+        // try {
+        // } catch (error) {
+        //   console.log(JSON.stringify(error), error.trace())
+        //   throw error;
+        // }
+        return true
+      }
+    }
+  },
+}

package/src/resolvers/menu.d.ts

@@ -0,0 +1,9 @@
+declare const _default: {
+    Query: {
+        menu: {
+            def: string;
+            fn: (parent: any, args: any, context: any, info: any) => Promise<import("@webresto/core/models/Group").default[]>;
+        };
+    };
+};
+export default _default;

package/src/resolvers/menu.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    Query: {
+        menu: {
+            def: "menu(concept: String, topLevelGroupId: String): [Group]",
+            fn: async (parent, args, context, info) => {
+                return await Group.getMenuGroups(args.concept, args.topLevelGroupId);
+            }
+        }
+    }
+};

package/src/resolvers/menu.ts

@@ -0,0 +1,10 @@
+export default {
+  Query: {
+    menu: {
+      def: "menu(concept: String, topLevelGroupId: String): [Group]",
+      fn: async (parent, args, context, info) => {
+        return await Group.getMenuGroups(args.concept, args.topLevelGroupId);
+      }
+    }
+  }
+}