@dynamatix/gb-schemas 2.3.283 → 2.3.285

package/dist/applicants/applicant-welcome-call.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applicant-welcome-call.model.d.ts","sourceRoot":"","sources":["../../applicants/applicant-welcome-call.model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAosBhC,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA4D,CAAC;AAEnF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"applicant-welcome-call.model.d.ts","sourceRoot":"","sources":["../../applicants/applicant-welcome-call.model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAyrBhC,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA4D,CAAC;AAEnF,eAAe,gBAAgB,CAAC"}

package/dist/applicants/applicant-welcome-call.model.js

@@ -341,7 +341,7 @@ welcomeCallSchema.virtual('otherApplicantsNameAndDOB').get(function () {
                 return 'N/A';
             }
             // Format each other applicant as: "First and middle names, last name, Date of birth"
-            const formattedApplicants = otherApplicants.map((applicant) => {
+            const formattedApplicants = otherApplicants.map((applicant, index) => {
                 // Check if applicant is an ObjectId (not populated)
                 if (typeof applicant === 'string' || (applicant.constructor && applicant.constructor.name === 'ObjectId')) {
                     return null; // Skip unpopulated references
@@ -379,11 +379,17 @@ welcomeCallSchema.virtual('otherApplicantsNameAndDOB').get(function () {
                         }
                     }
                 }
-                // Format as "First and middle names, last name, Date of birth"
-                return `${fullFirstName}, ${lastName}, ${formattedDOB}`;
-            }).filter((line) => line && line.trim() !== ', ,' && line.trim() !== '');
-            // Join all applicants with newline
-            return formattedApplicants.join('\n');
+                const isLast = index === otherApplicants.length - 1;
+                const comma = isLast ? '' : ',';
+                // Format as an HTML line (with bold labels and inline values)
+                return `
+            <div class="applicant-line">
+                <span>${fullFirstName}, ${lastName}, ${formattedDOB}${comma}</span>
+            </div>
+        `;
+            }).filter((line) => line && line.trim() !== '');
+            // Join all applicants as HTML (no \n needed)
+            return formattedApplicants.join('');
         }
     }
     // If application not populated or no applicants, return "N/A"
@@ -561,7 +567,6 @@ welcomeCallSchema.virtual('initialRatePercentage').get(function () {
 });
 // Virtual property for finance summary HTML
 welcomeCallSchema.virtual('financeSummaryHtml').get(function () {
-    console.log('financeSummaryHtml virtual field called');
     let application = null;
     if (this.applicantId && typeof this.applicantId === 'object' && !(typeof this.applicantId.toHexString === 'function') && this.applicantId.applicationId) {
         application = this.applicantId.applicationId;
@@ -570,11 +575,9 @@ welcomeCallSchema.virtual('financeSummaryHtml').get(function () {
         application = this.applicationId;
     }
     else {
-        console.log('No application found');
-        return 'N/A';
+        return '-';
     }
     if (application) {
-        console.log('Application data:', JSON.stringify(application, null, 2));
         // Initialize summary data
         let product = '';
         let financeTerm = '';
@@ -584,47 +587,40 @@ welcomeCallSchema.virtual('financeSummaryHtml').get(function () {
         // Get product information (first 3 characters)
         if (application.selectedProduct && typeof application.selectedProduct === 'string') {
             product = application.selectedProduct;
-            console.log('Product from selectedProduct:', product);
         }
         else if (application.productId && typeof application.productId === 'object' && application.productId.selectedProduct) {
             product = application.productId.selectedProduct;
-            console.log('Product from productId:', product);
+        }
+        else {
+            product = '-';
         }
         // Get finance term from productId if available
         if (application.productId && typeof application.productId === 'object') {
             if (application.productId.numberOfYearsToRepay !== undefined && application.productId.numberOfYearsToRepay !== null) {
                 financeTerm = `${application.productId.numberOfYearsToRepay} year finance term`;
-                console.log('Finance term from productId:', financeTerm);
             }
         }
         else {
-            console.log('No productId found or not populated');
+            financeTerm = '-';
         }
-        // Note: productFeatures is a separate collection that needs to be populated in form configuration
-        // If you need productFeatures data, it should be populated separately in the form config
         // Get rental income from mortgage - mortgageId is at application level
         let mortgage = null;
         if (application.mortgageId && typeof application.mortgageId === 'object') {
             mortgage = application.mortgageId;
         }
         if (mortgage) {
-            console.log('Mortgage data:', JSON.stringify(mortgage, null, 2));
             // Get rental income - check if it exists (even if 0)
             if (mortgage.monthlyRentalIncome !== undefined && mortgage.monthlyRentalIncome !== null) {
-                // Format the rental income value
-                const rentalValue = typeof mortgage.monthlyRentalIncome === 'string'
-                    ? mortgage.monthlyRentalIncome
-                    : mortgage.monthlyRentalIncome.toString();
+                // Convert to number first, then format
+                const numericValue = Number(mortgage.monthlyRentalIncome);
+                const rentalValue = isNaN(numericValue) ? '0.00' : numericValue.toFixed(2);
                 rentalIncome = `£${rentalValue}`;
-                console.log('Rental income:', rentalIncome);
             }
             // Get finance amount from loanRequired
             if (mortgage.loanRequired !== undefined && mortgage.loanRequired !== null) {
-                const financeValue = typeof mortgage.loanRequired === 'string'
-                    ? mortgage.loanRequired
-                    : mortgage.loanRequired.toString();
+                const numericValue = Number(mortgage.loanRequired);
+                const financeValue = isNaN(numericValue) ? '0.00' : numericValue.toFixed(2);
                 monthlyFinance = `£${financeValue}`;
-                console.log('Monthly finance (loanRequired):', monthlyFinance);
             }
             // Get occupancy information from mortgage
             if (mortgage.proposedTenantsLids && Array.isArray(mortgage.proposedTenantsLids) && mortgage.proposedTenantsLids.length > 0) {
@@ -632,12 +628,11 @@ welcomeCallSchema.virtual('financeSummaryHtml').get(function () {
                 const firstTenant = mortgage.proposedTenantsLids[0];
                 if (firstTenant && typeof firstTenant === 'object' && firstTenant.name) {
                     occupancy = firstTenant.name;
-                    console.log('Occupancy:', occupancy);
-                }
-                else {
-                    occupancy = '-';
                 }
             }
+            else {
+                occupancy = '-';
+            }
         }
         // Create HTML content
         const summaryContent = `
@@ -647,11 +642,9 @@ welcomeCallSchema.virtual('financeSummaryHtml').get(function () {
         <div><p class="text-bold">Rental Income:</p> <span>${rentalIncome}</span></div>
         <div><p class="text-bold">Occupancy:</p> <span>${occupancy}</span></div>
         `;
-        console.log('Final summary content:', summaryContent);
         return summaryContent;
     }
-    console.log('No application found');
-    return 'N/A';
+    return '-';
 });
 applyAuditMiddleware(welcomeCallSchema, "ApplicantWelcomeCall");
 // Apply workflow plugin to the schema

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/gb-schemas",
-  "version": "2.3.283",
+  "version": "2.3.285",
   "description": "All the schemas for gatehouse bank back-end",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",