gemcap-be-common 1.4.28 → 1.4.30

package/db/availability.db.d.ts

@@ -22,13 +22,15 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Model } from 'mongoose';
-import { IAvailabilitySignDoc, IAvailabilitySignItem } from '../models/AvailabilitySigns.model';
+import mongoose from 'mongoose';
+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[], repo?: Model<IAvailabilitySignDoc>) => 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.ts

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

package/db/bbcDates.db.d.ts

@@ -22,14 +22,17 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Model } from 'mongoose';
+import mongoose from 'mongoose';
 import { IBBCDateDoc } from '../models/BBCDate.model';
 import { ECollaterals } from '../enums/collaterals.enum';
 export declare const getBBCDateDoc: (bbcDateId: string) => Promise<mongoose.FlattenMaps<IBBCDateDoc> & {
     _id: mongoose.Types.ObjectId;
 }>;
 export declare const getBBCDatesByBorrower: (borrowerId: string, sortOrder?: 1 | -1) => Promise<IBBCDateDoc[]>;
-export declare const getLatestSignedBBCDateDoc: (borrowerId: string, date?: Date, repo?: Model<IBBCDateDoc>) => Promise<IBBCDateDoc | null>;
+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[]>;
 export declare const getBBCDatesForPeriod: (borrowerId: string, bbcDateStart: Date, bbcDateEnd: 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,17 +26,24 @@ const getBBCDatesByBorrower = async (borrowerId, sortOrder = 1) => {
     ]);
 };
 exports.getBBCDatesByBorrower = getBBCDatesByBorrower;
-const getLatestSignedBBCDateDoc = async (borrowerId, date, repo = BBCDate_model_1.BBCDateModel) => {
+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 };
     }
-    const bbcDates = await repo.aggregate([
-        { $match: match },
-        { $sort: { bbcDate: -1 } },
-    ]);
+    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),
+    };
+    if (date) {
+        match.bbcDate = { $lte: date };
+    }
+    const bbcDates = await (0, exports.getLatestBBCDates)(borrowerId, date);
     if (!bbcDates.length) {
         return null;
     }

package/db/bbcDates.db.ts

@@ -1,4 +1,4 @@
-import mongoose, { Model } from 'mongoose';
+import mongoose from 'mongoose';
 
 import { BBCDateModel, IBBCDateDoc } from '../models/BBCDate.model';
 import { BBCSheetModel } from '../models/BBCSheet.model';
@@ -23,7 +23,7 @@ export const getBBCDatesByBorrower = async (borrowerId: string, sortOrder: 1 | -
   ]);
 };
 
-export const getLatestSignedBBCDateDoc = async (borrowerId: string, date?: Date, repo: Model<IBBCDateDoc> = BBCDateModel): Promise<IBBCDateDoc | null> => {
+export const getLatestBBCDates = async (borrowerId: string, date?: Date, repo = BBCDateModel) => {
   const match: {
     borrowerId: mongoose.Types.ObjectId;
     bbcDate?: { $lte: Date };
@@ -34,10 +34,21 @@ export const getLatestSignedBBCDateDoc = async (borrowerId: string, date?: Date,
     match.bbcDate = { $lte: date };
   }
 
-  const bbcDates = await repo.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;
   }

package/models/AvailabilitySigns.model.d.ts

@@ -64,7 +64,7 @@ export interface IAvailabilitySignView {
 }
 export interface IAvailabilitySignDoc extends IAvailabilitySign, mongoose.Document {
 }
-export declare const IAvailabilitySignSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
+export declare const AvailabilitySignSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
 }, {
     createdAt: NativeDate;

package/models/AvailabilitySigns.model.js

@@ -3,12 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AvailabilitySignsModel = exports.IAvailabilitySignSchema = exports.REQUIRED_SIGNS = void 0;
+exports.AvailabilitySignsModel = exports.AvailabilitySignSchema = exports.REQUIRED_SIGNS = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
-const mongooseLeanId = require('../plugins/id.plugin');
 exports.REQUIRED_SIGNS = 2;
-exports.IAvailabilitySignSchema = new mongoose_1.default.Schema({
+exports.AvailabilitySignSchema = new mongoose_1.default.Schema({
     bbcDateId: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: _models_1.MODEL_NAMES.BBCDates,
@@ -41,5 +40,4 @@ exports.IAvailabilitySignSchema = new mongoose_1.default.Schema({
     ],
     __v: { type: Number, select: false },
 }, { timestamps: true });
-exports.IAvailabilitySignSchema.plugin(mongooseLeanId);
-exports.AvailabilitySignsModel = mongoose_1.default.model(_models_1.MODEL_NAMES.availabilitySign, exports.IAvailabilitySignSchema);
+exports.AvailabilitySignsModel = mongoose_1.default.model(_models_1.MODEL_NAMES.availabilitySign, exports.AvailabilitySignSchema);

package/models/AvailabilitySigns.model.ts

@@ -3,8 +3,6 @@ import mongoose from 'mongoose';
 import { IUser } from '../interfaces/auth-user.interface';
 import { MODEL_NAMES } from './_models';
 
-const mongooseLeanId = require('../plugins/id.plugin');
-
 export const REQUIRED_SIGNS = 2;
 
 export interface IAvailabilitySignItem {
@@ -53,7 +51,7 @@ export interface IAvailabilitySignView {
 export interface IAvailabilitySignDoc extends IAvailabilitySign, mongoose.Document {
 }
 
-export const IAvailabilitySignSchema = new mongoose.Schema(
+export const AvailabilitySignSchema = new mongoose.Schema(
   {
     bbcDateId: {
       type: mongoose.Schema.Types.ObjectId,
@@ -90,6 +88,4 @@ export const IAvailabilitySignSchema = new mongoose.Schema(
   { timestamps: true },
 );
 
-IAvailabilitySignSchema.plugin(mongooseLeanId);
-
-export const AvailabilitySignsModel = mongoose.model<IAvailabilitySignDoc>(MODEL_NAMES.availabilitySign, IAvailabilitySignSchema);
+export const AvailabilitySignsModel = mongoose.model<IAvailabilitySignDoc>(MODEL_NAMES.availabilitySign, AvailabilitySignSchema);

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, { Connection, Document, Model } from 'mongoose';
+import mongoose, { Document } from 'mongoose';
 export interface ICreateBBCDate {
     date: Date;
     inventory: boolean;
@@ -64,4 +64,3 @@ export declare const BBCDateSchema: mongoose.Schema<any, mongoose.Model<any, any
     _id: mongoose.Types.ObjectId;
 }>;
 export declare const BBCDateModel: mongoose.Model<IBBCDateDoc>;
-export declare const createBBCDateModel: (conn: Connection) => Model<IBBCDateDoc>;

package/models/BBCDate.model.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.createBBCDateModel = exports.BBCDateModel = exports.BBCDateSchema = exports.ICreateBBCDateSchema = void 0;
+exports.BBCDateModel = exports.BBCDateSchema = exports.ICreateBBCDateSchema = void 0;
 const joi_1 = __importDefault(require("joi"));
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
@@ -28,5 +28,3 @@ exports.BBCDateSchema = new mongoose_1.default.Schema({
 }, { timestamps: true });
 exports.BBCDateSchema.plugin(mongooseLeanId);
 exports.BBCDateModel = mongoose_1.default.model(_models_1.MODEL_NAMES.BBCDates, exports.BBCDateSchema);
-const createBBCDateModel = (conn) => conn.model(_models_1.MODEL_NAMES.BBCDates, exports.BBCDateSchema);
-exports.createBBCDateModel = createBBCDateModel;

package/models/BBCDate.model.ts

@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import mongoose, { Connection, Document, Model } from 'mongoose';
+import mongoose, { Document } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 
@@ -46,5 +46,3 @@ export const BBCDateSchema = new mongoose.Schema(
 BBCDateSchema.plugin(mongooseLeanId);
 
 export const BBCDateModel: mongoose.Model<IBBCDateDoc> = mongoose.model<IBBCDateDoc>(MODEL_NAMES.BBCDates, BBCDateSchema);
-
-export const createBBCDateModel = (conn: Connection): Model<IBBCDateDoc> => conn.model<IBBCDateDoc>(MODEL_NAMES.BBCDates, BBCDateSchema);

package/models/_index.js

@@ -86,7 +86,7 @@ exports.allSchemas = [
     { name: _models_1.MODEL_NAMES.accountPayableItem, schema: AccountPayableItem_model_1.AccountPayableItemSchema },
     { name: _models_1.MODEL_NAMES.allocatedBankTransactions, schema: AllocatedBankTransaction_model_1.AllocatedBankTransactionSchema },
     { name: _models_1.MODEL_NAMES.allocatedData, schema: AllocatedData_model_1.AllocatedDataSchema },
-    { name: _models_1.MODEL_NAMES.availabilitySign, schema: AvailabilitySigns_model_1.IAvailabilitySignSchema },
+    { name: _models_1.MODEL_NAMES.availabilitySign, schema: AvailabilitySigns_model_1.AvailabilitySignSchema },
     { name: _models_1.MODEL_NAMES.availabilitySignedData, schema: AvilabilitySignedData_model_1.AvailabilitySignedDataSchema },
     { name: _models_1.MODEL_NAMES.banks, schema: Banks_model_1.BankSchema },
     { name: _models_1.MODEL_NAMES.BBCDates, schema: BBCDate_model_1.BBCDateSchema },

package/models/_index.ts

@@ -2,7 +2,7 @@ import { MODEL_NAMES } from './_models';
 import { AccountPayableItemSchema } from './AccountPayableItem.model';
 import { AllocatedBankTransactionSchema } from './AllocatedBankTransaction.model';
 import { AllocatedDataSchema } from './AllocatedData.model';
-import { IAvailabilitySignSchema } from './AvailabilitySigns.model';
+import { AvailabilitySignSchema } from './AvailabilitySigns.model';
 import { AvailabilitySignedDataSchema } from './AvilabilitySignedData.model';
 import { BankSchema } from './Banks.model';
 import { BBCDateSchema } from './BBCDate.model';
@@ -84,7 +84,7 @@ export const allSchemas = [
   { name: MODEL_NAMES.accountPayableItem, schema: AccountPayableItemSchema },
   { name: MODEL_NAMES.allocatedBankTransactions, schema: AllocatedBankTransactionSchema },
   { name: MODEL_NAMES.allocatedData, schema: AllocatedDataSchema },
-  { name: MODEL_NAMES.availabilitySign, schema: IAvailabilitySignSchema },
+  { name: MODEL_NAMES.availabilitySign, schema: AvailabilitySignSchema },
   { name: MODEL_NAMES.availabilitySignedData, schema: AvailabilitySignedDataSchema },
   { name: MODEL_NAMES.banks, schema: BankSchema },
   { name: MODEL_NAMES.BBCDates, schema: BBCDateSchema },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.4.28",
+  "version": "1.4.30",
   "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;
         };
     }>;