@webresto/graphql 1.3.3 → 1.3.6

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]) {

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]) {

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.3"
+  "version": "1.3.6"
 }

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/additionalResolvers.js

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

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

@@ -65,11 +65,6 @@ exports.default = {
       type: String
       message: String
     }
-    type Street {
-      id: String
-      name: String
-      customData: Json
-    }
     type Action {
       type: String
       data: Json

package/src/graphql.ts

@@ -74,11 +74,6 @@ export default {
       type: String
       message: String
     }
-    type Street {
-      id: String
-      name: String
-      customData: Json
-    }
     type Action {
       type: String
       data: Json
@@ -141,6 +136,7 @@ export default {
     getEmitter().on("core-maintenance-disabled", "graphql", function () {
       pubsub.publish("maintenance", null);
     });
+    
     let apolloServer
     try {
       apolloServer = new ApolloServer({

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;

package/src/resolvers/checkout.js

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

package/src/resolvers/checkout.ts

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

package/test/fixture/app.js

@@ -27,7 +27,7 @@
 process.chdir(__dirname);
 
 process.env.DEV = "TRUE";
-
+process.env.PORT = 42776;
 
 // Attempt to import `sails` dependency, as well as `rc` (for loading `.sailsrc` files).
 var sails;

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

@@ -0,0 +1,82 @@
+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;
+        const result = await graphql.getServer().executeOperation({
+            query: `
+              {order(orderId:"test-cart"){
+                id
+                total
+              }}`
+        });
+        expect(result.errors).to.be.undefined;
+    });
+    it('orderAddDish', async () => {
+        const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
+        const result = await graphql.getServer().executeOperation({
+            query: `
+            mutation{orderAddDish(dishId: "df19cbbc-c026-595e-9296-1c8a378da6b3", orderId:"test-cart", amount: 1){
+                dishes {
+                  dish {
+                    id
+                    name
+                    price
+                  }
+                  itemTotal
+                }
+                total
+              }}
+              `
+        });
+        expect(result.data.orderAddDish.dishes[0].dish.id).to.equal("df19cbbc-c026-595e-9296-1c8a378da6b3");
+    });
+    it('checkOrder', async () => {
+        const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
+        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"}) {
+            order {
+              id
+              state
+              dishes{
+                dish {
+                  name
+                  id
+                }
+              }
+            }
+            message {
+              title
+              message
+            }
+          }}
+          `
+        });
+        expect(result.data.checkOrder.order.dishes[0].dish.id).to.equal("df19cbbc-c026-595e-9296-1c8a378da6b3");
+    });
+    it('sendOrder', async () => {
+        const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
+        const result = await graphql.getServer().executeOperation({
+            query: `
+        mutation{sendOrder(orderId:"test-cart") {
+          order {
+            id
+            state
+            dishes{
+              dish {
+                name
+                id
+              }
+              amount
+            }
+          }
+          message {
+            title
+            message
+          }
+        }}
+        `
+        });
+        expect(result.data.sendOrder.order.state).to.equal("ORDER");
+    });
+});

package/test/integration/order.test.ts

@@ -0,0 +1,107 @@
+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;
+        const result = await graphql.getServer().executeOperation({
+            query: `
+              {order(orderId:"test-cart"){
+                id
+                total
+              }}`
+        });
+        
+        expect(result.errors).to.be.undefined;
+    });
+
+
+    
+
+      it('orderAddDish', async () => {
+
+        const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
+        
+        const result = await graphql.getServer().executeOperation({
+            query: `
+            mutation{orderAddDish(dishId: "df19cbbc-c026-595e-9296-1c8a378da6b3", orderId:"test-cart", amount: 1){
+                dishes {
+                  dish {
+                    id
+                    name
+                    price
+                  }
+                  itemTotal
+                }
+                total
+              }}
+              `
+        });
+        expect(result.data.orderAddDish.dishes[0].dish.id).to.equal("df19cbbc-c026-595e-9296-1c8a378da6b3");
+    });
+
+
+    it('checkOrder', async () => {
+
+      const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
+      
+      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"}) {
+            order {
+              id
+              state
+              dishes{
+                dish {
+                  name
+                  id
+                }
+              }
+            }
+            message {
+              title
+              message
+            }
+          }}
+          `
+      });
+      expect(result.data.checkOrder.order.dishes[0].dish.id).to.equal("df19cbbc-c026-595e-9296-1c8a378da6b3");
+  });
+
+
+
+  it('sendOrder', async () => {
+
+    const graphql = require('./../fixture/node_modules/@webresto/graphql/src/graphql').default;
+    
+    const result = await graphql.getServer().executeOperation({
+        query: `
+        mutation{sendOrder(orderId:"test-cart") {
+          order {
+            id
+            state
+            dishes{
+              dish {
+                name
+                id
+              }
+              amount
+            }
+          }
+          message {
+            title
+            message
+          }
+        }}
+        `
+    });
+
+    expect(result.data.sendOrder.order.state).to.equal("ORDER");
+});
+
+
+  
+
+});
+
+

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