@webresto/graphql 1.3.5 → 1.3.6

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

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.5"
+  "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/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

@@ -64,7 +64,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 = {

package/src/resolvers/checkout.ts

@@ -80,7 +80,6 @@ export default {
           );
 
           order = await Order.findOne(data.orderId);
-          console.log(order.dishes)
           
           let message;
 

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