gemcap-be-common 1.5.51 → 1.5.53

package/models/BBCDate.model.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import Joi from 'joi';
-import mongoose, { Document } from 'mongoose';
+import mongoose from 'mongoose';
 import { ILoanStatementStatus } from './LoanStatementStatus.model';
 export interface ICreateBBCDate {
     date: Date;
@@ -36,7 +36,7 @@ export interface IBBCDate {
     borrowerId: mongoose.Types.ObjectId;
     bbcDate: Date;
 }
-export interface IBBCDateDoc extends IBBCDate, Document {
+export interface IBBCDateDoc extends IBBCDate, mongoose.Document {
 }
 export interface IBBCDateDoc extends ILoanStatementStatus, mongoose.Document {
     _id: mongoose.Types.ObjectId;

package/models/BBCDate.model.js

@@ -7,7 +7,6 @@ exports.BBCDateModel = exports.BBCDateSchema = exports.ICreateBBCDateSchema = vo
 const joi_1 = __importDefault(require("joi"));
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
-const BBCSheet_model_1 = require("./BBCSheet.model");
 const mongooseLeanId = require('../plugins/id.plugin');
 exports.ICreateBBCDateSchema = joi_1.default.object({
     date: joi_1.default.date().required(),
@@ -28,8 +27,8 @@ exports.BBCDateSchema = new mongoose_1.default.Schema({
     __v: { type: Number, select: false },
 }, { timestamps: true });
 exports.BBCDateSchema.plugin(mongooseLeanId);
-BBCSheet_model_1.BBCSheetSchema.index({
+exports.BBCDateSchema.index({
     borrowerId: 1,
-    bbcDate: 1,
+    bbcDate: -1,
 });
 exports.BBCDateModel = mongoose_1.default.model(_models_1.MODEL_NAMES.BBCDates, exports.BBCDateSchema);

package/models/BBCDate.model.ts

@@ -1,9 +1,8 @@
 import Joi from 'joi';
-import mongoose, { Document } from 'mongoose';
+import mongoose from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 import { ILoanStatementStatus } from './LoanStatementStatus.model';
-import { BBCSheetSchema } from './BBCSheet.model';
 
 const mongooseLeanId = require('../plugins/id.plugin');
 
@@ -26,7 +25,7 @@ export interface IBBCDate {
   bbcDate: Date;
 }
 
-export interface IBBCDateDoc extends IBBCDate, Document {
+export interface IBBCDateDoc extends IBBCDate, mongoose.Document {
 }
 
 export interface IBBCDateDoc extends ILoanStatementStatus, mongoose.Document {
@@ -68,9 +67,9 @@ export const BBCDateSchema = new mongoose.Schema(
 
 BBCDateSchema.plugin(mongooseLeanId);
 
-BBCSheetSchema.index({
+BBCDateSchema.index({
   borrowerId: 1,
-  bbcDate: 1,
+  bbcDate: -1,
 });
 
 export const BBCDateModel: mongoose.Model<IBBCDateDoc> = mongoose.model<IBBCDateDoc>(MODEL_NAMES.BBCDates, BBCDateSchema);

package/models/BBCSheet.model.js

@@ -49,4 +49,8 @@ exports.BBCSheetSchema.pre('findOneAndDelete', async function () {
     await AccountPayableItem_model_1.AccountPayableItemModel.deleteMany({ bbcSheetId: bbcSheetId });
     await SalesItem_model_1.SalesItem.deleteMany({ bbcSheetId: bbcSheetId });
 });
+exports.BBCSheetSchema.index({
+    dataType: 1,
+    bbcDateId: 1,
+});
 exports.BBCSheetModel = mongoose_1.default.model(_models_1.MODEL_NAMES.BBCSheets, exports.BBCSheetSchema);

package/models/BBCSheet.model.ts

@@ -83,4 +83,9 @@ BBCSheetSchema.pre('findOneAndDelete', async function () {
   await SalesItem.deleteMany({ bbcSheetId: bbcSheetId });
 });
 
+BBCSheetSchema.index({
+  dataType: 1,
+  bbcDateId: 1,
+});
+
 export const BBCSheetModel: mongoose.Model<IBBCSheetDoc> = mongoose.model<IBBCSheetDoc>(MODEL_NAMES.BBCSheets, BBCSheetSchema);

package/models/InventoryAvailability.model.d.ts

@@ -88,8 +88,8 @@ export declare const InventoryAvailabilityScheme: mongoose.Schema<any, mongoose.
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     status: string;
     summary: mongoose.Types.DocumentArray<{
         order: number;
@@ -121,8 +121,8 @@ export declare const InventoryAvailabilityScheme: mongoose.Schema<any, mongoose.
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     status: string;
     summary: mongoose.Types.DocumentArray<{
         order: number;
@@ -154,8 +154,8 @@ export declare const InventoryAvailabilityScheme: mongoose.Schema<any, mongoose.
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     status: string;
     summary: mongoose.Types.DocumentArray<{
         order: number;

package/models/InventoryAvailabilityItem.model.d.ts

@@ -48,8 +48,8 @@ export declare const InventoryAvailabilityItemScheme: mongoose.Schema<any, mongo
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    order: number;
     unique: boolean;
+    order: number;
     inventoryAvailabilityId: mongoose.Types.ObjectId;
     inventoryId: mongoose.Types.ObjectId;
     matched: boolean;
@@ -64,8 +64,8 @@ export declare const InventoryAvailabilityItemScheme: mongoose.Schema<any, mongo
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    order: number;
     unique: boolean;
+    order: number;
     inventoryAvailabilityId: mongoose.Types.ObjectId;
     inventoryId: mongoose.Types.ObjectId;
     matched: boolean;
@@ -80,8 +80,8 @@ export declare const InventoryAvailabilityItemScheme: mongoose.Schema<any, mongo
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    order: number;
     unique: boolean;
+    order: number;
     inventoryAvailabilityId: mongoose.Types.ObjectId;
     inventoryId: mongoose.Types.ObjectId;
     matched: boolean;

package/models/InventoryItem.model.d.ts

@@ -84,15 +84,17 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    value: number;
+    bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     skuDate: Date;
     category: string;
     sku: string;
     qty: number;
-    value: number;
-    bbcSheetId: mongoose.Types.ObjectId;
-    order: number;
-    expiryDate?: Date;
+    __v?: number;
     location?: string;
+    lotNumber?: string;
+    expiryDate?: Date;
     unitCost?: number;
     skuDescription1?: string;
     skuDescription2?: string;
@@ -100,21 +102,21 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     detail1?: string;
     detail2?: string;
     detail3?: string;
-    __v?: number;
-    lotNumber?: string;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    value: number;
+    bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     skuDate: Date;
     category: string;
     sku: string;
     qty: number;
-    value: number;
-    bbcSheetId: mongoose.Types.ObjectId;
-    order: number;
-    expiryDate?: Date;
+    __v?: number;
     location?: string;
+    lotNumber?: string;
+    expiryDate?: Date;
     unitCost?: number;
     skuDescription1?: string;
     skuDescription2?: string;
@@ -122,21 +124,21 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     detail1?: string;
     detail2?: string;
     detail3?: string;
-    __v?: number;
-    lotNumber?: string;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    value: number;
+    bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     skuDate: Date;
     category: string;
     sku: string;
     qty: number;
-    value: number;
-    bbcSheetId: mongoose.Types.ObjectId;
-    order: number;
-    expiryDate?: Date;
+    __v?: number;
     location?: string;
+    lotNumber?: string;
+    expiryDate?: Date;
     unitCost?: number;
     skuDescription1?: string;
     skuDescription2?: string;
@@ -144,8 +146,6 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     detail1?: string;
     detail2?: string;
     detail3?: string;
-    __v?: number;
-    lotNumber?: string;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/ReceivableAvailability.model.d.ts

@@ -184,9 +184,10 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
+    actual?: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
@@ -210,7 +211,6 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         ARReserves: number;
         ARAvailability: number;
     };
-    actual?: boolean;
     userCalculatedId?: string;
     calculatedAt?: Date;
     settings?: {
@@ -244,9 +244,10 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
+    actual?: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
@@ -270,7 +271,6 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         ARReserves: number;
         ARAvailability: number;
     };
-    actual?: boolean;
     userCalculatedId?: string;
     calculatedAt?: Date;
     settings?: {
@@ -304,9 +304,10 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
+    actual?: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
@@ -330,7 +331,6 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         ARReserves: number;
         ARAvailability: number;
     };
-    actual?: boolean;
     userCalculatedId?: string;
     calculatedAt?: Date;
     settings?: {

package/models/SalesItem.model.d.ts

@@ -51,9 +51,9 @@ export declare const SalesItemSchema: mongoose.Schema<any, mongoose.Model<any, a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    sku: string;
     bbcSheetId: mongoose.Types.ObjectId;
     order: number;
+    sku: string;
     unitsSold: number;
     __v?: number;
     skuName?: string;
@@ -63,9 +63,9 @@ export declare const SalesItemSchema: mongoose.Schema<any, mongoose.Model<any, a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    sku: string;
     bbcSheetId: mongoose.Types.ObjectId;
     order: number;
+    sku: string;
     unitsSold: number;
     __v?: number;
     skuName?: string;
@@ -75,9 +75,9 @@ export declare const SalesItemSchema: mongoose.Schema<any, mongoose.Model<any, a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    sku: string;
     bbcSheetId: mongoose.Types.ObjectId;
     order: number;
+    sku: string;
     unitsSold: number;
     __v?: number;
     skuName?: string;

package/package.json

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

package/queries/inventory/invoice-difference.js

@@ -23,6 +23,9 @@ const getInventoryDifference = async (params) => {
     const currentBbcDate = await BBCDate_model_1.BBCDateModel.findById(bbcDateId).lean();
     if (currentBbcDate) {
         const previousDocuments = await (0, collaterals_db_1.getPreviousCollateralDocument)(currentBbcDate.borrowerId.toString(), currentBbcDate.bbcDate, collaterals_enum_1.ECollaterals.INVENTORY, 1);
+        if (previousDocuments.length === 0) {
+            return { addedInventories: [], removedInventories: [] };
+        }
         const items1 = await (0, collaterals_db_1.getCollateralListByBBCAndType)(currentBbcDate._id.toString(), collaterals_enum_1.ECollaterals.INVENTORY);
         const items2 = await (0, collaterals_db_1.getCollateralListByBBCAndType)(previousDocuments[0]._id.toString(), collaterals_enum_1.ECollaterals.INVENTORY);
         const compareInventories = (items1, items2) => {

package/queries/inventory/invoice-difference.ts

@@ -22,6 +22,9 @@ export const getInventoryDifference = async (params: TQueryParams) => {
   const currentBbcDate = await BBCDateModel.findById(bbcDateId).lean();
   if (currentBbcDate) {
     const previousDocuments = await getPreviousCollateralDocument(currentBbcDate.borrowerId.toString(), currentBbcDate.bbcDate, ECollaterals.INVENTORY, 1);
+    if (previousDocuments.length === 0) {
+      return { addedInventories: [], removedInventories: [] };
+    }
     const items1 = await getCollateralListByBBCAndType(currentBbcDate._id.toString(), ECollaterals.INVENTORY);
     const items2 = await getCollateralListByBBCAndType(previousDocuments[0]._id.toString(), ECollaterals.INVENTORY);
     const compareInventories = (items1: any[], items2: any[]) => {

package/services/collateral-adjustments.service.js

@@ -67,7 +67,7 @@ class CollateralAdjustmentsService {
             const typeSummary = { rowDef: equipmentType, amount: 0 };
             collateralAdjustmentItems.map((item) => {
                 if (item.type === equipmentType) {
-                    typeSummary.amount = new decimal_js_1.default(typeSummary.amount).add(item.amount).toNumber();
+                    typeSummary.amount = new decimal_js_1.default(typeSummary.amount).add(item.amount ?? 0).toNumber();
                 }
                 return typeSummary;
             });

package/services/collateral-adjustments.service.ts

@@ -80,7 +80,7 @@ export class CollateralAdjustmentsService {
       const typeSummary = { rowDef: equipmentType, amount: 0 };
       collateralAdjustmentItems.map((item) => {
         if (item.type === equipmentType) {
-          typeSummary.amount = new Decimal(typeSummary.amount).add(item.amount).toNumber();
+          typeSummary.amount = new Decimal(typeSummary.amount).add(item.amount ?? 0).toNumber();
         }
         return typeSummary;
       });

package/services/equipment.service.js

@@ -85,9 +85,9 @@ class EquipmentService {
             const typeSummary = { rowDef: equipmentType, amount: 0, advanceRate: 0, availability: 0 };
             equipmentItems.forEach((item) => {
                 if (item.type === equipmentType) {
-                    typeSummary.amount = new decimal_js_1.default(typeSummary.amount).add(item.amount).toNumber();
-                    typeSummary.availability = new decimal_js_1.default(item.advanceRate).mul(item.amount).add(typeSummary.availability).toNumber();
-                    typeSummary.advanceRate = typeSummary.amount === 0 ? 0 : new decimal_js_1.default(typeSummary.availability).div(typeSummary.amount).toDP(4).toNumber();
+                    typeSummary.amount = new decimal_js_1.default(typeSummary.amount).add(item.amount ?? 0).toNumber();
+                    typeSummary.availability = new decimal_js_1.default(item.advanceRate ?? 0).mul(item.amount ?? 0).add(typeSummary.availability ?? 0).toNumber();
+                    typeSummary.advanceRate = typeSummary.amount === 0 ? 0 : new decimal_js_1.default(typeSummary.availability ?? 0).div(typeSummary.amount ?? 0).toDP(4).toNumber();
                 }
                 return typeSummary;
             }, typeSummary);

package/services/equipment.service.ts

@@ -109,9 +109,9 @@ export class EquipmentService {
       const typeSummary = <ISummaryItem>{ rowDef: equipmentType, amount: 0, advanceRate: 0, availability: 0 };
       equipmentItems.forEach((item) => {
         if (item.type === equipmentType) {
-          typeSummary.amount = new Decimal(typeSummary.amount).add(item.amount).toNumber();
-          typeSummary.availability = new Decimal(item.advanceRate).mul(item.amount).add(typeSummary.availability).toNumber();
-          typeSummary.advanceRate = typeSummary.amount === 0 ? 0 : new Decimal(typeSummary.availability).div(typeSummary.amount).toDP(4).toNumber();
+          typeSummary.amount = new Decimal(typeSummary.amount).add(item.amount ?? 0).toNumber();
+          typeSummary.availability = new Decimal(item.advanceRate ?? 0).mul(item.amount ?? 0).add(typeSummary.availability ?? 0).toNumber();
+          typeSummary.advanceRate = typeSummary.amount === 0 ? 0 : new Decimal(typeSummary.availability ?? 0).div(typeSummary.amount ?? 0).toDP(4).toNumber();
         }
         return typeSummary;
       }, typeSummary);

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 | string[] | Date)[];
+            [x: string]: (string | number | Date | string[])[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{

package/services/reserve.service.js

@@ -61,7 +61,7 @@ class ReserveService {
             const typeSummary = { rowDef: equipmentType, amount: 0 };
             reserveItems.forEach((item) => {
                 if (item.type === equipmentType) {
-                    typeSummary.amount = new decimal_js_1.default(typeSummary.amount).add(item.amount).toNumber();
+                    typeSummary.amount = new decimal_js_1.default(typeSummary.amount).add(item.amount ?? 0).toNumber();
                 }
                 return typeSummary;
             });

package/services/reserve.service.ts

@@ -64,7 +64,7 @@ export class ReserveService {
       const typeSummary = { rowDef: equipmentType, amount: 0 };
       reserveItems.forEach((item) => {
         if (item.type === equipmentType) {
-          typeSummary.amount = new Decimal(typeSummary.amount).add(item.amount).toNumber();
+          typeSummary.amount = new Decimal(typeSummary.amount).add(item.amount ?? 0).toNumber();
         }
         return typeSummary;
       });