@webresto/graphql 1.3.0 → 1.3.1

package/package.json

@@ -10,6 +10,27 @@
     "graphql": "^15.5.0",
     "waterline-criteria": "^2.0.0"
   },
+  "devDependencies": {
+    "@42pub/typed-sails": "^1.0.0",
+    "@types/bluebird": "^3.5.32",
+    "@types/bluebird-global": "^3.5.12",
+    "@types/body-parser": "^1.19.0",
+    "@types/chai": "^4.2.11",
+    "@types/express": "^4.17.7",
+    "@types/faker": "^4.1.12",
+    "@types/lodash": "^4.14.157",
+    "@types/mocha": "^8.0.2",
+    "@types/node": "^14.14.35",
+    "@types/uuid": "^8.0.0",
+    "@types/waterline": "^0.13.4",
+    "@webresto/core": "^1.0.0",
+    "chai": "^4.2.0",
+    "dotenv": "^16.0.0",
+    "faker": "^4.1.0",
+    "mocha": "^8.1.1",
+    "ts-node": "^10.7.0",
+    "typescript": "^3.9.7"
+  },
   "deprecated": false,
   "description": "Webresto graphql api",
   "directories": {
@@ -35,13 +56,9 @@
   },
   "scripts": {
     "gendoc": "apidoc -o apidoc/ && apidoc-markdown2 -p apidoc -o docs/api.md",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "test:js": "mocha test/_bootstrap.js test/**/*.test.js",
-    "test:init": "cd ./test/fixtures/v0.12-app && npm i --no-package-lock --prefix ./ && cd -"
+    "test": "mocha -r ts-node/register test/bootstrap.ts './test/{,!(fixture)/**}/*.test.ts' --exit",
+    "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.0",
-  "devDependencies": {
-    "@types/node": "^14.14.35",
-    "@webresto/core": "^1.0.0"
-  }
+  "version": "1.3.1"
 }

package/src/resolvers/cart.d.ts

@@ -38,8 +38,9 @@ declare const _default: {
                 deliveryItem: any;
                 deliveryCost: number;
                 totalWeight: number;
-                total: number;
                 trifleFrom: number;
+                bonusesTotal: number;
+                total: number;
                 orderTotal: number;
                 discountTotal: number;
                 orderDate: string;
@@ -108,8 +109,9 @@ declare const _default: {
                 deliveryItem: any;
                 deliveryCost: number;
                 totalWeight: number;
-                total: number;
                 trifleFrom: number;
+                bonusesTotal: number;
+                total: number;
                 orderTotal: number;
                 discountTotal: number;
                 orderDate: string;

package/src/resolvers/cart.ts

@@ -126,7 +126,8 @@ export default {
           args.replace,
           args.orderDishId
         );
-        return await Order.countCart(order);
+        await Order.countCart(order);
+        return await Order.populate(order.id);
       },
     },
     orderRemoveDish: {
@@ -150,7 +151,8 @@ export 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);
+        return await Order.populate(order.id);
       },
     },
     orderSetDishAmount: {
@@ -187,7 +189,8 @@ export default {
           );
 
         await Order.setCount(order.id, dish, args.amount);
-        return await Order.countCart(order);
+        await Order.countCart(order);
+        return await Order.populate(order.id);
       },
     },
     orderSetDishComment: {
@@ -223,7 +226,8 @@ export default {
         }
 
         await order.setComment(dish, comment);
-        return await Order.countCart(order);
+        await Order.countCart(order);
+        return await Order.populate(order.id);
       },
     },
 
@@ -234,6 +238,7 @@ export default {
         let order = args.order;
         if (!order.id) throw "order.id field is required"
         await Order.update({id: order.id}, {trifleFrom: order.trifleFrom})
+        await Order.populate(order.id);
         return await Order.populate(order.id);
       },
     },

package/test/bootstrap.ts

@@ -0,0 +1,33 @@
+import "mocha";
+require("dotenv").config();
+var Sails = require("./fixture/node_modules/sails").Sails;
+
+before(function (done) {
+  require("./fixture/app-export");
+  this.timeout(50000);
+  Sails().lift({}, function (err: any, _sails: any) {
+    if (err) return done(err);
+    global.sails = _sails;
+    return done();
+  });
+});
+
+after(function (done) {
+  if (global.sails) {
+    return global.sails.lower(function (err) {
+      if (err) {
+        done();
+      }
+      done();
+    });
+  }
+  done();
+});
+
+declare global {
+  namespace NodeJS {
+    interface Global {
+      sails: any;
+    }
+  }
+}

package/test/fixture/.tmp/localDiskDb/archive.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/dish.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/dish_images__image_dish.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/group.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/group_images__image_group.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/image.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/maintenance.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/order.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/orderdish.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/paymentdocument.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/paymentmethod.db

@@ -0,0 +1,2 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}
+{"$$indexCreated":{"fieldName":"adapter","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/place.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/settings.db

@@ -0,0 +1,2 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}
+{"$$indexCreated":{"fieldName":"key","unique":true,"sparse":false}}

package/test/fixture/.tmp/localDiskDb/street.db

@@ -0,0 +1 @@
+{"$$indexCreated":{"fieldName":"id","unique":true,"sparse":false}}

package/test/{fixtures/v0.12-app/app.js → fixture/app-export.js}

@@ -1,73 +1,73 @@
-/**
- * app.js
- *
- * Use `app.js` to run your app without `sails lift`.
- * To start the server, run: `node app.js`.
- *
- * This is handy in situations where the sails CLI is not relevant or useful.
- *
- * For example:
- *   => `node app.js`
- *   => `forever start app.js`
- *   => `node debug app.js`
- *   => `modulus deploy`
- *   => `heroku scale`
- *
- *
- * The same command-line arguments are supported, e.g.:
- * `node app.js --silent --port=80 --prod`
- */
-
-
-// Ensure we're in the project directory, so cwd-relative paths work as expected
-// no matter where we actually lift from.
-// > Note: This is not required in order to lift, but it is a convenient default.
-process.chdir(__dirname);
-
-// Attempt to import `sails`.
-var sails;
-try {
-  sails = require('sails');
-} catch (e) {
-  console.error('To run an app using `node app.js`, you usually need to have a version of `sails` installed in the same directory as your app.');
-  console.error('To do that, run `npm install sails`');
-  console.error('');
-  console.error('Alternatively, if you have sails installed globally (i.e. you did `npm install -g sails`), you can use `sails lift`.');
-  console.error('When you run `sails lift`, your app will still use a local `./node_modules/sails` dependency if it exists,');
-  console.error('but if it doesn\'t, the app will run with the global sails instead!');
-  return;
-}
-
-// --•
-// Try to get `rc` dependency (for loading `.sailsrc` files).
-var rc;
-try {
-  rc = require('rc');
-} catch (e0) {
-  try {
-    rc = require('sails/node_modules/rc');
-  } catch (e1) {
-    console.error('Could not find dependency: `rc`.');
-    console.error('Your `.sailsrc` file(s) will be ignored.');
-    console.error('To resolve this, run:');
-    console.error('npm install rc --save');
-    rc = function () { return {}; };
-  }
-}
-
-
-
-// function sails() {
-//   return new Promise(function (resolve, reject) {
-//     sails.lift(rc('sails'), (err, _sails) => {
-//       if (err) { return done(err); }
-//       resolve(_sails);
-//     });
-//   })
-// }
-
-
-module.exports = {
-  sails: sails,
-  rc: rc('sails')
-} 
+/**
+ * app.js
+ *
+ * Use `app.js` to run your app without `sails lift`.
+ * To start the server, run: `node app.js`.
+ *
+ * This is handy in situations where the sails CLI is not relevant or useful.
+ *
+ * For example:
+ *   => `node app.js`
+ *   => `forever start app.js`
+ *   => `node debug app.js`
+ *   => `modulus deploy`
+ *   => `heroku scale`
+ *
+ *
+ * The same command-line arguments are supported, e.g.:
+ * `node app.js --silent --port=80 --prod`
+ */
+
+
+// Ensure we're in the project directory, so cwd-relative paths work as expected
+// no matter where we actually lift from.
+// > Note: This is not required in order to lift, but it is a convenient default.
+process.chdir(__dirname);
+
+// Attempt to import `sails`.
+var sails;
+try {
+  sails = require('sails');
+} catch (e) {
+  console.error('To run an app using `node app.js`, you usually need to have a version of `sails` installed in the same directory as your app.');
+  console.error('To do that, run `npm install sails`');
+  console.error('');
+  console.error('Alternatively, if you have sails installed globally (i.e. you did `npm install -g sails`), you can use `sails lift`.');
+  console.error('When you run `sails lift`, your app will still use a local `./node_modules/sails` dependency if it exists,');
+  console.error('but if it doesn\'t, the app will run with the global sails instead!');
+  return;
+}
+
+// --•
+// Try to get `rc` dependency (for loading `.sailsrc` files).
+var rc;
+try {
+  rc = require('rc');
+} catch (e0) {
+  try {
+    rc = require('sails/accessible/rc');
+  } catch (e1) {
+    console.error('Could not find dependency: `rc`.');
+    console.error('Your `.sailsrc` file(s) will be ignored.');
+    console.error('To resolve this, run:');
+    console.error('npm install rc --save');
+    rc = function () { return {}; };
+  }
+}
+
+
+
+// function sails() {
+//   return new Promise(function (resolve, reject) {
+//     sails.lift(rc('sails'), (err, _sails) => {
+//       if (err) { return done(err); }
+//       resolve(_sails);
+//     });
+//   })
+// }
+
+
+module.exports = {
+  sails: sails,
+  rc: rc('sails')
+}

package/test/fixture/app.js

@@ -0,0 +1,56 @@
+/**
+ * app.js
+ *
+ * Use `app.js` to run your app without `sails lift`.
+ * To start the server, run: `node app.js`.
+ *
+ * This is handy in situations where the sails CLI is not relevant or useful,
+ * such as when you deploy to a server, or a PaaS like Heroku.
+ *
+ * For example:
+ *   => `node app.js`
+ *   => `npm start`
+ *   => `forever start app.js`
+ *   => `node debug app.js`
+ *
+ * The same command-line arguments and env vars are supported, e.g.:
+ * `NODE_ENV=production node app.js --port=80 --verbose`
+ *
+ * For more information see:
+ *   https://sailsjs.com/anatomy/app.js
+ */
+
+
+// Ensure we're in the project directory, so cwd-relative paths work as expected
+// no matter where we actually lift from.
+// > Note: This is not required in order to lift, but it is a convenient default.
+process.chdir(__dirname);
+
+process.env.DEV = "TRUE";
+
+
+// Attempt to import `sails` dependency, as well as `rc` (for loading `.sailsrc` files).
+var sails;
+var rc;
+try {
+  sails = require('sails');
+  rc = require('sails/accessible/rc');
+} catch (err) {
+  console.error('Encountered an error when attempting to require(\'sails\'):');
+  console.error(err.stack);
+  console.error('--');
+  console.error('To run an app using `node app.js`, you need to have Sails installed');
+  console.error('locally (`./node_modules/sails`).  To do that, just make sure you\'re');
+  console.error('in the same directory as your app and run `npm install`.');
+  console.error();
+  console.error('If Sails is installed globally (i.e. `npm install -g sails`) you can');
+  console.error('also run this app with `sails lift`.  Running with `sails lift` will');
+  console.error('not run this file (`app.js`), but it will do exactly the same thing.');
+  console.error('(It even uses your app directory\'s local Sails install, if possible.)');
+  return;
+}//-•
+
+console.log(rc('sails'))
+
+// Start server
+sails.lift(rc('sails'));

package/test/fixture/config/adminpanel.js

@@ -0,0 +1,3 @@
+module.exports.adminpanel = {
+    // auth: true
+}

package/test/fixture/config/connections.js

@@ -0,0 +1,9 @@
+module.exports.connections = {
+    // postgres: {
+    //     adapter: 'sails-postgresql',
+    //     host: process.env.PG_HOST === undefined ? '127.0.0.1' : process.env.PG_HOST,
+    //     user: process.env.PG_USER === undefined ? 'postgres' : process.env.PG_USER, 
+    //     password: process.env.PG_PASSWORD === undefined ? 'postgres' : process.env.PG_PASSWORD, 
+    //     database: process.env.PG_DATABASE === undefined ? 'testdb' : process.env.PG_DATABASE 
+    //   }
+};

package/test/fixture/config/env/development.js

@@ -0,0 +1,10 @@
+module.exports = {
+  // models: {
+  //  connection: 'postgres'
+   
+  // },
+  port: process.env.PORT === undefined ? 42772 : process.env.PORT,
+  log: {
+    level: process.env.LOG_LEVEL === undefined ? 'verbose' : process.env.PORT
+   }
+};

package/test/{fixtures/v0.12-app → fixture}/config/env/production.js

@@ -1,16 +1,16 @@
-module.exports = {
-  models: {
-    connection: 'memory',
-    migrate: 'safe'
-  },
-  adminpanel:{
-    auth: true
-  },
-  log: {
-    level: 'info'
-  },
-  port: process.env.PORT === undefined ? 42772 : process.env.PORT,
-  log: {
-   level: "silent"
-  }
-};
+module.exports = {
+  // models: {
+  //   connection: 'postgres',
+  //   migrate: 'safe'
+  // },
+  adminpanel:{
+    auth: true
+  },
+  log: {
+    level: 'info'
+  },
+  port: process.env.PORT === undefined ? 42772 : process.env.PORT,
+  log: {
+   level: "verbose"
+  }
+};

package/test/fixture/config/globals.js

@@ -0,0 +1,16 @@
+/**
+ * THIS FILE WAS ADDED AUTOMATICALLY by the Sails 1.0 app migration tool.
+ * The original file was backed up as `config/globals-old.js.txt`
+ */
+
+ module.exports.globals = {
+
+  _: require('lodash'),
+
+  async: require('async'),
+
+  models: true,
+
+  sails: true
+
+};

package/test/{fixtures/v0.12-app → fixture}/config/hookTimeout.js

@@ -1,8 +1,8 @@
-module.exports.orm = {
-  _hookTimeout: 100000000
-};
-
-module.exports.pubsub = {
-  _hookTimeout: 100000000
-};
-
+module.exports.orm = {
+  _hookTimeout: 100000000
+};
+
+module.exports.pubsub = {
+  _hookTimeout: 100000000
+};
+