gemcap-be-common 1.4.27 → 1.4.29

package/db/availability.db.d.ts

@@ -23,12 +23,14 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose from 'mongoose';
-import { IAvailabilitySignDoc, IAvailabilitySignItem } from '../models/AvailabilitySigns.model';
+import { IAvailabilitySignItem } from '../models/AvailabilitySigns.model';
 import { IResult } from '../interfaces/result.interface';
-export declare const findAvailabilitySignsByBBCDateId: (bbcDateId: string) => Promise<mongoose.FlattenMaps<IAvailabilitySignDoc> & {
+export declare const findAvailabilitySignsByBBCDateId: (bbcDateId: string) => Promise<mongoose.FlattenMaps<import("../models/AvailabilitySigns.model").IAvailabilitySignDoc> & {
     _id: mongoose.Types.ObjectId;
 }>;
-export declare const getAvailabilitySigns: (bbcDateIds: string[]) => Promise<(mongoose.FlattenMaps<IAvailabilitySignDoc> & {
+export declare const getAvailabilitySigns: (bbcDateIds: string[], repo?: mongoose.Model<import("../models/AvailabilitySigns.model").IAvailabilitySignDoc, {}, {}, {}, mongoose.Document<unknown, {}, import("../models/AvailabilitySigns.model").IAvailabilitySignDoc> & import("../models/AvailabilitySigns.model").IAvailabilitySignDoc & {
+    _id: mongoose.Types.ObjectId;
+}, any>) => Promise<(mongoose.FlattenMaps<import("../models/AvailabilitySigns.model").IAvailabilitySignDoc> & {
     _id: mongoose.Types.ObjectId;
 })[]>;
 export declare const addAvailabilitySign: (bbcDateId: string, sign: IAvailabilitySignItem) => Promise<IResult>;

package/db/availability.db.js

@@ -10,8 +10,8 @@ const findAvailabilitySignsByBBCDateId = async (bbcDateId) => {
     return AvailabilitySigns_model_1.AvailabilitySignsModel.findOne({ bbcDateId: new mongoose_1.default.Types.ObjectId(bbcDateId) }).lean();
 };
 exports.findAvailabilitySignsByBBCDateId = findAvailabilitySignsByBBCDateId;
-const getAvailabilitySigns = async (bbcDateIds) => {
-    return AvailabilitySigns_model_1.AvailabilitySignsModel.find({ bbcDateId: { $in: bbcDateIds } }).lean();
+const getAvailabilitySigns = async (bbcDateIds, repo = AvailabilitySigns_model_1.AvailabilitySignsModel) => {
+    return repo.find({ bbcDateId: { $in: bbcDateIds } }).lean();
 };
 exports.getAvailabilitySigns = getAvailabilitySigns;
 const addAvailabilitySign = async (bbcDateId, sign) => {

package/db/availability.db.ts

@@ -2,7 +2,6 @@ import mongoose from 'mongoose';
 
 import {
   AvailabilitySignsModel,
-  IAvailabilitySignDoc,
   IAvailabilitySignItem,
 } from '../models/AvailabilitySigns.model';
 import { IResult } from '../interfaces/result.interface';
@@ -11,8 +10,8 @@ export const findAvailabilitySignsByBBCDateId = async (bbcDateId: string) => {
   return AvailabilitySignsModel.findOne({ bbcDateId: new mongoose.Types.ObjectId(bbcDateId) }).lean();
 };
 
-export const getAvailabilitySigns = async (bbcDateIds: string[]) => {
-  return AvailabilitySignsModel.find({ bbcDateId: { $in: bbcDateIds } }).lean();
+export const getAvailabilitySigns = async (bbcDateIds: string[], repo = AvailabilitySignsModel) => {
+  return repo.find({ bbcDateId: { $in: bbcDateIds } }).lean();
 };
 
 export const addAvailabilitySign = async (bbcDateId: string, sign: IAvailabilitySignItem): Promise<IResult> => {

package/db/bbcDates.db.d.ts

@@ -29,6 +29,9 @@ export declare const getBBCDateDoc: (bbcDateId: string) => Promise<mongoose.Flat
     _id: mongoose.Types.ObjectId;
 }>;
 export declare const getBBCDatesByBorrower: (borrowerId: string, sortOrder?: 1 | -1) => Promise<IBBCDateDoc[]>;
+export declare const getLatestBBCDates: (borrowerId: string, date?: Date, repo?: mongoose.Model<IBBCDateDoc, {}, {}, {}, mongoose.Document<unknown, {}, IBBCDateDoc> & IBBCDateDoc & {
+    _id: mongoose.Types.ObjectId;
+}, any>) => Promise<IBBCDateDoc[]>;
 export declare const getLatestSignedBBCDateDoc: (borrowerId: string, date?: Date) => Promise<IBBCDateDoc | null>;
 export declare const getOlderBBCDates: (borrowerId: string, bbcDate: Date) => Promise<IBBCDateDoc[]>;
 export declare const getBBCDates: (borrowerId: string, bbcDate: Date) => Promise<IBBCDateDoc[]>;

package/db/bbcDates.db.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBBCDate = exports.getBBCDatesByType = exports.getBBCDatesForPeriod = exports.getBBCDates = exports.getOlderBBCDates = exports.getLatestSignedBBCDateDoc = exports.getBBCDatesByBorrower = exports.getBBCDateDoc = void 0;
+exports.createBBCDate = exports.getBBCDatesByType = exports.getBBCDatesForPeriod = exports.getBBCDates = exports.getOlderBBCDates = exports.getLatestSignedBBCDateDoc = exports.getLatestBBCDates = exports.getBBCDatesByBorrower = exports.getBBCDateDoc = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const BBCDate_model_1 = require("../models/BBCDate.model");
 const BBCSheet_model_1 = require("../models/BBCSheet.model");
@@ -26,6 +26,16 @@ const getBBCDatesByBorrower = async (borrowerId, sortOrder = 1) => {
     ]);
 };
 exports.getBBCDatesByBorrower = getBBCDatesByBorrower;
+const getLatestBBCDates = async (borrowerId, date, repo = BBCDate_model_1.BBCDateModel) => {
+    const match = {
+        borrowerId: new mongoose_1.default.Types.ObjectId(borrowerId),
+    };
+    if (date) {
+        match.bbcDate = { $lte: date };
+    }
+    return repo.aggregate([{ $match: match }, { $sort: { bbcDate: -1 } }]);
+};
+exports.getLatestBBCDates = getLatestBBCDates;
 const getLatestSignedBBCDateDoc = async (borrowerId, date) => {
     const match = {
         borrowerId: new mongoose_1.default.Types.ObjectId(borrowerId),
@@ -33,17 +43,16 @@ const getLatestSignedBBCDateDoc = async (borrowerId, date) => {
     if (date) {
         match.bbcDate = { $lte: date };
     }
-    const bbcDates = await BBCDate_model_1.BBCDateModel.aggregate([
-        { $match: match },
-        { $sort: { bbcDate: -1 } },
-    ]);
+    const bbcDates = await (0, exports.getLatestBBCDates)(borrowerId, date);
     if (!bbcDates.length) {
         return null;
     }
     let foundSignedBBC = null;
     let i = 0;
     while (!foundSignedBBC && i < bbcDates.length) {
-        const availabilitySigns = (await (0, availability_db_1.getAvailabilitySigns)([bbcDates[i]._id.toString()])).pop();
+        const bbcDateId = bbcDates[i]._id.toString();
+        const signs = await (0, availability_db_1.getAvailabilitySigns)([bbcDateId]);
+        const availabilitySigns = signs.pop();
         if (availabilitySigns) {
             const totalSigns = availabilitySigns.signs.filter((sign) => !sign.revokedAt);
             foundSignedBBC = totalSigns.length === availabilitySigns.requiredSigns ? bbcDates[i] : null;

package/db/bbcDates.db.ts

@@ -23,7 +23,7 @@ export const getBBCDatesByBorrower = async (borrowerId: string, sortOrder: 1 | -
   ]);
 };
 
-export const getLatestSignedBBCDateDoc = async (borrowerId: string, date?: Date): Promise<IBBCDateDoc | null> => {
+export const getLatestBBCDates = async (borrowerId: string, date?: Date, repo = BBCDateModel) => {
   const match: {
     borrowerId: mongoose.Types.ObjectId;
     bbcDate?: { $lte: Date };
@@ -34,18 +34,31 @@ export const getLatestSignedBBCDateDoc = async (borrowerId: string, date?: Date)
     match.bbcDate = { $lte: date };
   }
 
-  const bbcDates = await BBCDateModel.aggregate<IBBCDateDoc>([
-    { $match: match },
-    { $sort: { bbcDate: -1 } },
-  ]);
+  return repo.aggregate<IBBCDateDoc>([{ $match: match }, { $sort: { bbcDate: -1 } }]);
+};
+
+export const getLatestSignedBBCDateDoc = async (borrowerId: string, date?: Date,): Promise<IBBCDateDoc | null> => {
+  const match: {
+    borrowerId: mongoose.Types.ObjectId;
+    bbcDate?: { $lte: Date };
+  } = {
+    borrowerId: new mongoose.Types.ObjectId(borrowerId),
+  };
+  if (date) {
+    match.bbcDate = { $lte: date };
+  }
+
+  const bbcDates = await getLatestBBCDates(borrowerId, date);
   if (!bbcDates.length) {
     return null;
   }
 
-  let foundSignedBBC = null;
+  let foundSignedBBC: IBBCDateDoc | null = null;
   let i = 0;
   while (!foundSignedBBC && i < bbcDates.length) {
-    const availabilitySigns = (await getAvailabilitySigns([bbcDates[i]._id.toString()])).pop();
+    const bbcDateId = bbcDates[i]._id.toString();
+    const signs = await getAvailabilitySigns([bbcDateId]);
+    const availabilitySigns = signs.pop();
     if (availabilitySigns) {
       const totalSigns = availabilitySigns.signs.filter((sign) => !sign.revokedAt);
       foundSignedBBC = totalSigns.length === availabilitySigns.requiredSigns ? bbcDates[i] : null;

package/models/AccountPayableItem.model.d.ts

@@ -43,10 +43,10 @@ export declare const AccountPayableItemSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    amount: number;
-    order: number;
     bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     apDate: Date;
+    amount: number;
     __v?: number;
     poNumber?: string;
     customerName?: string;
@@ -57,10 +57,10 @@ export declare const AccountPayableItemSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    amount: number;
-    order: number;
     bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     apDate: Date;
+    amount: number;
     __v?: number;
     poNumber?: string;
     customerName?: string;
@@ -71,10 +71,10 @@ export declare const AccountPayableItemSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    amount: number;
-    order: number;
     bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     apDate: Date;
+    amount: number;
     __v?: number;
     poNumber?: string;
     customerName?: string;

package/models/BBCDate.model.ts

@@ -40,7 +40,7 @@ export const BBCDateSchema = new mongoose.Schema(
     },
     __v: { type: Number, select: false },
   },
-  { timestamps: true }
+  { timestamps: true },
 );
 
 BBCDateSchema.plugin(mongooseLeanId);

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

@@ -71,9 +71,9 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    order: number;
     value: number;
     bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     skuDate: Date;
     category: string;
     sku: string;
@@ -93,9 +93,9 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    order: number;
     value: number;
     bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     skuDate: Date;
     category: string;
     sku: string;
@@ -115,9 +115,9 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    order: number;
     value: number;
     bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     skuDate: Date;
     category: string;
     sku: string;

package/models/ReceivableAvailability.model.d.ts

@@ -190,43 +190,43 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        grossAR: number;
-        balanceAfterCrossAge: number;
-        permittedOver: number;
         creditNotes: number;
         excludedCustomerDeduction: number;
+        grossAR: number;
+        permittedOver: number;
+        preliminaryEligibleBalance: number;
+        creditNotesNegative: number;
         deduction: number;
         partiallyPaidDeduction: number;
         contraDeduction: number;
         crossAgeDeduction: number;
         waivedDeduction: number;
+        balanceAfterCrossAge: number;
         finalResult: number;
         insuredComponent: number;
-        preliminaryEligibleBalance: number;
         uninsuredComponent: number;
         insuredAvailability: number;
         uninsuredAvailability: number;
-        creditNotesNegative: number;
         ARReserves: number;
         ARAvailability: number;
     };
+    actual?: boolean;
     userCalculatedId?: string;
     calculatedAt?: Date;
-    actual?: boolean;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
@@ -250,43 +250,43 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        grossAR: number;
-        balanceAfterCrossAge: number;
-        permittedOver: number;
         creditNotes: number;
         excludedCustomerDeduction: number;
+        grossAR: number;
+        permittedOver: number;
+        preliminaryEligibleBalance: number;
+        creditNotesNegative: number;
         deduction: number;
         partiallyPaidDeduction: number;
         contraDeduction: number;
         crossAgeDeduction: number;
         waivedDeduction: number;
+        balanceAfterCrossAge: number;
         finalResult: number;
         insuredComponent: number;
-        preliminaryEligibleBalance: number;
         uninsuredComponent: number;
         insuredAvailability: number;
         uninsuredAvailability: number;
-        creditNotesNegative: number;
         ARReserves: number;
         ARAvailability: number;
     };
+    actual?: boolean;
     userCalculatedId?: string;
     calculatedAt?: Date;
-    actual?: boolean;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
@@ -310,43 +310,43 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        grossAR: number;
-        balanceAfterCrossAge: number;
-        permittedOver: number;
         creditNotes: number;
         excludedCustomerDeduction: number;
+        grossAR: number;
+        permittedOver: number;
+        preliminaryEligibleBalance: number;
+        creditNotesNegative: number;
         deduction: number;
         partiallyPaidDeduction: number;
         contraDeduction: number;
         crossAgeDeduction: number;
         waivedDeduction: number;
+        balanceAfterCrossAge: number;
         finalResult: number;
         insuredComponent: number;
-        preliminaryEligibleBalance: number;
         uninsuredComponent: number;
         insuredAvailability: number;
         uninsuredAvailability: number;
-        creditNotesNegative: number;
         ARReserves: number;
         ARAvailability: number;
     };
+    actual?: boolean;
     userCalculatedId?: string;
     calculatedAt?: Date;
-    actual?: boolean;
     settings?: {
         excludedCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedConcentration: mongoose.Types.DocumentArray<{
+        insuredCustomers: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        permittedExtendedARDays: mongoose.Types.DocumentArray<{
+        permittedConcentration: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;
-        insuredCustomers: mongoose.Types.DocumentArray<{
+        permittedExtendedARDays: mongoose.Types.DocumentArray<{
             limit?: number;
             customer?: string;
         }>;

package/models/ReceivableItem.model.d.ts

@@ -50,8 +50,8 @@ export declare const ReceivableItemSchema: mongoose.Schema<any, mongoose.Model<a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    order: number;
     bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     invoiceNumber: string;
     invoiceDate: Date;
     customerTitle: string;
@@ -66,8 +66,8 @@ export declare const ReceivableItemSchema: mongoose.Schema<any, mongoose.Model<a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    order: number;
     bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     invoiceNumber: string;
     invoiceDate: Date;
     customerTitle: string;
@@ -82,8 +82,8 @@ export declare const ReceivableItemSchema: mongoose.Schema<any, mongoose.Model<a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    order: number;
     bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     invoiceNumber: string;
     invoiceDate: Date;
     customerTitle: string;

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;
+        order: number;
         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;
+        order: number;
         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;
+        order: number;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.4.27",
+  "version": "1.4.29",
   "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: IBorrowerDocument[]): Promise<{
         [x: number]: {
+            SELECTED_PERIOD?: boolean;
+            ENTIRE_LOAN?: boolean;
             LAST_MONTH?: boolean;
             CURRENT_MONTH?: boolean;
-            ENTIRE_LOAN?: boolean;
-            SELECTED_PERIOD?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;