gemcap-be-common 1.4.3 → 1.4.5

package/services/brokers.service.d.ts

@@ -46,9 +46,9 @@ export declare class BrokersService {
     getAllProductBrokers(): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _id: import("mongoose").Types.ObjectId;
     })[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
+    getBorrowerBrokers(borrowerId: string): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _id: import("mongoose").Types.ObjectId;
-    })[]>;
+    })[] | BrokerView[]>;
     getProductBrokers(productId: string): Promise<import("../models/ProductBroker.model").IProductBrokerDocWithBroker[]>;
     getTotalShares(borrowerId: string, brokers: IProductBrokerView[], replaceNames?: boolean): Promise<ProductTotal>;
     getTotals(borrowerId: string): Promise<BrokerTotalView[]>;

package/services/compliance-borrowers.service.d.ts

@@ -44,8 +44,8 @@ export declare class ComplianceBorrowersService {
             tooltip: string;
         };
     };
-    getFullComplianceBorrowerById(complianceBorrowerId: any): Promise<any>;
-    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "items" | "borrower" | "fundingStatus"> | {
+    getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any>;
+    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "fundingStatus" | "items"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;

package/services/compliance-borrowers.service.js

@@ -75,10 +75,10 @@ class ComplianceBorrowersService {
             path: 'items',
             populate: { path: 'item', model: 'complianceItems' },
         })
-            .populate({
-            path: 'items',
-            populate: { path: 'instances.files.uploadedBy', model: 'users' },
-        })
+            // .populate({
+            //   path: 'items',
+            //   populate: { path: 'instances.files.uploadedBy', model: MODEL_NAMES.users },
+            // }) // TODO remove this when we have a better way to handle users
             .transform((borrower) => ({ ...borrower, plaidAccessToken: borrower?.plaidAccessToken ?? false }))
             .lean();
         if (!ourBorrower.borrower) {

package/services/compliance-borrowers.service.ts

@@ -76,7 +76,7 @@ export class ComplianceBorrowersService {
     return { progress, score };
   }
 
-  async getFullComplianceBorrowerById(complianceBorrowerId): Promise<any> {
+  async getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any> {
     if (!complianceBorrowerId) {
       return null;
     }
@@ -87,10 +87,10 @@ export class ComplianceBorrowersService {
         path: 'items',
         populate: { path: 'item', model: 'complianceItems' },
       })
-      .populate({
-        path: 'items',
-        populate: { path: 'instances.files.uploadedBy', model: 'users' },
-      })
+      // .populate({
+      //   path: 'items',
+      //   populate: { path: 'instances.files.uploadedBy', model: MODEL_NAMES.users },
+      // }) // TODO remove this when we have a better way to handle users
       .transform((borrower) => ({ ...borrower, plaidAccessToken: borrower?.plaidAccessToken ?? false }))
       .lean() as IComplianceBorrowerDocumentFull;
     if (!ourBorrower.borrower) {

package/services/loan-payments.service.js

@@ -214,7 +214,7 @@ class LoanPaymentsService {
                 productId: new mongoose_1.default.Types.ObjectId(productId),
                 reference: `${borrower.code} - STATEMENT PAID`,
                 transactionType: LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION,
-                userId: new mongoose_1.default.Types.ObjectId(userId),
+                userId,
             };
             transaction.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(transaction);
             const newTransaction = await this.loanTransactionsService.createLoanTransaction(transaction);
@@ -355,7 +355,7 @@ class LoanPaymentsService {
                             productId: revolverProduct._id,
                             reference: `${product.type} STATEMENT ADDED TO LOAN`,
                             transactionType: LoanTransaction_model_1.ELoanTransactionTypes.DISBURSEMENT,
-                            userId: new mongoose_1.default.Types.ObjectId(userId),
+                            userId,
                         };
                         newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
                         await this.loanTransactionsService.createLoanTransaction(newTransactions);
@@ -373,7 +373,7 @@ class LoanPaymentsService {
                     productId: revolverProduct._id,
                     reference: `OVERPAYMENT OF STATEMENT`,
                     transactionType: LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION,
-                    userId: new mongoose_1.default.Types.ObjectId(userId),
+                    userId,
                 };
                 newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
                 await this.loanTransactionsService.createLoanTransaction(newTransactions);
@@ -388,7 +388,7 @@ class LoanPaymentsService {
                     productId: new mongoose_1.default.Types.ObjectId(p.productId),
                     reference: `EXTRA PAYMENT REF`,
                     transactionType: LoanTransaction_model_1.ELoanTransactionTypes.COLLECTION,
-                    userId: new mongoose_1.default.Types.ObjectId(userId),
+                    userId,
                 };
                 newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
                 await this.loanTransactionsService.createLoanTransaction(newTransactions);

package/services/loan-payments.service.ts

@@ -249,7 +249,7 @@ export class LoanPaymentsService {
         productId: new mongoose.Types.ObjectId(productId),
         reference: `${borrower.code} - STATEMENT PAID`,
         transactionType: ELoanTransactionTypes.COLLECTION,
-        userId: new mongoose.Types.ObjectId(userId),
+        userId,
       };
       transaction.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(transaction);
       const newTransaction = await this.loanTransactionsService.createLoanTransaction(transaction);
@@ -399,7 +399,7 @@ export class LoanPaymentsService {
               productId: revolverProduct._id,
               reference: `${product.type} STATEMENT ADDED TO LOAN`,
               transactionType: ELoanTransactionTypes.DISBURSEMENT,
-              userId: new mongoose.Types.ObjectId(userId),
+              userId,
             };
             newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
             await this.loanTransactionsService.createLoanTransaction(newTransactions);
@@ -418,7 +418,7 @@ export class LoanPaymentsService {
           productId: revolverProduct._id,
           reference: `OVERPAYMENT OF STATEMENT`,
           transactionType: ELoanTransactionTypes.COLLECTION,
-          userId: new mongoose.Types.ObjectId(userId),
+          userId,
         };
         newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
         await this.loanTransactionsService.createLoanTransaction(newTransactions);
@@ -434,7 +434,7 @@ export class LoanPaymentsService {
           productId: new mongoose.Types.ObjectId(p.productId),
           reference: `EXTRA PAYMENT REF`,
           transactionType: ELoanTransactionTypes.COLLECTION,
-          userId: new mongoose.Types.ObjectId(userId),
+          userId,
         };
         newTransactions.effectiveDate = await this.loanTransactionsService.calculateEffectiveDate(newTransactions);
         await this.loanTransactionsService.createLoanTransaction(newTransactions);

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

@@ -112,7 +112,7 @@ export declare class LoanStatementService {
         isSystem: boolean;
         memo: string;
         settlementCode?: string;
-        userId?: import("mongoose").Types.ObjectId;
+        userId?: string;
         isEditable?: boolean;
         _id?: any;
         __v?: any;

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

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

package/services/loan-transactions.service.js

@@ -215,7 +215,7 @@ class LoanTransactionsService {
                     balance: 0,
                     floatedBalance: 0,
                     effectiveDate: await this.calculateEffectiveDate(item),
-                    userId: new mongoose_1.default.Types.ObjectId(userId),
+                    userId,
                 };
                 const newLoanTransaction = new LoanTransaction_model_1.LoanTransaction({
                     order: item.order,
@@ -283,7 +283,7 @@ class LoanTransactionsService {
                 transaction.amount = new decimal_js_1.default(transaction.amount).abs().neg().toNumber();
                 break;
         }
-        transaction.userId = new mongoose_1.default.Types.ObjectId(userId);
+        transaction.userId = userId;
         return transaction;
     }
     async createLoanTransaction(transaction) {

package/services/loan-transactions.service.ts

@@ -264,7 +264,7 @@ export class LoanTransactionsService {
           balance: 0,
           floatedBalance: 0,
           effectiveDate: await this.calculateEffectiveDate(item),
-          userId: new mongoose.Types.ObjectId(userId),
+          userId,
         };
         const newLoanTransaction = new LoanTransaction({
           order: item.order,
@@ -337,7 +337,7 @@ export class LoanTransactionsService {
         transaction.amount = new Decimal(transaction.amount).abs().neg().toNumber();
         break;
     }
-    transaction.userId = new mongoose.Types.ObjectId(userId);
+    transaction.userId = userId;
     return transaction;
   }
 

package/services/signs.service.d.ts

@@ -51,6 +51,7 @@ export declare class SignsService {
     users: IUser[];
     fulfillUserList(): Promise<void>;
     clearUserList(): void;
+    getAvailabilitiesSigns(bbcDateIds: string[]): Promise<IAvailabilitySignView[]>;
     getAvailabilitySigns(bbcDateId: string): Promise<IAvailabilitySignView>;
     revokeAvailability(bbcDateId: string, userId: string, userIdRevoked: string): Promise<void>;
     signAvailability(bbcDateId: string, user: IUser): Promise<IResult>;

package/services/signs.service.js

@@ -39,8 +39,25 @@ class SignsService {
     clearUserList() {
         this.users = null;
     }
+    async getAvailabilitiesSigns(bbcDateIds) {
+        const availabilitySigns = await (0, availability_db_1.getAvailabilitySigns)(bbcDateIds);
+        const users = await this.usersService.getUserList();
+        const usersMap = users.reduce((acc, user) => {
+            return { ...acc, [user.id]: user };
+        }, {});
+        return availabilitySigns.map((availabilitySign) => {
+            return {
+                ...availabilitySign,
+                signs: availabilitySign.signs.map((sign) => ({
+                    ...sign,
+                    userSigned: usersMap[sign.userSignedId],
+                    userRevoked: usersMap[sign.userRevokedId],
+                }))
+            };
+        });
+    }
     async getAvailabilitySigns(bbcDateId) {
-        const availabilitiesSigns = await (0, availability_db_1.getAvailabilitySigns)([bbcDateId]);
+        const availabilitiesSigns = await this.getAvailabilitiesSigns([bbcDateId]);
         if (!availabilitiesSigns.length) {
             return {
                 _id: null,
@@ -50,26 +67,12 @@ class SignsService {
             };
         }
         const availabilitySigns = availabilitiesSigns[0];
-        let keyCloakUsers = this.users;
-        if (!keyCloakUsers) {
-            keyCloakUsers = await this.usersService.getUserList();
-        }
         availabilitySigns.signs = availabilitySigns.signs.reduce((acc, userSign) => {
             if (!userSign.userSigned) {
                 return acc;
             }
-            const foundUserSigned = keyCloakUsers.find((user) => user.id === userSign.userSigned.id);
-            if (foundUserSigned) {
-                userSign.userSigned.firstName = foundUserSigned.firstName;
-                userSign.userSigned.lastName = foundUserSigned.lastName;
-            }
             userSign.userSigned = (lodash_1.default.pick(userSign.userSigned, ['_id', 'firstName', 'lastName']));
             if (userSign.userRevoked) {
-                const foundUserRevoked = keyCloakUsers.find((user) => user.id === userSign.userRevoked.id);
-                if (foundUserRevoked) {
-                    userSign.userRevoked.firstName = foundUserRevoked.firstName;
-                    userSign.userRevoked.lastName = foundUserRevoked.lastName;
-                }
                 userSign.userRevoked = (lodash_1.default.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName']));
             }
             return [...acc, lodash_1.default.pick(userSign, ['userSigned', 'signedAt', 'userRevoked', 'revokedAt'])];
@@ -202,7 +205,7 @@ class SignsService {
             },
             ...(0, collaterals_db_1.ITEMS_PAGINATION)(paginatorOptions),
         ]);
-        const availabilitiesSigns = await (0, availability_db_1.getAvailabilitySigns)(BBCDates.map((bbcDate) => bbcDate._id.toString()));
+        const availabilitiesSigns = await this.getAvailabilitiesSigns(BBCDates.map((bbcDate) => bbcDate._id.toString()));
         await Promise.all(BBCDates.slice().map(async (bbcDate) => {
             const foundAvailabilitySigns = availabilitiesSigns.find((aSigns) => aSigns.bbcDateId.toString() === bbcDate._id.toString());
             if (!foundAvailabilitySigns) {

package/services/signs.service.ts

@@ -60,8 +60,26 @@ export class SignsService {
     this.users = null;
   }
 
+  async getAvailabilitiesSigns(bbcDateIds: string[]): Promise<IAvailabilitySignView[]> {
+    const availabilitySigns = await getAvailabilitySigns(bbcDateIds);
+    const users = await this.usersService.getUserList();
+    const usersMap = users.reduce((acc, user) => {
+      return { ...acc, [user.id]: user };
+    }, <Record<string, IUser>>{});
+    return availabilitySigns.map((availabilitySign) => {
+      return {
+        ...availabilitySign,
+        signs: availabilitySign.signs.map((sign) => ({
+          ...sign,
+          userSigned: usersMap[sign.userSignedId],
+          userRevoked: usersMap[sign.userRevokedId],
+        }))
+      }
+    }) as unknown as IAvailabilitySignView[];
+  }
+
   async getAvailabilitySigns(bbcDateId: string): Promise<IAvailabilitySignView> {
-    const availabilitiesSigns = await getAvailabilitySigns([bbcDateId]);
+    const availabilitiesSigns = await this.getAvailabilitiesSigns([bbcDateId]);
     if (!availabilitiesSigns.length) {
       return <IAvailabilitySignView>{
         _id: null,
@@ -71,26 +89,12 @@ export class SignsService {
       };
     }
     const availabilitySigns = availabilitiesSigns[0];
-    let keyCloakUsers = this.users;
-    if (!keyCloakUsers) {
-      keyCloakUsers = await this.usersService.getUserList();
-    }
     availabilitySigns.signs = availabilitySigns.signs.reduce((acc, userSign) => {
       if (!userSign.userSigned) {
         return acc;
       }
-      const foundUserSigned = keyCloakUsers.find((user) => user.id === userSign.userSigned.id);
-      if (foundUserSigned) {
-        userSign.userSigned.firstName = foundUserSigned.firstName;
-        userSign.userSigned.lastName = foundUserSigned.lastName;
-      }
       userSign.userSigned = (_.pick(userSign.userSigned, ['_id', 'firstName', 'lastName'])) as IUser;
       if (userSign.userRevoked) {
-        const foundUserRevoked = keyCloakUsers.find((user) => user.id === userSign.userRevoked.id);
-        if (foundUserRevoked) {
-          userSign.userRevoked.firstName = foundUserRevoked.firstName;
-          userSign.userRevoked.lastName = foundUserRevoked.lastName;
-        }
         userSign.userRevoked = (_.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName'])) as IUser;
       }
       return [...acc, _.pick(userSign, ['userSigned', 'signedAt', 'userRevoked', 'revokedAt'])];
@@ -233,7 +237,7 @@ export class SignsService {
       ...ITEMS_PAGINATION(paginatorOptions),
     ]);
 
-    const availabilitiesSigns = await getAvailabilitySigns(BBCDates.map((bbcDate) => bbcDate._id.toString()));
+    const availabilitiesSigns = await this.getAvailabilitiesSigns(BBCDates.map((bbcDate) => bbcDate._id.toString()));
     await Promise.all(BBCDates.slice().map(async (bbcDate) => {
       const foundAvailabilitySigns = availabilitiesSigns.find((aSigns) => aSigns.bbcDateId.toString() ===bbcDate._id.toString());
       if (!foundAvailabilitySigns) {

package/services/uploads.service.js

@@ -118,7 +118,7 @@ class UploadsService {
             borrowerId: borrowerIdToWrite,
             filename: file.filename,
             originalName: file.originalname,
-            userId: new mongoose_1.default.Types.ObjectId(userId),
+            userId,
             type: uploadType,
         };
         return await UploadedFile_model_1.default.create(newFile);

package/services/uploads.service.ts

@@ -139,7 +139,7 @@ export class UploadsService {
       borrowerId: borrowerIdToWrite,
       filename: file.filename,
       originalName: file.originalname,
-      userId: new mongoose.Types.ObjectId(userId),
+      userId,
       type: uploadType,
     };
     return await UploadedFile.create(newFile);

package/services/users.service.d.ts

@@ -21,9 +21,9 @@
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose" />
 /// <reference types="mongoose/types/inferschematype" />
 import express from 'express';
-import mongoose from 'mongoose';
 import { IRole, IUser } from '../interfaces/auth-user.interface';
 interface IKeycloakConfig {
     keycloakHost: string;
@@ -36,10 +36,10 @@ export declare class UsersService {
     private readonly config;
     constructor(config: IKeycloakConfig);
     getUserAccessByRequest(req: express.Request): Promise<IUser | null>;
-    getUserById(userId: string): Promise<IUser | null>;
-    getUserByUsername(username: string): Promise<IUser | null>;
-    getUserByToken(req: express.Request): Promise<IUser | null>;
-    getUserIdByToken(req: express.Request): Promise<string | null>;
+    getUserById(userId: string): Promise<IUser>;
+    getUserByUsername(username: string): Promise<IUser>;
+    getUserByToken(req: express.Request): Promise<IUser>;
+    getUserIdByToken(req: express.Request): Promise<string>;
     getUserList(): Promise<IUser[]>;
     getAllRoles(): Promise<IRole[]>;
     getUserRoles(userId: string): Promise<string[]>;
@@ -54,8 +54,8 @@ export declare class UsersService {
         }[];
     }>;
     createUserLoginLog(): Promise<void>;
-    getUserLogByDate(userId: string, date: Date): Promise<mongoose.FlattenMaps<import("../models/UserLog.model").IUserLog> & Required<{
-        _id: mongoose.Types.ObjectId;
+    getUserLogByDate(userId: string, date: Date): Promise<import("mongoose").FlattenMaps<import("../models/UserLog.model").IUserLog> & Required<{
+        _id: import("mongoose").Types.ObjectId;
     }>>;
 }
 export {};

package/services/users.service.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsersService = void 0;
 const jwt_decode_1 = require("jwt-decode");
 const axios_1 = __importDefault(require("axios"));
-const mongoose_1 = __importDefault(require("mongoose"));
 const BorrowerCompliance_model_1 = require("../models/BorrowerCompliance.model");
 const UserMobileAccess_model_1 = require("../models/UserMobileAccess.model");
 const UserLog_model_1 = require("../models/UserLog.model");
@@ -129,7 +128,7 @@ class UsersService {
         // }
     }
     async getUserLogByDate(userId, date) {
-        return UserLog_model_1.UserLog.findOne({ userId: new mongoose_1.default.Types.ObjectId(userId), timestamp: date }).lean();
+        return UserLog_model_1.UserLog.findOne({ userId, timestamp: date }).lean();
     }
 }
 exports.UsersService = UsersService;

package/services/users.service.ts

@@ -1,7 +1,6 @@
 import { jwtDecode } from 'jwt-decode';
 import express from 'express';
 import axios from 'axios';
-import mongoose from 'mongoose';
 
 import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
 import { UserMobileAccess } from '../models/UserMobileAccess.model';
@@ -36,17 +35,17 @@ export class UsersService {
     return user;
   }
 
-  async getUserById(userId: string): Promise<IUser | null> {
-    const { data } = await axios.get(`${this.config.baseUrl}/users/by-id/${userId}`);
+  async getUserById(userId: string) {
+    const { data } = await axios.get<IUser>(`${this.config.baseUrl}/users/by-id/${userId}`);
     return data ?? null;
   }
 
-  async getUserByUsername(username: string): Promise<IUser | null> {
-    const { data } = await axios.get(`${this.config.baseUrl}/users/by-username/${username}`);
+  async getUserByUsername(username: string) {
+    const { data } = await axios.get<IUser>(`${this.config.baseUrl}/users/by-username/${username}`);
     return data ?? null;
   }
 
-  async getUserByToken(req: express.Request): Promise<IUser | null> {
+  async getUserByToken(req: express.Request) {
     const authorization = req.get('Authorization');
     if (!authorization) {
       return null;
@@ -55,7 +54,7 @@ export class UsersService {
     return this.getUserById(keycloakUserId);
   }
 
-  async getUserIdByToken(req: express.Request): Promise<string | null> {
+  async getUserIdByToken(req: express.Request) {
     const user = await this.getUserByToken(req);
     if (user) {
       return user.id;
@@ -149,6 +148,6 @@ export class UsersService {
   }
 
   async getUserLogByDate(userId: string, date: Date) {
-    return UserLog.findOne({ userId: new mongoose.Types.ObjectId(userId), timestamp: date }).lean();
+    return UserLog.findOne({ userId, timestamp: date }).lean();
   }
 }