turf-common 1.1.1-beta.46 → 1.1.1-beta.48

package/build/@type.d.ts

@@ -27,3 +27,4 @@ export * from "./interface/without-token-registration-entity.types";
 export * from "./interface/modify.interface";
 export * from "./interface/modify-entity.interface";
 export * from "./interface/key-value.interface";
+export * from "./interface/ui/upgrade-subscription-data.interface";

package/build/@type.js

@@ -43,3 +43,5 @@ __exportStar(require("./interface/without-token-registration-entity.types"), exp
 __exportStar(require("./interface/modify.interface"), exports);
 __exportStar(require("./interface/modify-entity.interface"), exports);
 __exportStar(require("./interface/key-value.interface"), exports);
+// changes for the ui
+__exportStar(require("./interface/ui/upgrade-subscription-data.interface"), exports);

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

@@ -0,0 +1,15 @@
+import { ISubscriptionEntity } from "../entity";
+export type PickOnly<T, K extends keyof T> = Pick<T, K> & {
+    [P in Exclude<keyof T, K>]?: never;
+};
+export type UpgradeSubscriptionData = PickOnly<ISubscriptionEntity, "from" | "to" | "noOfPitches" | "netAmount" | "grossAmount" | "organizationId" | "pricingPlanId" | "registrationId" | "type" | "previousSubscriptionIds" | "amountPaid" | "discount"> & {
+    newlyAddedPitchCount: number;
+    basePrice: number;
+    remainingSubscriptionDays: number;
+    additionalGrossAmount: number;
+};
+export type RenewSubscriptionData = PickOnly<ISubscriptionEntity, "noOfPitches" | "netAmount" | "grossAmount" | "organizationId" | "pricingPlanId" | "registrationId" | "type" | "previousSubscriptionIds" | "amountPaid" | "discount"> & {
+    fromDate: Date;
+    toDate: Date;
+    basePrice: number;
+};

package/build/interface/ui/upgrade-subscription-data.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -7,4 +7,5 @@ export declare class BillingCycleModel implements IBillingCycleModel {
     key: string;
     constructor(data: IBillingCycleModel);
     getDiscount(): number;
+    getBillingCycle(date: Date): [Date, Date];
 }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BillingCycleModel = void 0;
+var date_util_1 = require("../utils/date-util");
 var BillingCycleModel = /** @class */ (function () {
     function BillingCycleModel(data) {
         this.from = data.from;
@@ -15,6 +16,12 @@ var BillingCycleModel = /** @class */ (function () {
         }
         return 0;
     };
+    BillingCycleModel.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 BillingCycleModel;
 }());
 exports.BillingCycleModel = BillingCycleModel;

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

@@ -1,5 +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";
 export declare class SubscriptionModel implements ISubscriptionModel {
     id: number;
     organizationId: number;
@@ -22,8 +26,15 @@ export declare class SubscriptionModel implements ISubscriptionModel {
     updatedBy: number;
     fromDateCode: string;
     toDateCode: string;
+    details?: ISubscriptionPitchMappingEntity[];
     constructor(data: ISubscriptionEntity);
+    static getInstanceByResponse(data: IGetCurrentSubscriptionResponse): SubscriptionModel;
+    getFromDate(): Date;
+    getToDate(): Date;
+    isRenewalDue(): boolean;
     remainingSubscriptionDays(): number;
+    upgradeSubscription(totalPitchCount: number, subscribedPricingModel: SubscribedPricingPlanModel): UpgradeSubscriptionData;
+    renewSubscription(totalPitchCount: number, billingCycle: string, currentPricingPlanModel: PricingPlanModel): RenewSubscriptionData;
     static updateStatus(subscriptionEntities: ISubscriptionEntity[], status: SubscriptionStatus, userId: number): ISubscriptionEntity[];
     remainingAmount(): number;
     isAmountFullyPaid(): boolean;

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

@@ -1,15 +1,118 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
+var subscribed_pricing_plan_model_1 = require("../subscribed-pricing-plan-model");
 var SubscriptionModel = /** @class */ (function () {
     function SubscriptionModel(data) {
         Object.assign(this, data);
     }
+    SubscriptionModel.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 SubscriptionModel(demo);
+    };
+    SubscriptionModel.prototype.getFromDate = function () {
+        return this.from;
+    };
+    SubscriptionModel.prototype.getToDate = function () {
+        return this.to;
+    };
+    SubscriptionModel.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);
+    };
     SubscriptionModel.prototype.remainingSubscriptionDays = function () {
-        var oneDay = 24 * 60 * 60 * 1000;
-        var dayDifference = Math.ceil((this.to.getTime() - new Date().getTime()) / oneDay);
-        return dayDifference - 1; //minus 1 day
+        // 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());
+    };
+    SubscriptionModel.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),
+        };
+    };
+    SubscriptionModel.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.SubscribedPricingPlanModel(currentPricingPlanModel, totalPitchCount, billingCycle);
+        var toDate = this.to;
+        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,
+            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(),
+        };
     };
     SubscriptionModel.updateStatus = function (subscriptionEntities, status, userId) {
         return subscriptionEntities.map(function (subscriptionEntity) {

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

@@ -21,4 +21,7 @@ export declare class PricingPlanModel implements IPricingPlanModel {
     getBillingCycleKeys(): string[];
     validateBillingCycleKey(billingCycleKey: string): void;
     getBillingCycleByDay(numberOfDay: number): BillingCycleModel | undefined;
+    getPitchSlabIndex(pitchCount: number): number;
+    formatPitchSlab(index: number): string;
+    getBillingCycleIndexByMonths(noOfMonths: number): number;
 }

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

@@ -62,6 +62,28 @@ var PricingPlanModel = /** @class */ (function () {
             }
         });
     };
+    PricingPlanModel.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;
+        });
+    };
+    PricingPlanModel.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);
+    };
+    PricingPlanModel.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 PricingPlanModel;
 }());
 exports.PricingPlanModel = PricingPlanModel;

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

@@ -1,5 +1,7 @@
+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";
 export declare class SubscribedPricingPlanModel extends PricingPlanModel {
@@ -23,4 +25,7 @@ export declare class SubscribedPricingPlanModel extends PricingPlanModel {
     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: IGetPricingPlanByDateResponse, subscriptionDataModel: SubscriptionModel): SubscribedPricingPlanModel;
+    getSelectedPitchSlabBasePrice(): number;
 }

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

@@ -16,6 +16,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubscribedPricingPlanModel = void 0;
+var date_util_1 = require("../utils/date-util");
 var pricing_plan_model_1 = require("./pricing-plan-model");
 var SubscribedPricingPlanModel = /** @class */ (function (_super) {
     __extends(SubscribedPricingPlanModel, _super);
@@ -83,6 +84,18 @@ var SubscribedPricingPlanModel = /** @class */ (function (_super) {
     SubscribedPricingPlanModel.prototype.getNetAmountByPitchDaysBasePrice = function (basePrice, pitchCount, days) {
         return Math.round(basePrice * (1 - this.getBillingDiscount() / 100) * pitchCount * days * 24);
     };
+    SubscribedPricingPlanModel.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];
+    };
+    SubscribedPricingPlanModel.getInstanceBySubscriptionData = function (data, subscriptionDataModel) {
+        return new SubscribedPricingPlanModel(data, subscriptionDataModel.noOfPitches, subscriptionDataModel.type);
+    };
+    SubscribedPricingPlanModel.prototype.getSelectedPitchSlabBasePrice = function () {
+        return this.selectedPitchSlabBasePrice;
+    };
     return SubscribedPricingPlanModel;
 }(pricing_plan_model_1.PricingPlanModel));
 exports.SubscribedPricingPlanModel = SubscribedPricingPlanModel;

package/build/utils/constant.d.ts

@@ -0,0 +1 @@
+export declare const SUBSCRIPTION_RENEWAL_THRESHOLD_DAYS = 7;

package/build/utils/constant.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SUBSCRIPTION_RENEWAL_THRESHOLD_DAYS = void 0;
+exports.SUBSCRIPTION_RENEWAL_THRESHOLD_DAYS = 7;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "turf-common",
-  "version": "1.1.1-beta.46",
+  "version": "1.1.1-beta.48",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",