gemcap-be-common 1.4.198 → 1.4.200

package/helpers/excel.helper.js

@@ -96,7 +96,7 @@ const checkData = (dataToConvert) => {
                     if (cell.v === null) {
                         console.warn(`❌ cell.t === 'n' but v === null at ${pos}:`, cell);
                     }
-                    else if (typeof cell.v !== 'number') {
+                    else if (cell.v !== undefined && typeof cell.v !== 'number') {
                         console.warn(`❌ cell.t === 'n' but v is not a number at ${pos}:`, cell);
                     }
                 }
@@ -115,6 +115,9 @@ const checkData = (dataToConvert) => {
                 if (cell.v === null && cell.z) {
                     console.warn(`❌ Null value with format (z) at ${pos}:`, cell);
                 }
+                if (cell.v === undefined && cell.z && cell.t === 'n') {
+                    // allowed: empty numeric cell with format
+                }
             });
         });
     }

package/helpers/excel.helper.ts

@@ -91,7 +91,7 @@ const checkData = (dataToConvert: { [sheetName: string]: IExcelDataCellWithStyle
         if (cell.t === 'n') {
           if (cell.v === null) {
             console.warn(`❌ cell.t === 'n' but v === null at ${pos}:`, cell);
-          } else if (typeof cell.v !== 'number') {
+          } else if (cell.v !== undefined && typeof cell.v !== 'number') {
             console.warn(`❌ cell.t === 'n' but v is not a number at ${pos}:`, cell);
           }
         }
@@ -115,6 +115,10 @@ const checkData = (dataToConvert: { [sheetName: string]: IExcelDataCellWithStyle
         if (cell.v === null && cell.z) {
           console.warn(`❌ Null value with format (z) at ${pos}:`, cell);
         }
+
+        if (cell.v === undefined && cell.z && cell.t === 'n') {
+          // allowed: empty numeric cell with format
+        }
       });
     });
   }

package/models/CashAllocationReference.model.d.ts

@@ -24,17 +24,36 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Model } from 'mongoose';
 export interface ICashAllocationReference {
-    _id?: mongoose.Types.ObjectId;
+    uiId: string;
     order: number;
     reference: string;
     cashAllocationProductId: mongoose.Types.ObjectId;
 }
+export interface ICashAllocationReferenceDoc extends ICashAllocationReference, Document {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface ICashAllocationReferenceLean extends ICashAllocationReference {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface ICashAllocationReferencePlain extends Omit<ICashAllocationReference, 'cashAllocationProductId'> {
+    _id: string;
+    cashAllocationProductId: string;
+    createdAt: Date;
+    updatedAt: Date;
+}
 export type ICashAllocationReferenceStringified = {
     [K in keyof ICashAllocationReference]: K extends '_id' | 'cashAllocationProductId' ? string : ICashAllocationReference[K];
 };
-type CashAllocationReferenceModel = Model<ICashAllocationReference>;
-export declare const CashAllocationReferenceSchema: mongoose.Schema<ICashAllocationReference, CashAllocationReferenceModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, ICashAllocationReference, mongoose.Document<unknown, {}, mongoose.FlatRecord<ICashAllocationReference>> & mongoose.FlatRecord<ICashAllocationReference> & Required<{
+export type CashAllocationReferenceModel = Model<ICashAllocationReference>;
+export declare const CashAllocationReferenceSchema: mongoose.Schema<ICashAllocationReferenceDoc, mongoose.Model<ICashAllocationReferenceDoc, any, any, any, mongoose.Document<unknown, any, ICashAllocationReferenceDoc> & ICashAllocationReferenceDoc & Required<{
+    _id: mongoose.Types.ObjectId;
+}>, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, ICashAllocationReferenceDoc, mongoose.Document<unknown, {}, mongoose.FlatRecord<ICashAllocationReferenceDoc>> & mongoose.FlatRecord<ICashAllocationReferenceDoc> & Required<{
     _id: mongoose.Types.ObjectId;
 }>>;
-export declare const CashAllocationReference: CashAllocationReferenceModel;
-export {};
+export declare const CashAllocationReference: mongoose.Model<ICashAllocationReferenceDoc, {}, {}, {}, mongoose.Document<unknown, {}, ICashAllocationReferenceDoc> & ICashAllocationReferenceDoc & Required<{
+    _id: mongoose.Types.ObjectId;
+}>, any>;

package/models/CashAllocationReference.model.js

@@ -7,6 +7,10 @@ exports.CashAllocationReference = exports.CashAllocationReferenceSchema = void 0
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
 exports.CashAllocationReferenceSchema = new mongoose_1.default.Schema({
+    uiId: {
+        type: String,
+        required: true,
+    },
     order: {
         type: Number,
         required: true,

package/models/CashAllocationReference.model.ts

@@ -3,20 +3,43 @@ import mongoose, { Model } from 'mongoose';
 import { MODEL_NAMES } from './_models';
 
 export interface ICashAllocationReference {
-  _id?: mongoose.Types.ObjectId;
+  uiId: string;
   order: number;
   reference: string;
   cashAllocationProductId: mongoose.Types.ObjectId;
 }
 
+export interface ICashAllocationReferenceDoc extends ICashAllocationReference, Document {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface ICashAllocationReferenceLean extends ICashAllocationReference {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface ICashAllocationReferencePlain extends Omit<ICashAllocationReference, 'cashAllocationProductId'> {
+  _id: string;
+  cashAllocationProductId: string;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
 export type ICashAllocationReferenceStringified = {
   [K in keyof ICashAllocationReference]: K extends '_id' | 'cashAllocationProductId' ? string : ICashAllocationReference[K];
 };
 
-type CashAllocationReferenceModel = Model<ICashAllocationReference>;
+export type CashAllocationReferenceModel = Model<ICashAllocationReference>;
 
-export const CashAllocationReferenceSchema = new mongoose.Schema<ICashAllocationReference, CashAllocationReferenceModel>(
+export const CashAllocationReferenceSchema = new mongoose.Schema<ICashAllocationReferenceDoc>(
   {
+    uiId: {
+      type: String,
+      required: true,
+    },
     order: {
       type: Number,
       required: true,
@@ -37,4 +60,4 @@ export const CashAllocationReferenceSchema = new mongoose.Schema<ICashAllocation
   },
 );
 
-export const CashAllocationReference = mongoose.model<ICashAllocationReference, CashAllocationReferenceModel>(MODEL_NAMES.cashAllocationReferences, CashAllocationReferenceSchema);
+export const CashAllocationReference = mongoose.model<ICashAllocationReferenceDoc>(MODEL_NAMES.cashAllocationReferences, CashAllocationReferenceSchema);

package/models/_index.d.ts

@@ -31,8 +31,8 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
         amount: number;
         __v?: number;
@@ -45,8 +45,8 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
         amount: number;
         __v?: number;
@@ -59,8 +59,8 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
         amount: number;
         __v?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.4.198",
+  "version": "1.4.200",
   "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]: {
-            SELECTED_PERIOD?: boolean;
-            ENTIRE_LOAN?: boolean;
             LAST_MONTH?: boolean;
             CURRENT_MONTH?: boolean;
+            ENTIRE_LOAN?: boolean;
+            SELECTED_PERIOD?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

package/services/cash-allocation.service.d.ts

@@ -24,17 +24,17 @@
 /// <reference types="mongoose" />
 /// <reference types="mongoose/types/inferschematype" />
 import { IUploadedBankTransaction } from '../models/UploadedBankTransaction.model';
-import { ICashAllocationReference, ICashAllocationReferenceStringified } from '../models/CashAllocationReference.model';
+import { ICashAllocationReferenceDoc, ICashAllocationReferencePlain } from '../models/CashAllocationReference.model';
 import { ICashAllocationProduct, ICashAllocationProductStringified } from '../models/CashAllocationProduct.model';
 export declare class CashAllocationService {
     createCashAllocation(transactions: IUploadedBankTransaction[]): Promise<void>;
     getNextOrder(): Promise<number>;
-    getCashAllocationsByReferences(references: string[]): Promise<(import("mongoose").FlattenMaps<ICashAllocationReference> & Required<{
+    getCashAllocationsByReferences(references: string[]): Promise<(import("mongoose").FlattenMaps<ICashAllocationReferenceDoc> & Required<{
         _id: import("mongoose").Types.ObjectId;
     }>)[]>;
     getAllCashAllocations(): Promise<{
-        references: ICashAllocationReference[];
+        references: ICashAllocationReferenceDoc[];
         products: ICashAllocationProduct[];
     }>;
-    updateAllCashAllocation(products: ICashAllocationProductStringified[], references: ICashAllocationReferenceStringified[]): Promise<void>;
+    updateAllCashAllocation(products: ICashAllocationProductStringified[], references: ICashAllocationReferencePlain[]): Promise<void>;
 }

package/services/cash-allocation.service.js

@@ -24,6 +24,7 @@ class CashAllocationService {
                 return;
             }
             const cashAllocation = {
+                uiId: (0, main_helper_1.getUUID)(),
                 order,
                 reference: transactions.reference.trim(),
                 cashAllocationProductId: null,

package/services/cash-allocation.service.ts

@@ -1,9 +1,10 @@
 import { IUploadedBankTransaction } from '../models/UploadedBankTransaction.model';
-import { fieldsToUnset, removeFields } from '../helpers/main.helper';
+import { fieldsToUnset, getUUID, removeFields } from '../helpers/main.helper';
 import {
   CashAllocationReference,
   ICashAllocationReference,
-  ICashAllocationReferenceStringified,
+  ICashAllocationReferenceDoc,
+  ICashAllocationReferencePlain,
 } from '../models/CashAllocationReference.model';
 import {
   CashAllocationProduct,
@@ -31,6 +32,7 @@ export class CashAllocationService {
         return;
       }
       const cashAllocation: ICashAllocationReference = {
+        uiId: getUUID(),
         order,
         reference: transactions.reference.trim(),
         cashAllocationProductId: null,
@@ -60,12 +62,12 @@ export class CashAllocationService {
       .find()
       .sort({ order: 1 });
     return {
-      references: cashAllocationReferences.map((i) => removeFields<ICashAllocationReference>(i, fieldsToUnset)),
+      references: cashAllocationReferences.map((i) => removeFields<ICashAllocationReferenceDoc>(i, fieldsToUnset)),
       products: cashAllocationsProducts.map((i) => removeFields<ICashAllocationProduct>(i, fieldsToUnset)),
     };
   }
 
-  async updateAllCashAllocation(products: ICashAllocationProductStringified[], references: ICashAllocationReferenceStringified[]) {
+  async updateAllCashAllocation(products: ICashAllocationProductStringified[], references: ICashAllocationReferencePlain[]) {
     const existingCashAllocations = await this.getAllCashAllocations();
 
     const existingCashAllocationProductIds = existingCashAllocations.products.map((i) => i._id.toString());

package/services/loan-transactions.service.d.ts

@@ -155,7 +155,7 @@ export declare class LoanTransactionsService {
     getTransactionReport(transactionIds: string[], borrowerId: string, effectiveDate: Date): Promise<{
         transactionIdsToMark: string[];
         transactions: {
-            [x: string]: (string | number | Date | string[])[];
+            [x: string]: (string | number | string[] | Date)[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{