gemcap-be-common 1.5.68 → 1.5.70

package/helpers/excel.helper.d.ts

@@ -22,12 +22,7 @@ export interface IExcelJsCell {
     t?: string;
     z?: string;
     hyperlink?: string;
-    s?: {
-        font?: Partial<ExcelJS.Font>;
-        alignment?: Partial<ExcelJS.Alignment>;
-        fill?: Partial<ExcelJS.FillPattern>;
-        border?: Partial<ExcelJS.Borders>;
-    };
+    s?: Partial<ExcelJS.Style>;
 }
 export declare const cellStyles: {
     title: {

package/helpers/excel.helper.js

@@ -199,11 +199,16 @@ const convertDataToFileWithStyle = async (dataToConvert, options) => {
                         };
                     }
                     if (cell.s.fill) {
-                        excelCell.fill = {
-                            type: 'pattern',
-                            pattern: 'solid',
-                            ...cell.s.fill,
-                        };
+                        if (cell.s.fill.type === 'pattern') {
+                            excelCell.fill = {
+                                type: 'pattern',
+                                pattern: cell.s.fill.pattern ?? 'solid',
+                                ...cell.s.fill,
+                            };
+                        }
+                        else {
+                            excelCell.fill = cell.s.fill;
+                        }
                     }
                     if (cell.s.border) {
                         excelCell.border = cell.s.border;

package/helpers/excel.helper.ts

@@ -26,12 +26,13 @@ export interface IExcelJsCell {
   t?: string;
   z?: string;
   hyperlink?: string;
-  s?: {
-    font?: Partial<ExcelJS.Font>;
-    alignment?: Partial<ExcelJS.Alignment>;
-    fill?: Partial<ExcelJS.FillPattern>;
-    border?: Partial<ExcelJS.Borders>;
-  };
+  // s?: {
+  //   font?: Partial<ExcelJS.Font>;
+  //   alignment?: Partial<ExcelJS.Alignment>;
+  //   fill?: Partial<ExcelJS.FillPattern>;
+  //   border?: Partial<ExcelJS.Borders>;
+  // };
+  s?: Partial<ExcelJS.Style>;
 }
 
 export const cellStyles = {
@@ -234,11 +235,15 @@ export const convertDataToFileWithStyle = async (
             };
           }
           if (cell.s.fill) {
-            excelCell.fill = {
-              type: 'pattern',
-              pattern: 'solid',
-              ...cell.s.fill,
-            };
+            if (cell.s.fill.type === 'pattern') {
+              excelCell.fill = {
+                type: 'pattern',
+                pattern: cell.s.fill.pattern ?? 'solid',
+                ...cell.s.fill,
+              };
+            } else {
+              excelCell.fill = cell.s.fill;
+            }
           }
           if (cell.s.border) {
             excelCell.border = cell.s.border;

package/package.json

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

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

@@ -23,27 +23,28 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose from 'mongoose';
-import { IEmailRecipient } from '../models/ComplianceItem.model';
+import { IBorrowerItemDocument, IBorrowerItemInstanceDocument, IEmailRecipient } from '../models/ComplianceItem.model';
 import { IGroupedEmailsUpdate } from '../interfaces/email-addresses.interface';
 import { IComplianceBorrowerWithBorrower, IComplianceBorrowerDocumentFull, IComplianceBorrowerWithPlaidToken } from '../models/BorrowerCompliance.model';
 import { IUserAccess } from '../interfaces/auth-user.interface';
 import { FileManagerService } from './file-manager.service';
 import { UploadsService } from './uploads.service';
+export interface IInstanceStatus {
+    progress: {
+        text: string;
+        status: string;
+    };
+    score: {
+        value: number;
+        tooltip: string;
+    };
+}
 export declare class ComplianceBorrowersService {
     private readonly _fileManagerService;
     private readonly _uploadsService;
     constructor(_fileManagerService: FileManagerService, _uploadsService: UploadsService);
     isComplianceBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean;
-    calculateInstanceStatuses(instance: any, item: any): {
-        progress: {
-            text: string;
-            status: string;
-        };
-        score: {
-            value: number;
-            tooltip: string;
-        };
-    };
+    calculateInstanceStatuses(instance: IBorrowerItemInstanceDocument, item: IBorrowerItemDocument): IInstanceStatus;
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any>;
     getAllBorrowersShortened(userAccess: IUserAccess): Promise<(Pick<IComplianceBorrowerWithBorrower, "borrower" | "fundingStatus" | "items"> | {
         items: {

package/services/compliance-borrowers.service.ts

@@ -2,7 +2,12 @@ import dayjs, { ManipulateType } from 'dayjs';
 import _ from 'lodash';
 import mongoose from 'mongoose';
 
-import { IBorrowerItemDocument, IEmailRecipient } from '../models/ComplianceItem.model';
+import {
+  IBorrowerItemDocument,
+  IBorrowerItemInstanceDocument,
+  IComplianceFile,
+  IEmailRecipient,
+} from '../models/ComplianceItem.model';
 import { IGroupedEmailsUpdate } from '../interfaces/email-addresses.interface';
 import { EItemProgressStatus } from '../enums/item-progress-status.enum';
 import {
@@ -35,6 +40,17 @@ const dueDifference = (date) => {
   return currentDate.diff(nextDate, 'day');
 };
 
+export interface IInstanceStatus {
+  progress: {
+    text: string;
+    status: string;
+  };
+  score: {
+    value: number;
+    tooltip: string;
+  };
+}
+
 export class ComplianceBorrowersService {
 
   constructor(
@@ -51,7 +67,7 @@ export class ComplianceBorrowersService {
     return true;
   }
 
-  calculateInstanceStatuses(instance, item) {
+  calculateInstanceStatuses(instance: IBorrowerItemInstanceDocument, item: IBorrowerItemDocument): IInstanceStatus {
     let progress: { text: string, status: string };
     let score: { value: number, tooltip: string } = null;
     if (instance.submittedDate) {
@@ -77,7 +93,7 @@ export class ComplianceBorrowersService {
     return { progress, score };
   }
 
-  async getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any> {
+  async getFullComplianceBorrowerById(complianceBorrowerId: string) {
     if (!complianceBorrowerId) {
       return null;
     }
@@ -109,7 +125,7 @@ export class ComplianceBorrowersService {
       return Promise.resolve(null);
     }
 
-    const items = { items: [], ...ourBorrower }.items.map((item) => {
+    const items = { items: [] as IBorrowerItemDocument[], ...ourBorrower }.items.map((item) => {
       return {
         ...item,
         instances: item.instances.reduce((acc, instance) => {
@@ -124,7 +140,10 @@ export class ComplianceBorrowersService {
             console.error({ e });
             return acc;
           }
-        }, []),
+        }, <(IBorrowerItemInstanceDocument & IInstanceStatus & {
+          itemId: mongoose.Types.ObjectId,
+          files: IComplianceFile[]
+        })[]>[]),
       };
     });
     return Promise.resolve({ ...ourBorrower, items });

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

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