gemcap-be-common 1.4.117 → 1.4.119

package/models/Banks.model.d.ts

@@ -22,7 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Document } from 'mongoose';
+import mongoose, { Document, Model } from 'mongoose';
 export interface IBank {
     isDeleted?: boolean;
     active: boolean;
@@ -36,56 +36,27 @@ export interface IBank {
 export interface IBankWithId extends IBank {
     _id: mongoose.Types.ObjectId;
 }
-export type IBankView = Omit<IBankWithId, 'order'>;
 export interface IBankDoc extends IBank, Document {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
 }
-export declare const BankSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
-    timestamps: true;
-}, {
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
-    name: string;
-    order: number;
-    isDeleted: boolean;
-    active: boolean;
-    bankAccountNumber: string;
-    ledgerAccountCodes: Map<string, {
-        type?: mongoose.Types.ObjectId;
-        ref?: unknown;
-    }>;
-    __v?: number;
-}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
-    name: string;
-    order: number;
-    isDeleted: boolean;
-    active: boolean;
-    bankAccountNumber: string;
-    ledgerAccountCodes: Map<string, {
-        type?: mongoose.Types.ObjectId;
-        ref?: unknown;
-    }>;
-    __v?: number;
-}>> & mongoose.FlatRecord<{
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
-    name: string;
-    order: number;
-    isDeleted: boolean;
-    active: boolean;
-    bankAccountNumber: string;
-    ledgerAccountCodes: Map<string, {
-        type?: mongoose.Types.ObjectId;
-        ref?: unknown;
-    }>;
-    __v?: number;
-}> & {
+export interface IBankLean extends IBank {
     _id: mongoose.Types.ObjectId;
-}>;
-export declare const Bank: mongoose.Model<IBankDoc, {}, {}, {}, mongoose.Document<unknown, {}, IBankDoc> & IBankDoc & {
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IBankPlain extends Omit<IBank, 'ledgerAccountCodes'> {
+    _id: string;
+    createdAt: Date;
+    updatedAt: Date;
+    ledgerAccountCodes: {
+        [companyId: string]: string;
+    };
+}
+export type IBankView = Omit<IBankWithId, 'order'>;
+export type IBankModel = Model<IBank>;
+export declare const BankSchema: mongoose.Schema<IBank, IBankModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, IBank, mongoose.Document<unknown, {}, mongoose.FlatRecord<IBank>> & mongoose.FlatRecord<IBank> & {
     _id: mongoose.Types.ObjectId;
-}, any>;
+}>;
+export declare const Bank: IBankModel;

package/models/Banks.model.js

@@ -36,9 +36,5 @@ exports.BankSchema = new mongoose_1.default.Schema({
         of: { type: mongoose_1.default.Schema.Types.ObjectId, ref: _models_1.MODEL_NAMES.quickbooksAccounts },
         default: {},
     },
-    __v: {
-        type: Number,
-        select: false
-    },
 }, { timestamps: true });
 exports.Bank = mongoose_1.default.model(_models_1.MODEL_NAMES.banks, exports.BankSchema);

package/models/Banks.model.ts

@@ -1,4 +1,4 @@
-import mongoose, { Document } from 'mongoose';
+import mongoose, { Document, Model } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 
@@ -17,12 +17,32 @@ export interface IBankWithId extends IBank {
   _id: mongoose.Types.ObjectId;
 }
 
-export type IBankView = Omit<IBankWithId, 'order'>
-
 export interface IBankDoc extends IBank, Document {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IBankLean extends IBank {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
 }
 
-export const BankSchema = new mongoose.Schema(
+export interface IBankPlain extends Omit<IBank, 'ledgerAccountCodes'> {
+  _id: string;
+  createdAt: Date;
+  updatedAt: Date;
+  ledgerAccountCodes: {
+    [companyId: string]: string;
+  };
+}
+
+export type IBankView = Omit<IBankWithId, 'order'>
+
+export type IBankModel = Model<IBank>;
+
+export const BankSchema = new mongoose.Schema<IBank, IBankModel>(
   {
     isDeleted: {
       type: Boolean,
@@ -53,12 +73,8 @@ export const BankSchema = new mongoose.Schema(
       of: { type: mongoose.Schema.Types.ObjectId, ref: MODEL_NAMES.quickbooksAccounts },
       default: {},
     },
-    __v: {
-      type: Number,
-      select: false
-    },
   },
   { timestamps: true },
 );
 
-export const Bank = mongoose.model<IBankDoc>(MODEL_NAMES.banks, BankSchema);
+export const Bank = mongoose.model<IBank, IBankModel>(MODEL_NAMES.banks, BankSchema);

package/package.json

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

package/services/banks.service.d.ts

@@ -28,7 +28,7 @@ export declare class BanksService {
     getBanks(): Promise<IBankView[]>;
     createBank(bank: IBankView): Promise<void>;
     editBank(bank: IBankView): Promise<void>;
-    findBankByNumber(bankAccountNumber: string): Promise<import("mongoose").FlattenMaps<import("../models/Banks.model").IBankDoc> & {
+    findBankByNumber(bankAccountNumber: string): Promise<import("mongoose").FlattenMaps<import("../models/Banks.model").IBank> & {
         _id: import("mongoose").Types.ObjectId;
     }>;
     findBankByAccountCode(accountCode: string): Promise<IBankWithId>;

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]: {
-            LAST_MONTH?: boolean;
-            CURRENT_MONTH?: boolean;
             ENTIRE_LOAN?: boolean;
             SELECTED_PERIOD?: boolean;
+            CURRENT_MONTH?: boolean;
+            LAST_MONTH?: 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> & {
         _id: import("mongoose").Types.ObjectId;
     })[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
+    getBorrowerBrokers(borrowerId: string): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _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-statement.service.js

@@ -776,7 +776,9 @@ class LoanStatementService {
         const results = await Promise.all(borrowerIds.map(async (borrowerId) => {
             const borrower = await Borrower_model_1.BorrowerModel.findById(borrowerId).lean();
             const products = await this.loanChargesService.getLoanProducts(borrowerId);
-            return await Promise.all(products.map(async (product) => {
+            return await Promise.all(products
+                .filter(product => !(0, dayjs_1.default)(product.deactivationDate).isBefore((0, dayjs_1.default)(selectedDate)))
+                .map(async (product) => {
                 if ((0, dayjs_1.default)(product.deactivationDate).isBefore((0, dayjs_1.default)(selectedDate))) {
                     return null;
                 }
@@ -855,9 +857,8 @@ class LoanStatementService {
             }));
         }));
         return results
-            .filter((res) => !!res)
-            .reduce((acc, res) => ([...acc, ...res]), [])
-            .sort((a, b) => (b.code.toUpperCase() < a.code.toUpperCase() ? 1 : -1));
+            .flat()
+            .sort((a, b) => a.code.toUpperCase().localeCompare(b.code.toUpperCase()));
     }
     async getOutstandingStatementsExcel(borrowerIds, selectedDate, fullMonth) {
         const results = await this.getOutstandingStatements(borrowerIds, selectedDate, fullMonth);

package/services/loan-statement.service.ts

@@ -831,7 +831,7 @@ export class LoanStatementService {
           }
           case ELoanTypes.TERM: {
             data.termBalance = lastTransaction.balance ?? 0;
-            break
+            break;
           }
         }
       }
@@ -870,92 +870,93 @@ export class LoanStatementService {
     const results = await Promise.all(borrowerIds.map(async (borrowerId) => {
       const borrower = await BorrowerModel.findById(borrowerId).lean();
       const products = await this.loanChargesService.getLoanProducts(borrowerId);
-      return await Promise.all(products.map(async (product) => {
-        if (dayjs(product.deactivationDate).isBefore(dayjs(selectedDate))) {
-          return null;
-        }
-        const relevantStatementEndMonth = fullMonth
-          ? dayjs(selectedDate).utcOffset(0).startOf('month').subtract(1, 'seconds')
-          : dayjs(selectedDate).utcOffset(0).endOf('month');
-        const relevantStatementEnd = fullMonth
-          ? dayjs(selectedDate).utcOffset(0).startOf('month').subtract(1, 'seconds')
-          : dayjs(selectedDate).utcOffset(0).endOf('day');
-        const relevantStatementStart = dayjs(selectedDate).utcOffset(0).startOf('month').subtract(1, 'seconds').startOf('month');
-
-        const paymentFilterEnd = dayjs(selectedDate).utcOffset(0).endOf('day');
-        const paymentFilterStart = relevantStatementStart;
-
-        const lastTransaction = await this.loanTransactionsService.getLastTransactionForDate(product._id.toString(), dayjs(selectedDate).endOf('day').toDate());
-        let actualBalance = 0;
-        if (lastTransaction) {
-          actualBalance = new Decimal(lastTransaction.balance).toDP(2).toNumber();
-        }
+      return await Promise.all(products
+        .filter(product => !dayjs(product.deactivationDate).isBefore(dayjs(selectedDate)))
+        .map(async (product) => {
+          if (dayjs(product.deactivationDate).isBefore(dayjs(selectedDate))) {
+            return null;
+          }
+          const relevantStatementEndMonth = fullMonth
+            ? dayjs(selectedDate).utcOffset(0).startOf('month').subtract(1, 'seconds')
+            : dayjs(selectedDate).utcOffset(0).endOf('month');
+          const relevantStatementEnd = fullMonth
+            ? dayjs(selectedDate).utcOffset(0).startOf('month').subtract(1, 'seconds')
+            : dayjs(selectedDate).utcOffset(0).endOf('day');
+          const relevantStatementStart = dayjs(selectedDate).utcOffset(0).startOf('month').subtract(1, 'seconds').startOf('month');
+
+          const paymentFilterEnd = dayjs(selectedDate).utcOffset(0).endOf('day');
+          const paymentFilterStart = relevantStatementStart;
+
+          const lastTransaction = await this.loanTransactionsService.getLastTransactionForDate(product._id.toString(), dayjs(selectedDate).endOf('day').toDate());
+          let actualBalance = 0;
+          if (lastTransaction) {
+            actualBalance = new Decimal(lastTransaction.balance).toDP(2).toNumber();
+          }
 
-        const statementFilter = {
-          productIds: [product._id.toString()],
-          start: relevantStatementStart.toDate(),
-          end: relevantStatementEnd.toDate(),
-        };
-        const paymentFilter = {
-          productIds: [product._id.toString()],
-          start: paymentFilterStart.toDate(),
-          end: paymentFilterEnd.toDate(),
-        };
-        const statementTransactions = await this.loanChargesService.getLoanStatementsForForProductWithCharges(statementFilter);
-        const statementPayments = await this.loanPaymentsService.getLoanPayments(paymentFilter, null);
-        const paidStatementIds = statementPayments.reduce((acc, s) => [...acc, ...s.paid.map((p) => p.statementId.toString())], []);
-        const fees = {
-          [ELoanChargeType.INTEREST_FEE]: 0,
-          [ELoanChargeType.ADMIN_FEE]: 0,
-          [ELoanChargeType.UNUSED_LINE_FEE]: 0,
-          [ELoanChargeType.WIRE_FEE]: 0,
-          [ELoanChargeType.OTHER]: 0,
-          [ELoanChargeType.RECOVERABLE]: 0,
-          [ELoanChargeType.ANNUAL_LINE_FEE]: 0,
-        };
-        const sumResults = statementTransactions.reduce((acc, t) => {
-          const amountPaid = paidStatementIds.includes(t._id.toString()) ? t.amountPaid : 0;
-          return {
-            ...acc,
-            [t.charge.chargeType]: new Decimal(acc[t.charge.chargeType] ?? 0).add(t.amount ?? 0).sub(amountPaid ?? 0).toNumber(),
+          const statementFilter = {
+            productIds: [product._id.toString()],
+            start: relevantStatementStart.toDate(),
+            end: relevantStatementEnd.toDate(),
           };
-        }, fees);
-
-        let principal = 0;
-        let principalExpectedDate = null;
-        if (product.type === ELoanTypes.TERM) {
-          const termLoan = await TermLoanModel.findOne({ productId: product._id.toString(), actual: true });
-          if (termLoan) {
-            const calculatedTermLoan = await TermLoanCalculatedModel.findOne({
-              termLoanId: termLoan._id.toString(),
-              relevantStatement: relevantStatementEndMonth.format('YYYY-MM-DD'),
-            });
-            if (calculatedTermLoan) {
-              if (calculatedTermLoan.payments && calculatedTermLoan.payments.length > 0) {
-                const totalPayment = calculatedTermLoan.payments.reduce((acc, p) => new Decimal(acc ?? 0).add(p.amount ?? 0).toNumber(), 0);
-                principal = new Decimal(calculatedTermLoan.monthlyPrincipal).sub(totalPayment).toDP(2).toNumber();
-              } else {
-                principal = calculatedTermLoan.monthlyPrincipal;
-                principalExpectedDate = calculatedTermLoan.paymentDueDate;
+          const paymentFilter = {
+            productIds: [product._id.toString()],
+            start: paymentFilterStart.toDate(),
+            end: paymentFilterEnd.toDate(),
+          };
+          const statementTransactions = await this.loanChargesService.getLoanStatementsForForProductWithCharges(statementFilter);
+          const statementPayments = await this.loanPaymentsService.getLoanPayments(paymentFilter, null);
+          const paidStatementIds = statementPayments.reduce((acc, s) => [...acc, ...s.paid.map((p) => p.statementId.toString())], []);
+          const fees = {
+            [ELoanChargeType.INTEREST_FEE]: 0,
+            [ELoanChargeType.ADMIN_FEE]: 0,
+            [ELoanChargeType.UNUSED_LINE_FEE]: 0,
+            [ELoanChargeType.WIRE_FEE]: 0,
+            [ELoanChargeType.OTHER]: 0,
+            [ELoanChargeType.RECOVERABLE]: 0,
+            [ELoanChargeType.ANNUAL_LINE_FEE]: 0,
+          };
+          const sumResults = statementTransactions.reduce((acc, t) => {
+            const amountPaid = paidStatementIds.includes(t._id.toString()) ? t.amountPaid : 0;
+            return {
+              ...acc,
+              [t.charge.chargeType]: new Decimal(acc[t.charge.chargeType] ?? 0).add(t.amount ?? 0).sub(amountPaid ?? 0).toNumber(),
+            };
+          }, fees);
+
+          let principal = 0;
+          let principalExpectedDate = null;
+          if (product.type === ELoanTypes.TERM) {
+            const termLoan = await TermLoanModel.findOne({ productId: product._id.toString(), actual: true });
+            if (termLoan) {
+              const calculatedTermLoan = await TermLoanCalculatedModel.findOne({
+                termLoanId: termLoan._id.toString(),
+                relevantStatement: relevantStatementEndMonth.format('YYYY-MM-DD'),
+              });
+              if (calculatedTermLoan) {
+                if (calculatedTermLoan.payments && calculatedTermLoan.payments.length > 0) {
+                  const totalPayment = calculatedTermLoan.payments.reduce((acc, p) => new Decimal(acc ?? 0).add(p.amount ?? 0).toNumber(), 0);
+                  principal = new Decimal(calculatedTermLoan.monthlyPrincipal).sub(totalPayment).toDP(2).toNumber();
+                } else {
+                  principal = calculatedTermLoan.monthlyPrincipal;
+                  principalExpectedDate = calculatedTermLoan.paymentDueDate;
+                }
               }
             }
           }
-        }
 
-        return {
-          borrowerCode: borrower.code,
-          ...product,
-          actualBalance,
-          ...sumResults,
-          principal,
-          principalExpectedDate,
-        };
-      }));
+          return {
+            borrowerCode: borrower.code,
+            ...product,
+            actualBalance,
+            ...sumResults,
+            principal,
+            principalExpectedDate,
+          };
+        }));
     }));
     return results
-      .filter((res) => !!res)
-      .reduce((acc, res) => ([...acc, ...res]), [])
-      .sort((a, b) => (b.code.toUpperCase() < a.code.toUpperCase() ? 1 : -1));
+      .flat()
+      .sort((a, b) => a.code.toUpperCase().localeCompare(b.code.toUpperCase()));
   }
 
   async getOutstandingStatementsExcel(borrowerIds: string[], selectedDate: Date, fullMonth: boolean) {