add fetch

webresto · May 4, 2024 · aaba593 · aaba593
1 parent 5ef44b3
commit aaba593
Show file tree

Hide file tree

Showing 22 changed files with 84 additions and 50 deletions.
diff --git a/adapters/promotion/default/configuredPromotion.js b/adapters/promotion/default/configuredPromotion.js
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AbstractPromotion_1 = __importDefault(require("../AbstractPromotion"));
 const findModelInstance_1 = __importDefault(require("../../../libs/findModelInstance"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
-const stringsInArray_1 = require("../../../libs/stringsInArray");
+const someInArray_1 = require("../../../libs/someInArray");
 class ConfiguredPromotion extends AbstractPromotion_1.default {
     constructor(promotion, config) {
         super();
@@ -32,7 +32,7 @@ class ConfiguredPromotion extends AbstractPromotion_1.default {
     }
     condition(arg) {
         if ((0, findModelInstance_1.default)(arg) === "Order" && (this.concept[0] === undefined || this.concept[0] === "")
-            ? true : (0, stringsInArray_1.stringsInArray)(arg.concept, this.concept)) {
+            ? true : (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
             let order = arg;
             // TODO:  if order.dishes type number[]
             let orderDishes = order.dishes;
@@ -43,12 +43,12 @@ class ConfiguredPromotion extends AbstractPromotion_1.default {
             return false;
         }
         if ((0, findModelInstance_1.default)(arg) === "Dish" && (this.concept[0] === undefined || this.concept[0] === "") ? true :
-            (0, stringsInArray_1.stringsInArray)(arg.concept, this.concept)) {
-            return (0, stringsInArray_1.stringsInArray)(arg.id, this.config.dishes);
+            (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
+            return (0, someInArray_1.someInArray)(arg.id, this.config.dishes);
         }
         if ((0, findModelInstance_1.default)(arg) === "Group" && (this.concept[0] === undefined || this.concept[0] === "") ? true :
-            (0, stringsInArray_1.stringsInArray)(arg.concept, this.concept)) {
-            return (0, stringsInArray_1.stringsInArray)(arg.id, this.config.groups);
+            (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
+            return (0, someInArray_1.someInArray)(arg.id, this.config.groups);
         }
         return false;
     }
@@ -106,11 +106,11 @@ class ConfiguredPromotion extends AbstractPromotion_1.default {
                     continue;
                 }
                 if ((this.concept[0] === undefined || this.concept[0] === "") ?
-                    false : !(0, stringsInArray_1.stringsInArray)(orderDish.dish.concept, this.concept)) {
+                    false : !(0, someInArray_1.someInArray)(orderDish.dish.concept, this.concept)) {
                     continue;
                 }
-                let checkDishes = (0, stringsInArray_1.stringsInArray)(orderDish.dish.id, this.config.dishes);
-                let checkGroups = (0, stringsInArray_1.stringsInArray)(orderDish.dish.parentGroup, this.config.groups);
+                let checkDishes = (0, someInArray_1.someInArray)(orderDish.dish.id, this.config.dishes);
+                let checkGroups = (0, someInArray_1.someInArray)(orderDish.dish.parentGroup, this.config.groups);
                 if (!checkDishes || !checkGroups)
                     continue;
                 if (this.configDiscount.discountType === "flat") {

diff --git a/adapters/rms/RMSAdapter.js b/adapters/rms/RMSAdapter.js
@@ -133,7 +133,7 @@ class RMSAdapter {
                     const inactiveGroups = await Group.find({ isDeleted: true });
                     const inactiveGroupIds = inactiveGroups.map((group) => group.id);
                     // Delete all dishes in inactive groups or not in the updated list
-                    await Dish.update({ where: { or: [{ parentGroup: { in: inactiveGroupIds } }, { rmsId: { "!=": allProductIds } }, { parentGroup: null }] } }, { isDeleted: true });
+                    await Dish.update({ where: { or: [{ parentGroup: { in: inactiveGroupIds } }, { rmsId: { "!=": allProductIds } }, { parentGroup: null }] } }, { isDeleted: true }).fetch();
                     emitter.emit("rms-sync:after-sync-products");
                 }
                 return resolve();

diff --git a/adapters/rms/RMSAdapter.ts b/adapters/rms/RMSAdapter.ts
@@ -174,7 +174,7 @@ export default abstract class RMSAdapter {
           const inactiveGroups = await Group.find({ isDeleted: true });
           const inactiveGroupIds = inactiveGroups.map((group) => group.id);
           // Delete all dishes in inactive groups or not in the updated list
-          await Dish.update({ where: { or: [{ parentGroup: { in: inactiveGroupIds } }, { rmsId: { "!=": allProductIds } }, { parentGroup: null }] } }, { isDeleted: true });
+          await Dish.update({ where: { or: [{ parentGroup: { in: inactiveGroupIds } }, { rmsId: { "!=": allProductIds } }, { parentGroup: null }] } }, { isDeleted: true }).fetch();
           emitter.emit("rms-sync:after-sync-products");
         }
         return resolve();

diff --git a/libs/AwaitEmitter.js b/libs/AwaitEmitter.js
@@ -147,6 +147,13 @@ class AwaitEmitter {
                             res.push(new HandlerResponse(subscriber.id, null, null, true));
                         }
                     };
+                    /**
+                     *
+                     * TODO:
+                     * Add TTL for emmiter
+                     *
+                     * To know how many functions were performed before it
+                     */
                     const execHandler = async function () {
                         const now = new Date();
                         try {

diff --git a/libs/AwaitEmitter.ts b/libs/AwaitEmitter.ts
@@ -242,7 +242,13 @@ export default class AwaitEmitter {
                   res.push(new HandlerResponse(subscriber.id, null, null, true));
                 }
               };
-
+              /**
+               * 
+               * TODO:
+               * Add TTL for emmiter
+               * 
+               * To know how many functions were performed before it
+               */
               const execHandler = async function () {
                 const now = new Date();
                 try {

diff --git a/libs/stringsInArray.d.ts b/libs/stringsInArray.d.ts
@@ -1 +1,2 @@
+export declare function stringsInArray(check: string[] | string, array: string[]): boolean;
 export declare function someInArray(check: string[] | string, array: string[]): boolean;
diff --git a/libs/stringsInArray.js b/libs/stringsInArray.js
@@ -1,10 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringsInArray = void 0;
+exports.someInArray = exports.stringsInArray = void 0;
 function stringsInArray(check, array) {
+    // If check is an array of strings
+    if (Array.isArray(check)) {
+        // Check each string in the check array
+        for (const str of check) {
+            // If any of the strings is not present in the array array, return false
+            if (!array.includes(str)) {
+                return false;
+            }
+        }
+        // If all strings in the check array are present in the array array, return true
+        return true;
+    }
+    // If check is a string
+    else {
+        // Check if the check string is present in the array array
+        return array.includes(check);
+    }
+}
+exports.stringsInArray = stringsInArray;
+function someInArray(check, array) {
     if (typeof check === 'string') {
         check = [check];
     }
     return array.some((e) => check.includes(e));
 }
-exports.stringsInArray = stringsInArray;
+exports.someInArray = someInArray;
diff --git a/models/OneTimePassword.js b/models/OneTimePassword.js
@@ -28,7 +28,7 @@ let Model = {
     },
     async check(login, password) {
         // Clean expired
-        await OneTimePassword.destroy({ expires: { "<": Date.now() } });
+        await OneTimePassword.destroy({ expires: { "<": Date.now() } }).fetch();
         if (process.env.NODE_ENV !== "production" && process.env.DEFAULT_OTP === password) {
             return true;
         }

diff --git a/models/OneTimePassword.ts b/models/OneTimePassword.ts
@@ -40,7 +40,7 @@ let Model = {
 
   async check(login: string, password: string): Promise<boolean> {
     // Clean expired
-    await OneTimePassword.destroy({expires: { "<": Date.now() }})
+    await OneTimePassword.destroy({expires: { "<": Date.now() }}).fetch()
 
     if(process.env.NODE_ENV !== "production" && process.env.DEFAULT_OTP === password) {
       return true

diff --git a/models/Order.js b/models/Order.js
@@ -468,7 +468,7 @@ let Model = {
                 await OrderDish.update({ id: get.id }, { amount: get.amount }).fetch();
             }
             else {
-                await OrderDish.destroy({ id: get.id });
+                await OrderDish.destroy({ id: get.id }).fetch();
                 sails.log.info("destroy", get.id);
             }
             await Order.next(order.id, "CART");
@@ -687,7 +687,7 @@ let Model = {
         // Custom emitters checks
         const results = await emitter.emit("core:order-check", order, customer, isSelfService, address, paymentMethodId);
         delete (order.dishes);
-        await Order.update({ id: order.id }, { ...order });
+        await Order.update({ id: order.id }, { ...order }).fetch();
         ////////////////////
         // CHECKOUT COUNTING
         try {
@@ -759,7 +759,7 @@ let Model = {
         sails.log.silly("Order > check > after wait general emitter", order, results);
         emitter.emit("core:order-after-check-counting", order);
         delete (order.dishes);
-        await Order.update({ id: order.id }, { ...order });
+        await Order.update({ id: order.id }, { ...order }).fetch();
         /** The check can pass without listeners, because the check itself is minimal
         * has basic checks. And is self-sufficient, but
         * is still set by default so all checks must be passed
@@ -1043,7 +1043,7 @@ let Model = {
                         if (!dish) {
                             sails.log.error("Dish with id " + orderDish.dish.id + " not found!");
                             emitter.emit("core:order-return-full-order-destroy-orderdish", dish, order);
-                            await OrderDish.destroy({ id: orderDish.id });
+                            await OrderDish.destroy({ id: orderDish.id }).fetch();
                             continue;
                         }
                         if (dish.balance === -1 ? false : dish.balance < orderDish.amount) {
@@ -1146,7 +1146,7 @@ let Model = {
                 }
                 catch (e) {
                     sails.log.error("Order > count > iterate orderDish error", e);
-                    await OrderDish.destroy({ id: orderDish.id });
+                    await OrderDish.destroy({ id: orderDish.id }).fetch();
                     uniqueDishes -= 1;
                     continue;
                 }

diff --git a/models/Order.ts b/models/Order.ts
@@ -598,7 +598,7 @@ let Model = {
       if (get.amount > 0) {
         await OrderDish.update({ id: get.id }, { amount: get.amount }).fetch();
       } else {
-        await OrderDish.destroy({ id: get.id });
+        await OrderDish.destroy({ id: get.id }).fetch();
         sails.log.info("destroy", get.id);
       }
 
@@ -856,7 +856,7 @@ let Model = {
     const results = await emitter.emit("core:order-check", order, customer, isSelfService, address, paymentMethodId);
 
     delete (order.dishes);
-    await Order.update({ id: order.id }, { ...order });
+    await Order.update({ id: order.id }, { ...order }).fetch();
 
     ////////////////////
     // CHECKOUT COUNTING
@@ -944,7 +944,7 @@ let Model = {
     emitter.emit("core:order-after-check-counting", order);
 
     delete (order.dishes);
-    await Order.update({ id: order.id }, { ...order });
+    await Order.update({ id: order.id }, { ...order }).fetch();
 
 
     /** The check can pass without listeners, because the check itself is minimal
@@ -1273,7 +1273,7 @@ let Model = {
             if (!dish) {
               sails.log.error("Dish with id " + orderDish.dish.id + " not found!");
               emitter.emit("core:order-return-full-order-destroy-orderdish", dish, order);
-              await OrderDish.destroy({ id: orderDish.id });
+              await OrderDish.destroy({ id: orderDish.id }).fetch();
               continue;
             }
 
@@ -1394,7 +1394,7 @@ let Model = {
           totalWeight = totalWeight.plus(orderDish.totalWeight);
         } catch (e) {
           sails.log.error("Order > count > iterate orderDish error", e);
-          await OrderDish.destroy({ id: orderDish.id });
+          await OrderDish.destroy({ id: orderDish.id }).fetch();
           uniqueDishes -= 1;
           continue;
         }

diff --git a/models/PaymentDocument.js b/models/PaymentDocument.js
@@ -90,7 +90,7 @@ let Model = {
         };
         emitter.emit("core:payment-document-before-create", payment);
         try {
-            await PaymentDocument.create(payment);
+            await PaymentDocument.create(payment).fetch();
         }
         catch (e) {
             sails.log.error("Error in paymentAdapter.createPayment :", e);

diff --git a/models/PaymentDocument.ts b/models/PaymentDocument.ts
@@ -164,7 +164,7 @@ let Model = {
 
     emitter.emit("core:payment-document-before-create", payment);
     try {
-      await PaymentDocument.create(payment as PaymentDocument);
+      await PaymentDocument.create(payment as PaymentDocument).fetch();
     } catch (e) {
       sails.log.error("Error in paymentAdapter.createPayment :", e);
       throw {

diff --git a/models/Promotion.js b/models/Promotion.js
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const hashCode_1 = __importDefault(require("../libs/hashCode"));
 const adapters_1 = require("../adapters");
-const stringsInArray_1 = require("../libs/stringsInArray");
+const someInArray_1 = require("../libs/someInArray");
 const uuid_1 = require("uuid");
 // import Decimal from "decimal.js";
 // sails.on("lifted", function () {
@@ -165,11 +165,11 @@ let Model = {
         let activePromotionIds = promotionAdapter.getActivePromotionsIds();
         if (concept[0] === "") {
             let filteredRAM = promotionRAM.filter(promotion => (promotion.concept[0] === undefined || promotion.concept[0] === "")
-                && (0, stringsInArray_1.stringsInArray)(promotion.id, activePromotionIds));
+                && (0, someInArray_1.someInArray)(promotion.id, activePromotionIds));
             return filteredRAM;
         }
-        let filteredRAM = promotionRAM.filter(promotion => (0, stringsInArray_1.stringsInArray)(promotion.concept, concept) || (promotion.concept[0] === undefined || promotion.concept[0] === "")
-            && (0, stringsInArray_1.stringsInArray)(promotion.id, activePromotionIds));
+        let filteredRAM = promotionRAM.filter(promotion => (0, someInArray_1.someInArray)(promotion.concept, concept) || (promotion.concept[0] === undefined || promotion.concept[0] === "")
+            && (0, someInArray_1.someInArray)(promotion.id, activePromotionIds));
         if (!filteredRAM)
             throw "Promotion with concept: " + concept + " not found";
         return filteredRAM;

diff --git a/models/User.js b/models/User.js
@@ -211,8 +211,8 @@ let Model = {
                 throw `OTP checks failed`;
             }
         }
-        await UserDevice.update({ user: userId }, { isLoggedIn: false });
-        User.update({ id: userId }, { isDeleted: true });
+        await UserDevice.update({ user: userId }, { isLoggedIn: false }).fetch();
+        User.update({ id: userId }, { isDeleted: true }).fetch();
     },
     /**
      * Returns phone string by user criteria

diff --git a/models/User.ts b/models/User.ts
@@ -244,8 +244,8 @@ let Model = {
         throw `OTP checks failed`
       }
     }
-    await UserDevice.update({ user: userId }, { isLoggedIn: false });
-    User.update({id: userId}, {isDeleted: true});
+    await UserDevice.update({ user: userId }, { isLoggedIn: false }).fetch();
+    User.update({id: userId}, {isDeleted: true}).fetch();
   },
 
   /**

diff --git a/models/UserDevice.js b/models/UserDevice.js
@@ -51,7 +51,7 @@ let Model = {
     },
     /** Method set lastActivity for a device */
     async setActivity(criteria, client = {}) {
-        await UserDevice.update(criteria, client);
+        await UserDevice.update(criteria, client).fetch();
     },
     async checkSession(sessionId, userId, client = {}) {
         let ud = await UserDevice.findOne({ sessionId: sessionId });

diff --git a/models/UserDevice.ts b/models/UserDevice.ts
@@ -69,7 +69,7 @@ let Model = {
 
   /** Method set lastActivity for a device */
   async setActivity(criteria: CriteriaQuery<UserDevice>, client:  { lastIP?: string , userAgent?: string } = {}): Promise<void> {
-    await UserDevice.update(criteria, client);
+    await UserDevice.update(criteria, client).fetch();
   },
 
   async checkSession(sessionId: string, userId: string, client: { lastIP?: string , userAgent?: string } = {}): Promise<boolean> {

diff --git a/models/UserOrderHistory.js b/models/UserOrderHistory.js
@@ -47,7 +47,7 @@ let Model = {
         }
         // Count orders
         let count = await UserOrderHistory.find({ user: user.id });
-        await User.update({ id: user.id }, { orderCount: count.length });
+        await User.update({ id: user.id }, { orderCount: count.length }).fetch();
     }
 };
 module.exports = {

diff --git a/models/UserOrderHistory.ts b/models/UserOrderHistory.ts
@@ -64,7 +64,7 @@ let Model = {
 
     // Count orders
     let count = await UserOrderHistory.find({user: user.id})
-    await User.update({id: user.id}, {orderCount: count.length});
+    await User.update({id: user.id}, {orderCount: count.length}).fetch();
   }
 };
 

diff --git a/test/generators/discount.generator.js b/test/generators/discount.generator.js
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const faker_1 = __importDefault(require("faker"));
 const findModelInstance_1 = __importDefault(require("../../libs/findModelInstance"));
 const configuredPromotion_1 = __importDefault(require("../../adapters/promotion/default/configuredPromotion"));
-const stringsInArray_1 = require("../../libs/stringsInArray");
+const someInArray_1 = require("../../libs/someInArray");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 var autoincrement = 0;
 function discountGenerator(config = {
@@ -48,7 +48,7 @@ function discountGenerator(config = {
         },
         // productCategoryDiscounts: undefined,
         condition: function (arg) {
-            if ((0, findModelInstance_1.default)(arg) === "Order" && (0, stringsInArray_1.stringsInArray)(arg.concept, this.concept)) {
+            if ((0, findModelInstance_1.default)(arg) === "Order" && (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
                 let order = arg;
                 // TODO:  if order.dishes type number[]
                 let orderDishes = order.dishes;
@@ -58,14 +58,14 @@ function discountGenerator(config = {
                     return true;
                 return false;
             }
-            if ((0, findModelInstance_1.default)(arg) === "Dish" && (0, stringsInArray_1.stringsInArray)(arg.concept, this.concept)) {
-                return (0, stringsInArray_1.stringsInArray)(arg.id, this.configDiscount.dishes);
+            if ((0, findModelInstance_1.default)(arg) === "Dish" && (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
+                return (0, someInArray_1.someInArray)(arg.id, this.configDiscount.dishes);
                 // if(this.config.dishes.includes(arg.id)){
                 //   return true;
                 // }
             }
-            if ((0, findModelInstance_1.default)(arg) === "Group" && (0, stringsInArray_1.stringsInArray)(arg.concept, this.concept)) {
-                return (0, stringsInArray_1.stringsInArray)(arg.id, this.configDiscount.groups);
+            if ((0, findModelInstance_1.default)(arg) === "Group" && (0, someInArray_1.someInArray)(arg.concept, this.concept)) {
+                return (0, someInArray_1.someInArray)(arg.id, this.configDiscount.groups);
                 // if(this.config.groups.includes(arg.id)){
                 //   return true;
                 // }