gemcap-be-common 1.4.201 → 1.4.204

package/models/LoanTransaction.model.d.ts

@@ -28,7 +28,8 @@ import { IBankDoc } from './Banks.model';
 export declare enum ELoanTransactionTypes {
     COLLECTION = "COLLECTION",
     DISBURSEMENT = "DISBURSEMENT",
-    ADJUSTMENT = "ADJUSTMENT"
+    ADJUSTMENT = "ADJUSTMENT",
+    CHARGE = "CHARGE"
 }
 export declare const LOAN_TRANSACTION_DOWNLOAD_FIELDS: string[];
 export declare const LOAN_TRANSACTION_FIELDS: string[];
@@ -47,6 +48,7 @@ export interface ILoanTransaction {
     date: Date;
     effectiveDate: Date;
     productId: mongoose.Types.ObjectId;
+    chargeId?: mongoose.Types.ObjectId;
     amount: number;
     description: string;
     reference: string;
@@ -79,11 +81,12 @@ export interface ILoanTransactionLean extends ILoanTransaction {
     createdAt: Date;
     updatedAt: Date;
 }
-export interface ILoanTransactionPlain extends Omit<ILoanTransaction, 'productId' | 'bankId' | 'loanPaymentId'> {
+export interface ILoanTransactionPlain extends Omit<ILoanTransaction, 'productId' | 'bankId' | 'loanPaymentId' | 'chargeId'> {
     _id: string;
     productId: string;
     bankId: string;
     loanPaymentId: string;
+    chargeId: string;
 }
 export type TLoanTransactionModel = mongoose.Model<ILoanTransaction>;
 export interface ILoanTransactionModel extends mongoose.Model<ILoanTransaction> {

package/models/LoanTransaction.model.js

@@ -14,6 +14,7 @@ var ELoanTransactionTypes;
     ELoanTransactionTypes["COLLECTION"] = "COLLECTION";
     ELoanTransactionTypes["DISBURSEMENT"] = "DISBURSEMENT";
     ELoanTransactionTypes["ADJUSTMENT"] = "ADJUSTMENT";
+    ELoanTransactionTypes["CHARGE"] = "CHARGE";
 })(ELoanTransactionTypes || (exports.ELoanTransactionTypes = ELoanTransactionTypes = {}));
 exports.LOAN_TRANSACTION_DOWNLOAD_FIELDS = [
     'date',
@@ -28,6 +29,7 @@ exports.LOAN_TRANSACTION_FIELDS = [
     'date',
     'effectiveDate',
     'productId',
+    'chargeId',
     'amount',
     'description',
     'reference',
@@ -62,6 +64,11 @@ exports.LoanTransactionSchema = new mongoose_1.default.Schema({
         ref: _models_1.MODEL_NAMES.loanProducts,
         required: true,
     },
+    chargeId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: _models_1.MODEL_NAMES.loanCharges,
+        required: false,
+    },
     amount: {
         type: Number,
         required: true,

package/models/LoanTransaction.model.ts

@@ -10,7 +10,8 @@ import { createLog, getLogChanges } from '../db/user-logs.db';
 export enum ELoanTransactionTypes {
   COLLECTION = 'COLLECTION',
   DISBURSEMENT = 'DISBURSEMENT',
-  ADJUSTMENT = 'ADJUSTMENT'
+  ADJUSTMENT = 'ADJUSTMENT',
+  CHARGE = 'CHARGE',
 }
 
 export const LOAN_TRANSACTION_DOWNLOAD_FIELDS = [
@@ -27,6 +28,7 @@ export const LOAN_TRANSACTION_FIELDS = [
   'date',
   'effectiveDate',
   'productId',
+  'chargeId',
   'amount',
   'description',
   'reference',
@@ -55,6 +57,7 @@ export interface ILoanTransaction {
   date: Date;
   effectiveDate: Date,
   productId: mongoose.Types.ObjectId;
+  chargeId?: mongoose.Types.ObjectId;
   amount: number;
   description: string;
   reference: string;
@@ -92,11 +95,12 @@ export interface ILoanTransactionLean extends ILoanTransaction {
   updatedAt: Date;
 }
 
-export interface ILoanTransactionPlain extends Omit<ILoanTransaction, 'productId' | 'bankId' | 'loanPaymentId'> {
+export interface ILoanTransactionPlain extends Omit<ILoanTransaction, 'productId' | 'bankId' | 'loanPaymentId' | 'chargeId'> {
   _id: string;
   productId: string;
   bankId: string;
   loanPaymentId: string;
+  chargeId: string;
 }
 
 export type TLoanTransactionModel = mongoose.Model<ILoanTransaction>;
@@ -138,6 +142,11 @@ export const LoanTransactionSchema = new mongoose.Schema<ILoanTransactionDoc, IL
       ref: MODEL_NAMES.loanProducts,
       required: true,
     },
+    chargeId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: MODEL_NAMES.loanCharges,
+      required: false,
+    },
     amount: {
       type: Number,
       required: true,

package/models/_index.d.ts

@@ -31,10 +31,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
+        amount: number;
         order: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -45,10 +45,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
+        amount: number;
         order: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -59,10 +59,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
+        amount: number;
         order: 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.4.201",
+  "version": "1.4.204",
   "description": "",
   "main": "index.js",
   "scripts": {

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-transactions.service.js

@@ -452,17 +452,15 @@ class LoanTransactionsService {
             for (const transaction of recalculatedTransactions) {
                 const totalPostponed = await (0, loan_products_db_1.getPostponedTransactions)(transaction.date, transaction.productId.toString(), true);
                 switch (transaction.transactionType) {
-                    case LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION:
+                    case LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION: {
                         await this.postponedTransactionsService.cleanRecalculated(transaction._id.toString());
                         await this.postponedTransactionsService.createPostponedTransaction(transaction);
                         currentFloatedBalance = new decimal_js_1.default(currentFloatedBalance).add(totalPostponed).toNumber();
                         break;
-                    case LoanTransaction_model_1.ELoanTransactionTypes.DISBURSEMENT:
-                        currentFloatedBalance = new decimal_js_1.default(currentFloatedBalance).add(transaction.amount).add(totalPostponed).toNumber();
-                        break;
-                    case LoanTransaction_model_1.ELoanTransactionTypes.ADJUSTMENT:
+                    }
+                    default: {
                         currentFloatedBalance = new decimal_js_1.default(currentFloatedBalance).add(transaction.amount).add(totalPostponed).toNumber();
-                        break;
+                    }
                 }
                 await LoanTransaction_model_1.LoanTransaction.findByIdAndUpdate(transaction._id, { floatedBalance: currentFloatedBalance });
             }
@@ -527,15 +525,15 @@ class LoanTransactionsService {
             // floatedBalance recalculation
             const totalPostponed = await (0, loan_products_db_1.getPostponedTransactions)(tr.date, tr.productId.toString(), true);
             switch (tr.transactionType) {
-                case LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION:
+                case LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION: {
                     await this.postponedTransactionsService.cleanRecalculated(tr._id.toString());
                     await this.postponedTransactionsService.createPostponedTransaction(tr);
                     floatedBalance = new decimal_js_1.default(floatedBalance).add(totalPostponed).toNumber();
                     break;
-                case LoanTransaction_model_1.ELoanTransactionTypes.DISBURSEMENT:
-                case LoanTransaction_model_1.ELoanTransactionTypes.ADJUSTMENT:
+                }
+                default: {
                     floatedBalance = new decimal_js_1.default(floatedBalance).add(tr.amount).add(totalPostponed).toNumber();
-                    break;
+                }
             }
             await LoanTransaction_model_1.LoanTransaction.updateOne({ _id: tr._id }, { balance, floatedBalance });
         }

package/services/loan-transactions.service.ts

@@ -515,17 +515,15 @@ export class LoanTransactionsService {
       for (const transaction of recalculatedTransactions) {
         const totalPostponed = await getPostponedTransactions(transaction.date, transaction.productId.toString(), true);
         switch (transaction.transactionType) {
-          case ELoanTransactionTypes.COLLECTION:
+          case ELoanTransactionTypes.COLLECTION: {
             await this.postponedTransactionsService.cleanRecalculated(transaction._id.toString());
             await this.postponedTransactionsService.createPostponedTransaction(transaction);
             currentFloatedBalance = new Decimal(currentFloatedBalance).add(totalPostponed).toNumber();
             break;
-          case ELoanTransactionTypes.DISBURSEMENT:
-            currentFloatedBalance = new Decimal(currentFloatedBalance).add(transaction.amount).add(totalPostponed).toNumber();
-            break;
-          case ELoanTransactionTypes.ADJUSTMENT:
+          }
+          default: {
             currentFloatedBalance = new Decimal(currentFloatedBalance).add(transaction.amount).add(totalPostponed).toNumber();
-            break;
+          }
         }
         await LoanTransaction.findByIdAndUpdate(transaction._id, { floatedBalance: currentFloatedBalance });
       }
@@ -601,15 +599,15 @@ export class LoanTransactionsService {
       // floatedBalance recalculation
       const totalPostponed = await getPostponedTransactions(tr.date, tr.productId.toString(), true);
       switch (tr.transactionType) {
-        case ELoanTransactionTypes.COLLECTION:
+        case ELoanTransactionTypes.COLLECTION: {
           await this.postponedTransactionsService.cleanRecalculated(tr._id.toString());
           await this.postponedTransactionsService.createPostponedTransaction(tr);
           floatedBalance = new Decimal(floatedBalance).add(totalPostponed).toNumber();
           break;
-        case ELoanTransactionTypes.DISBURSEMENT:
-        case ELoanTransactionTypes.ADJUSTMENT:
+        }
+        default: {
           floatedBalance = new Decimal(floatedBalance).add(tr.amount).add(totalPostponed).toNumber();
-          break;
+        }
       }
 
       await LoanTransaction.updateOne(