@dynamatix/gb-schemas 2.3.267 → 2.3.269

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;AAymBhC,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;AAspBhC,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA4D,CAAC;AAEnF,eAAe,gBAAgB,CAAC"}

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

@@ -247,59 +247,42 @@ welcomeCallSchema.virtual('customerCurrentResidentialAddress').get(function () {
 });
 // Virtual property for applicant employer/business name based on income settings
 welcomeCallSchema.virtual('applicantEmployerBusinessName').get(function () {
-    console.log(this.applicantId, 'testing');
     if (this.applicantId && typeof this.applicantId === 'object') {
         const applicant = this.applicantId;
-        console.log(applicant, 'applicant data');
         // Check if applicant has income settings
         if (applicant.incomeSourceId && typeof applicant.incomeSourceId === 'object') {
             const incomeSettings = applicant.incomeSourceId;
-            // Debug logging
-            console.log('Income Settings:', {
-                incomeFromEmployment: incomeSettings.incomeFromEmployment,
-                employmentStatusLid: incomeSettings.employmentStatusLid
-            });
             // If incomeFromEmployment is false, return N/A
-            if (!incomeSettings.incomeFromEmployment) {
-                console.log('Returning N/A: incomeFromEmployment is false');
+            if (!incomeSettings.incomeFromEmployment)
                 return 'N/A';
-            }
             // Check employment status to determine if employed or self-employed
             if (incomeSettings.employmentStatusLid && typeof incomeSettings.employmentStatusLid === 'object') {
                 const employmentStatus = incomeSettings.employmentStatusLid;
-                const statusValue = employmentStatus.value || employmentStatus.name;
-                console.log('Employment Status:', {
-                    statusValue,
-                    name: employmentStatus.name,
-                    value: employmentStatus.value
-                });
-                // Check if it's employed status (options 1, 3, 5)
-                if (statusValue === '1' || statusValue === '3' || statusValue === '5') {
-                    console.log('Matched employed status, checking employment info');
+                const statusName = employmentStatus.name;
+                // Check if it's employed status - compare by name for stability
+                if (statusName === 'Employee with no shareholding' ||
+                    statusName === 'A non-equity partner in a partnership' ||
+                    statusName === 'A shareholder with less than 25% shares') {
                     // Check employment information
                     if (applicant.employmentInformationId && typeof applicant.employmentInformationId === 'object') {
                         const employment = applicant.employmentInformationId;
-                        console.log('Employment Info:', { employerName: employment.employerName });
                         if (employment.employerName && employment.employerName.trim() !== '') {
                             return employment.employerName;
                         }
                     }
                 }
-                // Check if it's self-employed or solo trader status (options 2, 4)
-                else if (statusValue === '2' || statusValue === '4' || statusValue === '6') {
-                    console.log('Matched self-employed status, checking self-employment info');
+                // Check if it's self-employed or solo trader status - compare by name for stability
+                else if (statusName === 'A shareholder with 25% or more shares' ||
+                    statusName === 'An equity partner in a partnership' ||
+                    statusName === 'Sole Trader') {
                     // Check self-employment information
                     if (applicant.selfEmployedInformationId && typeof applicant.selfEmployedInformationId === 'object') {
                         const selfEmployment = applicant.selfEmployedInformationId;
-                        console.log('Self-Employment Info:', { nameOfBusiness: selfEmployment.nameOfBusiness });
                         if (selfEmployment.nameOfBusiness && selfEmployment.nameOfBusiness.trim() !== '') {
                             return selfEmployment.nameOfBusiness;
                         }
                     }
                 }
-                else {
-                    console.log('No matching employment status found for:', statusValue);
-                }
             }
             else {
                 console.log('No employment status found');
@@ -397,6 +380,73 @@ welcomeCallSchema.virtual('allApplicantsNameAndDOB').get(function () {
     // If application not populated or no applicants, return "N/A"
     return 'N/A';
 });
+// Virtual property for other applicants name and DOB in the requested format
+welcomeCallSchema.virtual('otherApplicantsNameAndDOB').get(function () {
+    // Get application and its applicants
+    if (this.applicationId && typeof this.applicationId === 'object') {
+        const application = this.applicationId;
+        // Get all applicants from the application (field name is 'applicants')
+        if (application.applicants && Array.isArray(application.applicants) && application.applicants.length > 0) {
+            // Get current applicant ID for comparison
+            const currentApplicantId = this.applicantId?._id || this.applicantId;
+            // Filter out the current applicant to get only OTHER applicants
+            const otherApplicants = application.applicants.filter((applicant) => {
+                const applicantId = applicant._id || applicant;
+                return applicantId.toString() !== currentApplicantId.toString();
+            });
+            // If no other applicants, return "N/A" (single applicant case)
+            if (otherApplicants.length === 0) {
+                return 'N/A';
+            }
+            // Format each other applicant as: "First and middle names, last name, Date of birth"
+            const formattedApplicants = otherApplicants.map((applicant) => {
+                // Check if applicant is an ObjectId (not populated)
+                if (typeof applicant === 'string' || (applicant.constructor && applicant.constructor.name === 'ObjectId')) {
+                    return null; // Skip unpopulated references
+                }
+                const firstName = applicant.firstName || '';
+                const middleName = applicant.middleName || '';
+                const lastName = applicant.lastName || '';
+                // Combine first and middle names with space
+                const fullFirstName = middleName ? `${firstName} ${middleName}` : firstName;
+                // Format date of birth to dd/mm/yyyy
+                let formattedDOB = '';
+                if (applicant.dateOfBirth) {
+                    // Check if dateOfBirth is already a formatted string (DD/MM/YYYY)
+                    if (typeof applicant.dateOfBirth === 'string' && /^\d{2}\/\d{2}\/\d{4}$/.test(applicant.dateOfBirth)) {
+                        // Already in DD/MM/YYYY format
+                        formattedDOB = applicant.dateOfBirth;
+                    }
+                    else {
+                        // Try to parse as Date object or ISO string
+                        try {
+                            const date = new Date(applicant.dateOfBirth);
+                            // Check if date is valid
+                            if (!isNaN(date.getTime())) {
+                                const day = String(date.getDate()).padStart(2, '0');
+                                const month = String(date.getMonth() + 1).padStart(2, '0');
+                                const year = date.getFullYear();
+                                formattedDOB = `${day}/${month}/${year}`;
+                            }
+                        }
+                        catch (e) {
+                            // Date parsing failed, try to use as-is if it's a string
+                            if (typeof applicant.dateOfBirth === 'string') {
+                                formattedDOB = applicant.dateOfBirth;
+                            }
+                        }
+                    }
+                }
+                // 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');
+        }
+    }
+    // If application not populated or no applicants, return "N/A"
+    return 'N/A';
+});
 // Virtual property for broker name and firm 
 welcomeCallSchema.virtual('brokerNameAndFirm').get(function () {
     // Access application from welcome call directly

package/package.json

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