@dynamatix/gb-schemas 0.7.1 → 0.9.0

package/applicants/applicant.model.js

@@ -100,23 +100,59 @@ const applicantSchema = new mongoose.Schema({
     incomeSource: applicantIncomeSourceSchema,
     expenditure: applicantExpenditureSchema,
     employment: applicantEmploymentSchema,
-    commitments:[applicantCommitmentSchema],
+    commitments: [applicantCommitmentSchema],
     directDebit: applicantDirectDebitSchema,
     creditProfile: creditProfileSchema,
     income: incomeSchema
+}, {
+    timestamps: true,
+    toJSON: { virtuals: true },
+    toObject: { virtuals: true }
 });
 
 applicantSchema.virtual('nationality').get(function () {
-    return this.nationalityLid ? this.nationalityLid.name : null;
+    return this.nationalityLid?.name ?? null;
 });
 
 applicantSchema.virtual('residence').get(function () {
-    return this.countryOfResidenceLid ? this.countryOfResidenceLid.name : null;
+    return this.countryOfResidenceLid?.name ?? null;
 });
 
 applicantSchema.virtual('industry').get(function () {
-    return this.employment?.industryLid ? this.employment?.industryLid.name : null;
+    return this.employment?.industryLid ? this.employment?.industryLid?.name : null;
 });
-applicantSchema.set('toJSON', { virtuals: true });
+
+applicantSchema.virtual('addressCountry').get(function () {
+    return this.addressCountryLid?.name ?? null;
+});
+
+applicantSchema.virtual('previous1AddressCountry').get(function () {
+    return this.previous1AddressCountryLid?.name ?? null;
+});
+
+applicantSchema.virtual('previous2AddressCountry').get(function () {
+    return this.previous2AddressCountryLid?.name ?? null;
+});
+
+applicantSchema.virtual('maritalStatus').get(function () {
+    return this.maritalStatusLid?.name ?? null;
+});
+
+applicantSchema.virtual('relationshipToOthers').get(function () {
+    return this.relationshipToOthersLid?.name ?? null;
+});
+
+applicantSchema.virtual('residentialStatus').get(function () {
+    return this.residentialStatusLid?.name ?? null;
+});
+
+applicantSchema.virtual('taxPayer').get(function () {
+    return this.taxPayerLid?.name ?? null;
+});
+
+applicantSchema.virtual('vulnerabilityType').get(function () {
+    return this.VulnerabilityTypeLid?.name ?? null;
+});
+
 const ApplicantModel = mongoose.model("Applicant", applicantSchema);
-export default ApplicantModel;
+export default ApplicantModel;

package/applications/application.model.js

@@ -134,6 +134,16 @@ applicationSchema.virtual('noOfApplicants').get(function() {
   applicationSchema.virtual('solicitorEmail').get(function() {
     return this.solicitorId ? this.solicitorId?.email : null;
   });
+
+  // Virtual property for broker phone
+  applicationSchema.virtual('brokerPhone').get(function () {
+    return this.brokerId ? this.brokerId?.mobileTelephone : null;
+  });
+  
+  // Virtual property for solicitor phone
+  applicationSchema.virtual('solicitorPhone').get(function () {
+    return this.solicitorId ? this.solicitorId?.telephone : null;
+  });
   
 const ApplicationModel = mongoose.model("Application", applicationSchema);
 export default ApplicationModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/gb-schemas",
-  "version": "0.7.1",
+  "version": "0.9.0",
   "description": "All the schemas for gatehouse bank back-end",
   "main": "index.js",
   "scripts": {