gemcap-be-common 1.4.70 → 1.4.72

package/db/loan-products.db.d.ts

@@ -30,7 +30,7 @@ export declare const fieldsToUnset: string[];
 export declare const getLoanProductById: (productId: string) => Promise<mongoose.FlattenMaps<import("../models/LoanProducts.model").ILoanProductDoc> & {
     _id: mongoose.Types.ObjectId;
 }>;
-export declare const getLoanProductBalance: (productId: string, forDate?: Date) => Promise<{
+export declare const getLoanProductBalance: (productId: string, asOfDate?: Date) => Promise<{
     balance: number;
     floatedBalance: number;
 }>;

package/db/loan-products.db.js

@@ -21,12 +21,12 @@ const getLoanProductById = async (productId) => {
     return LoanProducts_model_1.LoanProduct.findById(productId).lean();
 };
 exports.getLoanProductById = getLoanProductById;
-const getLoanProductBalance = async (productId, forDate = new Date()) => {
+const getLoanProductBalance = async (productId, asOfDate = new Date()) => {
     const simpleTransactions = await LoanTransaction_model_1.LoanTransaction.aggregate([
         {
             $match: {
                 'productId': new mongoose_1.default.Types.ObjectId(productId),
-                'date': { $lte: (0, dayjs_1.default)(forDate).startOf('day').subtract(1, 'seconds').toDate() },
+                'date': { $lte: asOfDate },
             },
         }, {
             $sort: {
@@ -42,7 +42,7 @@ const getLoanProductBalance = async (productId, forDate = new Date()) => {
         {
             $match: {
                 'productId': new mongoose_1.default.Types.ObjectId(productId),
-                'effectiveDate': { $lte: forDate },
+                'effectiveDate': { $lte: asOfDate },
                 $expr: { $ne: ['$date', '$effectiveDate'] },
             },
         }, {
@@ -59,7 +59,7 @@ const getLoanProductBalance = async (productId, forDate = new Date()) => {
         {
             $match: {
                 'productId': new mongoose_1.default.Types.ObjectId(productId),
-                'effectiveDate': { $lte: forDate },
+                'effectiveDate': { $lte: asOfDate },
                 $expr: { $eq: ['$date', '$effectiveDate'] },
             },
         }, {
@@ -97,7 +97,7 @@ const getLoanProductBalance = async (productId, forDate = new Date()) => {
     if (normalTransaction && !collectionsTransaction) {
         floatedBalance = normalTransaction.floatedBalance;
     }
-    const totalPostponed = await (0, exports.getPostponedTransactions)(forDate, productId);
+    const totalPostponed = await (0, exports.getPostponedTransactions)(asOfDate, productId);
     if (transactions.length === 0) {
         return { balance: 0, floatedBalance: totalPostponed };
     }

package/db/loan-products.db.ts

@@ -21,13 +21,13 @@ export const getLoanProductById = async (productId: string) => {
   return LoanProduct.findById(productId).lean();
 };
 
-export const getLoanProductBalance = async (productId: string, forDate = new Date()) => {
+export const getLoanProductBalance = async (productId: string, asOfDate = new Date()) => {
 
   const simpleTransactions = await LoanTransaction.aggregate<ILoanTransactionDoc>([
     {
       $match: {
         'productId': new mongoose.Types.ObjectId(productId),
-        'date': { $lte: dayjs(forDate).startOf('day').subtract(1, 'seconds').toDate() },
+        'date': { $lte: asOfDate },
       },
     }, {
       $sort: {
@@ -44,7 +44,7 @@ export const getLoanProductBalance = async (productId: string, forDate = new Dat
     {
       $match: {
         'productId': new mongoose.Types.ObjectId(productId),
-        'effectiveDate': { $lte: forDate },
+        'effectiveDate': { $lte: asOfDate },
         $expr: { $ne: ['$date', '$effectiveDate'] },
       },
     }, {
@@ -62,7 +62,7 @@ export const getLoanProductBalance = async (productId: string, forDate = new Dat
     {
       $match: {
         'productId': new mongoose.Types.ObjectId(productId),
-        'effectiveDate': { $lte: forDate },
+        'effectiveDate': { $lte: asOfDate },
         $expr: { $eq: ['$date', '$effectiveDate'] },
       },
     }, {
@@ -103,7 +103,7 @@ export const getLoanProductBalance = async (productId: string, forDate = new Dat
   if (normalTransaction && !collectionsTransaction) {
     floatedBalance = normalTransaction.floatedBalance;
   }
-  const totalPostponed = await getPostponedTransactions(forDate, productId);
+  const totalPostponed = await getPostponedTransactions(asOfDate, productId);
   if (transactions.length === 0) {
     return { balance: 0, floatedBalance: totalPostponed };
   }

package/db/new-summary.ts

@@ -5,7 +5,7 @@ import _ from 'lodash';
 
 import { reorderObject } from '../helpers/common.helper';
 import { getLastTransactionForDate } from './loan-transactions.db';
-import { BorrowerModel, IBorrowerDocument } from '../models/Borrower.model';
+import { BorrowerModel, IBorrowerDoc } from '../models/Borrower.model';
 import { ILoanProductDoc, LoanProduct } from '../models/LoanProducts.model';
 import { getAverageActualBalance } from './loan-products.db';
 import { LoanStatementTransactionModel } from '../models/LoanStatementTransaction.model';
@@ -148,7 +148,7 @@ const borrowerTitleLength = 15;
 const dateFormat = 'MM-DD-YYYY';
 
 const productsDataMap = new Map<string, ReportRow>();
-const borrowersMap = new Map<string, IBorrowerDocument>();
+const borrowersMap = new Map<string, IBorrowerDoc>();
 const productsMap = new Map<string, ILoanProductDoc>();
 const chargesMap = new Map<string, ILoanChargeDoc>();
 const complianceBorrowersMap = new Map<string, IComplianceBorrowerDocument>();

package/models/Borrower.model.d.ts

@@ -22,7 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Document } from 'mongoose';
+import mongoose, { Document, Model } from 'mongoose';
 import { IOrganization } from './Organization.model';
 interface ISchemaItem {
     column: string;
@@ -42,18 +42,32 @@ export interface IBorrower {
     organizationId: IOrganization;
     schemas: IMapSchema[];
 }
-export interface IBorrowerDocument extends IBorrower, Document {
+export interface IBorrowerDoc extends IBorrower, Document {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IBorrowerLean extends IBorrower {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IBorrowerPlain extends IBorrower {
+    _id: string;
+    createdAt: Date;
+    updatedAt: Date;
 }
+export type BorrowerModel = Model<IBorrowerDoc>;
 export declare const BorrowerSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
 }, {
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    name: string;
-    active: boolean;
     code: string;
+    name: string;
     title: string;
+    active: boolean;
     accrualStatus: boolean;
     __v?: number;
     organizationId?: mongoose.Types.ObjectId;
@@ -69,10 +83,10 @@ export declare const BorrowerSchema: mongoose.Schema<any, mongoose.Model<any, an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    name: string;
-    active: boolean;
     code: string;
+    name: string;
     title: string;
+    active: boolean;
     accrualStatus: boolean;
     __v?: number;
     organizationId?: mongoose.Types.ObjectId;
@@ -88,10 +102,10 @@ export declare const BorrowerSchema: mongoose.Schema<any, mongoose.Model<any, an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    name: string;
-    active: boolean;
     code: string;
+    name: string;
     title: string;
+    active: boolean;
     accrualStatus: boolean;
     __v?: number;
     organizationId?: mongoose.Types.ObjectId;
@@ -106,5 +120,5 @@ export declare const BorrowerSchema: mongoose.Schema<any, mongoose.Model<any, an
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;
-export declare const BorrowerModel: mongoose.Model<IBorrowerDocument>;
+export declare const BorrowerModel: mongoose.Model<IBorrowerDoc>;
 export {};

package/models/Borrower.model.ts

@@ -1,4 +1,4 @@
-import mongoose, { Document } from 'mongoose';
+import mongoose, { Document, Model } from 'mongoose';
 import { MODEL_NAMES } from './_models';
 import { IOrganization } from './Organization.model';
 
@@ -25,9 +25,26 @@ export interface IBorrower {
   schemas: IMapSchema[];
 }
 
-export interface IBorrowerDocument extends IBorrower, Document {
+export interface IBorrowerDoc extends IBorrower, Document {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
 }
 
+export interface IBorrowerLean extends IBorrower {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IBorrowerPlain extends IBorrower {
+  _id: string;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export type BorrowerModel = Model<IBorrowerDoc>;
+
 export const BorrowerSchema = new mongoose.Schema(
   {
     code: {
@@ -106,4 +123,4 @@ BorrowerSchema.pre(/^(findOneAndDelete|deleteOne|deleteMany)/, async function()
 
 BorrowerSchema.plugin(mongooseLeanId);
 
-export const BorrowerModel: mongoose.Model<IBorrowerDocument> = mongoose.model<IBorrowerDocument>(MODEL_NAMES.borrowers, BorrowerSchema);
+export const BorrowerModel: mongoose.Model<IBorrowerDoc> = mongoose.model<IBorrowerDoc>(MODEL_NAMES.borrowers, BorrowerSchema);

package/models/FinancialComplianceBorrower.model.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from 'mongoose';
-import { IBorrowerDocument } from './Borrower.model';
+import { IBorrowerDoc } from './Borrower.model';
 import { IEmailRecipient } from './ComplianceItem.model';
 export interface IFinancialComplianceBorrowerSettings {
     invoiceSentDate: Date;
@@ -40,7 +40,7 @@ export interface IFinancialComplianceBorrowerSettings {
     reminderCounter: number;
 }
 export interface IFinancialComplianceBorrower extends IFinancialComplianceBorrowerSettings {
-    borrower: IBorrowerDocument;
+    borrower: IBorrowerDoc;
 }
 export interface IFinancialComplianceBorrowerDocument extends IFinancialComplianceBorrower, Document {
 }

package/models/FinancialComplianceBorrower.model.ts

@@ -1,7 +1,7 @@
 import mongoose, { Document } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
-import { IBorrowerDocument } from './Borrower.model';
+import { IBorrowerDoc } from './Borrower.model';
 import { IEmailRecipient } from './ComplianceItem.model';
 
 const mongooseLeanId = require('../plugins/id.plugin');
@@ -22,7 +22,7 @@ export interface IFinancialComplianceBorrowerSettings {
 }
 
 export interface IFinancialComplianceBorrower extends IFinancialComplianceBorrowerSettings {
-  borrower: IBorrowerDocument;
+  borrower: IBorrowerDoc;
 }
 
 export interface IFinancialComplianceBorrowerDocument extends IFinancialComplianceBorrower, Document {

package/package.json

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

package/services/borrowers.db.d.ts

@@ -25,13 +25,13 @@
 /// <reference types="mongoose/types/inferschematype" />
 import { IUserAccess } from '../interfaces/auth-user.interface';
 export declare class BorrowersDB {
-    getAllBorrowers(): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
+    getAllBorrowers(): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDoc> & Required<{
         _id: import("mongoose").Types.ObjectId;
-    })[]>;
-    getActiveBorrowers(): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
+    }>)[]>;
+    getActiveBorrowers(): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDoc> & Required<{
         _id: import("mongoose").Types.ObjectId;
-    })[]>;
-    getAllowedBorrowers(user: IUserAccess): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDocument> & {
+    }>)[]>;
+    getAllowedBorrowers(user: IUserAccess): Promise<(import("mongoose").FlattenMaps<import("../models/Borrower.model").IBorrowerDoc> & Required<{
         _id: import("mongoose").Types.ObjectId;
-    })[]>;
+    }>)[]>;
 }

package/services/borrowers.service.d.ts

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose from 'mongoose';
 import { IBorrowerSettingsDocPopulated } from '../models/BorrowerSettings.model';
-import { IBorrowerDocument } from '../models/Borrower.model';
+import { IBorrowerDoc } from '../models/Borrower.model';
 import { IBorrowerDataDocWithName } from '../models/BorrowerData.model';
 import { CollateralsService } from './collaterals.service';
 import { LoanStatementStatusService } from './loan-statement-status.service';
@@ -42,17 +42,17 @@ export declare class BorrowerService {
     constructor(getCollateralsService: () => CollateralsService, getLoanStatementStatusService: () => LoanStatementStatusService, getLoanTransactionsService: () => LoanTransactionsService, getSignsService: () => SignsService);
     isBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean;
     checkBorrower(user: IUser, requestedBorrowerId: string): boolean;
-    getBorrowerById(borrowerId: string): Promise<mongoose.FlattenMaps<IBorrowerDocument> & {
+    getBorrowerById(borrowerId: string): Promise<mongoose.FlattenMaps<IBorrowerDoc> & Required<{
         _id: mongoose.Types.ObjectId;
-    }>;
-    isNameCodeAllowed(borrower: IBorrowerDocument): Promise<{
+    }>>;
+    isNameCodeAllowed(borrower: IBorrowerDoc): Promise<{
         message: string;
     }>;
     private getDefaultSettings;
     private addOptionNames;
     getBorrowerOption(borrowerId: string, optionName: string): Promise<IBorrowerDataDocWithName>;
     getBorrowerSettings(borrowerId: string): Promise<IBorrowerSettingsDocPopulated>;
-    getBorrowerByCode(code: string): Promise<IBorrowerDocument>;
+    getBorrowerByCode(code: string): Promise<IBorrowerDoc>;
     getExtraInfo(borrowerId: string): Promise<{
         extraInfo: {
             REVOLVER: {
@@ -82,8 +82,8 @@ export declare class BorrowerService {
     }>;
     updateBorrowerSettings(borrowerId: string, borrowerSettings: IBorrowerSettingsDocPopulated): Promise<void>;
     getBorrowerCodesMap(): Promise<Map<string, string>>;
-    getBorrowerStatementDetails(borrowers: IBorrowerDocument[]): Promise<{
-        [x: number]: {
+    getBorrowerStatementDetails(borrowers: IBorrowerDoc[]): Promise<{
+        [x: string]: {
             LAST_MONTH?: boolean;
             CURRENT_MONTH?: boolean;
             ENTIRE_LOAN?: boolean;

package/services/borrowers.service.ts

@@ -5,7 +5,7 @@ import {
   IBorrowerSettings,
   IBorrowerSettingsDocPopulated,
 } from '../models/BorrowerSettings.model';
-import { BorrowerModel, IBorrowerDocument } from '../models/Borrower.model';
+import { BorrowerModel, IBorrowerDoc } from '../models/Borrower.model';
 import {
   BorrowerDataModel,
   BorrowerDataOptionModel,
@@ -73,7 +73,7 @@ export class BorrowerService {
     return BorrowerModel.findById(borrowerId).lean();
   }
 
-  async isNameCodeAllowed(borrower: IBorrowerDocument) {
+  async isNameCodeAllowed(borrower: IBorrowerDoc) {
     const existingUserName = await BorrowerModel.findOne({ name: borrower.name });
     const existingUserCode = await BorrowerModel.findOne({ code: borrower.code });
     if (existingUserName && existingUserName.id !== borrower._id) {
@@ -177,7 +177,7 @@ export class BorrowerService {
     return await this.addOptionNames(unmappedSettings as IBorrowerSettingsDocPopulated);
   }
 
-  async getBorrowerByCode(code: string): Promise<IBorrowerDocument> {
+  async getBorrowerByCode(code: string): Promise<IBorrowerDoc> {
     return BorrowerModel.findOne({ code });
   }
 
@@ -274,7 +274,7 @@ export class BorrowerService {
     return codesMap;
   }
 
-  async getBorrowerStatementDetails(borrowers: IBorrowerDocument[]) {
+  async getBorrowerStatementDetails(borrowers: IBorrowerDoc[]) {
     const allBorrowersWithExtraInfo = await Promise.all(borrowers.map(async (borrower) => {
       const borrowerId = borrower._id.toString();
       const loanStatementStatusService = this.getLoanStatementStatusService();

package/services/file-manager.service.d.ts

@@ -23,12 +23,12 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose from 'mongoose';
-import { IBorrowerDocument } from '../models/Borrower.model';
+import { IBorrowerDoc } from '../models/Borrower.model';
 import { IComplianceFile } from '../models/ComplianceItem.model';
 import { ComplianceBorrowersService } from './compliance-borrowers.service';
 export type BorrowerWithFiles = {
     _id: mongoose.Types.ObjectId;
-    borrower: IBorrowerDocument;
+    borrower: IBorrowerDoc;
     files: IComplianceFile[];
 };
 export declare class FileManagerService {

package/services/file-manager.service.ts

@@ -1,14 +1,14 @@
 import mongoose from 'mongoose';
 
 import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
-import { IBorrowerDocument } from '../models/Borrower.model';
+import { IBorrowerDoc } from '../models/Borrower.model';
 import { IComplianceFile } from '../models/ComplianceItem.model';
 
 import { ComplianceBorrowersService } from './compliance-borrowers.service';
 
 export type BorrowerWithFiles = {
   _id: mongoose.Types.ObjectId;
-  borrower: IBorrowerDocument;
+  borrower: IBorrowerDoc;
   files: IComplianceFile[]
 }
 

package/services/loan-statement.service.js

@@ -173,7 +173,8 @@ class LoanStatementService {
             return;
         }
         await this.cleanProductStatement(productId, statementDate);
-        const balance = await this.loanChargesService.getLoanProductBalance(productId, dayjs_1.default.utc(statementDate).add(1, 'day').toDate());
+        const balanceDate = dayjs_1.default.utc(statementDate).add(1, 'day').subtract(1, 'second').toDate();
+        const balance = await this.loanChargesService.getLoanProductBalance(productId, balanceDate);
         const loanStatementEffectsService = this.getLoanStatementEffectsService();
         await loanStatementEffectsService.saveMonthData(productId, statementDate);
         const charges = await this.loanChargesService.getLoanChargeForProduct(productId);

package/services/loan-statement.service.ts

@@ -208,7 +208,8 @@ export class LoanStatementService {
       return;
     }
     await this.cleanProductStatement(productId, statementDate);
-    const balance = await this.loanChargesService.getLoanProductBalance(productId, dayjs.utc(statementDate).add(1, 'day').toDate());
+    const balanceDate = dayjs.utc(statementDate).add(1, 'day').subtract(1, 'second').toDate();
+    const balance = await this.loanChargesService.getLoanProductBalance(productId, balanceDate);
 
     const loanStatementEffectsService = this.getLoanStatementEffectsService();
     await loanStatementEffectsService.saveMonthData(productId, statementDate);

package/services/reports.service.d.ts

@@ -100,9 +100,9 @@ export declare class ReportsService {
     getCollateralAdjustmentsForLastSignedBBC(borrowerId: string, date: Date): Promise<number>;
     private getProductBalances;
     getBorrowerAndProducts(borrowerId: string, date: Date, useSignedBBC?: boolean, requireBBC?: boolean): Promise<{
-        borrower: import("mongoose").Document<unknown, {}, import("../models/Borrower.model").IBorrowerDocument> & import("../models/Borrower.model").IBorrowerDocument & {
+        borrower: import("mongoose").Document<unknown, {}, import("../models/Borrower.model").IBorrowerDoc> & import("../models/Borrower.model").IBorrowerDoc & Required<{
             _id: import("mongoose").Types.ObjectId;
-        };
+        }>;
         latestBBC: import("../models/BBCDate.model").IBBCDateDoc;
         summaries: import("./availability.service").IAvailabilityFullSummary;
         products: import("../models/LoanProducts.model").ILoanProductView[];

package/services/signs.service.d.ts

@@ -26,7 +26,7 @@ import mongoose, { Document } from 'mongoose';
 import { IResult } from '../interfaces/result.interface';
 import { IAvailabilitySignView } from '../models/AvailabilitySigns.model';
 import { IBBCDateDoc } from '../models/BBCDate.model';
-import { IBorrowerDocument } from '../models/Borrower.model';
+import { IBorrowerDoc } from '../models/Borrower.model';
 import { IPaginatorOptions } from '../interfaces/collaterals.interface';
 import { UsersService } from './users.service';
 import { LoanTransactionsService } from './loan-transactions.service';
@@ -34,7 +34,7 @@ import { LockService } from './lock.service';
 import { LoanStatementService } from './loan-statement.service';
 import { IUser } from '../interfaces/auth-user.interface';
 export interface IBBCDateWithBorrower extends Document {
-    borrowerId: IBorrowerDocument;
+    borrowerId: IBorrowerDoc;
     bbcDate: Date;
 }
 export declare enum ESignStatus {

package/services/signs.service.ts

@@ -19,7 +19,7 @@ import { MODEL_NAMES } from '../models/_models';
 import { getOlderBBCDates } from '../db/bbcDates.db';
 import { ELogActionType, ELogType } from '../models/UserLog.model';
 import { createLog, ICreateLogParams } from '../db/user-logs.db';
-import { IBorrowerDocument } from '../models/Borrower.model';
+import { IBorrowerDoc } from '../models/Borrower.model';
 import { IPaginatorOptions } from '../interfaces/collaterals.interface';
 import { ITEMS_PAGINATION } from '../db/collaterals.db';
 import { UsersService } from './users.service';
@@ -30,7 +30,7 @@ import { LoanStatementService } from './loan-statement.service';
 import { IUser } from '../interfaces/auth-user.interface';
 
 export interface IBBCDateWithBorrower extends Document {
-  borrowerId: IBorrowerDocument;
+  borrowerId: IBorrowerDoc;
   bbcDate: Date;
 }