gemcap-be-common 1.5.15 → 1.5.17

package/helpers/date.helper.d.ts

@@ -26,4 +26,4 @@ export declare const getShiftedMonth: (month: ISelectedMonth, shift: number) =>
     year: number;
     month: number;
 };
-export declare const isProductActive: (deactivationDate: Date | null | undefined, checkDate: Date) => boolean;
+export declare const isProductActive: (startDate: Date | null | undefined, deactivationDate: Date | null | undefined, checkDate: Date) => boolean;

package/helpers/date.helper.js

@@ -97,14 +97,18 @@ const getShiftedMonth = (month, shift) => {
     return { year: nextMonth.year(), month: nextMonth.month() + 1 };
 };
 exports.getShiftedMonth = getShiftedMonth;
-const isProductActive = (deactivationDate, checkDate) => {
-    // If no deactivation date → product is active
+const isProductActive = (startDate, deactivationDate, checkDate) => {
+    const check = (0, dayjs_1.default)(checkDate);
+    // If startDate exists and is in the future → not active yet
+    if (startDate && (0, dayjs_1.default)(startDate).isAfter(check)) {
+        return false;
+    }
+    // If no deactivation date → active (and already started)
     if (!deactivationDate) {
         return true;
     }
     const deactivation = (0, dayjs_1.default)(deactivationDate);
-    const check = (0, dayjs_1.default)(checkDate);
-    // Active if deactivation is on or after the check date
-    return !deactivation.isBefore(check);
+    // Active if checkDate is before deactivationDate
+    return check.isBefore(deactivation);
 };
 exports.isProductActive = isProductActive;

package/helpers/date.helper.ts

@@ -103,15 +103,25 @@ export const getShiftedMonth = (month: ISelectedMonth, shift: number) => {
   return { year: nextMonth.year(), month: nextMonth.month() + 1 };
 };
 
-export const isProductActive = (deactivationDate: Date | null | undefined, checkDate: Date) => {
-  // If no deactivation date → product is active
+export const isProductActive = (
+  startDate: Date | null | undefined,
+  deactivationDate: Date | null | undefined,
+  checkDate: Date
+) => {
+  const check = dayjs(checkDate);
+
+  // If startDate exists and is in the future → not active yet
+  if (startDate && dayjs(startDate).isAfter(check)) {
+    return false;
+  }
+
+  // If no deactivation date → active (and already started)
   if (!deactivationDate) {
     return true;
   }
 
   const deactivation = dayjs(deactivationDate);
-  const check = dayjs(checkDate);
 
-  // Active if deactivation is on or after the check date
-  return !deactivation.isBefore(check);
+  // Active if checkDate is before deactivationDate
+  return check.isBefore(deactivation);
 };

package/models/ReceivableAvailability.model.d.ts

@@ -206,9 +206,9 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         insuredComponent: number;
         preliminaryEligibleBalance: number;
         uninsuredComponent: number;
-        creditNotesNegative: number;
         insuredAvailability: number;
         uninsuredAvailability: number;
+        creditNotesNegative: number;
         ARAvailability: number;
     };
     userCalculatedId?: string;
@@ -218,15 +218,15 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
@@ -266,9 +266,9 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         insuredComponent: number;
         preliminaryEligibleBalance: number;
         uninsuredComponent: number;
-        creditNotesNegative: number;
         insuredAvailability: number;
         uninsuredAvailability: number;
+        creditNotesNegative: number;
         ARAvailability: number;
     };
     userCalculatedId?: string;
@@ -278,15 +278,15 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
@@ -326,9 +326,9 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         insuredComponent: number;
         preliminaryEligibleBalance: number;
         uninsuredComponent: number;
-        creditNotesNegative: number;
         insuredAvailability: number;
         uninsuredAvailability: number;
+        creditNotesNegative: number;
         ARAvailability: number;
     };
     userCalculatedId?: string;
@@ -338,15 +338,15 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;

package/models/_index.d.ts

@@ -32,9 +32,9 @@ export declare const allSchemas: {
         updatedAt: NativeDate;
     } & {
         order: number;
+        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -46,9 +46,9 @@ export declare const allSchemas: {
         updatedAt: NativeDate;
     } & {
         order: number;
+        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -60,9 +60,9 @@ export declare const allSchemas: {
         updatedAt: NativeDate;
     } & {
         order: number;
+        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.5.15",
+  "version": "1.5.17",
   "description": "",
   "main": "index.js",
   "scripts": {

package/services/borrower-summary.service.js

@@ -213,7 +213,7 @@ class BorrowerSummaryService {
     }
     async getChartData(borrowerId) {
         const products = await this.loanChargesService.getLoanProducts(borrowerId);
-        const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.deactivationDate, new Date()));
+        const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.startDate, product.deactivationDate, new Date()));
         const chartData = [];
         if (revolverProduct) {
             const lastSignedBBC = await (0, bbcDates_db_1.getLatestSignedBBCDateDoc)(borrowerId);

package/services/borrower-summary.service.ts

@@ -236,7 +236,7 @@ export class BorrowerSummaryService {
 
   private async getChartData(borrowerId: string) {
     const products = await this.loanChargesService.getLoanProducts(borrowerId);
-    const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.deactivationDate, new Date()));
+    const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.startDate, product.deactivationDate, new Date()));
     const chartData = [];
     if (revolverProduct) {
       const lastSignedBBC = await getLatestSignedBBCDateDoc(borrowerId);

package/services/borrowers.service.d.ts

@@ -84,10 +84,10 @@ export declare class BorrowerService {
     getBorrowerCodesMap(): Promise<Map<string, string>>;
     getBorrowerStatementDetails(borrowers: IBorrowerDoc[]): Promise<{
         [x: string]: {
+            SELECTED_PERIOD?: boolean;
+            ENTIRE_LOAN?: boolean;
             LAST_MONTH?: boolean;
             CURRENT_MONTH?: boolean;
-            ENTIRE_LOAN?: boolean;
-            SELECTED_PERIOD?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

package/services/brokers.service.d.ts

@@ -46,9 +46,9 @@ export declare class BrokersService {
     getAllProductBrokers(): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & Required<{
         _id: import("mongoose").Types.ObjectId;
     }>)[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & Required<{
+    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & Required<{
         _id: import("mongoose").Types.ObjectId;
-    }>)[] | BrokerView[]>;
+    }>)[]>;
     getProductBrokers(productId: string): Promise<import("../models/ProductBroker.model").IProductBrokerDocWithBroker[]>;
     getTotalShares(borrowerId: string, brokers: IProductBrokerView[], replaceNames?: boolean): Promise<ProductTotal>;
     getTotals(borrowerId: string): Promise<BrokerTotalView[]>;

package/services/loan-payments.service.js

@@ -440,7 +440,7 @@ class LoanPaymentsService {
             if (borrowerIds.includes(borrower._id.toString())) {
                 try {
                     const borrowerProducts = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-                    const revolverProduct = borrowerProducts.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.deactivationDate, selectedDate));
+                    const revolverProduct = borrowerProducts.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.startDate, product.deactivationDate, selectedDate));
                     const loanStatementService = this.getLoanStatementService();
                     const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
                     if (dueAmounts.total === 0) {

package/services/loan-payments.service.ts

@@ -491,7 +491,7 @@ export class LoanPaymentsService {
       if (borrowerIds.includes(borrower._id.toString())) {
         try {
           const borrowerProducts = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-          const revolverProduct = borrowerProducts.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.deactivationDate, selectedDate));
+          const revolverProduct = borrowerProducts.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.startDate, product.deactivationDate, selectedDate));
           const loanStatementService = this.getLoanStatementService();
           const dueAmounts = await loanStatementService.getBorrowerProductTotals(borrower._id.toString());
           if (dueAmounts.total === 0) {

package/services/loan-statement.service.js

@@ -179,7 +179,6 @@ class LoanStatementService {
         await loanStatementEffectsService.saveMonthData(productId, statementDate);
         const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
         const product = await this.loanChargesService.getLoanProductById(productId);
-        console.debug({ charges });
         // If product is already deactivated for this statement date (inclusive) — skip everything early
         if (product.deactivationDate && (0, dayjs_1.default)(statementDate).isSameOrAfter((0, dayjs_1.default)(product.deactivationDate))) {
             return;
@@ -189,7 +188,7 @@ class LoanStatementService {
         let orderIndex = 0;
         for (const charge of charges) {
             if (charge.applyFrom.getTime() > statementDate.getTime()) {
-                return;
+                continue;
             }
             const statementDateFormat = (0, dayjs_1.default)(statementDate).format('YYYY-MM-DD');
             let calculateFee = false;
@@ -293,9 +292,6 @@ class LoanStatementService {
                     return fee;
                 };
                 fee = checkMinAmount(fee);
-                if (loan_charge_type_enum_1.ELoanChargeType[charge.chargeType] === loan_charge_type_enum_1.ELoanChargeType.ADMIN_FEE) {
-                    console.debug({ charge, statementDate, fee, isAfter: (0, dayjs_1.default)(statementDate).isSameOrAfter((0, dayjs_1.default)(charge.applyFrom)) });
-                }
                 if (fee !== null && fee > 0) {
                     if ((0, dayjs_1.default)(statementDate).isSameOrAfter((0, dayjs_1.default)(charge.applyFrom))) {
                         const newStatement = {

package/services/loan-statement.service.ts

@@ -219,8 +219,6 @@ export class LoanStatementService {
     const charges = await this.loanChargesService.getLoanChargeForProduct(productId);
     const product = await this.loanChargesService.getLoanProductById(productId);
 
-    console.debug({ charges });
-
     // If product is already deactivated for this statement date (inclusive) — skip everything early
     if (product.deactivationDate && dayjs(statementDate).isSameOrAfter(dayjs(product.deactivationDate))) {
       return;
@@ -231,7 +229,7 @@ export class LoanStatementService {
     let orderIndex = 0;
     for (const charge of charges) {
       if (charge.applyFrom.getTime() > statementDate.getTime()) {
-        return;
+        continue;
       }
       const statementDateFormat = dayjs(statementDate).format('YYYY-MM-DD');
       let calculateFee = false;
@@ -341,10 +339,6 @@ export class LoanStatementService {
 
         fee = checkMinAmount(fee);
 
-        if (ELoanChargeType[charge.chargeType] === ELoanChargeType.ADMIN_FEE) {
-          console.debug({ charge, statementDate, fee, isAfter: dayjs(statementDate).isSameOrAfter(dayjs(charge.applyFrom)) });
-        }
-
         if (fee !== null && fee > 0) {
           if (dayjs(statementDate).isSameOrAfter(dayjs(charge.applyFrom))) {
             const newStatement: ILoanStatementTransaction = {

package/services/loan-transactions.service.js

@@ -677,7 +677,7 @@ class LoanTransactionsService {
             [loan_types_enum_1.ELoanTypes.REVOLVER]: 0,
         };
         await Promise.all(loanProducts
-            .filter((product) => (0, date_helper_1.isProductActive)(product.deactivationDate, bbcDate.bbcDate))
+            .filter((product) => (0, date_helper_1.isProductActive)(product.startDate, product.deactivationDate, bbcDate.bbcDate))
             .map(async (product) => {
             const lastTransaction = await this.getLastTransactionForDate(product._id.toString(), (0, dayjs_1.default)(bbcDate.bbcDate).utcOffset(0).endOf('day').toDate());
             if (lastTransaction) {

package/services/loan-transactions.service.ts

@@ -766,7 +766,7 @@ export class LoanTransactionsService {
       [ELoanTypes.REVOLVER]: 0,
     };
     await Promise.all(loanProducts
-      .filter((product) => isProductActive(product.deactivationDate, bbcDate.bbcDate))
+      .filter((product) => isProductActive(product.startDate, product.deactivationDate, bbcDate.bbcDate))
       .map(async (product) => {
       const lastTransaction = await this.getLastTransactionForDate(product._id.toString(), dayjs(bbcDate.bbcDate).utcOffset(0).endOf('day').toDate());
       if (lastTransaction) {

package/services/quickbooks.service.js

@@ -434,7 +434,7 @@ class QuickbooksService {
                 };
                 if (settlementCode === 'null') {
                     const products = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-                    const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.deactivationDate, reportDate));
+                    const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.startDate, product.deactivationDate, reportDate));
                     if (revolverProduct) {
                         settlementCode = revolverProduct.code;
                     }

package/services/quickbooks.service.ts

@@ -506,7 +506,7 @@ export class QuickbooksService {
 
         if (settlementCode === 'null') {
           const products = await this.loanChargesService.getLoanProducts(borrower._id.toString());
-          const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.deactivationDate, reportDate));
+          const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.startDate, product.deactivationDate, reportDate));
           if (revolverProduct) {
             settlementCode = revolverProduct.code;
           }

package/services/reports.service.js

@@ -231,7 +231,7 @@ class ReportsService {
             if (!borrower) {
                 return;
             }
-            const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.deactivationDate, date));
+            const revolverProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.REVOLVER && (0, date_helper_1.isProductActive)(product.startDate, product.deactivationDate, date));
             const termProduct = products.find((product) => product.type === loan_types_enum_1.ELoanTypes.TERM);
             let revolverDataGroup = null;
             if (revolverProduct) {

package/services/reports.service.ts

@@ -314,7 +314,7 @@ export class ReportsService {
       if (!borrower) {
         return;
       }
-      const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.deactivationDate, date));
+      const revolverProduct = products.find((product) => product.type === ELoanTypes.REVOLVER && isProductActive(product.startDate, product.deactivationDate, date));
       const termProduct = products.find((product) => product.type === ELoanTypes.TERM);
 
       let revolverDataGroup: ISummaryReportDataGroup = null;