@dynamatix/gb-schemas 2.3.261 → 2.3.262

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

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

@@ -226,12 +226,18 @@ welcomeCallSchema.virtual('customerCurrentResidentialAddress').get(function () {
         const applicant = this.applicantId;
         // Use only regular address fields (addressLine1, addressLine2, addressLine3)
         if (applicant.addressLine1) {
+            // Get country name from populated addressCountryLid
+            let countryName = '';
+            if (applicant.addressCountryLid && typeof applicant.addressCountryLid === 'object') {
+                countryName = applicant.addressCountryLid.name || '';
+            }
             const addressParts = [
                 applicant.addressLine1,
                 applicant.addressLine2,
                 applicant.addressLine3,
                 applicant.addressCity,
-                applicant.addressPostCode
+                applicant.addressPostCode,
+                countryName
             ].filter(part => part && part.trim() !== '');
             return addressParts.join(', ');
         }
@@ -257,46 +263,101 @@ welcomeCallSchema.virtual('customerContactNumbers').get(function () {
 });
 // Virtual property for all applicants name/DOB when there are multiple applicants
 welcomeCallSchema.virtual('allApplicantsNameAndDOB').get(function () {
-    // For single applicant, return the current applicant's name and DOB
-    if (this.applicantId && typeof this.applicantId === 'object') {
-        const applicant = this.applicantId;
-        const name = applicant.firstName && applicant.lastName
-            ? `${applicant.firstName} ${applicant.lastName}`
-            : 'Unknown Name';
-        const dob = applicant.dateOfBirth || 'Unknown DOB';
-        return `${name}/${dob}`;
+    // 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: firstName,middleName,lastName,dd/mm/yyyy
+            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
+                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;
+                            }
+                        }
+                    }
+                }
+                return `${fullFirstName},${lastName},${formattedDOB}`;
+            }).filter((line) => line && line.trim() !== ',,' && line.trim() !== '');
+            // Join all applicants with newline
+            return formattedApplicants.join('\n');
+        }
     }
-    return null;
+    // 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 () {
-    if (this.applicantId && typeof this.applicantId === 'object' && this.applicantId.applicationId) {
-        const application = this.applicantId.applicationId;
+    // Access application from welcome call directly
+    if (this.applicationId && typeof this.applicationId === 'object') {
+        const application = this.applicationId;
         let brokerName = '';
-        let solicitorFirmName = '';
-        // Get broker name
-        if (application && application.brokerId && typeof application.brokerId === 'object') {
+        let tradingName = '';
+        // Get broker information
+        if (application.brokerId && typeof application.brokerId === 'object') {
             const broker = application.brokerId;
+            // Get broker name
             if (broker.firstName && broker.lastName) {
                 brokerName = `${broker.firstName} ${broker.lastName}`;
             }
-        }
-        // Get solicitor firm name
-        if (application && application.solicitorId && typeof application.solicitorId === 'object') {
-            const solicitor = application.solicitorId;
-            if (solicitor.nameOfFirm) {
-                solicitorFirmName = solicitor.nameOfFirm;
+            // Get trading name (try both lowercase and uppercase)
+            if (broker.tradingName) {
+                tradingName = broker.tradingName;
+            }
+            else if (broker.TradingName) {
+                tradingName = broker.TradingName;
             }
         }
-        // Combine in format "Broker name / nameOfFirm"
-        if (brokerName && solicitorFirmName) {
-            return `${brokerName} / ${solicitorFirmName}`;
+        // Combine in format "Broker name / Trading Name"
+        if (brokerName && tradingName) {
+            return `${brokerName} / ${tradingName}`;
         }
         else if (brokerName) {
             return brokerName;
         }
-        else if (solicitorFirmName) {
-            return solicitorFirmName;
+        else if (tradingName) {
+            return tradingName;
         }
     }
     return null;
@@ -332,18 +393,24 @@ welcomeCallSchema.virtual('accountHolderAndBank').get(function () {
 });
 // virtual property for property address
 welcomeCallSchema.virtual('customerPropertyAddress').get(function () {
-    if (this.applicantId && typeof this.applicantId === 'object') {
-        const applicant = this.applicantId;
-        // Use only regular address fields (propertyAddressLine1, propertyAddressLine2, propertyAddressLine3)
-        if (applicant.propertyAddressLine1) {
-            const addressParts = [
-                applicant.propertyAddressLine1,
-                applicant.propertyAddressLine2,
-                applicant.propertyAddressLine3,
-                applicant.propertyAddressCity,
-                applicant.propertyAddressPostCode
-            ].filter(part => part && part.trim() !== '');
-            return addressParts.join(', ');
+    // Get property address from application's security reference
+    if (this.applicationId && typeof this.applicationId === 'object') {
+        const application = this.applicationId;
+        // Access security details through securityId
+        if (application.securityId && typeof application.securityId === 'object') {
+            const security = application.securityId;
+            // Use property address fields from security model
+            if (security.propertyAddressLine1) {
+                const addressParts = [
+                    security.propertyAddressLine1,
+                    security.propertyAddressLine2,
+                    security.propertyAddressLine3,
+                    security.propertyAddressCity,
+                    security.propertyAddressPostCode
+                ].filter(part => part && part.trim() !== '')
+                    .map(part => `${part},`);
+                return addressParts.join('\n');
+            }
         }
     }
     return null;
@@ -366,6 +433,70 @@ welcomeCallSchema.virtual('applicantEmployer').get(function () {
     }
     return null;
 });
+// Virtual property for product name
+welcomeCallSchema.virtual('productName').get(function () {
+    // Get product from application
+    if (this.applicationId && typeof this.applicationId === 'object') {
+        const application = this.applicationId;
+        // First check if selectedProduct is on the application directly
+        let selectedProduct = application.selectedProduct;
+        // If not found on application, check productId
+        if (!selectedProduct || selectedProduct.trim() === '') {
+            if (application.productId && typeof application.productId === 'object') {
+                selectedProduct = application.productId.selectedProduct;
+            }
+        }
+        // Extract text before parentheses if selectedProduct has a value
+        if (selectedProduct && typeof selectedProduct === 'string' && selectedProduct.trim() !== '') {
+            // Extract text before opening parenthesis and trim whitespace
+            const match = selectedProduct.match(/^([^(]+)/);
+            if (match && match[1]) {
+                let productName = match[1].trim();
+                // Remove product type words like "Fixed", "Variable", "Tracker", etc.
+                // Split by common product type keywords and return only the first part
+                const productTypeKeywords = ['Fixed', 'Variable', 'Tracker', 'Discount', 'Capped'];
+                for (const keyword of productTypeKeywords) {
+                    if (productName.includes(keyword)) {
+                        productName = productName.split(keyword)[0].trim();
+                        break;
+                    }
+                }
+                return productName;
+            }
+            // If no parentheses found, return the whole string trimmed
+            return selectedProduct.trim();
+        }
+    }
+    return null;
+});
+// Virtual property for initial rate percentage
+welcomeCallSchema.virtual('initialRatePercentage').get(function () {
+    // Get product features from application
+    if (this.applicationId && typeof this.applicationId === 'object') {
+        const application = this.applicationId;
+        // Check if product features are available
+        if (application.productFeatures && typeof application.productFeatures === 'object') {
+            const productFeatures = application.productFeatures;
+            // Get initialRate value
+            if (productFeatures.initialRate !== undefined && productFeatures.initialRate !== null) {
+                const initialRate = productFeatures.initialRate;
+                // Convert to number
+                const rateValue = typeof initialRate === 'string' ? parseFloat(initialRate) : initialRate;
+                // Check if valid number
+                if (!isNaN(rateValue)) {
+                    // If value is less than 1, it's likely stored as decimal (e.g., 0.0599)
+                    // Multiply by 100 to get percentage
+                    // If value is greater than or equal to 1, it's likely already in percentage form (e.g., 5.99)
+                    // Divide by 100 as requested by user
+                    const percentageValue = rateValue >= 1 ? rateValue / 100 : rateValue * 100;
+                    // Format to 2 decimal places and add % sign
+                    return `${percentageValue.toFixed(2)}%`;
+                }
+            }
+        }
+    }
+    return null;
+});
 // Apply workflow plugin to the schema
 applyWorkflowPlugin(welcomeCallSchema, 'applicantwelcomecall');
 const WelcomeCallModel = mongoose.model('ApplicantWelcomeCall', welcomeCallSchema);

package/package.json

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