@dynamatix/gb-schemas 2.3.272 → 2.3.274

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;AA+hBhC,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;AAulBhC,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA4D,CAAC;AAEnF,eAAe,gBAAgB,CAAC"}

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

@@ -237,14 +237,60 @@ welcomeCallSchema.virtual('customerCurrentResidentialAddress').get(function () {
                 applicant.addressLine2,
                 applicant.addressLine3,
                 applicant.addressCity,
-                applicant.addressPostCode,
-                countryName
+                applicant.propertyAddressCountry,
+                applicant.addressPostCode
             ].filter(part => part && part.trim() !== '');
             return addressParts.join(', ');
         }
     }
     return null;
 });
+// Virtual property for applicant employer/business name based on income settings
+welcomeCallSchema.virtual('applicantEmployerBusinessName').get(function () {
+    if (this.applicantId && typeof this.applicantId === 'object') {
+        const applicant = this.applicantId;
+        // Check if applicant has income settings
+        if (applicant.incomeSourceId && typeof applicant.incomeSourceId === 'object') {
+            const incomeSettings = applicant.incomeSourceId;
+            // If incomeFromEmployment is false, return N/A
+            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 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;
+                        if (employment.employerName && employment.employerName.trim() !== '') {
+                            return employment.employerName;
+                        }
+                    }
+                }
+                // 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;
+                        if (selfEmployment.nameOfBusiness && selfEmployment.nameOfBusiness.trim() !== '') {
+                            return selfEmployment.nameOfBusiness;
+                        }
+                    }
+                }
+            }
+            else {
+                console.log('No employment status found');
+            }
+        }
+    }
+    return 'N/A';
+});
 // Virtual property for Customer's Contact Numbers (Phone and Mobile)
 welcomeCallSchema.virtual('customerContactNumbers').get(function () {
     if (this.applicantId && typeof this.applicantId === 'object') {
@@ -262,11 +308,19 @@ welcomeCallSchema.virtual('customerContactNumbers').get(function () {
     }
     return null;
 });
-// Virtual property for all applicants name/DOB when there are multiple applicants
-welcomeCallSchema.virtual('allApplicantsNameAndDOB').get(function () {
-    // Get application and its applicants
-    if (this.applicationId && typeof this.applicationId === 'object') {
-        const application = this.applicationId;
+// Virtual property for other applicants name and DOB in the requested format
+welcomeCallSchema.virtual('otherApplicantsNameAndDOB').get(function () {
+    let application = null;
+    if (this.applicantId && typeof this.applicantId === 'object' && !(typeof this.applicantId.toHexString === 'function') && this.applicantId.applicationId) {
+        application = this.applicantId.applicationId;
+    }
+    else if (this.applicationId && typeof this.applicationId === 'object') {
+        application = this.applicationId;
+    }
+    else {
+        return 'N/A';
+    }
+    if (application) {
         // 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
@@ -280,7 +334,7 @@ welcomeCallSchema.virtual('allApplicantsNameAndDOB').get(function () {
             if (otherApplicants.length === 0) {
                 return 'N/A';
             }
-            // Format each other applicant as: firstName,middleName,lastName,dd/mm/yyyy
+            // 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')) {
@@ -289,8 +343,8 @@ welcomeCallSchema.virtual('allApplicantsNameAndDOB').get(function () {
                 const firstName = applicant.firstName || '';
                 const middleName = applicant.middleName || '';
                 const lastName = applicant.lastName || '';
-                // Combine first and middle names
-                const fullFirstName = middleName ? `${firstName},${middleName}` : firstName;
+                // 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) {
@@ -319,8 +373,9 @@ welcomeCallSchema.virtual('allApplicantsNameAndDOB').get(function () {
                         }
                     }
                 }
-                return `${fullFirstName},${lastName},${formattedDOB}`;
-            }).filter((line) => line && line.trim() !== ',,' && line.trim() !== '');
+                // 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');
         }

package/dist/shared/lookup.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lookup.model.d.ts","sourceRoot":"","sources":["../../shared/lookup.model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AA+BhC,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAyC,CAAC;AAC3D,eAAe,WAAW,CAAC"}
+{"version":3,"file":"lookup.model.d.ts","sourceRoot":"","sources":["../../shared/lookup.model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAgChC,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAyC,CAAC;AAC3D,eAAe,WAAW,CAAC"}

package/dist/shared/lookup.model.js

@@ -22,5 +22,6 @@ lookupSchema.index({ value: 1 });
 lookupSchema.index({ name: 1 }, { collation: { locale: "en", strength: 2 } });
 // Compound index for lookupGroupId + name queries
 lookupSchema.index({ lookupGroupId: 1, name: 1 }, { collation: { locale: "en", strength: 2 } });
+lookupSchema.index({ lookupGroupId: 1, value: 1 });
 const LookupModel = mongoose.model('Lookup', lookupSchema);
 export default LookupModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/gb-schemas",
-  "version": "2.3.272",
+  "version": "2.3.274",
   "description": "All the schemas for gatehouse bank back-end",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/DynamatixAnalyticsPvtLtd/gb-schemas#readme",
   "dependencies": {
-    "@dynamatix/cat-shared": "^0.0.126",
+    "@dynamatix/cat-shared": "^0.0.127",
     "dotenv": "^16.4.5",
     "mongodb": "^6.14.2",
     "mongoose": "^8.9.5"