gemcap-be-common 1.5.156 → 1.5.158

package/package.json

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

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

@@ -58,7 +58,7 @@ export declare class ComplianceBorrowersService {
     isComplianceBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean;
     calculateInstanceStatuses(instance: IBorrowerItemInstance, item: IBorrowerItemLean): IInstanceStatus;
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<IComplianceBorrowerDocumentFullWithStatuses>;
-    getAllBorrowersShortened(userAccess: IUserAccess): Promise<Pick<IComplianceBorrowerWithBorrower, "items" | "borrower" | "fundingStatus">[]>;
+    getAllBorrowersShortened(userAccess: IUserAccess): Promise<Pick<IComplianceBorrowerWithBorrower, "borrower" | "items" | "fundingStatus">[]>;
     generateInstances(complianceBorrowerId: any): Promise<IComplianceBorrowerDocumentFullWithStatuses>;
     calculateAndUpdateFundingStatus(complianceBorrowerId: string): Promise<void>;
     calculateFundingStatus(complianceBorrower: IComplianceBorrowerDocumentFull): string;

package/services/user-logs.service.d.ts

@@ -5,7 +5,7 @@ import { BorrowersDB } from './borrowers.db';
 import { LoanChargesService } from './loan-charges.service';
 export interface IUserLogFilter {
     userId: string;
-    borrowerId: string;
+    borrowerId?: string;
     periodStart: Date;
     periodEnd: Date;
 }

package/services/user-logs.service.js

@@ -121,7 +121,7 @@ class UserLogsService {
                     $and: [
                         { 'timestamp': { $gte: filter.periodStart } },
                         { 'timestamp': { $lte: filter.periodEnd } },
-                        filter.userId ? { 'userId': new mongoose_1.default.Types.ObjectId(filter.userId) } : {},
+                        filter.userId ? { 'userId': filter.userId } : {},
                     ],
                 },
             },
@@ -132,9 +132,9 @@ class UserLogsService {
             },
         ]);
         const logsWithRecord = await Promise.all(logs.map(async (log) => await this.performDynamicLookup(log)));
-        const filteredByBorrowers = !filter.borrowerId
-            ? logsWithRecord.slice()
-            : await this.filterByBorrower(logsWithRecord, filter.borrowerId);
+        const filteredByBorrowers = filter.borrowerId
+            ? await this.filterByBorrower(logsWithRecord, filter.borrowerId)
+            : logsWithRecord.slice();
         await this.replaceBorrowers(filteredByBorrowers);
         return filteredByBorrowers;
     }

package/services/user-logs.service.ts

@@ -10,7 +10,7 @@ import { LoanChargesService } from './loan-charges.service';
 
 export interface IUserLogFilter {
   userId: string;
-  borrowerId: string;
+  borrowerId?: string;
   periodStart: Date;
   periodEnd: Date;
 }
@@ -138,7 +138,7 @@ export class UserLogsService {
           $and: [
             { 'timestamp': { $gte: filter.periodStart } },
             { 'timestamp': { $lte: filter.periodEnd } },
-            filter.userId ? { 'userId': new mongoose.Types.ObjectId(filter.userId) } : {},
+            filter.userId ? { 'userId': filter.userId } : {},
           ],
         },
       },
@@ -149,9 +149,9 @@ export class UserLogsService {
       },
     ]);
     const logsWithRecord = await Promise.all(logs.map(async (log) => await this.performDynamicLookup(log)));
-    const filteredByBorrowers = !filter.borrowerId
-      ? logsWithRecord.slice()
-      : await this.filterByBorrower(logsWithRecord, filter.borrowerId);
+    const filteredByBorrowers = filter.borrowerId
+      ? await this.filterByBorrower(logsWithRecord, filter.borrowerId)
+      : logsWithRecord.slice();
     await this.replaceBorrowers(filteredByBorrowers);
     return filteredByBorrowers;
   }