turf-common 1.4.1-beta.3 → 1.4.1-beta.5

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/interface/api/get-pricing-plan-by-date-response.interface.d.ts

@@ -21,3 +21,27 @@ export interface IGetPricingPlanByDateResponse {
         };
     };
 }
+export interface IGetPricingPlanByDateResponseV2 {
+    id: number;
+    effective_from_date: number;
+    effective_to_date: number;
+    base_price: number;
+    unit: string;
+    billing_cost_code: string;
+    pitch_slab: {
+        [key: string]: {
+            from: number;
+            to: number;
+            discount: string;
+        };
+    };
+    billing_cycle: {
+        [key: string]: {
+            from: number;
+            to: number;
+            discount: string;
+            name: string;
+            key: string;
+        };
+    };
+}

package/build/src/interface/billing-cycle.interface.d.ts

@@ -5,3 +5,9 @@ export interface IBillingCycleModel {
     name: string;
     key: string;
 }
+export interface IBillingCycleModelV2 {
+    from: number;
+    to: number;
+    name: string;
+    key: string;
+}

package/build/src/interface/entity/pricing-plan-entity.interface.d.ts

@@ -13,4 +13,20 @@ export interface IPricingPlanEntity extends IEntityAuditColumn {
     basePrice: number;
     billingCycle: string;
     unit: string;
+    billingCostCode: string | null;
+    subscriptionCycle: string | null;
+}
+export interface IPricingPlanEntityV2 extends IEntityAuditColumn {
+    id: number;
+    effectiveFrom: Date;
+    effectiveTo: Date;
+    status: PricingPlanStatus;
+    createdBy: number;
+    createdOn: Date;
+    updatedBy: number;
+    updatedOn: Date;
+    basePrice: number;
+    unit: string;
+    subscriptionCycle: string | null;
+    billingCostCode: string | null;
 }

package/build/src/interface/entity/subscription-entity.interface.d.ts

@@ -24,3 +24,7 @@ export type ISubscriptionModel = ISubscriptionEntity & {
     details?: ISubscriptionPitchMappingEntity[];
     advanceAmount?: number;
 };
+export type ISubscriptionModelV2 = ISubscriptionEntity & {
+    details?: ISubscriptionPitchMappingEntity[];
+    advanceAmount?: number;
+};

package/build/src/interface/entity/subscription-pitch-mapping.interface.d.ts

@@ -6,3 +6,10 @@ export interface ISubscriptionPitchMappingEntity extends IEntityAuditColumn {
     status: string;
     organizationId: number;
 }
+export interface ISubscriptionPitchMappingEntityV2 extends IEntityAuditColumn {
+    pitchId: number;
+    turfId: number;
+    subscriptionId: number;
+    status: string;
+    organizationId: number;
+}

package/build/src/interface/get-pricing-plan-by-date-response.interface.d.ts

@@ -21,3 +21,24 @@ export interface GetPricingPlanByDateResponse {
         };
     };
 }
+export interface GetPricingPlanByDateResponseV2 {
+    id: number;
+    effective_from_date: number;
+    effective_to_date: number;
+    base_price: number;
+    unit: string;
+    pitch_slab: {
+        [key: string]: {
+            from: number;
+            to: number;
+        };
+    };
+    billing_cycle: {
+        [key: string]: {
+            from: number;
+            to: number;
+            name: string;
+            key: string;
+        };
+    };
+}

package/build/src/interface/model/pricing-plan-entity-model.interface.d.ts

@@ -1,7 +1,7 @@
-import { PricingPlanModel } from "../../models/pricing-plan-model";
-import { IPricingPlanEntity } from "../entity/pricing-plan-entity.interface";
-import { GetPricingPlanByDateResponse } from "../get-pricing-plan-by-date-response.interface";
-import { IPitchSlab } from "../pitch-slab.interface";
+import { PricingPlanModel, PricingPlanModelV2 } from "../../models/pricing-plan-model";
+import { IPricingPlanEntity, IPricingPlanEntityV2 } from "../entity/pricing-plan-entity.interface";
+import { GetPricingPlanByDateResponse, GetPricingPlanByDateResponseV2 } from "../get-pricing-plan-by-date-response.interface";
+import { IPitchSlab, IPitchSlabV2 } from "../pitch-slab.interface";
 export interface IPricingPlanEntityModel extends IPricingPlanEntity {
     getBillingCycleKeys(): string[];
     toModel(): PricingPlanModel;
@@ -11,3 +11,12 @@ export interface IPricingPlanEntityModel extends IPricingPlanEntity {
     toObject(): GetPricingPlanByDateResponse;
     toPitchSlabs(): IPitchSlab[];
 }
+export interface IPricingPlanEntityModelV2 extends IPricingPlanEntityV2 {
+    getBillingCycleKeys(): string[];
+    toModel(): PricingPlanModelV2;
+    arrayToIndexedObject<T>(arr: T[]): {
+        [key: string]: T;
+    };
+    toObject(): GetPricingPlanByDateResponseV2;
+    toPitchSlabs(): IPitchSlabV2[];
+}

package/build/src/interface/pitch-slab-dto.interface.d.ts

@@ -6,3 +6,11 @@ export interface ISlabDto {
     to: number;
     discount: string;
 }
+export interface IPitchSlabDtoV2 {
+    [key: string]: ISlabDtoV2;
+}
+export interface ISlabDtoV2 {
+    from: number;
+    to: number;
+    discount: string;
+}

package/build/src/interface/pitch-slab.interface.d.ts

@@ -3,3 +3,7 @@ export interface IPitchSlab {
     to: number;
     discount: string;
 }
+export interface IPitchSlabV2 {
+    from: number;
+    to: number;
+}

package/build/src/interface/pricing-plan.interface.d.ts

@@ -1,5 +1,5 @@
-import { IBillingCycleModel } from "./billing-cycle.interface";
-import { IPitchSlab } from "./pitch-slab.interface";
+import { IBillingCycleModel, IBillingCycleModelV2 } from "./billing-cycle.interface";
+import { IPitchSlab, IPitchSlabV2 } from "./pitch-slab.interface";
 export interface IPricingPlanModel {
     id: number;
     effective_from_date: number;
@@ -13,3 +13,17 @@ export interface IPricingPlanModel {
         [key: string]: IBillingCycleModel;
     };
 }
+export interface IPricingPlanModelV2 {
+    id: number;
+    effective_from_date: number;
+    effective_to_date: number;
+    base_price: number;
+    unit: string;
+    pitch_slab: {
+        [key: string]: IPitchSlabV2;
+    };
+    billing_cycle: {
+        [key: string]: IBillingCycleModelV2;
+    };
+    billing_cost_code: string;
+}

package/build/src/interface/ui/upgrade-subscription-data.interface.d.ts

@@ -13,3 +13,8 @@ export type RenewSubscriptionData = PickOnly<ISubscriptionEntity, "noOfPitches"
     toDate: Date;
     basePrice: number;
 };
+export type RenewSubscriptionDataV2 = PickOnly<ISubscriptionEntity, "noOfPitches" | "netAmount" | "grossAmount" | "organizationId" | "pricingPlanId" | "registrationId" | "type" | "previousSubscriptionIds" | "amountPaid" | "discount"> & {
+    fromDate: Date;
+    toDate: Date;
+    basePrice: number;
+};

package/build/src/models/billing-cycle-model.d.ts

@@ -1,4 +1,4 @@
-import { IBillingCycleModel } from "../interface/billing-cycle.interface";
+import { IBillingCycleModel, IBillingCycleModelV2 } from "../interface/billing-cycle.interface";
 export declare class BillingCycleModel implements IBillingCycleModel {
     from: number;
     to: number;
@@ -9,3 +9,11 @@ export declare class BillingCycleModel implements IBillingCycleModel {
     getDiscount(): number;
     getBillingCycle(date: Date): [Date, Date];
 }
+export declare class BillingCycleModelV2 implements IBillingCycleModelV2 {
+    from: number;
+    to: number;
+    name: string;
+    key: string;
+    constructor(data: IBillingCycleModelV2);
+    getBillingCycle(date: Date): [Date, Date];
+}

package/build/src/models/billing-cycle-model.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BillingCycleModel = void 0;
+exports.BillingCycleModelV2 = exports.BillingCycleModel = void 0;
 var date_util_1 = require("../utils/date-util");
 var BillingCycleModel = /** @class */ (function () {
     function BillingCycleModel(data) {
@@ -25,3 +25,27 @@ var BillingCycleModel = /** @class */ (function () {
     return BillingCycleModel;
 }());
 exports.BillingCycleModel = BillingCycleModel;
+// v2 __________________________________________________________________________________________//
+var BillingCycleModelV2 = /** @class */ (function () {
+    function BillingCycleModelV2(data) {
+        this.from = data.from;
+        this.to = data.to;
+        // this.discount = data.discount;
+        this.name = data.name;
+        this.key = data.key;
+    }
+    // public getDiscount(): number {
+    //   if (this.discount.indexOf("P") > -1) {
+    //     return parseFloat(this.discount.replace("P", ""));
+    //   }
+    //   return 0;
+    // }
+    BillingCycleModelV2.prototype.getBillingCycle = function (date) {
+        // const dateUtilService = AppInjector.get(DateUtilService);
+        var startDate = date_util_1.dateUtilService.addNDaysToDate(date, 1);
+        var endDate = date_util_1.dateUtilService.addNDaysToDate(startDate, this.to * 30);
+        return [startDate, endDate];
+    };
+    return BillingCycleModelV2;
+}());
+exports.BillingCycleModelV2 = BillingCycleModelV2;

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

@@ -1,11 +1,11 @@
 import { PricingPlanStatus } from "../../enums/pricing-plan-status.enum";
-import { IBillingCycleModel } from "../../interface/billing-cycle.interface";
-import { GetPricingPlanByDateResponse } from "../../interface/get-pricing-plan-by-date-response.interface";
-import { IPitchSlab } from "../../interface/pitch-slab.interface";
-import { IPricingPlanEntityModel } from "../../interface/model/pricing-plan-entity-model.interface";
-import { IPricingPlanEntity } from "../../interface/entity/pricing-plan-entity.interface";
-import { BillingCycleModel } from "../billing-cycle-model";
-import { PricingPlanModel } from "../pricing-plan-model";
+import { IBillingCycleModel, IBillingCycleModelV2 } from "../../interface/billing-cycle.interface";
+import { GetPricingPlanByDateResponse, GetPricingPlanByDateResponseV2 } from "../../interface/get-pricing-plan-by-date-response.interface";
+import { IPitchSlab, IPitchSlabV2 } from "../../interface/pitch-slab.interface";
+import { IPricingPlanEntityModel, IPricingPlanEntityModelV2 } from "../../interface/model/pricing-plan-entity-model.interface";
+import { IPricingPlanEntity, IPricingPlanEntityV2 } from "../../interface/entity/pricing-plan-entity.interface";
+import { BillingCycleModel, BillingCycleModelV2 } from "../billing-cycle-model";
+import { PricingPlanModel, PricingPlanModelV2 } from "../pricing-plan-model";
 export declare class PricingPlanEntityModel implements IPricingPlanEntityModel {
     id: number;
     effectiveFrom: Date;
@@ -19,6 +19,8 @@ export declare class PricingPlanEntityModel implements IPricingPlanEntityModel {
     basePrice: number;
     billingCycle: string;
     unit: string;
+    billingCostCode: string | null;
+    subscriptionCycle: string | null;
     constructor(data: IPricingPlanEntity);
     getBillingCycleKeys(): string[];
     toModel(): PricingPlanModel;
@@ -34,6 +36,11 @@ export declare class PitchSlabParser {
     constructor(code: string);
     parseToModel(): IPitchSlab;
 }
+export declare class PitchSlabParserV2 {
+    code: string;
+    constructor(code: string);
+    parseToModel(): IPitchSlabV2;
+}
 export declare class BillingCycleCodeParser {
     code: string;
     from: number;
@@ -45,3 +52,36 @@ export declare class BillingCycleCodeParser {
     parseToModel(): BillingCycleModel;
     getKey(): string;
 }
+export declare class PricingPlanEntityModelV2 implements IPricingPlanEntityModelV2 {
+    id: number;
+    effectiveFrom: Date;
+    effectiveTo: Date;
+    status: PricingPlanStatus;
+    createdBy: number;
+    createdOn: Date;
+    updatedBy: number;
+    updatedOn: Date;
+    basePrice: number;
+    unit: string;
+    billingCostCode: string | null;
+    subscriptionCycle: string | null;
+    constructor(data: IPricingPlanEntityV2);
+    getBillingCycleKeys(): string[];
+    toModel(): PricingPlanModelV2;
+    arrayToIndexedObject<T>(arr: T[]): {
+        [key: string]: T;
+    };
+    toObject(): GetPricingPlanByDateResponseV2;
+    toPitchSlabs(): IPitchSlabV2[];
+    toBillingCycles(): IBillingCycleModelV2[];
+}
+export declare class BillingCycleCodeParserV2 {
+    code: string;
+    from: number;
+    to: number;
+    name: string;
+    constructor(code: string);
+    parse(): BillingCycleCodeParserV2;
+    parseToModel(): BillingCycleModelV2;
+    getKey(): string;
+}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BillingCycleCodeParser = exports.PitchSlabParser = exports.PricingPlanEntityModel = void 0;
+exports.BillingCycleCodeParserV2 = exports.PricingPlanEntityModelV2 = exports.BillingCycleCodeParser = exports.PitchSlabParserV2 = exports.PitchSlabParser = exports.PricingPlanEntityModel = void 0;
 var billing_cycle_model_1 = require("../billing-cycle-model");
 var booking_code_model_1 = require("../booking-code-model");
 var pitch_slab_model_1 = require("../pitch-slab-model");
@@ -94,6 +94,22 @@ var PitchSlabParser = /** @class */ (function () {
     return PitchSlabParser;
 }());
 exports.PitchSlabParser = PitchSlabParser;
+var PitchSlabParserV2 = /** @class */ (function () {
+    function PitchSlabParserV2(code) {
+        this.code = code;
+    }
+    PitchSlabParserV2.prototype.parseToModel = function () {
+        var costCodeComponents = this.code.split("#");
+        costCodeComponents = costCodeComponents[0].split("_");
+        return new pitch_slab_model_1.PitchSlabModelV2({
+            // discount: costCodeComponents[1],
+            from: parseInt(costCodeComponents[0]),
+            to: parseInt(costCodeComponents[1]),
+        });
+    };
+    return PitchSlabParserV2;
+}());
+exports.PitchSlabParserV2 = PitchSlabParserV2;
 var BillingCycleCodeParser = /** @class */ (function () {
     function BillingCycleCodeParser(code) {
         this.code = code;
@@ -126,3 +142,114 @@ var BillingCycleCodeParser = /** @class */ (function () {
     return BillingCycleCodeParser;
 }());
 exports.BillingCycleCodeParser = BillingCycleCodeParser;
+// V2 ___________________________________________________________________________________________//
+// Done
+var PricingPlanEntityModelV2 = /** @class */ (function () {
+    function PricingPlanEntityModelV2(data) {
+        Object.assign(this, data);
+    }
+    PricingPlanEntityModelV2.prototype.getBillingCycleKeys = function () {
+        return this.toBillingCycles().map(function (billingCycle) { return billingCycle.key; });
+    };
+    PricingPlanEntityModelV2.prototype.toModel = function () {
+        return new pricing_plan_model_1.PricingPlanModelV2({
+            id: this.id,
+            base_price: this.basePrice,
+            effective_from_date: parseInt(booking_code_model_1.BookingCode.getDateCode(this.effectiveFrom)),
+            effective_to_date: parseInt(booking_code_model_1.BookingCode.getDateCode(this.effectiveTo)),
+            unit: this.unit,
+            billing_cycle: this.arrayToIndexedObject(this.toBillingCycles()),
+            pitch_slab: this.arrayToIndexedObject(this.toPitchSlabs()),
+            billing_cost_code: this.billingCostCode,
+        });
+    };
+    PricingPlanEntityModelV2.prototype.arrayToIndexedObject = function (arr) {
+        return arr.reduce(function (result, item, index) {
+            result[index.toString()] = item; //a, b, c
+            return result;
+        }, {});
+    };
+    PricingPlanEntityModelV2.prototype.toObject = function () {
+        var _a;
+        var responseObj = {
+            id: this.id,
+            effective_from_date: 0,
+            effective_to_date: 0,
+            base_price: 0,
+            unit: "per_hour_per_pitch",
+            pitch_slab: {},
+            billing_cycle: {},
+        };
+        var billingCycle = (_a = this.subscriptionCycle) === null || _a === void 0 ? void 0 : _a.split(",");
+        billingCycle === null || billingCycle === void 0 ? void 0 : billingCycle.forEach(function (billing, index) {
+            var billingArray = billing.split("_");
+            responseObj.billing_cycle[index] = {
+                from: Number(billingArray[0].slice(0, 3)),
+                to: Number(billingArray[0].slice(3, 6)),
+                // discount: billingArray[1],
+                name: billingArray.slice(2).join("_"),
+                key: billingArray.slice(2).join("-").toLowerCase().replace(/ /g, "-"),
+            };
+        });
+        this.billingCostCode.split(",").forEach(function (code, index) {
+            var costCode = code.split("#");
+            responseObj.pitch_slab[index] = {
+                from: Number(costCode[0]),
+                to: Number(costCode[0]),
+                // discount: costCode[1],
+            };
+        });
+        responseObj.effective_from_date = Number(booking_code_model_1.BookingCode.getDateCode(this.effectiveFrom));
+        responseObj.effective_to_date = Number(booking_code_model_1.BookingCode.getDateCode(this.effectiveTo));
+        responseObj.unit = this.unit;
+        responseObj.base_price = this.basePrice;
+        return responseObj;
+    };
+    PricingPlanEntityModelV2.prototype.toPitchSlabs = function () {
+        return this.billingCostCode
+            .split(",")
+            .map(function (cost_code) { return new PitchSlabParserV2(cost_code).parseToModel(); });
+    };
+    PricingPlanEntityModelV2.prototype.toBillingCycles = function () {
+        return this.subscriptionCycle
+            .split(",")
+            .map(function (billingCode) {
+            return new BillingCycleCodeParserV2(billingCode).parseToModel();
+        });
+    };
+    return PricingPlanEntityModelV2;
+}());
+exports.PricingPlanEntityModelV2 = PricingPlanEntityModelV2;
+// Done
+var BillingCycleCodeParserV2 = /** @class */ (function () {
+    function BillingCycleCodeParserV2(code) {
+        this.code = code;
+    }
+    BillingCycleCodeParserV2.prototype.parse = function () {
+        var billingCycleComponents = this.code.split("_");
+        this.from = parseInt(billingCycleComponents[0].slice(0, 3));
+        this.to = parseInt(billingCycleComponents[0].slice(3, 6));
+        // this.discount = billingCycleComponents[1];
+        this.name = billingCycleComponents[2];
+        return this;
+    };
+    BillingCycleCodeParserV2.prototype.parseToModel = function () {
+        var billingCycleComponents = this.code.split("_");
+        this.from = parseInt(billingCycleComponents[0].slice(0, 3));
+        this.to = parseInt(billingCycleComponents[0].slice(3, 6));
+        // this.discount = billingCycleComponents[1];
+        this.name = billingCycleComponents[2];
+        return new billing_cycle_model_1.BillingCycleModelV2({
+            // discount: this.discount,
+            from: this.from,
+            to: this.to,
+            name: this.name,
+            key: this.getKey(),
+        });
+    };
+    BillingCycleCodeParserV2.prototype.getKey = function () {
+        return this.name.toLowerCase().replace(" ", "-");
+    };
+    return BillingCycleCodeParserV2;
+}());
+exports.BillingCycleCodeParserV2 = BillingCycleCodeParserV2;

package/build/src/models/entity/subscription-model.d.ts

@@ -1,9 +1,9 @@
 import { IGetCurrentSubscriptionResponse, ISubscriptionPitchMappingEntity } from "../../@type";
 import { SubscriptionStatus } from "../../enums/subscription-status.enum";
-import { ISubscriptionEntity, ISubscriptionModel } from "../../interface/entity/subscription-entity.interface";
-import { RenewSubscriptionData, UpgradeSubscriptionData } from "../../interface/ui/upgrade-subscription-data.interface";
-import { PricingPlanModel } from "../pricing-plan-model";
-import { SubscribedPricingPlanModel } from "../subscribed-pricing-plan-model";
+import { ISubscriptionEntity, ISubscriptionModel, ISubscriptionModelV2 } from "../../interface/entity/subscription-entity.interface";
+import { RenewSubscriptionData, RenewSubscriptionDataV2, UpgradeSubscriptionData } from "../../interface/ui/upgrade-subscription-data.interface";
+import { PricingPlanModel, PricingPlanModelV2 } from "../pricing-plan-model";
+import { SubscribedPricingPlanModel, SubscribedPricingPlanModelV2 } from "../subscribed-pricing-plan-model";
 export declare class SubscriptionModel implements ISubscriptionModel {
     id: number;
     organizationId: number;
@@ -42,3 +42,41 @@ export declare class SubscriptionModel implements ISubscriptionModel {
     isAmountPaidGreater(): boolean;
     updateStatusIfPaymentDone(): void;
 }
+export declare class SubscriptionModelV2 implements ISubscriptionModelV2 {
+    id: number;
+    organizationId: number;
+    from: Date;
+    to: Date;
+    type: string;
+    grossAmount: number;
+    discount: string;
+    netAmount: number;
+    amountPaid: number;
+    status: SubscriptionStatus;
+    noOfPitches: number;
+    remarks: string;
+    registrationId: number;
+    pricingPlanId: number;
+    previousSubscriptionIds: string;
+    createdOn: Date;
+    updatedOn: Date;
+    createdBy: number;
+    updatedBy: number;
+    fromDateCode: string;
+    toDateCode: string;
+    details?: ISubscriptionPitchMappingEntity[];
+    advanceAmount?: number;
+    constructor(data: ISubscriptionEntity);
+    static getInstanceByResponse(data: IGetCurrentSubscriptionResponse): SubscriptionModelV2;
+    getFromDate(): Date;
+    getToDate(): Date;
+    isRenewalDue(): boolean;
+    remainingSubscriptionDays(): number;
+    upgradeSubscription(totalPitchCount: number, subscribedPricingModel: SubscribedPricingPlanModelV2): UpgradeSubscriptionData;
+    renewSubscription(totalPitchCount: number, billingCycle: string, currentPricingPlanModel: PricingPlanModelV2): RenewSubscriptionDataV2;
+    static updateStatus(subscriptionEntities: ISubscriptionEntity[], status: SubscriptionStatus, userId: number): ISubscriptionEntity[];
+    remainingAmount(): number;
+    isAmountFullyPaid(): boolean;
+    isAmountPaidGreater(): boolean;
+    updateStatusIfPaymentDone(): void;
+}

package/build/src/models/entity/subscription-model.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubscriptionModel = void 0;
+exports.SubscriptionModelV2 = exports.SubscriptionModel = void 0;
 var subscription_status_enum_1 = require("../../enums/subscription-status.enum");
 var constant_1 = require("../../utils/constant");
 var date_util_1 = require("../../utils/date-util");
@@ -152,3 +152,140 @@ var SubscriptionModel = /** @class */ (function () {
     return SubscriptionModel;
 }());
 exports.SubscriptionModel = SubscriptionModel;
+var SubscriptionModelV2 = /** @class */ (function () {
+    function SubscriptionModelV2(data) {
+        Object.assign(this, data);
+    }
+    SubscriptionModelV2.getInstanceByResponse = function (data) {
+        // this.id = data.id;
+        // this.organizationId = data.organizationId;
+        // this.from = data.from;
+        // this.to = data.to;
+        // this.type = data.type;
+        // this.grossAmount = data.grossAmount;
+        // this.discount = data.discount;
+        // this.netAmount = data.netAmount;
+        // this.amountPaid = data.amountPaid;
+        // this.status = data.status;
+        // this.noOfPitches = data.noOfPitches;
+        // this.createdBy = data.createdBy;
+        // this.createdOn = data.createdOn;
+        // this.updatedBy = data.updatedBy;
+        // this.updatedOn = data.updatedOn;
+        // this.remarks = data.remarks;
+        // this.registrationId = data.registrationId;
+        // this.pricingPlanId = data.pricingPlanId;
+        // this.upgradeSubscriptionId = Number(data.previousSubscriptionIds);
+        // this.details = data.details;
+        var demo = __assign(__assign({}, data), { from: date_util_1.dateUtilService.getDateFromDatabaseDate(data.from), to: date_util_1.dateUtilService.getDateFromDatabaseDate(data.to), createdOn: date_util_1.dateUtilService.getDateFromDatabaseDate(data.createdOn), updatedOn: date_util_1.dateUtilService.getDateFromDatabaseDate(data.updatedOn) });
+        return new SubscriptionModelV2(demo);
+    };
+    SubscriptionModelV2.prototype.getFromDate = function () {
+        return date_util_1.dateUtilService.convertStringToDate(this.fromDateCode, "yyMMdd");
+    };
+    SubscriptionModelV2.prototype.getToDate = function () {
+        return date_util_1.dateUtilService.convertStringToDate(this.toDateCode, "yyMMdd");
+    };
+    SubscriptionModelV2.prototype.isRenewalDue = function () {
+        // Check if difference 'to' date and today's date is less than 7 days
+        return (this.getToDate().getTime() - new Date().getTime() <
+            constant_1.SUBSCRIPTION_RENEWAL_THRESHOLD_DAYS * 24 * 60 * 60 * 1000);
+    };
+    SubscriptionModelV2.prototype.remainingSubscriptionDays = function () {
+        // const oneDay = 24 * 60 * 60 * 1000;
+        // const dayDifference = Math.ceil(
+        //   (this.to.getTime() - new Date().getTime()) / oneDay
+        // );
+        // return dayDifference - 1; //minus 1 day
+        return date_util_1.dateUtilService.noOfDaysBetweenDates(new Date(), this.getToDate());
+    };
+    SubscriptionModelV2.prototype.upgradeSubscription = function (totalPitchCount, subscribedPricingModel) {
+        var newlyAddedPitchCount = totalPitchCount - this.noOfPitches;
+        var basePrice = subscribedPricingModel.getSelectedPitchSlabBasePrice();
+        var remainingSubscriptionDays = this.remainingSubscriptionDays();
+        var additionalGrossAmount = basePrice * remainingSubscriptionDays * 24 * newlyAddedPitchCount;
+        return {
+            amountPaid: this.amountPaid,
+            discount: this.discount,
+            from: this.from,
+            to: this.to,
+            noOfPitches: totalPitchCount,
+            netAmount: Math.round(this.netAmount + additionalGrossAmount),
+            grossAmount: Math.round(this.grossAmount + additionalGrossAmount),
+            organizationId: this.organizationId,
+            pricingPlanId: this.pricingPlanId,
+            registrationId: this.registrationId,
+            type: this.type,
+            previousSubscriptionIds: this.id.toString(),
+            newlyAddedPitchCount: newlyAddedPitchCount,
+            basePrice: basePrice,
+            remainingSubscriptionDays: remainingSubscriptionDays,
+            additionalGrossAmount: Math.round(additionalGrossAmount),
+        };
+    };
+    SubscriptionModelV2.prototype.renewSubscription = function (totalPitchCount, billingCycle, currentPricingPlanModel) {
+        // const dateUtilService = new DateUtilService();
+        // dateService.convertStringToDate(this.from, "yyyy-MM-dd");
+        // const subscribedPitchCount: number = this.noOfPitches;
+        var renewalSubscriptionModel = new subscribed_pricing_plan_model_1.SubscribedPricingPlanModelV2(currentPricingPlanModel, totalPitchCount, billingCycle);
+        var toDate = this.getToDate();
+        var _a = renewalSubscriptionModel.getNextBillingCycleDateRange(toDate), startDate = _a[0], endDate = _a[1];
+        // const [startDateCode, endDateCode]: [string, string] = [
+        //   dateService.getDateCode(startDate),
+        //   dateService.getDateCode(endDate),
+        // ];
+        return {
+            amountPaid: 0,
+            // discount: renewalSubscriptionModel.selectedBillingCycle.discount,
+            discount: renewalSubscriptionModel.getDiscount(),
+            fromDate: startDate,
+            grossAmount: Math.round(renewalSubscriptionModel.getGrossAmount()),
+            netAmount: Math.round(renewalSubscriptionModel.getNetAmount()),
+            noOfPitches: totalPitchCount,
+            pricingPlanId: currentPricingPlanModel.id,
+            toDate: endDate,
+            type: billingCycle,
+            organizationId: this.organizationId,
+            registrationId: this.registrationId,
+            previousSubscriptionIds: null,
+            basePrice: renewalSubscriptionModel.getSelectedPitchSlabBasePrice(),
+        };
+    };
+    SubscriptionModelV2.updateStatus = function (subscriptionEntities, status, userId) {
+        return subscriptionEntities.map(function (subscriptionEntity) {
+            subscriptionEntity.status = status;
+            subscriptionEntity.updatedBy = userId;
+            subscriptionEntity.updatedOn = new Date();
+            return subscriptionEntity;
+        });
+    };
+    SubscriptionModelV2.prototype.remainingAmount = function () {
+        return this.netAmount - this.amountPaid;
+    };
+    SubscriptionModelV2.prototype.isAmountFullyPaid = function () {
+        if (this.netAmount === this.amountPaid) {
+            return true;
+        }
+        return false;
+    };
+    SubscriptionModelV2.prototype.isAmountPaidGreater = function () {
+        if (this.amountPaid > this.netAmount) {
+            return true;
+        }
+        return false;
+    };
+    SubscriptionModelV2.prototype.updateStatusIfPaymentDone = function () {
+        if (this.isAmountFullyPaid()) {
+            this.status =
+                this.status === subscription_status_enum_1.SubscriptionStatus.UPGRADE_PAYMENT_PENDING
+                    ? subscription_status_enum_1.SubscriptionStatus.UPGRADE_PAYMENT_DONE
+                    : this.status === subscription_status_enum_1.SubscriptionStatus.UPGRADE_RENEW_PAYMENT_PENDING
+                        ? subscription_status_enum_1.SubscriptionStatus.UPGRADE_RENEW_PAYMENT_DONE
+                        : this.status === subscription_status_enum_1.SubscriptionStatus.PAYMENT_PENDING
+                            ? subscription_status_enum_1.SubscriptionStatus.PAYMENT_DONE
+                            : this.status;
+        }
+    };
+    return SubscriptionModelV2;
+}());
+exports.SubscriptionModelV2 = SubscriptionModelV2;

package/build/src/models/pitch-slab-model.d.ts

@@ -1,4 +1,4 @@
-import { IPitchSlab } from "../interface/pitch-slab.interface";
+import { IPitchSlab, IPitchSlabV2 } from "../interface/pitch-slab.interface";
 export declare class PitchSlabModel implements IPitchSlab {
     from: number;
     to: number;
@@ -7,3 +7,8 @@ export declare class PitchSlabModel implements IPitchSlab {
     getDiscount(): number;
     getBasePrice(basePrice: number): number;
 }
+export declare class PitchSlabModelV2 implements IPitchSlabV2 {
+    from: number;
+    to: number;
+    constructor(data: IPitchSlabV2);
+}

package/build/src/models/pitch-slab-model.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PitchSlabModel = void 0;
+exports.PitchSlabModelV2 = exports.PitchSlabModel = void 0;
 var PitchSlabModel = /** @class */ (function () {
     function PitchSlabModel(data) {
         this.from = data.from;
@@ -19,3 +19,14 @@ var PitchSlabModel = /** @class */ (function () {
     return PitchSlabModel;
 }());
 exports.PitchSlabModel = PitchSlabModel;
+//v2 __________________________________________________________________________________________//
+var PitchSlabModelV2 = /** @class */ (function () {
+    // public discount: string;
+    function PitchSlabModelV2(data) {
+        this.from = data.from;
+        this.to = data.to;
+        // this.discount = data.discount;
+    }
+    return PitchSlabModelV2;
+}());
+exports.PitchSlabModelV2 = PitchSlabModelV2;

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

@@ -1,6 +1,6 @@
-import { IPricingPlanModel } from "../interface/pricing-plan.interface";
-import { PitchSlabModel } from "./pitch-slab-model";
-import { BillingCycleModel } from "./billing-cycle-model";
+import { IPricingPlanModel, IPricingPlanModelV2 } from "../interface/pricing-plan.interface";
+import { PitchSlabModel, PitchSlabModelV2 } from "./pitch-slab-model";
+import { BillingCycleModel, BillingCycleModelV2 } from "./billing-cycle-model";
 export declare class PricingPlanModel implements IPricingPlanModel {
     id: number;
     effective_from_date: number;
@@ -25,3 +25,28 @@ export declare class PricingPlanModel implements IPricingPlanModel {
     formatPitchSlab(index: number): string;
     getBillingCycleIndexByMonths(noOfMonths: number): number;
 }
+export declare class PricingPlanModelV2 implements IPricingPlanModelV2 {
+    id: number;
+    effective_from_date: number;
+    effective_to_date: number;
+    base_price: number;
+    unit: string;
+    pitch_slab: {
+        [key: string]: PitchSlabModelV2;
+    };
+    billing_cycle: {
+        [key: string]: BillingCycleModelV2;
+    };
+    billing_cost_code: string;
+    constructor(data: IPricingPlanModelV2);
+    getPitchSlab(pitchCount: number): PitchSlabModelV2;
+    getBillingCycle(billingCycleKey: string): BillingCycleModelV2;
+    getMonth(billingCycleKey: string): number;
+    getNoOfSubscriptionDays(billingCycleKey: string): number;
+    getBillingCycleKeys(): string[];
+    validateBillingCycleKey(billingCycleKey: string): void;
+    getBillingCycleByDay(numberOfDay: number): BillingCycleModelV2 | undefined;
+    getPitchSlabIndex(pitchCount: number): number;
+    formatPitchSlab(index: number): string;
+    getBillingCycleIndexByMonths(noOfMonths: number): number;
+}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PricingPlanModel = void 0;
+exports.PricingPlanModelV2 = exports.PricingPlanModel = void 0;
 var pitch_slab_model_1 = require("./pitch-slab-model");
 var billing_cycle_model_1 = require("./billing-cycle-model");
 var app_badrequest_exception_1 = require("../exceptions/app-badrequest.exception");
@@ -87,3 +87,88 @@ var PricingPlanModel = /** @class */ (function () {
     return PricingPlanModel;
 }());
 exports.PricingPlanModel = PricingPlanModel;
+//v2 __________________________________________________________________________________________//
+// Done
+var PricingPlanModelV2 = /** @class */ (function () {
+    function PricingPlanModelV2(data) {
+        var _this = this;
+        this.id = data.id;
+        this.effective_from_date = data.effective_from_date;
+        this.effective_to_date = data.effective_to_date;
+        this.base_price = data.base_price;
+        this.unit = data.unit;
+        this.pitch_slab = {};
+        this.billing_cycle = {};
+        Object.keys(data.pitch_slab).forEach(function (key) {
+            _this.pitch_slab[key] = new pitch_slab_model_1.PitchSlabModelV2(data.pitch_slab[key]);
+        });
+        Object.keys(data.billing_cycle).forEach(function (key) {
+            _this.billing_cycle[key] = new billing_cycle_model_1.BillingCycleModelV2(data.billing_cycle[key]);
+        });
+    }
+    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;
+    };
+    PricingPlanModelV2.prototype.getBillingCycle = function (billingCycleKey) {
+        var billingCycleMap = this.billing_cycle;
+        var billingCycles = Object.values(billingCycleMap);
+        var selectedBillingCycle = billingCycles.filter(function (_a) {
+            var key = _a.key;
+            return key === billingCycleKey;
+        })[0];
+        return selectedBillingCycle;
+    };
+    PricingPlanModelV2.prototype.getMonth = function (billingCycleKey) {
+        return this.getBillingCycle(billingCycleKey).to;
+    };
+    PricingPlanModelV2.prototype.getNoOfSubscriptionDays = function (billingCycleKey) {
+        return this.getBillingCycle(billingCycleKey).to * 30 - 1;
+    };
+    PricingPlanModelV2.prototype.getBillingCycleKeys = function () {
+        return Object.values(this.billing_cycle).map(function (obj) { return obj.key; });
+    };
+    PricingPlanModelV2.prototype.validateBillingCycleKey = function (billingCycleKey) {
+        if (!this.getBillingCycleKeys().includes(billingCycleKey)) {
+            throw new app_badrequest_exception_1.AppBadRequestException({
+                key: "type",
+                message: ["pricing plan type:'".concat(billingCycleKey, "' is not found")],
+            });
+        }
+    };
+    PricingPlanModelV2.prototype.getBillingCycleByDay = function (numberOfDay) {
+        return Object.values(this.billing_cycle).find(function (obj) {
+            if (numberOfDay <= obj.to * 30) {
+                return obj;
+            }
+        });
+    };
+    PricingPlanModelV2.prototype.getPitchSlabIndex = function (pitchCount) {
+        var pitchRangesMap = this.pitch_slab;
+        var pitchRanges = Object.values(pitchRangesMap);
+        return pitchRanges.findIndex(function (pitchRange) {
+            return pitchRange.from <= pitchCount && pitchCount <= pitchRange.to;
+        });
+    };
+    PricingPlanModelV2.prototype.formatPitchSlab = function (index) {
+        var pitchRangesMap = this.pitch_slab;
+        var pitchRanges = Object.values(pitchRangesMap);
+        var selectedPitchSlab = pitchRanges[index];
+        if (index === pitchRanges.length - 1) {
+            return "".concat(selectedPitchSlab.from - 1, "+");
+        }
+        return "".concat(selectedPitchSlab.from, "-").concat(selectedPitchSlab.to);
+    };
+    PricingPlanModelV2.prototype.getBillingCycleIndexByMonths = function (noOfMonths) {
+        return Object.values(this.billing_cycle).findIndex(function (_a) {
+            var from = _a.from, to = _a.to;
+            return from <= noOfMonths && noOfMonths <= to;
+        });
+    };
+    return PricingPlanModelV2;
+}());
+exports.PricingPlanModelV2 = PricingPlanModelV2;

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

@@ -1,9 +1,9 @@
-import { IGetPricingPlanByDateResponse } from "../@type";
-import { IPricingPlanModel } from "../interface/pricing-plan.interface";
-import { BillingCycleModel } from "./billing-cycle-model";
-import { SubscriptionModel } from "./entity";
-import { PitchSlabModel } from "./pitch-slab-model";
-import { PricingPlanModel } from "./pricing-plan-model";
+import { IGetPricingPlanByDateResponse, IGetPricingPlanByDateResponseV2 } from "../@type";
+import { IPricingPlanModel, IPricingPlanModelV2 } from "../interface/pricing-plan.interface";
+import { BillingCycleModel, BillingCycleModelV2 } from "./billing-cycle-model";
+import { SubscriptionModel, SubscriptionModelV2 } from "./entity";
+import { PitchSlabModel, PitchSlabModelV2 } from "./pitch-slab-model";
+import { PricingPlanModel, PricingPlanModelV2 } from "./pricing-plan-model";
 export declare class SubscribedPricingPlanModel extends PricingPlanModel {
     pitchCount: number;
     billingCycle: string;
@@ -35,3 +35,45 @@ export declare class SubscribedPricingPlanModel extends PricingPlanModel {
     getBasePriceBySelectedBillingCycleDiscount(): number;
     getTotalHours(): number;
 }
+export declare class SubscribedPricingPlanModelV2 extends PricingPlanModelV2 {
+    pitchCount: number;
+    billingCycle: string;
+    selectedPitchSlab: PitchSlabModelV2;
+    selectedBillingCycle: BillingCycleModelV2;
+    selectedPitchSlabBasePrice: number;
+    hourInMonth: number;
+    months: number | undefined;
+    constructor(data: IPricingPlanModelV2, pitchCount: number, billingCycle: string);
+    getCodeByPitchCountCycle(): string;
+    getCodeByCycle(): string[];
+    getDiscount(): string;
+    getBasePriceByPitchSlab(): number;
+    getCodesByPitchSlab(): string[];
+    parseCode(code: string): {
+        from: number;
+        to: number;
+        month: number;
+        price: number;
+    }[];
+    getMonths(): number;
+    getBasePrice(): number;
+    getGrossAmount(config?: {
+        roundDown: boolean;
+    }): number;
+    getNetAmount(config?: {
+        roundDown: boolean;
+    }): number;
+    getBillingDiscount(): number;
+    getMonthDifference(that: SubscribedPricingPlanModelV2): number;
+    getGrossAmountByMonth(month: number): number;
+    getNetAmountByMonth(month: number): number;
+    getGrossAmountByPitchDays(pitchCount: number, days: number): number;
+    getNetAmountByPitchDays(pitchCount: number, days: number): number;
+    getGrossAmountByPitchDaysBasePrice(basePrice: number, pitchCount: number, days: number): number;
+    getNetAmountByPitchDaysBasePrice(basePrice: number, pitchCount: number, days: number): number;
+    getNextBillingCycleDateRange(date: Date): [Date, Date];
+    static getInstanceBySubscriptionData(data: IGetPricingPlanByDateResponseV2, subscriptionDataModel: SubscriptionModelV2): SubscribedPricingPlanModelV2;
+    getSelectedPitchSlabBasePrice(): number;
+    getBasePriceBySelectedBillingCycleDiscount(): number;
+    getTotalHours(): number;
+}

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

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubscribedPricingPlanModel = void 0;
+exports.SubscribedPricingPlanModelV2 = exports.SubscribedPricingPlanModel = void 0;
 var date_util_1 = require("../utils/date-util");
 var math_util_1 = require("../utils/math-util");
 var pricing_plan_model_1 = require("./pricing-plan-model");
@@ -120,3 +120,195 @@ var SubscribedPricingPlanModel = /** @class */ (function (_super) {
     return SubscribedPricingPlanModel;
 }(pricing_plan_model_1.PricingPlanModel));
 exports.SubscribedPricingPlanModel = SubscribedPricingPlanModel;
+//V2 ___________________________________________________________________________________________//
+var SubscribedPricingPlanModelV2 = /** @class */ (function (_super) {
+    __extends(SubscribedPricingPlanModelV2, _super);
+    function SubscribedPricingPlanModelV2(data, pitchCount, billingCycle) {
+        var _this = _super.call(this, data) || this;
+        _this.hourInMonth = 24 * 30;
+        _this.pitchCount = pitchCount;
+        _this.billingCycle = billingCycle;
+        _this.selectedPitchSlab = _this.getPitchSlab(_this.pitchCount);
+        _this.selectedBillingCycle = _this.getBillingCycle(_this.billingCycle);
+        // this.selectedPitchSlabBasePrice = this.selectedPitchSlab.getBasePrice(
+        //   this.base_price
+        // );
+        _this.selectedPitchSlabBasePrice = _this.getBasePriceByPitchSlab();
+        return _this;
+    }
+    SubscribedPricingPlanModelV2.prototype.getCodeByPitchCountCycle = function () {
+        var _this = this;
+        var codes = this.billing_cost_code.split(",");
+        // Filter by pitch count
+        codes = codes.filter(function (code) {
+            var _a = code.split("_"), from = _a[0], to = _a[1];
+            return _this.pitchCount >= parseInt(from) && _this.pitchCount <= parseInt(to);
+        });
+        codes.sort();
+        // Filter by billing cycle
+        codes = codes.filter(function (code) {
+            return _this.selectedBillingCycle.key === _this.billingCycle;
+        });
+        return codes ? codes[0] : "";
+    };
+    SubscribedPricingPlanModelV2.prototype.getCodeByCycle = function () {
+        var _this = this;
+        var codes = this.billing_cost_code.split(",");
+        // Filter by pitch count
+        // codes = codes.filter((code) => {
+        //   const [from, to] = code.split("_");
+        //   return this.pitchCount >= parseInt(from) && this.pitchCount <= parseInt(to);
+        // });
+        // codes.sort();
+        // Filter by billing cycle
+        return codes.filter(function (code) {
+            return _this.selectedBillingCycle.to === parseInt(code.split("#")[1]);
+        });
+        // return codes ? codes[0] : "";
+    };
+    SubscribedPricingPlanModelV2.prototype.getDiscount = function () {
+        var codes = this.getCodeByPitchCountCycle();
+        return codes === null || codes === void 0 ? void 0 : codes.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];
+            return _this.pitchCount >= parseInt(from) && _this.pitchCount <= parseInt(to);
+        });
+        code.sort();
+        if (code) {
+            var _a = code[0].split("#"), from = _a[0], to = _a[1], price = _a[2];
+            return parseFloat(price);
+        }
+        return 0;
+    };
+    SubscribedPricingPlanModelV2.prototype.getCodesByPitchSlab = function () {
+        var _this = this;
+        var codes = this.billing_cost_code.split(",");
+        return codes.filter(function (code) {
+            var _a = code.split("_"), from = _a[0], to = _a[1];
+            return _this.pitchCount >= parseInt(from) && _this.pitchCount <= parseInt(to);
+        });
+        // code.sort();
+        // if (code) {
+        //   const [from, to, price] = code[0].split("#");
+        //   return parseFloat(price);
+        // } 
+        // return 0;
+    };
+    SubscribedPricingPlanModelV2.prototype.parseCode = function (code) {
+        // 1_5#1#100,1_5#6#98,6_10#1#97,6_10#6#90
+        var codes = code.split(",");
+        return codes.map(function (code) {
+            var _a = code.split("#"), pitch = _a[0], month = _a[1], price = _a[2];
+            var _b = pitch.split("_"), from = _b[0], to = _b[1];
+            return {
+                from: parseInt(from),
+                to: parseInt(to),
+                month: parseInt(month),
+                price: parseFloat(price),
+            };
+        });
+    };
+    SubscribedPricingPlanModelV2.prototype.getMonths = function () {
+        return this.selectedBillingCycle.to;
+    };
+    SubscribedPricingPlanModelV2.prototype.getBasePrice = function () {
+        return this.selectedPitchSlabBasePrice;
+    };
+    SubscribedPricingPlanModelV2.prototype.getGrossAmount = function (config) {
+        if (config === void 0) { config = { roundDown: false }; }
+        var roundDown = config.roundDown;
+        if (roundDown) {
+            return Math.floor(this.selectedPitchSlabBasePrice * this.pitchCount * this.getTotalHours());
+        }
+        else {
+            return Math.round(this.selectedPitchSlabBasePrice * this.pitchCount * this.getTotalHours());
+        }
+    };
+    SubscribedPricingPlanModelV2.prototype.getNetAmount = function (config) {
+        if (config === void 0) { config = { roundDown: false }; }
+        var roundDown = config.roundDown;
+        if (roundDown) {
+            return Math.floor(parseFloat(this.getCodeByPitchCountCycle().split("#")[2]) *
+                this.pitchCount *
+                this.getTotalHours());
+        }
+        else {
+            return Math.round(parseFloat(this.getCodeByPitchCountCycle().split("#")[2]) *
+                this.pitchCount *
+                this.getTotalHours());
+        }
+    };
+    SubscribedPricingPlanModelV2.prototype.getBillingDiscount = function () {
+        var selectedCode = this.getCodeByPitchCountCycle();
+        var selectedCodesByCycle = this.getCodeByCycle();
+        selectedCodesByCycle.sort();
+        var basePrice = parseFloat(selectedCodesByCycle[0].split("#")[2]);
+        var actualPrice = parseFloat(selectedCode.split("#")[2]);
+        return (basePrice - actualPrice) / basePrice * 100;
+        // 6_10#1#97,6_10#6#90
+        // return this.selectedBillingCycle.getDiscount();
+    };
+    SubscribedPricingPlanModelV2.prototype.getMonthDifference = function (that) {
+        return that.getMonths() - this.getMonths();
+    };
+    SubscribedPricingPlanModelV2.prototype.getGrossAmountByMonth = function (month) {
+        return Math.round(this.selectedPitchSlabBasePrice *
+            this.pitchCount *
+            this.hourInMonth *
+            month);
+    };
+    SubscribedPricingPlanModelV2.prototype.getNetAmountByMonth = function (month) {
+        return Math.round(this.selectedPitchSlabBasePrice *
+            (1 - this.getBillingDiscount() / 100) *
+            this.pitchCount *
+            this.hourInMonth *
+            month);
+    };
+    SubscribedPricingPlanModelV2.prototype.getGrossAmountByPitchDays = function (pitchCount, days) {
+        return Math.round(this.selectedPitchSlabBasePrice * pitchCount * days * 24);
+    };
+    SubscribedPricingPlanModelV2.prototype.getNetAmountByPitchDays = function (pitchCount, days) {
+        return Math.round(this.selectedPitchSlabBasePrice *
+            (1 - this.getBillingDiscount() / 100) *
+            pitchCount *
+            days *
+            24);
+    };
+    SubscribedPricingPlanModelV2.prototype.getGrossAmountByPitchDaysBasePrice = function (basePrice, pitchCount, days) {
+        return Math.round(basePrice * pitchCount * days * 24);
+    };
+    SubscribedPricingPlanModelV2.prototype.getNetAmountByPitchDaysBasePrice = function (basePrice, pitchCount, days) {
+        return Math.round(basePrice * (1 - this.getBillingDiscount() / 100) * pitchCount * days * 24);
+    };
+    SubscribedPricingPlanModelV2.prototype.getNextBillingCycleDateRange = function (date) {
+        // const dateService = new DateUtilService();
+        var startDate = date_util_1.dateUtilService.addNDaysToDate(date, 1);
+        var endDate = date_util_1.dateUtilService.addNDaysToDate(date, this.selectedBillingCycle.to * 30);
+        return [startDate, endDate];
+    };
+    SubscribedPricingPlanModelV2.getInstanceBySubscriptionData = function (data, subscriptionDataModel) {
+        return new SubscribedPricingPlanModelV2(data, subscriptionDataModel.noOfPitches, subscriptionDataModel.type);
+    };
+    SubscribedPricingPlanModelV2.prototype.getSelectedPitchSlabBasePrice = function () {
+        return this.selectedPitchSlabBasePrice;
+    };
+    SubscribedPricingPlanModelV2.prototype.getBasePriceBySelectedBillingCycleDiscount = function () {
+        return this.selectedPitchSlabBasePrice;
+        // return (
+        //   this.selectedPitchSlabBasePrice -
+        //   mathUtil.getDiscountAmount(
+        //     this.selectedBillingCycle.discount,
+        //     this.selectedPitchSlabBasePrice
+        //   )
+        // );
+    };
+    SubscribedPricingPlanModelV2.prototype.getTotalHours = function () {
+        return this.hourInMonth * this.selectedBillingCycle.to;
+    };
+    return SubscribedPricingPlanModelV2;
+}(pricing_plan_model_1.PricingPlanModelV2));
+exports.SubscribedPricingPlanModelV2 = SubscribedPricingPlanModelV2;

package/build/src/utils/string-util.d.ts

@@ -0,0 +1 @@
+export declare function testRegexArray(regexArray: RegExp[], testString: string): boolean[];

package/build/src/utils/string-util.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.testRegexArray = void 0;
+function testRegexArray(regexArray, testString) {
+    return regexArray.map(function (regex) { return regex.test(testString); });
+}
+exports.testRegexArray = testRegexArray;

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "turf-common",
-  "version": "1.4.1-beta.3",
-  "description": "",
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
-  "files": [
-    "build/**/*"
-  ],
-  "scripts": {
-    "clean": "rm -rf build",
-    "build": "npm run clean && tsc",
-    "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",
-    "version:deploy:beta": "npm version prerelease --preid beta && git push && npm run build && npm publish --tag beta",
-    "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.1-beta.5",
+  "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"
+  }
+}