gemcap-be-common 1.5.26 → 1.5.28

package/models/Prospect.model.d.ts

@@ -302,6 +302,7 @@ export interface IProspect extends IProspectBase, IProspectExternalNew {
     };
     closingPoints: number;
     expectedLoanYield: number;
+    depositRequested: number;
     state: string;
     contacts: IProspectContact[];
     underwriterIds: mongoose.Types.ObjectId[];

package/models/Prospect.model.js

@@ -455,6 +455,7 @@ exports.ProspectValidationSchema = joi_1.default.object({
     industryId: joi_1.default.string().required(),
     status: joi_1.default.string().valid(...Object.values(EProspectStatus)).required(),
     probability: joi_1.default.number().required(),
+    depositRequested: joi_1.default.number().required(),
     revolver: joi_1.default.object({
         commitment: joi_1.default.number(),
         expected: joi_1.default.number(),
@@ -625,6 +626,9 @@ exports.ProspectSchema = new mongoose_1.default.Schema({
     expectedLoanYield: {
         type: Number,
     },
+    depositRequested: {
+        type: Number,
+    },
     keyDates: {
         lastContact: {
             type: Date,

package/models/Prospect.model.ts

@@ -559,6 +559,7 @@ export interface IProspect extends IProspectBase, IProspectExternalNew {
   },
   closingPoints: number;
   expectedLoanYield: number;
+  depositRequested: number;
   state: string;
   contacts: IProspectContact[];
   underwriterIds: mongoose.Types.ObjectId[];
@@ -639,6 +640,7 @@ export const ProspectValidationSchema = Joi.object({
   industryId: Joi.string().required(),
   status: Joi.string().valid(...Object.values(EProspectStatus)).required(),
   probability: Joi.number().required(),
+  depositRequested: Joi.number().required(),
   revolver: Joi.object({
     commitment: Joi.number(),
     expected: Joi.number(),
@@ -815,6 +817,9 @@ export const ProspectSchema = new mongoose.Schema<IProspect, ProspectModel>(
     expectedLoanYield: {
       type: Number,
     },
+    depositRequested: {
+      type: Number,
+    },
     keyDates: {
       lastContact: {
         type: Date,

package/package.json

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

package/services/pdf.service.js

@@ -440,8 +440,10 @@ class PdfService {
                 emptyString,
                 ...preparedTransactionsHeader,
                 preparedTransactions,
-                productForPeriod.length === index + 1 ? emptyString : pageBreaker,
             ];
+            const productPageEnd = productForPeriod.length === index + 1
+                ? emptyString
+                : pageBreaker;
             if (product.type === loan_types_enum_1.ELoanTypes.TERM) {
                 const { termLoanTableData, monthlyPrincipal, dueDate, } = await this.getTermLoan(product._id.toString(), new Date(start));
                 if (monthlyPrincipal !== null) {
@@ -465,9 +467,13 @@ class PdfService {
                         table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
                         layout: 'lightHorizontalLines',
                     },
+                    productPageEnd,
                 ];
             }
-            return baseContent;
+            return [
+                ...baseContent,
+                productPageEnd,
+            ];
         }));
         const preparedTotal = Object.entries(totalGroupedData).map(([chargeType, amount]) => {
             totalStatementValue = new decimal_js_1.default(totalStatementValue).add(amount).toNumber();

package/services/pdf.service.ts

@@ -522,9 +522,12 @@ export class PdfService {
         emptyString,
         ...preparedTransactionsHeader,
         preparedTransactions,
-        productForPeriod.length === index + 1 ? emptyString : pageBreaker,
       ];
 
+      const productPageEnd = productForPeriod.length === index + 1
+        ? emptyString
+        : pageBreaker;
+
       if (product.type === ELoanTypes.TERM) {
         const {
           termLoanTableData,
@@ -554,10 +557,14 @@ export class PdfService {
             table: { widths: ['*', '*', '*', '*', '*', '*', '*', '*', '*'], body: termLoanTableData },
             layout: 'lightHorizontalLines',
           },
+          productPageEnd,
         ];
       }
 
-      return baseContent;
+      return [
+        ...baseContent,
+        productPageEnd,
+      ];
     }));
 
     const preparedTotal = Object.entries(totalGroupedData).map(([chargeType, amount]) => {