feat: add normalizePercent utility for percentage normalization and integrate it into bonus coverage calculations

Author: VuXfi

adapters/promotion/default/promotionAdapter.js

@@ -100,6 +100,7 @@ class PromotionAdapter extends AbstractPromotionAdapter_1.default {
             if (!record.worktime)
                 return true;
             try {
+                //@ts-ignore
                 return worktime_1.WorkTimeValidator.isWorkNow({ worktime: record.worktime }).workNow;
             }
             catch (error) {

adapters/promotion/default/promotionAdapter.ts

@@ -110,6 +110,7 @@ export class PromotionAdapter extends AbstractPromotionAdapter {
       .filter((record) => {
         if (!record.worktime) return true;
         try {
+          //@ts-ignore
           return WorkTimeValidator.isWorkNow({ worktime: record.worktime }).workNow;
         } catch (error) {
           sails.log.error("Promotion > helper > error: ", error);

models/BonusProgram.d.ts

@@ -33,6 +33,7 @@ export interface BonusProgramRecord extends attributes, ORM {
 }
 declare let Model: {
     beforeCreate(init: BonusProgramRecord, cb: (err?: string) => void): void;
+    beforeUpdate(valuesToUpdate: Partial<BonusProgramRecord>, cb: (err?: string) => void): void;
     /**
      * Method for registration alive bonus program adapter
      * @param bonusProgramAdapter

models/BonusProgram.js

@@ -5,6 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const adapters_1 = require("../adapters");
 const uuid_1 = require("uuid");
+const normalize_1 = require("../utils/normalize");
 const aliveBonusPrograms = {};
 let attributes = {
     /** ID */
@@ -51,15 +52,12 @@ let Model = {
             init.id = (0, uuid_1.v4)();
         }
         // defaults
-        if (!init.coveragePercentage) {
-            init.coveragePercentage = 1;
+        if (init.coveragePercentage !== undefined) {
+            init.coveragePercentage = (0, normalize_1.normalizePercent)(init.coveragePercentage).toNumber();
         }
-        else if (init.coveragePercentage > 1) {
+        else {
             init.coveragePercentage = 1;
         }
-        else if (init.coveragePercentage < 0) {
-            init.coveragePercentage = 0;
-        }
         if (!init.exchangeRate) {
             init.exchangeRate = 1;
         }
@@ -72,6 +70,12 @@ let Model = {
         }
         cb();
     },
+    beforeUpdate(valuesToUpdate, cb) {
+        if (valuesToUpdate.coveragePercentage !== undefined) {
+            valuesToUpdate.coveragePercentage = (0, normalize_1.normalizePercent)(valuesToUpdate.coveragePercentage).toNumber();
+        }
+        cb();
+    },
     /**
      * Method for registration alive bonus program adapter
      * @param bonusProgramAdapter

models/BonusProgram.ts

@@ -8,6 +8,7 @@ import ORM from "../interfaces/ORM";
 import { ORMModel } from "../interfaces/ORMModel";
 
 import { v4 as uuid } from "uuid";
+import { normalizePercent } from "../utils/normalize";
 
 const aliveBonusPrograms: {
   [key: string]: BonusProgramAdapter
@@ -76,12 +77,10 @@ let Model = {
     }
 
     // defaults
-    if (!init.coveragePercentage) {
-      init.coveragePercentage = 1;
-    }else if(init.coveragePercentage > 1) {
+    if (init.coveragePercentage !== undefined) {
+      init.coveragePercentage = normalizePercent(init.coveragePercentage).toNumber();
+    } else {
       init.coveragePercentage = 1;
-    } else if (init.coveragePercentage < 0) {
-      init.coveragePercentage = 0;
     }
 
     if (!init.exchangeRate) {
@@ -100,6 +99,13 @@ let Model = {
     cb();
   },
 
+  beforeUpdate(valuesToUpdate: Partial<BonusProgramRecord>, cb: (err?: string) => void) {
+    if (valuesToUpdate.coveragePercentage !== undefined) {
+      valuesToUpdate.coveragePercentage = normalizePercent(valuesToUpdate.coveragePercentage).toNumber();
+    }
+    cb();
+  },
+
   /**
    * Method for registration alive bonus program adapter
    * @param bonusProgramAdapter

models/Group.js

@@ -369,6 +369,7 @@ let Model = {
         groups = groups.filter(group => {
             if (!group.worktime)
                 return true;
+            //@ts-ignore
             return worktime_1.WorkTimeValidator.isWorkNow({ worktime: group.worktime }).workNow;
         });
         return groups.sort((a, b) => a.sortOrder - b.sortOrder);

models/Group.ts

@@ -448,6 +448,7 @@ let Model = {
     }
     groups = groups.filter(group => {
       if (!group.worktime) return true;
+      //@ts-ignore
        return WorkTimeValidator.isWorkNow({ worktime: group.worktime }).workNow
       }
     );

models/Order.js

@@ -10,6 +10,7 @@ const phoneValidByMask_1 = require("../libs/phoneValidByMask");
 const OrderHelper_1 = require("../libs/helpers/OrderHelper");
 const isValue_1 = require("../utils/isValue");
 const ProductModifier_1 = require("../libs/ProductModifier");
+const normalize_1 = require("../utils/normalize");
 let attributes = {
     /** Id  */
     id: {
@@ -774,7 +775,14 @@ let Model = {
                         throw `Invalid bonus spending strategy: ${bonusSpendingStrategy}`;
                 }
                 // Calculate maximum allowed bonus coverage
-                const maxBonusCoverage = new decimal_js_1.default(amountToDeduct).mul(bonusProgram.coveragePercentage);
+                const maxBonusCoverage = new decimal_js_1.default(amountToDeduct).mul((0, normalize_1.normalizePercent)(bonusProgram.coveragePercentage));
+                // Ensure maxBonusCoverage is not greater than amountToDeduct
+                if (maxBonusCoverage.gt(amountToDeduct)) {
+                    throw {
+                        code: 19,
+                        error: "Max bonus coverage exceeds allowable amount to deduct",
+                    };
+                }
                 // Check if the specified bonus spend amount is more than the maximum allowed bonus coverage
                 let bonusCoverage;
                 if (spendBonus.amount && new decimal_js_1.default(spendBonus.amount).lessThan(maxBonusCoverage)) {

models/Order.ts

@@ -27,6 +27,7 @@ import ToInitialize from "../hook/initialize";
 import { or } from "ajv/dist/compile/codegen";
 import { BonusTransaction } from "../adapters/bonusprogram/BonusProgramAdapter";
 import { ProductModifier } from "../libs/ProductModifier";
+import { normalizePercent } from "../utils/normalize";
 
 export interface PromotionState {
   type: string;
@@ -962,8 +963,14 @@ let Model = {
         }
 
         // Calculate maximum allowed bonus coverage
-        const maxBonusCoverage = new Decimal(amountToDeduct).mul(bonusProgram.coveragePercentage);
-
+        const maxBonusCoverage = new Decimal(amountToDeduct).mul(normalizePercent(bonusProgram.coveragePercentage));
+        // Ensure maxBonusCoverage is not greater than amountToDeduct
+        if (maxBonusCoverage.gt(amountToDeduct)) {
+          throw {
+            code: 19,
+            error: "Max bonus coverage exceeds allowable amount to deduct",
+          };
+        }
         // Check if the specified bonus spend amount is more than the maximum allowed bonus coverage
         let bonusCoverage: Decimal;
         if (spendBonus.amount && new Decimal(spendBonus.amount).lessThan(maxBonusCoverage)) {

utils/normalize.d.ts

@@ -0,0 +1,2 @@
+import Decimal from "decimal.js";
+export declare function normalizePercent(value: string | number | Decimal): Decimal;