delete console logs

adapters/index.js

@@ -220,7 +220,6 @@ class Adapter {
                 adapterName = adapter;
             }
             else if (adapter instanceof DeliveryAdapter_1.default) {
-                console.log(">>>");
                 this.instanceDeliveryAdapter = adapter;
                 return this.instanceDeliveryAdapter;
             }

adapters/index.ts

@@ -217,7 +217,6 @@ export class Adapter {
       if (typeof adapter === "string") {
         adapterName = adapter;
       } else if (adapter instanceof DeliveryAdapter) {
-        console.log(">>>")
         this.instanceDeliveryAdapter = adapter;
         return this.instanceDeliveryAdapter;
       }

adapters/mediafile/default/local.js

@@ -197,7 +197,6 @@ function resizeMediaFile({ srcPath, dstPath, size, customArgs }) {
         imageMagick(srcPath)
             .size((err, dimensions) => {
             if (err) {
-                console.log(err);
                 return reject(new Error(err));
             }
             // Определяем, какая сторона меньше
@@ -214,7 +213,6 @@ function resizeMediaFile({ srcPath, dstPath, size, customArgs }) {
                 .out(...customArgs)
                 .write(dstPath, (err) => {
                 if (err) {
-                    console.log(err);
                     reject(new Error(err));
                 }
                 else {

adapters/mediafile/default/local.ts

@@ -227,7 +227,6 @@ function resizeMediaFile({ srcPath, dstPath, size, customArgs }: ResizeMediaFile
     imageMagick(srcPath)
       .size((err, dimensions) => {
         if (err) {
-          console.log(err);
           return reject(new Error(err));
         }
 
@@ -245,7 +244,6 @@ function resizeMediaFile({ srcPath, dstPath, size, customArgs }: ResizeMediaFile
           .out(...customArgs)
           .write(dstPath, (err) => {
             if (err) {
-              console.log(err);
               reject(new Error(err));
             } else {
               resolve();

adapters/otp/default/defaultOTP.js

@@ -21,7 +21,6 @@ class DefaultOTP extends OneTimePasswordAdapter_1.default {
         let mainLoginField = await Settings.get("LOGIN_FIELD") ?? 'phone';
         if (NotificationManager.isChannelExist(mainLoginField === "phone" ? "sms" : mainLoginField)) {
             try {
-                console.log(">>>>>>>>>>>> to user");
                 await NotificationManager.sendMessageToUser("info", `Your code is ${otp.password}`, { phone: { code: "", number: login } });
             }
             catch (error) {

adapters/otp/default/defaultOTP.ts

@@ -18,7 +18,6 @@ export class DefaultOTP extends OneTimePasswordAdapter {
     let mainLoginField = await Settings.get("LOGIN_FIELD") as string ?? 'phone';
     if (NotificationManager.isChannelExist(mainLoginField === "phone" ? "sms" : mainLoginField)){
       try {
-        console.log(">>>>>>>>>>>> to user")
         await NotificationManager.sendMessageToUser("info", `Your code is ${otp.password}`,{ phone: { code: "", number:login}});
       } catch (error) {
         sails.log.error(`SEND OTP ERROR: ${error}`)

adapters/promotion/default/configuredPromotion.js

@@ -53,7 +53,6 @@ class ConfiguredPromotion extends AbstractPromotion_1.default {
         return false;
     }
     async action(order) {
-        //  console.log(this.config + "  action")
         let mass = await this.applyPromotion(order);
         return mass;
     }

adapters/promotion/default/configuredPromotion.ts

@@ -74,7 +74,6 @@ export default class ConfiguredPromotion extends AbstractPromotionHandler {
   }
 
   public async action(order: Order): Promise<PromotionState> {
-    //  console.log(this.config + "  action")
     let mass: PromotionState = await this.applyPromotion(order)
     return mass
   }

interfaces/index.js

@@ -220,7 +220,6 @@ class Adapter {
                 adapterName = adapter;
             }
             else if (adapter instanceof DeliveryAdapter_1.default) {
-                console.log(">>>");
                 this.instanceDeliveryAdapter = adapter;
                 return this.instanceDeliveryAdapter;
             }

interfaces/index.ts

@@ -218,7 +218,6 @@ export class Adapter {
       if (typeof adapter === "string") {
         adapterName = adapter;
       } else if (adapter instanceof DeliveryAdapter) {
-        console.log(">>>")
         this.instanceDeliveryAdapter = adapter;
         return this.instanceDeliveryAdapter;
       }

libs/phoneValidByMask.js

@@ -13,7 +13,6 @@ function phoneValidByMask(phoneNumber, countryCode, phoneMasks) {
         if (maskDigits.length === phoneNumberDigits.length) {
             let isValid = true;
             for (let i = 0; i < maskDigits.length; i++) {
-                console.log(phoneNumberDigits[i], maskDigits[i]);
                 if (isNaN(parseInt(phoneNumberDigits[i]))) {
                     isValid = false;
                     break;

libs/phoneValidByMask.ts

@@ -13,7 +13,6 @@ export function phoneValidByMask(phoneNumber: string, countryCode: string, phone
     if (maskDigits.length === phoneNumberDigits.length) {
       let isValid: boolean = true;
       for (let i = 0; i < maskDigits.length; i++) {
-        console.log(phoneNumberDigits[i], maskDigits[i]);
         if (isNaN(parseInt(phoneNumberDigits[i]))) {
           isValid = false;
           break;

models/Order.d.ts

@@ -33,7 +33,7 @@ declare let attributes: {
     /**
      * @deprecated will be rename to `Items` in **v2**
      */
-    dishes: number[] | OrderDish[];
+    dishes: OrderDish[] | number[];
     paymentMethod: any;
     /** */
     paymentMethodTitle: string;
@@ -161,7 +161,7 @@ declare let Model: {
     beforeCreate(orderInit: Order, cb: (err?: string) => void): void;
     afterCreate(order: Order, cb: (err?: string) => void): Promise<void>;
     /** Add dish into order */
-    addDish(criteria: CriteriaQuery<Order>, dish: string | Dish, amount: number, modifiers: OrderModifier[], comment: string, addedBy: "user" | "promotion" | "core" | "custom", replace?: boolean, orderDishId?: number): Promise<void>;
+    addDish(criteria: CriteriaQuery<Order>, dish: Dish | string, amount: number, modifiers: OrderModifier[], comment: string, addedBy: "user" | "promotion" | "core" | "custom", replace?: boolean, orderDishId?: number): Promise<void>;
     removeDish(criteria: CriteriaQuery<Order>, dish: OrderDish, amount: number, stack?: boolean): Promise<void>;
     setCount(criteria: CriteriaQuery<Order>, dish: OrderDish, amount: number): Promise<void>;
     setComment(criteria: CriteriaQuery<Order>, dish: OrderDish, comment: string): Promise<void>;
@@ -206,7 +206,7 @@ declare let Model: {
         state?: string;
         concept?: string;
         isMixedConcept?: boolean;
-        dishes?: number[] | OrderDish[];
+        dishes?: OrderDish[] | number[];
         paymentMethod?: any;
         paymentMethodTitle?: string;
         paid?: boolean;
@@ -266,7 +266,7 @@ declare let Model: {
      */
     countCart(criteria: CriteriaQuery<Order>, isPromoting?: boolean): Promise<Order>;
     doPaid(criteria: CriteriaQuery<Order>, paymentDocument: PaymentDocument): Promise<void>;
-    applyPromotionCode(criteria: CriteriaQuery<Order>, promotionCodeString: string): Promise<Order>;
+    applyPromotionCode(criteria: CriteriaQuery<Order>, promotionCodeString: string | null): Promise<Order>;
 };
 declare global {
     const Order: typeof Model & ORMModel<Order, null> & StateFlowModel;

models/Order.js

@@ -973,7 +973,9 @@ let Model = {
         try {
             let order = await Order.findOne(criteria);
             if (order.isPromoting !== isPromoting) {
-                sails.log.error(`The order status does not match the passed parameters order.isPromoting [${order.isPromoting}], attribute [${isPromoting}], check your promotions`);
+                let err = `CountCart: The order status does not match the passed parameters order.isPromoting [${order.isPromoting}], attribute [${isPromoting}], check your promotions`;
+                sails.log.error(err);
+                throw new Error(err);
             }
             order.isPromoting = isPromoting;
             emitter.emit("core-order-before-count", order);
@@ -1093,7 +1095,6 @@ let Model = {
                     dishesCount += orderDish.amount;
                     uniqueDishes++;
                     totalWeight = totalWeight.plus(orderDish.totalWeight);
-                    // console.log(totalWeight, "TOTAL WEIGTH IN THE END =====================")
                 }
                 catch (e) {
                     sails.log.error("Order > count > iterate orderDish error", e);

models/Order.ts

@@ -1180,7 +1180,9 @@ let Model = {
 
       let order = await Order.findOne(criteria);
       if (order.isPromoting !== isPromoting) {
-        sails.log.error(`The order status does not match the passed parameters order.isPromoting [${order.isPromoting}], attribute [${isPromoting}], check your promotions`)
+        let err = `CountCart: The order status does not match the passed parameters order.isPromoting [${order.isPromoting}], attribute [${isPromoting}], check your promotions`
+        sails.log.error(err);
+        throw new Error(err)
       }
       order.isPromoting = isPromoting;
 
@@ -1327,7 +1329,6 @@ let Model = {
           dishesCount += orderDish.amount;
           uniqueDishes++;
           totalWeight = totalWeight.plus(orderDish.totalWeight);
-          // console.log(totalWeight, "TOTAL WEIGTH IN THE END =====================")
         } catch (e) {
           sails.log.error("Order > count > iterate orderDish error", e);
           await OrderDish.destroy({ id: orderDish.id });

models/Promotion.js

@@ -152,7 +152,8 @@ let Model = {
             }
         }
         catch (error) {
-            console.log(error);
+            sails.log.error(error);
+            throw new Error(error);
         }
     },
     getAllByConcept(concept) {

models/Promotion.ts

@@ -213,7 +213,8 @@ let Model = {
       }
 
     } catch (error) {
-      console.log(error);
+      sails.log.error(error);
+      throw new Error(error)
     }
   },
 

models/Settings.js

@@ -162,7 +162,6 @@ module.exports = {
 };
 function toScreamingSnake(str) {
     if (!str) {
-        console.log("STR", str);
         return '';
     }
     // Test123___Test_test -> TEST123_TEST_TEST

models/Settings.ts

@@ -201,7 +201,6 @@ declare global {
 
 function toScreamingSnake(str: string): string {
   if (!str) {
-    console.log("STR", str)
     return '';
   }
 

models/User.d.ts

@@ -88,7 +88,7 @@ declare let Model: {
      * @param {WaterlineCriteria} criteria
      * @returns String
      */
-    getPhoneString(phone: Phone, target?: "string" | "login" | "print"): Promise<string>;
+    getPhoneString(phone: Phone, target?: "login" | "print" | "string"): Promise<string>;
     /**
      * Update user password
      *

models/UserBonusProgram.d.ts

@@ -26,13 +26,13 @@ interface UserBonusProgram extends attributes, ORM {
 export default UserBonusProgram;
 declare let Model: {
     beforeCreate(init: UserBonusProgram, cb: (err?: string) => void): void;
-    registration(user: string | User, adapterOrId: string): Promise<UserBonusProgram>;
-    delete(user: string | User, adapterOrId: string): Promise<void>;
-    syncAll(user: string | User): Promise<void>;
+    registration(user: User | string, adapterOrId: string): Promise<UserBonusProgram>;
+    delete(user: User | string, adapterOrId: string): Promise<void>;
+    syncAll(user: User | string): Promise<void>;
     /** Full sync all transaction with external system */
-    sync(user: string | User, bonusProgram: string | BonusProgram, force?: boolean): Promise<void>;
-    checkEnoughToSpend(user: string | User, bonusProgram: string | BonusProgram, amount: number): Promise<boolean>;
-    sumCurrentBalance(user: string | User, bonusProgram: string | BonusProgram): Promise<number>;
+    sync(user: User | string, bonusProgram: BonusProgram | string, force?: boolean): Promise<void>;
+    checkEnoughToSpend(user: User | string, bonusProgram: BonusProgram | string, amount: number): Promise<boolean>;
+    sumCurrentBalance(user: User | string, bonusProgram: BonusProgram | string): Promise<number>;
 };
 declare global {
     const UserBonusProgram: typeof Model & ORMModel<UserBonusProgram, "user" | "bonusProgram">;

test/integration/adapters/promotion.test.js

@@ -55,9 +55,7 @@ describe("Promotion adapter integration test", function () {
         await promotionAdapter.addPromotionHandler(promotion10Percent);
         await Order.addDish({ id: order.id }, dish1, 5, [], "", "user");
         await Order.addDish({ id: order.id }, dish2, 4, [], "", "user");
-        // console.log(await OrderDish.find({order: order.id}))
         let result = await Order.findOne(order.id);
-        // console.log(result, result.promotionState[0])
         (0, chai_1.expect)(result.discountTotal).to.equal(11.13);
     });
     it("IsJoint: false configured discount over total discount for specific dish", async () => {
@@ -166,7 +164,6 @@ describe("Promotion adapter integration test", function () {
         await Order.addDish({ id: order.id }, dish1, 5, [], "", "user");
         await Order.addDish({ id: order.id }, dish2, 4, [], "", "user");
         let result = await Order.findOne(order.id);
-        // console.log(result)
         (0, chai_1.expect)(result.discountTotal).to.equal(5);
     });
     //   /**

test/integration/adapters/promotion.test.ts

@@ -82,9 +82,7 @@ describe("Promotion adapter integration test", function () {
     await Order.addDish({ id: order.id }, dish1, 5, [], "", "user");
     await Order.addDish({ id: order.id }, dish2, 4, [], "", "user");
 
-    // console.log(await OrderDish.find({order: order.id}))
     let result = await Order.findOne(order.id)
-    // console.log(result, result.promotionState[0])
     expect(result.discountTotal).to.equal(11.13);
   });
 
@@ -224,7 +222,6 @@ describe("Promotion adapter integration test", function () {
     await Order.addDish({ id: order.id }, dish2, 4, [], "", "user");
 
     let result = await Order.findOne(order.id)
-    // console.log(result)
 
     expect(result.discountTotal).to.equal(5);
   })

test/unit/discount/discount.test.js

@@ -54,7 +54,6 @@ describe('Discount', function () {
             return false;
         },
         action: async (order) => {
-            // console.log("ACTION ================awdawdawd")
             return await configuredPromotion.applyPromotion(order);
         },
         isPublic: true,
@@ -117,7 +116,6 @@ describe('Discount', function () {
         await index_1.Adapter.getPromotionAdapter().addPromotionHandler(discountEx);
         let discount = await Promotion.find({});
         let discountById = await index_1.Adapter.getPromotionAdapter().getPromotionHandlerById(discountEx.id);
-        // console.log(discount)
         (0, chai_1.expect)(discount[0]).to.be.an("object");
         (0, chai_1.expect)(discountById).to.be.an("object");
     });
@@ -164,15 +162,12 @@ describe('Discount', function () {
         order = await Order.findOne(order.id);
         await promotionAdapter.processOrder(order);
         let result = await Order.findOne(order.id); //.populate("dishes");
-        // console.log(result)
-        // console.log(result, "get discount order")
         (0, chai_1.expect)(result.discountTotal).to.equal(11.97);
         let dish3 = await Dish.createOrUpdate((0, dish_generator_1.default)({ name: "test disha", price: 10, concept: "a", parentGroup: groupsId[0] }));
         let dish4 = await Dish.createOrUpdate((0, dish_generator_1.default)({ name: "test fisha", price: 15, concept: "a", parentGroup: groupsId[0] }));
         await Order.addDish({ id: order.id }, dish3, 5, [], "", "user");
         await Order.addDish({ id: order.id }, dish4, 4, [], "", "user");
         order = await Order.findOne(order.id);
-        // console.log(order)
         await promotionAdapter.processOrder(order);
         result = await Order.findOne(order.id);
         (0, chai_1.expect)(result.discountTotal).to.equal(11.97);
@@ -187,13 +182,10 @@ describe('Discount', function () {
         await promotionAdapter.addPromotionHandler(discInMemory);
         await Order.addDish({ id: order.id }, dish1, 5, [], "", "user");
         await Order.addDish({ id: order.id }, dish2, 4, [], "", "user");
-        // console.log(discInMemory)
-        // let result1 = await Dish.findOne(dish1.id)
         // DiscountAdapter.applyToOrder(order)
         await index_1.Adapter.getPromotionAdapter().clearOfPromotion(order);
         await configuredPromotionFromMemory.applyPromotion(order);
         let result = await Order.findOne(order.id); //.populate("dishes");
-        // console.log(result, "get discount order")
         (0, chai_1.expect)(result.discountTotal).to.equal(11.13);
     });
     it("discount test dishes with flat and percentage types of discounts but same concept", async function () {
@@ -219,7 +211,6 @@ describe('Discount', function () {
         order = await Order.findOne(order.id);
         await promotionAdapter.processOrder(order);
         let result = await Order.findOne(order.id);
-        // console.log(result, "get discount order")
         (0, chai_1.expect)(result.discountTotal).to.equal(60.45);
     });
     it("discount test dishes with flat and percentage types of discounts but different concept", async function () {
@@ -247,7 +238,6 @@ describe('Discount', function () {
         order = await Order.findOne(order.id);
         await promotionAdapter.processOrder(order);
         let result = await Order.findOne(order.id); //.populate("dishes");
-        // console.log(result, "get discount order")
         (0, chai_1.expect)(result.discountTotal).to.equal(49.81);
     });
     it("discount test dishes with 3 dif type of discount", async function () {
@@ -276,8 +266,6 @@ describe('Discount', function () {
         (0, chai_1.expect)(result.discountTotal).to.equal(62.48);
     });
     it("discount test displayDish", async function () {
-        // let order = await Order.create({id: "test-display-dish"}).fetch();
-        // await Order.updateOne({id: order.id}, {concept: "origin",user: "user"});
         let dish1 = await Dish.createOrUpdate((0, dish_generator_1.default)({ name: "test dish2", price: 10.1, concept: "Display Dish", parentGroup: groupsId[0] }));
         let dish2 = await Dish.createOrUpdate((0, dish_generator_1.default)({ name: "test fish3", price: 15.2, concept: "Display Dish", parentGroup: groupsId[0] }));
         discInMemory.configDiscount.dishes.push(dish1.id);
@@ -321,17 +309,13 @@ describe('Discount', function () {
         let dish1 = await Dish.createOrUpdate((0, dish_generator_1.default)({ name: "test dish", price: 10, concept: "clear", parentGroup: groupsId[0] }));
         discountEx.configDiscount.dishes.push(dish1.id);
         await promotionAdapter.addPromotionHandler(discountEx);
-        // console.log(promotionAdapter.promotions)
         await Order.addDish({ id: order.id }, dish1, 5, [], "", "user");
-        // await Adapter.getPromotionAdapter().applyPromotion(order.id, discountEx.configDiscount, discountEx.id)
         // before clear
         let orderDishes1 = await OrderDish.find({ order: order.id }).populate("dish");
-        // console.log(orderDishes1)
         (0, chai_1.expect)(orderDishes1[0].discountTotal).to.equal(6.65);
         //after clear
         await index_1.Adapter.getPromotionAdapter().clearOfPromotion(order);
         let orderDishes = await OrderDish.find({ order: order.id }).populate("dish");
-        // console.log(orderDishes)
         (0, chai_1.expect)(orderDishes[0].discountTotal).to.equal(0);
     });
     it("discount test Adapter.getDiscount ", async function () {
@@ -343,16 +327,12 @@ describe('Discount', function () {
         discountEx.configDiscount.dishes.push(dish1.id);
         await a.addPromotionHandler(discountEx);
         await Order.addDish({ id: order.id }, dish1, 5, [], "", "user");
-        // await promotionAdapter.addPromotionHandler(discountEx)
-        // await Adapter.getPromotionAdapter().applyPromotion(order.id, discountEx.configDiscount, discountEx.id)
         // before clear
         let orderDishes1 = await OrderDish.find({ order: order.id }).populate("dish");
-        // console.log(orderDishes1)
         (0, chai_1.expect)(orderDishes1[0].discountTotal).to.equal(6.65);
         //after clear
         await index_1.Adapter.getPromotionAdapter().clearOfPromotion(order);
         let orderDishes = await OrderDish.find({ order: order.id }).populate("dish");
-        // console.log(orderDishes)
         (0, chai_1.expect)(orderDishes[0].discountTotal).to.equal(0);
     });
     // if promotion returns