turf-common 1.4.1 → 1.4.2-beta.2

package/README.md

@@ -1,20 +1,20 @@
-## 1 npm init -y
-
-## 2 npm login
-
-## 3 npm version patch
-
-# //it increase version
-
-## 3 npm publish --access public
-
-# //npm publish by default --access public
-
-## 4 npm run version:deploy
-
-### deploy version
-
-## Client side
-
-update package command <br />
-npm update turf-comman
+## 1 npm init -y
+
+## 2 npm login
+
+## 3 npm version patch
+
+# //it increase version
+
+## 3 npm publish --access public
+
+# //npm publish by default --access public
+
+## 4 npm run version:deploy
+
+### deploy version
+
+## Client side
+
+update package command <br />
+npm update turf-comman

package/build/src/models/pricing-plan-model.js

@@ -110,10 +110,7 @@ var PricingPlanModelV2 = /** @class */ (function () {
     PricingPlanModelV2.prototype.getPitchSlab = function (pitchCount) {
         var pitchRangesMap = this.pitch_slab;
         var pitchRanges = Object.values(pitchRangesMap);
-        var selectedPitchSlab = pitchRanges.filter(function (pitchRange) {
-            return pitchRange.from <= pitchCount && pitchCount <= pitchRange.to;
-        })[0];
-        return selectedPitchSlab;
+        return pitchRanges[this.getPitchSlabIndex(pitchCount)];
     };
     PricingPlanModelV2.prototype.getBillingCycle = function (billingCycleKey) {
         var billingCycleMap = this.billing_cycle;

package/build/src/models/subscribed-pricing-plan-model.d.ts

@@ -57,13 +57,21 @@ export declare class SubscribedPricingPlanModelV2 extends PricingPlanModelV2 {
     }[];
     getMonths(): number;
     getBasePrice(): number;
+    getBasePriceV2(): number;
     getGrossAmount(config?: {
         roundDown: boolean;
     }): number;
+    getGrossAmountV2(config?: {
+        roundDown: boolean;
+    }): number;
     getNetAmount(config?: {
         roundDown: boolean;
     }): number;
+    getNetAmountV2(config?: {
+        roundDown: boolean;
+    }): number;
     getBillingDiscount(): number;
+    getBillingDiscountV2(): number;
     getMonthDifference(that: SubscribedPricingPlanModelV2): number;
     getGrossAmountByMonth(month: number): number;
     getNetAmountByMonth(month: number): number;

package/build/src/models/subscribed-pricing-plan-model.js

@@ -196,15 +196,7 @@ var SubscribedPricingPlanModelV2 = /** @class */ (function (_super) {
         return codes ? codes[0].split("#")[3] : "";
     };
     SubscribedPricingPlanModelV2.prototype.getBasePriceByPitchSlab = function () {
-        var _this = this;
-        var codes = this.billing_cost_code.split(",");
-        var code = codes.filter(function (code) {
-            var _a = code.split("_"), from = _a[0], to = _a[1];
-            to = to.split("#")[0];
-            // console.log(from, to)
-            return _this.pitchCount >= parseInt(from) && _this.pitchCount <= parseInt(to);
-        });
-        // console.log(code)
+        var code = this.getCodesByPitchSlab();
         code.sort();
         if (code) {
             var _a = code[0].split("#"), from = _a[0], to = _a[1], price = _a[2];
@@ -248,6 +240,9 @@ var SubscribedPricingPlanModelV2 = /** @class */ (function (_super) {
     SubscribedPricingPlanModelV2.prototype.getBasePrice = function () {
         return this.selectedPitchSlabBasePrice;
     };
+    SubscribedPricingPlanModelV2.prototype.getBasePriceV2 = function () {
+        return this.base_price;
+    };
     // Tested
     SubscribedPricingPlanModelV2.prototype.getGrossAmount = function (config) {
         if (config === void 0) { config = { roundDown: false }; }
@@ -259,6 +254,17 @@ var SubscribedPricingPlanModelV2 = /** @class */ (function (_super) {
             return Math.round(this.selectedPitchSlabBasePrice * this.pitchCount * this.getTotalHours());
         }
     };
+    SubscribedPricingPlanModelV2.prototype.getGrossAmountV2 = function (config) {
+        if (config === void 0) { config = { roundDown: false }; }
+        var grossAmount = this.base_price * this.pitchCount * this.getTotalHours();
+        var roundDown = config.roundDown;
+        if (roundDown) {
+            return Math.floor(grossAmount);
+        }
+        else {
+            return Math.round(grossAmount);
+        }
+    };
     // Tested
     SubscribedPricingPlanModelV2.prototype.getNetAmount = function (config) {
         var _this = this;
@@ -283,19 +289,42 @@ var SubscribedPricingPlanModelV2 = /** @class */ (function (_super) {
                 this.getTotalHours());
         }
     };
+    SubscribedPricingPlanModelV2.prototype.getNetAmountV2 = function (config) {
+        if (config === void 0) { config = { roundDown: false }; }
+        var roundDown = config.roundDown;
+        var netAmount = this.base_price * (1 - this.getBillingDiscountV2() / 100) * this.pitchCount * this.getTotalHours();
+        if (roundDown) {
+            return Math.floor(netAmount);
+        }
+        else {
+            return Math.round(netAmount);
+        }
+    };
     // Tested
     SubscribedPricingPlanModelV2.prototype.getBillingDiscount = function () {
         var _this = this;
         // const codesByPitchCount = this.getCodesByPitchSlab();
         var basePriceByPitchSlab = this.getBasePriceByPitchSlab();
+        // console.log(`basePriceByPitchSlab: ${basePriceByPitchSlab}`)
         var codesByBillingCycle = this.getCodeByCycle();
+        // console.log(`codesByBillingCycle: ${codesByBillingCycle}`)
         var codeByPitchCycle = codesByBillingCycle.filter(function (code) {
             var _a = code.split("#")[0].split("_"), from = _a[0], to = _a[1];
             return _this.pitchCount >= parseInt(from) && _this.pitchCount <= parseInt(to);
         })[0];
+        // console.log(`codeByPitchCycle: ${codeByPitchCycle}`)
         var basePriceByPitchCycle = parseFloat(codeByPitchCycle.split("#")[2]);
         return parseFloat(((basePriceByPitchSlab - basePriceByPitchCycle) / basePriceByPitchSlab * 100).toFixed(2));
     };
+    SubscribedPricingPlanModelV2.prototype.getBillingDiscountV2 = function () {
+        var _this = this;
+        var codesByBillingCycle = this.getCodeByCycle();
+        var codeByPitchCycle = codesByBillingCycle.filter(function (code) {
+            var _a = code.split("#")[0].split("_"), from = _a[0], to = _a[1];
+            return _this.pitchCount >= parseInt(from) && _this.pitchCount <= parseInt(to);
+        })[0];
+        return parseFloat(parseFloat(codeByPitchCycle.split("#")[2]).toFixed(2));
+    };
     SubscribedPricingPlanModelV2.prototype.getMonthDifference = function (that) {
         return that.getMonths() - this.getMonths();
     };
@@ -350,14 +379,7 @@ var SubscribedPricingPlanModelV2 = /** @class */ (function (_super) {
     };
     // Tested
     SubscribedPricingPlanModelV2.prototype.getBasePriceBySelectedBillingCycleDiscount = function () {
-        var _this = this;
-        var codesByBillingCycle = this.getCodeByCycle();
-        var codeByPitchCycle = codesByBillingCycle.filter(function (code) {
-            var _a = code.split("#")[0].split("_"), from = _a[0], to = _a[1];
-            return _this.pitchCount >= parseInt(from) && _this.pitchCount <= parseInt(to);
-        })[0];
-        var basePriceByPitchCycle = parseFloat(codeByPitchCycle.split("#")[2]);
-        return parseFloat(basePriceByPitchCycle.toFixed(2));
+        return parseFloat(this.getBillingDiscountV2().toFixed(2));
     };
     // Tested
     SubscribedPricingPlanModelV2.prototype.getTotalHours = function () {

package/build/tests/unit/pricing-plan/basic-scenario.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/build/tests/unit/pricing-plan/basic-scenario.spec.js

@@ -0,0 +1,183 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var _enum_1 = require("../../../@enum");
+var _model_1 = require("../../../@model");
+describe("AppController (e2e)", function () {
+    it("Pricing and Subscription related methods values assertion", function () {
+        var pricingPlanEntityV2 = {
+            id: 1,
+            effectiveFrom: new Date(),
+            effectiveTo: new Date(),
+            status: _enum_1.PricingPlanStatus.ACTIVE,
+            createdBy: 1,
+            createdOn: new Date(),
+            updatedBy: 1,
+            updatedOn: new Date(),
+            basePrice: 1,
+            unit: "unit",
+            subscriptionCycle: "000001_0P_Monthly,000003_0P_Quarterly,000006_0P_Half-Yearly,000012_0P_Yearly",
+            billingCostCode: "1_5#1#1.0000#0P,1_5#3#0.9500#5P,1_5#6#0.9300#7P,1_5#12#0.9000#10P,6_10#1#0.9800#2P,6_10#3#0.9300#7P,6_10#6#0.9100#9P,6_10#12#0.8800#12P,11_99#1#0.9500#5P,11_99#3#0.9000#10P,11_99#6#0.8800#12P,11_99#12#0.8600#14P",
+            // costCode: "001005_0P_1,006010_2P_1,011999_5P_1",
+            // billingCycle: "000001_0P_Monthly,000003_5P_Quarterly,000006_7P_Half-Yearly,000012_10P_Yearly"
+        };
+        var pricingPlanEntityModel2 = new _model_1.PricingPlanEntityModelV2(pricingPlanEntityV2);
+        // console.log(pricingPlanEntityModel2.toPitchSlabs())
+        // console.log(pricingPlanEntityModel2.toBillingCycles())
+        var expectedBillingCycles = [
+            {
+                to: 1,
+                name: 'Monthly',
+                key: 'monthly'
+            },
+            {
+                to: 3,
+                name: 'Quarterly',
+                key: 'quarterly'
+            },
+            {
+                to: 6,
+                name: 'Half-Yearly',
+                key: 'half-yearly'
+            },
+            {
+                to: 12,
+                name: 'Yearly',
+                key: 'yearly'
+            }
+        ];
+        var expectedBillingCycleKeys = expectedBillingCycles.map(function (billingCycle) { return billingCycle.key; });
+        var expectedbillingCycles = pricingPlanEntityModel2.toBillingCycles();
+        expectedbillingCycles.forEach(function (billingCycle, index) {
+            expect(billingCycle.to).toEqual(expectedBillingCycles[index].to);
+            expect(billingCycle.name).toEqual(expectedBillingCycles[index].name);
+            expect(billingCycle.key).toEqual(expectedBillingCycles[index].key);
+        });
+        var pricingPlanModelV2 = new _model_1.PricingPlanModelV2(pricingPlanEntityModel2.toModel());
+        expect(pricingPlanModelV2.formatPitchSlab(0)).toEqual("1-5");
+        expect(pricingPlanModelV2.formatPitchSlab(1)).toEqual("6-10");
+        expect(pricingPlanModelV2.formatPitchSlab(2)).toEqual("10+");
+        // console.log(pricingPlanModel.getPitchSlab(1))
+        // console.log(pricingPlanModelV2.getPitchSlab(1) )
+        var pitchCounts = [1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 70];
+        var pitchSlabs = [
+            { from: 1, to: 5 },
+            { from: 6, to: 10 },
+            { from: 11, to: 99 },
+        ];
+        var expectedPitchSlabsByPitchCount = [
+            pitchSlabs[0],
+            pitchSlabs[0],
+            pitchSlabs[0],
+            pitchSlabs[0],
+            pitchSlabs[1],
+            pitchSlabs[1],
+            pitchSlabs[1],
+            pitchSlabs[1],
+            pitchSlabs[1],
+            pitchSlabs[2],
+            pitchSlabs[2],
+            pitchSlabs[2],
+        ];
+        var pitchSlab = pricingPlanModelV2.getPitchSlab(1);
+        pitchCounts.forEach(function (pitchCount, index) {
+            pitchSlab = pricingPlanModelV2.getPitchSlab(pitchCount);
+            expect(pitchSlab.from).toEqual(expectedPitchSlabsByPitchCount[index].from);
+            expect(pitchSlab.to).toEqual(expectedPitchSlabsByPitchCount[index].to);
+        });
+        var _loop_1 = function (billingCycleKey) {
+            expect(pricingPlanModelV2.getBillingCycle(billingCycleKey)).toEqual(expectedbillingCycles.filter(function (billingCycle) { return billingCycle.key === billingCycleKey; })[0]);
+        };
+        for (var _i = 0, expectedBillingCycleKeys_1 = expectedBillingCycleKeys; _i < expectedBillingCycleKeys_1.length; _i++) {
+            var billingCycleKey = expectedBillingCycleKeys_1[_i];
+            _loop_1(billingCycleKey);
+        }
+        var monthsByBillingCycle = {
+            monthly: 1,
+            quarterly: 3,
+            "half-yearly": 6,
+            yearly: 12,
+        };
+        for (var _a = 0, expectedBillingCycleKeys_2 = expectedBillingCycleKeys; _a < expectedBillingCycleKeys_2.length; _a++) {
+            var billingCycleKey = expectedBillingCycleKeys_2[_a];
+            expect(pricingPlanModelV2.getMonth(billingCycleKey)).toEqual(monthsByBillingCycle[billingCycleKey]);
+        }
+        var noOfSubscriptionDaysByBillingCycle = {
+            monthly: 30,
+            quarterly: 90,
+            "half-yearly": 180,
+            yearly: 360,
+        };
+        // TODO: Need to check the logic of the below method as it returning 1 less than the expected value
+        // for (let billingCycleKey of expectedBillingCycleKeys) {
+        //     expect(pricingPlanModelV2.getNoOfSubscriptionDays(billingCycleKey)).toEqual(noOfSubscriptionDaysByBillingCycle[billingCycleKey]);
+        // }
+        var daysByBillingCycle = {
+            monthly: [1, 3, 29, 30],
+            quarterly: [31, 90],
+            "half-yearly": [91, 180],
+            yearly: [181, 360],
+        };
+        for (var _b = 0, _c = Object.entries(daysByBillingCycle); _b < _c.length; _b++) {
+            var _d = _c[_b], billingCycleKey = _d[0], days = _d[1];
+            for (var _e = 0, days_1 = days; _e < days_1.length; _e++) {
+                var day = days_1[_e];
+                var billingCycle = pricingPlanModelV2.getBillingCycleByDay(day);
+                expect(billingCycle).toBeDefined();
+                expect(billingCycle === null || billingCycle === void 0 ? void 0 : billingCycle.key).toEqual(billingCycleKey);
+            }
+        }
+        var noOfMonthsByBillingCycle = {
+            0: [1],
+            1: [3, 2],
+            2: [4, 5, 6],
+            3: [7, 8, 9, 10, 11, 12],
+        };
+        for (var _f = 0, _g = Object.entries(noOfMonthsByBillingCycle); _f < _g.length; _f++) {
+            var _h = _g[_f], billingCycleKeyIndex = _h[0], months = _h[1];
+            for (var _j = 0, months_1 = months; _j < months_1.length; _j++) {
+                var month = months_1[_j];
+                expect(pricingPlanModelV2.getBillingCycleIndexByMonths(month)).toEqual(parseInt(billingCycleKeyIndex));
+            }
+        }
+        // const pitchCount = 11;
+        // const billingCycleKey = 'quarterly';
+        // const billingCycleKeys = ["monthly", "quarterly", "half-yearly", "yearly"];
+        var basePriceMatrix = [
+            [1, 0.95, 0.93, 0.9],
+            [0.98, 0.93, 0.91, 0.88],
+            [0.95, 0.9, 0.88, 0.86],
+        ];
+        pitchCounts = [2, 6, 70];
+        for (var _k = 0, pitchCounts_1 = pitchCounts; _k < pitchCounts_1.length; _k++) {
+            var pitchCount = pitchCounts_1[_k];
+            for (var _l = 0, expectedBillingCycleKeys_3 = expectedBillingCycleKeys; _l < expectedBillingCycleKeys_3.length; _l++) {
+                var billingCycleKey = expectedBillingCycleKeys_3[_l];
+                var subscribedPricingPlanModelV2 = new _model_1.SubscribedPricingPlanModelV2(pricingPlanModelV2, pitchCount, billingCycleKey);
+                console.log("---- Pitch Count: '".concat(subscribedPricingPlanModelV2.pitchCount, "', Billing: '").concat(subscribedPricingPlanModelV2.billingCycle, "'"));
+                // TODO: Need to check the usability of the below method
+                // console.log(`subscribedPricingPlanModelV2.getMonths() : ${subscribedPricingPlanModelV2.getMonths()}`)
+                // TODO: Needs to change the name to getBasePriceByPitchSlab for Monthly
+                // console.log(`subscribedPricingPlanModelV2.getBasePrice(): ${subscribedPricingPlanModelV2.getBasePrice()}`)
+                // TODO: Neede removal
+                // console.log(`subscribedPricingPlanModelV2.getBillingDiscount(): ${subscribedPricingPlanModelV2.getBillingDiscount()}`)
+                // expect(subscribebPricingPlanModel.getBillingDiscount()).toEqual(
+                // 	subscribedPricingPlanModelV2.getBillingDiscount()
+                // );
+                // TODO: Needs to change the logic based on base price and discount
+                // console.log(`subscribedPricingPlanModelV2.getGrossAmount(): ${subscribedPricingPlanModelV2.getGrossAmount()}`)
+                // TODO: Needs to change the logic based on base price and discount
+                // console.log(`subscribedPricingPlanModelV2.getNetAmount(): ${subscribedPricingPlanModelV2.getNetAmount()}`)
+                // console.log(`subscribedPricingPlanModelV2.getGrossAmountByPitchDays(): ${subscribedPricingPlanModelV2.getGrossAmountByPitchDays(11, 3)}`)
+                // console.log(`subscribedPricingPlanModelV2.getNetAmountByPitchDays(): ${subscribedPricingPlanModelV2.getNetAmountByPitchDays(11, 3)}`)
+                var pitchSlabIndex = subscribedPricingPlanModelV2.getPitchSlabIndex(pitchCount);
+                var billingCycleIndex = subscribedPricingPlanModelV2.getBillingCycleIndexByMonths(subscribedPricingPlanModelV2.selectedBillingCycle.to);
+                expect(subscribedPricingPlanModelV2.getBasePriceBySelectedBillingCycleDiscount()).toEqual(basePriceMatrix[pitchSlabIndex][billingCycleIndex]);
+                // const months = [1, 2, 3, 5, 6, 7, 11, 12];
+                // for (let month of months) {
+                // console.log(`subscribedPricingPlanModelV2.getGrossAmountByMonth(${month}): ${subscribedPricingPlanModelV2.getGrossAmountByMonth(month)}`)
+                // console.log(`subscribedPricingPlanModelV2.getNetAmountByMonth(${month}): ${subscribedPricingPlanModelV2.getNetAmountByMonth(month)}`)
+                // }
+            }
+        }
+    });
+});

package/build/tests/unit/pricing-plan/basic.spec.js

@@ -6,7 +6,7 @@ var _model_1 = require("../../../@model");
 // 000001_0P_Monthly,000003_5P_Quarterly,000006_7P_Half-Yearly,000012_10P_Yearly
 // 1_5#1#1#0P,1_5#3#0.95#5P,1_5#6#0.93#7P,1_5#12#0.9#10P,6_10#1#0.98#2P,6_10#3#0.931#6.9P,6_10#6#0.9114#8.86P,6_10#12#0.882#11.8P,11_99#1#0.95#5P,11_99#3#0.9025#9.75P,11_99#6#0.8835#11.65P,11_99#12#0.855#14.5P
 describe("AppController (e2e)", function () {
-    it("exceute all methods of pricingPlanEntityModel", function () {
+    it("Pricing and subscriptions related version 2 models method values verification ", function () {
         var pricingPlanEntity = {
             id: 1,
             effectiveFrom: new Date(),

package/package.json

@@ -1,42 +1,43 @@
-{
-  "name": "turf-common",
-  "version": "1.4.1",
-  "description": "",
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
-  "files": [
-    "build/**/*"
-  ],
-  "scripts": {
-    "clean": "rm -rf build",
-    "build": "npm run clean && tsc",
-    "version:deploy:beta": "npm version prerelease --preid beta && git push && npm run build && npm publish --tag beta",
-    "version:deploy:patch": "npm version patch && git push && npm run build && npm publish",
-    "version:deploy:minor": "npm version minor && git push && npm run build && npm publish",
-    "test": "jest",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" 2>&1| tee eslint.log",
-    "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
-  },
-  "repository": {
-    "type": "git",
-    "url": "github__bellex-dev__turf-common:bellex-dev/turf-common.git"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.8.9",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
-    "del-cli": "^5.1.0",
-    "eslint": "^8.50.0",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.2.2"
-  },
-  "dependencies": {
-    "date-fns": "^2.30.0"
-  }
-}
+{
+  "name": "turf-common",
+  "version": "1.4.2-beta.2",
+  "description": "",
+  "main": "./build/index.js",
+  "types": "./build/index.d.ts",
+  "files": [
+    "build/**/*"
+  ],
+  "scripts": {
+    "clean": "rm -rf build",
+    "build": "npm run clean && tsc",
+    "version:deploy:beta": "npm version prerelease --preid beta && git push && npm run build && npm publish --tag beta",
+    "version:deploy:patch": "npm version patch && git push && npm run build && npm publish",
+    "version:deploy:minor": "npm version minor && git push && npm run build && npm publish",
+    "test": "jest",
+    "test:pattern": "jest -i TURF-533",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" 2>&1| tee eslint.log",
+    "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
+  },
+  "repository": {
+    "type": "git",
+    "url": "github__bellex-dev__turf-common:bellex-dev/turf-common.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.8.9",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
+    "del-cli": "^5.1.0",
+    "eslint": "^8.50.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.2.2"
+  },
+  "dependencies": {
+    "date-fns": "^2.30.0"
+  }
+}