@webresto/graphql 1.3.4 → 1.3.7

package/lib/eventHelper.js

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

package/lib/graphqlHelper.js

@@ -223,17 +223,12 @@ function createType(model) {
             scalarType = scalarTypes[relationModel.attributes[relationModel.primaryKey].type];
             const name = sails.models[attributes[prop].model.toLowerCase()].globalId;
             type += `  ${prop}: ${name}\n`;
-            // todelete
-            type += `  ${prop}Id: ${scalarType}\n`;
         }
         // COLLECTION SCHEMA GENERATION
         if (attributes[prop].collection) {
             scalarType = scalarTypes[attributes[sails.models[attributes[prop].collection.toLowerCase()].primaryKey].type.toLowerCase()];
             const name = sails.models[attributes[prop].collection.toLowerCase()].globalId;
-            console.log(1, scalarType);
             type += `  ${prop}: [${name}]\n`;
-            // todelete
-            type += `  ${prop}Ids: ${scalarType}\n`;
         }
     }
     if (customFields[modelName]) {
@@ -488,7 +483,6 @@ function addModelResolver(modelname) {
             return parent && parent[key];
         };
     });
-    console.log(modelName, resolvers);
     modelsResolvers[modelName] = resolvers;
     // Subscription resolver
     if (!blackList.includes(`${modelName}`) && whiteList[modelname].includes('subscription')) {

package/lib/graphqlHelper.ts

@@ -228,20 +228,13 @@ function createType(model) {
       scalarType = scalarTypes[relationModel.attributes[relationModel.primaryKey].type]
       const name = sails.models[attributes[prop].model.toLowerCase()].globalId;
       type += `  ${prop}: ${name}\n`;
-
-      // todelete
-      type += `  ${prop}Id: ${scalarType}\n`;
     }
 
     // COLLECTION SCHEMA GENERATION
     if (attributes[prop].collection) {
       scalarType = scalarTypes[attributes[sails.models[attributes[prop].collection.toLowerCase()].primaryKey].type.toLowerCase()]
       const name = sails.models[attributes[prop].collection.toLowerCase()].globalId;
-      console.log(1,scalarType)
       type += `  ${prop}: [${name}]\n`;
-
-      // todelete
-      type += `  ${prop}Ids: ${scalarType}\n`;
     }
   }
   if (customFields[modelName]) {
@@ -536,7 +529,6 @@ function addModelResolver(modelname) {
       };
     });
 
-    console.log(modelName,resolvers)
     modelsResolvers[modelName] = resolvers;
 
 

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.4"
+  "version": "1.3.7"
 }

package/src/additionalResolvers.d.ts

@@ -16,4 +16,10 @@ export declare const additionalResolver: {
     Group: {
         parentGroup: (parent: any, args: any, context: any, info: any) => Promise<any>;
     };
+    Order: {
+        dishes: (parent: any, args: any, context: any, info: any) => Promise<any>;
+    };
+    OrderDish: {
+        dish: (parent: any, args: any, context: any, info: any) => Promise<any>;
+    };
 };

package/src/resolvers/cart.js

@@ -41,7 +41,7 @@ exports.default = {
                 if (args.modifiers) {
                     args.modifiers.forEach((modifier) => {
                         if (modifier.amount === undefined || modifier.id === undefined)
-                            throw new errorWrapper_1.Error(0, "ERROR", `modifier required (amount, id) for dish: ${args.dishId} current values: id: ${modifier.id}, amount: ${modifier.amount}`);
+                            throw new errorWrapper_1.Error("BAD_DISHMODIFIER", `modifier required (amount, id) for dish: ${args.dishId} current values: id: ${modifier.id}, amount: ${modifier.amount}`);
                     });
                 }
                 if (args.orderId)
@@ -66,7 +66,7 @@ exports.default = {
                         throw new errorWrapper_1.Error(0, "ERROR", `"${dish.name}" является акционным и не может быть добавлено пользователем`);
                     }
                 }
-                await Order.addDish(order.id, args.dishId, args.amount, args.modifiers || [], args.comment, args.from, args.replace, args.orderDishId);
+                await Order.addDish(order.id, args.dishId, args.amount, args.modifiers === undefined ? [] : args.modifiers, args.comment, args.from, args.replace, args.orderDishId);
                 await Order.countCart(order);
                 let fullOrder = await Order.populate(order.id);
                 getEmitter_1.default().emit("http-api:before-response-order-add-dish", fullOrder);
@@ -86,7 +86,7 @@ exports.default = {
                 if (order.paid || order.state === "ORDER") {
                     order = await getNewCart();
                 }
-                await Order.addDish(order.id, args.dishId, args.amount, args.modifiers || [], args.comment, args.from, args.replace, args.orderDishId);
+                await Order.addDish(order.id, args.dishId, args.amount, args.modifiers === undefined ? [] : args.modifiers, args.comment, args.from, args.replace, args.orderDishId);
                 await Order.countCart(order);
                 let fullOrder = await Order.populate(order.id);
                 getEmitter_1.default().emit("http-api:before-response-order-replace-dish", fullOrder);

package/src/resolvers/cart.ts

@@ -45,12 +45,13 @@ export default {
       fn: async function (parent, args, context) {
         let order;
 
+
+
         if (args.modifiers) {
           args.modifiers.forEach((modifier) => {
             if (modifier.amount === undefined || modifier.id === undefined)
               throw new Error(
-                0,
-                "ERROR",
+                "BAD_DISHMODIFIER",
                 `modifier required (amount, id) for dish: ${args.dishId} current values: id: ${modifier.id}, amount: ${modifier.amount}`
               );
           });
@@ -92,7 +93,7 @@ export default {
           order.id,
           args.dishId,
           args.amount,
-          args.modifiers || [],
+          args.modifiers === undefined ?  [] : args.modifiers,
           args.comment,
           args.from,
           args.replace,
@@ -127,7 +128,7 @@ export default {
           order.id,
           args.dishId,
           args.amount,
-          args.modifiers || [],
+          args.modifiers === undefined ?  [] : args.modifiers,
           args.comment,
           args.from,
           args.replace,

package/src/resolvers/checkout.d.ts

@@ -3,8 +3,8 @@ declare const _default: {
         checkOrder: {
             def: string;
             fn: (parent: any, args: any, context: any) => Promise<void | {
+                message: any;
                 order: import("@webresto/core/models/Order").default;
-                message?: undefined;
             } | {
                 message: {
                     type: string;
@@ -17,12 +17,22 @@ declare const _default: {
         sendOrder: {
             def: string;
             fn: (parent: any, args: any, context: any) => Promise<{
+                order: import("@webresto/core/models/Order").default;
+                action: {
+                    type: string;
+                    data: {
+                        redirectLink: string;
+                    };
+                };
+                message?: undefined;
+            } | {
                 order: import("@webresto/core/models/Order").default;
                 message: {
                     type: string;
                     title: string;
                     message: string;
                 };
+                action?: undefined;
             }>;
         };
     };

package/src/resolvers/checkout.js

@@ -21,6 +21,10 @@ exports.default = {
                 if (data.selfService || data.selfDelivery) {
                     isSelfService = true;
                 }
+                else {
+                    if (!data.address)
+                        throw `Address is required for non self service orders`;
+                }
                 try {
                     var order = await Order.findOne(data.orderId);
                     if (!order) {
@@ -64,7 +68,6 @@ exports.default = {
                     await Order.update({ id: order.id }, order).fetch();
                     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 (order.state === "CHECKOUT") {
                         message = {
@@ -86,7 +89,7 @@ exports.default = {
                             };
                         }
                     }
-                    return eventHelper.sendMessage(args.orderId, message);
+                    eventHelper.sendMessage(args.orderId, message);
                     return { message: message, order: order };
                 }
                 catch (e) {
@@ -137,14 +140,6 @@ exports.default = {
             def: "sendOrder(orderId: String!): CheckResponse",
             fn: async function (parent, args, context) {
                 let data = args;
-                // if (data.date) {
-                //   let date = moment(data.date)
-                //   if(!date.isValid()){
-                //     return eventHelper.sendMessage(args.orderId,"Please order.date format is ISO (YYYY-MM-DD HH:mm:ss)");
-                //   } else {
-                //     data.date = date.format('YYYY-MM-DD HH:mm:ss');
-                //   }
-                // }
                 try {
                     var order = await Order.findOne({ id: data.orderId });
                     if (!order) {
@@ -157,52 +152,29 @@ exports.default = {
                         sails.log.error(`${errorMessage}`);
                         throw new errorWrapper_1.Error(0, errorMessage);
                     }
-                    // if (data.comment) order.comment = data.comment;
-                    // if (data.paymentMethodId) {
-                    //   if (order.paymentMethod !== data.paymentMethodId) {
-                    //     await Order.check(
-                    //       order.id,
-                    //       null,
-                    //       null,
-                    //       null,
-                    //       data.paymentMethodId
-                    //     );
-                    //     order = await Order.findOne({ id: data.orderId });
-                    //   }
-                    // }
-                    // if (order.paymentMethod) {
-                    //   if (!(await PaymentMethod.checkAvailable(order.paymentMethod))) {
-                    //     let errorMessage = `Проверка платежной системы завершилась неудачно`;
-                    //     eventHelper.sendMessage(args.orderId, {
-                    //       type: "error",
-                    //       title: "Ошибка",
-                    //       message: errorMessage,
-                    //     });
-                    //     sails.log.error(`${errorMessage}`)
-                    //     throw new Error(0,errorMessage);
-                    //   }
-                    //   if (!(await PaymentMethod.isPaymentPromise(data.paymentMethodId))) {
-                    //     try {
-                    //       let paymentResponse = await order.payment();
-                    //       const action = {
-                    //         type: "PaymentRedirect",
-                    //         data: {
-                    //           redirectLink: paymentResponse.redirectLink,
-                    //         },
-                    //       };
-                    //       eventHelper.sendAction(args.orderId, action);
-                    //       return { order: order, action: action };
-                    //     } catch (e) {
-                    //       eventHelper.sendMessage(args.orderId, {
-                    //         type: "error",
-                    //         title: "Ошибка",
-                    //         message: "Попытка регистрации платежа завершилась неудачно",
-                    //       });
-                    //       sails.log.error(e);
-                    //       throw new Error(0, JSON.stringify(e));
-                    //     }
-                    //   }
-                    // }
+                    if (!(await PaymentMethod.isPaymentPromise(order.paymentMethod))) {
+                        try {
+                            let paymentResponse = await Order.payment({ id: order.id });
+                            const action = {
+                                type: "PaymentRedirect",
+                                data: {
+                                    redirectLink: paymentResponse.redirectLink,
+                                },
+                            };
+                            eventHelper.sendAction(args.orderId, action);
+                            order = await Order.populate(order.id);
+                            return { order: order, action: action };
+                        }
+                        catch (e) {
+                            eventHelper.sendMessage(args.orderId, {
+                                type: "error",
+                                title: "Ошибка",
+                                message: "Попытка регистрации платежа завершилась неудачно",
+                            });
+                            sails.log.error(e);
+                            throw new errorWrapper_1.Error(JSON.stringify(e));
+                        }
+                    }
                     await Order.order(order.id);
                     order = await Order.findOne({ id: data.orderId });
                     const message = {

package/src/resolvers/checkout.ts

@@ -22,6 +22,8 @@ export default {
         //@ts-ignore
         if (data.selfService || data.selfDelivery) {
           isSelfService = true;
+        } else {
+          if(!data.address) throw `Address is required for non self service orders`
         }
 
         try {
@@ -80,7 +82,6 @@ export default {
           );
 
           order = await Order.findOne(data.orderId);
-          console.log(order.dishes)
           
           let message;
 
@@ -105,8 +106,7 @@ export default {
             }
           }
 
-          return eventHelper.sendMessage(args.orderId, message);
-
+          eventHelper.sendMessage(args.orderId, message);
           return { message: message, order: order };
         } catch (e) {
           let message = {
@@ -149,15 +149,6 @@ export default {
       fn: async function (parent, args, context) {
         let data = args;
 
-        // if (data.date) {
-        //   let date = moment(data.date)
-        //   if(!date.isValid()){
-        //     return eventHelper.sendMessage(args.orderId,"Please order.date format is ISO (YYYY-MM-DD HH:mm:ss)");
-        //   } else {
-        //     data.date = date.format('YYYY-MM-DD HH:mm:ss');
-        //   }
-        // }
-
         try {
           var order = await Order.findOne({ id: data.orderId });
           if (!order) {
@@ -171,56 +162,30 @@ export default {
             throw new Error(0,errorMessage);
           }
 
-          // if (data.comment) order.comment = data.comment;
-
-          // if (data.paymentMethodId) {
-          //   if (order.paymentMethod !== data.paymentMethodId) {
-          //     await Order.check(
-          //       order.id,
-          //       null,
-          //       null,
-          //       null,
-          //       data.paymentMethodId
-          //     );
-          //     order = await Order.findOne({ id: data.orderId });
-          //   }
-          // }
-
-          // if (order.paymentMethod) {
-          //   if (!(await PaymentMethod.checkAvailable(order.paymentMethod))) {
-          //     let errorMessage = `Проверка платежной системы завершилась неудачно`;
-          //     eventHelper.sendMessage(args.orderId, {
-          //       type: "error",
-          //       title: "Ошибка",
-          //       message: errorMessage,
-          //     });
-          //     sails.log.error(`${errorMessage}`)
-          //     throw new Error(0,errorMessage);
-          //   }
-
-          //   if (!(await PaymentMethod.isPaymentPromise(data.paymentMethodId))) {
-          //     try {
-          //       let paymentResponse = await order.payment();
-          //       const action = {
-          //         type: "PaymentRedirect",
-          //         data: {
-          //           redirectLink: paymentResponse.redirectLink,
-          //         },
-          //       };
-          //       eventHelper.sendAction(args.orderId, action);
-          //       return { order: order, action: action };
-          //     } catch (e) {
-          //       eventHelper.sendMessage(args.orderId, {
-          //         type: "error",
-          //         title: "Ошибка",
-          //         message: "Попытка регистрации платежа завершилась неудачно",
-          //       });
-
-          //       sails.log.error(e);
-          //       throw new Error(0, JSON.stringify(e));
-          //     }
-          //   }
-          // }
+          if (!(await PaymentMethod.isPaymentPromise(order.paymentMethod))) {
+              try {
+                let paymentResponse = await Order.payment({id: order.id});
+                
+                const action = {
+                  type: "PaymentRedirect",
+                  data: {
+                    redirectLink: paymentResponse.redirectLink,
+                  },
+                };
+                eventHelper.sendAction(args.orderId, action);
+                order = await Order.populate(order.id);
+                return { order: order, action: action };
+              } catch (e) {
+                eventHelper.sendMessage(args.orderId, {
+                  type: "error",
+                  title: "Ошибка",
+                  message: "Попытка регистрации платежа завершилась неудачно",
+                });
+
+                sails.log.error(e);
+                throw new Error(JSON.stringify(e));
+              }
+            }
 
           await Order.order(order.id);
           order = await Order.findOne({ id: data.orderId })

package/test/integration/graphql.test.js

@@ -2,7 +2,6 @@ const expect = require("chai").expect;
 describe('GraphQl', function () {
     it('Added fields exist in schema', async () => {
         const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-        console.log(graphql);
         const result = await graphql.getServer().executeOperation({
             query: '{dish { id } \n group { id }}'
         });

package/test/integration/graphql.test.ts

@@ -4,7 +4,6 @@ describe('GraphQl', function () {
     it('Added fields exist in schema', async () => {
 
         const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-        console.log(graphql)
         const result = await graphql.getServer().executeOperation({
             query: '{dish { id } \n group { id }}'
         });

package/test/integration/order.test.js

@@ -2,7 +2,6 @@ const expect = require("chai").expect;
 describe('Send order to restarant', function () {
     it('Create new', async () => {
         const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-        console.log(graphql);
         const result = await graphql.getServer().executeOperation({
             query: `
               {order(orderId:"test-cart"){
@@ -14,7 +13,6 @@ describe('Send order to restarant', function () {
     });
     it('orderAddDish', async () => {
         const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-        console.log(graphql);
         const result = await graphql.getServer().executeOperation({
             query: `
             mutation{orderAddDish(dishId: "df19cbbc-c026-595e-9296-1c8a378da6b3", orderId:"test-cart", amount: 1){
@@ -34,7 +32,6 @@ describe('Send order to restarant', function () {
     });
     it('checkOrder', async () => {
         const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-        console.log(graphql);
         const result = await graphql.getServer().executeOperation({
             query: `
           mutation{checkOrder(orderId:"test-cart", paymentMethodId: "", address: {city: "town", street: "test", home: "123"}, customer: {phone: {code: "+1", number: "0000000000"}, name: "Piter Parker"}) {
@@ -59,7 +56,6 @@ describe('Send order to restarant', function () {
     });
     it('sendOrder', async () => {
         const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-        console.log(graphql);
         const result = await graphql.getServer().executeOperation({
             query: `
         mutation{sendOrder(orderId:"test-cart") {

package/test/integration/order.test.ts

@@ -4,7 +4,6 @@ describe('Send order to restarant', function () {
     it('Create new', async () => {
 
         const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-        console.log(graphql)
         const result = await graphql.getServer().executeOperation({
             query: `
               {order(orderId:"test-cart"){
@@ -22,7 +21,7 @@ describe('Send order to restarant', function () {
       it('orderAddDish', async () => {
 
         const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-        console.log(graphql)
+        
         const result = await graphql.getServer().executeOperation({
             query: `
             mutation{orderAddDish(dishId: "df19cbbc-c026-595e-9296-1c8a378da6b3", orderId:"test-cart", amount: 1){
@@ -45,7 +44,7 @@ describe('Send order to restarant', function () {
     it('checkOrder', async () => {
 
       const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-      console.log(graphql)
+      
       const result = await graphql.getServer().executeOperation({
           query: `
           mutation{checkOrder(orderId:"test-cart", paymentMethodId: "", address: {city: "town", street: "test", home: "123"}, customer: {phone: {code: "+1", number: "0000000000"}, name: "Piter Parker"}) {
@@ -74,7 +73,7 @@ describe('Send order to restarant', function () {
   it('sendOrder', async () => {
 
     const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
-    console.log(graphql)
+    
     const result = await graphql.getServer().executeOperation({
         query: `
         mutation{sendOrder(orderId:"test-cart") {

package/todo.md

@@ -1 +1 @@
-1. Add support for multi websoketServer (several tests placed in lib dirrectory)
+1. Add support for multi websoketServer (several tests placed in lib dirrectory) 

package/restApi.http

@@ -1,11 +0,0 @@
-@host = http://127.0.0.1:42777
-
-@host2 = https://api.lifenadym.webresto.dev
-
-GET {{host}}/api/0.5/menu
-
-###
-GET {{host2}}/api/0.5/api/getNomenclature
-
-###
-GET {{host}}/api/0.5/menu?groupSlug=sousy