@dynamatix/gb-schemas 0.21.11 → 0.21.13

package/applicants/applicant-employment.model.js

@@ -18,7 +18,7 @@ const applicantEmploymentSchema = new mongoose.Schema({
 
     classLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", default: null },
     contractRemaining: { type: String },
-    dateJoined: { type: Date },
+    dateJoined: { type: String },
     disabilityLiving: { type: String },
     employerName: { type: String },
     employerTelephone: { type: String },
@@ -37,8 +37,8 @@ const applicantEmploymentSchema = new mongoose.Schema({
     previousAddressLine3: { type: String },
     previousAddressPostCode: { type: String },
     previousBasicGrossIncome: { type: String },
-    previousDateJoined: { type: Date },
-    previousDateLeft: { type: Date },
+    previousDateJoined: { type: String },
+    previousDateLeft: { type: String },
     previousEmployerName: { type: String },
     previousEmployerTelephone: { type: String },
     previousJobTitle: { type: String },

package/applicants/applicant-income.model.js

@@ -20,8 +20,8 @@ const incomeSchema = new mongoose.Schema({
     businessType: { type: String, default: '4' },
     charteredCertifiedOrOther: { type: String, default: '' },
     contactName: { type: String, default: '' },
-    currentYearEnd: { type: Date, default: null },
-    dateEstablished: { type: Date, default: null },
+    currentYearEnd: { type: String, default: null },
+    dateEstablished: { type: String, default: null },
     doYouHaveAccountant: { type: String, default: false },
     isBusinessAddressDifferent: { type: String, default: false },
     nameOfBusiness: { type: String, default: '' },
@@ -38,7 +38,7 @@ const incomeSchema = new mongoose.Schema({
     registeredCountry: { type: String, default: 'GBR' },
     registeredPostCode: { type: String, default: '' },
     registeredTelephone: { type: String, default: '' },
-    selfEmployedDate: { type: Date, default: null },
+    selfEmployedDate: { type: String, default: null },
     turnover1: { type: String, default: 0.0 },
     turnover2: { type: String, default: 0.0 },
     turnover3: { type: String, default: 0.0 },

package/applicants/applicant.model.js

@@ -18,7 +18,7 @@ const applicantSchema = new mongoose.Schema({
     addressLine1: { type: String, default: null },
     addressLine2: { type: String, default: null },
     addressLine3: { type: String, default: null },
-    addressMovedDate: { type: Date, default: null },
+    addressMovedDate: { type: String, default: null },
     addressPostCode: { type: String, default: null },
     correspondenceAddressCity: { type: String, default: null },
     correspondenceAddressCountry: { type: String, default: null },
@@ -27,7 +27,7 @@ const applicantSchema = new mongoose.Schema({
     correspondenceAddressLine3: { type: String, default: null },
     correspondenceAddressPostCode: { type: String, default: null },
     countryOfResidenceLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", default: null },
-    dateOfBirth: { type: Date, default: null },
+    dateOfBirth: { type: String, default: null },
     dependant10Age: { type: String, default: 0 },
     dependant1Age: { type: String, default: 0 },
     dependant2Age: { type: String, default: 0 },
@@ -74,7 +74,7 @@ const applicantSchema = new mongoose.Schema({
     previous1AddressLine1: { type: String, default: null },
     previous1AddressLine2: { type: String, default: null },
     previous1AddressLine3: { type: String, default: null },
-    previous1AddressMovedDate: { type: Date, default: null },
+    previous1AddressMovedDate: { type: String, default: null },
     previous1AddressPostCode: { type: String, default: null },
     previous1AddressPropertyOwnedBy: { type: String, default: null },
     previous2AddressCity: { type: String, default: null },
@@ -82,7 +82,7 @@ const applicantSchema = new mongoose.Schema({
     previous2AddressLine1: { type: String, default: null },
     previous2AddressLine2: { type: String, default: null },
     previous2AddressLine3: { type: String, default: null },
-    previous2AddressMovedDate: { type: Date, default: null },
+    previous2AddressMovedDate: { type: String, default: null },
     previous2AddressPostCode: { type: String, default: null },
     previous2AddressPropertyOwnedBy: { type: String, default: null },
     relationshipToOthersLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", default: null },

package/applications/application-audit.model.js

@@ -15,7 +15,7 @@ const applicationAuditSchema = new mongoose.Schema({
         required: true
     },
     auditDate: {
-        type: Date,
+        type: String,
         required: true
     },
     changeType: {

package/applications/application-checklist-Item.model.js

@@ -4,19 +4,19 @@ import mongooseEncryption from "../utils/encryption.middleware.js";
 const checkListItemSchema = new mongoose.Schema({
   additionalOfferConditions: { type: String, default: "" },
   appFormSignedNotes: { type: String, default: "" },
-  applicationCompletionDate: { type: Date },
+  applicationCompletionDate: { type: String },
   buildingInsuranceInsurerName: { type: String, default: "" },
   buildingInsurancePolicyNumber: { type: String, default: "" },
   buildingInsuranceReceived: { type: String, default: "" },
-  buildingInsuranceRenewalDate: { type: Date },
-  dateOfValuationReceived: { type: Date },
+  buildingInsuranceRenewalDate: { type: String },
+  dateOfValuationReceived: { type: String },
   feePaidDocumentsDownloaded: { type: String, default: "" },
   feePaidNotes: { type: String, default: "" },
   fundsNotes: { type: String, default: "" },
-  fundsReleasedDate: { type: Date },
+  fundsReleasedDate: { type: String },
   hasAllDocsReviewedAndAccepted: { type: String, default: "" },
   idnPorReceived: { type: String, default: "" },
-  legalCompletionDate: { type: Date },
+  legalCompletionDate: { type: String },
   legalDocsReceived: { type: String, default: "" },
   legalNotes: { type: String, default: "" },
   ninetyDaysValuationAmount: { type: String, default: "" },
@@ -26,21 +26,21 @@ const checkListItemSchema = new mongoose.Schema({
   offerOfferPrepared: { type: String, default: "" },
   offerOfferReviewed: { type: String, default: "" },
   offerSignedNotes: { type: String, default: "" },
-  offerSolicitorInstructedDate: { type: Date },
+  offerSolicitorInstructedDate: { type: String },
   packagingNotes: { type: String, default: "" },
   preOfferNotes: { type: String, default: "" },
   reinstatementAmount: { type: String, default: "" },
   rotReceived: { type: String, default: "" },
-  rotReceivedDate: { type: Date },
+  rotReceivedDate: { type: String },
   salesContractReceived: { type: String, default: "" },
   underwritingNotes: { type: String, default: "" },
   underwritingValuationNotes: { type: String, default: "" },
-  valuationAccepted: { type: Date },
+  valuationAccepted: { type: String },
   valuationFurtherConditions: { type: String, default: "" },
   valuationNotes: { type: String, default: "" },
-  valuationReceived: { type: Date },
-  valuationRequestedDate: { type: Date },
-  valuationScheduledDate: { type: Date },
+  valuationReceived: { type: String },
+  valuationRequestedDate: { type: String },
+  valuationScheduledDate: { type: String },
   valuationSurveyorDetails: { type: String, default: "" }
 });
 

package/applications/application-document.model.js

@@ -17,7 +17,7 @@ const documentSchema = new mongoose.Schema({
     documentTypeId: { type: String, required: false },
     fileName: { type: String, required: false },
     contentType: { type: String, required: false },
-    created: { type: Date, required: false },
+    created: { type: String, required: false },
     createdBy: { type: String, required: false },
     isGenerated: { type: String, required: false },
     data: { type: String, required: false },

package/applications/application-note.model.js

@@ -8,7 +8,7 @@ const noteSchema = new mongoose.Schema({
         default: null
     },
     createdOn: {
-        type: Date,
+        type: String,
         default: null
     },
     createdBy: {
@@ -29,7 +29,7 @@ const noteSchema = new mongoose.Schema({
         required: true
     },
     reminderDate: {
-        type: Date,
+        type: String,
         default: null
     },
     attachmentDocumentId: {

package/applications/application-offer.model.js

@@ -2,7 +2,7 @@ import mongoose from "mongoose";
 import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const offerSchema = new mongoose.Schema({
-  date: { type: Date } // The date associated with the offer
+  date: { type: String } // The date associated with the offer
 });
 
 

package/applications/application-onboarding.model.js

@@ -4,7 +4,7 @@ import mongooseEncryption from "../utils/encryption.middleware.js";
 const onboardingSchema = new mongoose.Schema({
   errors: { type: String, default: "" }, 
   status: { type: String, default: "" }, 
-  statusDate: { type: Date },
+  statusDate: { type: String },
   warnings: { type: String, default: "" } 
 });
 

package/applications/application.model.js

@@ -27,7 +27,7 @@ const applicationSchema = new mongoose.Schema(
     isBrokerAssigned: { type: String, default: false },
     isFinanceRecommendedToApplicant: { type: String, required: true },
     isWorkflowTaskCreated: { type: String, required: true },
-    lastUpdated: { type: Date },
+    lastUpdated: { type: String },
     lendingTypeLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
     networkClubName: { type: String, default: "" },
     isNetworkClubSubmission: { type: String, required: true },
@@ -44,7 +44,7 @@ const applicationSchema = new mongoose.Schema(
     sowSalary: { type: String, default: "" },
     statusLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
     submitReason: { type: String, default: "" },
-    submittedDate: { type: Date },
+    submittedDate: { type: String },
     underwriter: { type: String, default: "" },
     isValuationFeePaid: { type: String, required: true },
     withdrawalReason: { type: String, default: "" },
@@ -57,7 +57,7 @@ const applicationSchema = new mongoose.Schema(
       { type: mongoose.Schema.Types.ObjectId, ref: "Applicant" }
     ],
     statusLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
-    submittedDate: { type: Date },
+    submittedDate: { type: String },
     isValuationFeePaid: { type: String, required: true },
     isActive: { type: String, default: false },
     isUkResident: { type: String, default: true },

package/applications/document.model.js

@@ -17,7 +17,7 @@ const documentSchema = new mongoose.Schema({
     documentTypeId: { type: mongoose.Schema.Types.ObjectId, ref: "DocumentType", required: false },
     fileName: { type: String, required: false },
     contentType: { type: String, required: false },
-    created: { type: Date, required: false },
+    created: { type: String, required: false },
     createdBy: { type: String, required: false },
     isGenerated: { type: String, required: false },
     data: { type: String, required: false },

package/applications/productfeatures.model.js

@@ -49,7 +49,7 @@ const productFeaturesSchema = new mongoose.Schema({
     totalReversionRate: { type: String, default: null },
     initialRate: { type: String, required: true },
     fixedTerm: { type: String, required: true },
-    fixedTermEndDate: { type: Date, default: null },
+    fixedTermEndDate: { type: String, default: null },
     baseRate: { type: String, default: null },
     productRate: { type: String, default: null },
     apr: { type: String, default: null },
@@ -72,11 +72,11 @@ const productFeaturesSchema = new mongoose.Schema({
     ercCode: { type: String, default: '' },
     variableTerm: { type: String, default: null },
     totalFeePayable: { type: String, default: null },
-    dipIssueDate: { type: Date, default: null },
-    estimatedCompletionDate: { type: Date, default: null },
-    dipExpiryDate: { type: Date, default: null },
-    fixedRepaymentUntillDate: { type: Date, default: null },
-    rentalReviewDate: { type: Date, default: null },
+    dipIssueDate: { type: String, default: null },
+    estimatedCompletionDate: { type: String, default: null },
+    dipExpiryDate: { type: String, default: null },
+    fixedRepaymentUntillDate: { type: String, default: null },
+    rentalReviewDate: { type: String, default: null },
     totalReimbursementWithFee: { type: String, default: null },
     finalRentPayment: { type: String, default: null },
     clientDeposit: { type: String, default: null },

package/package.json

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

package/product-catalogues/product-catalogue.model.js

@@ -5,9 +5,9 @@ const productCatalogueSchema = new mongoose.Schema({
     productCatalogueId: { type: String, required: true }, 
     name: { type: String, required: true },
     description: { type: String },
-    applyFrom: { type: Date, required: true },
-    applyUntil: { type: Date, required: true },
-    submitUntil: { type: Date, required: true },
+    applyFrom: { type: String, required: true },
+    applyUntil: { type: String, required: true },
+    submitUntil: { type: String, required: true },
     status: { type: String, required: true },
     lockedForEdit: { type: String, required: true },
     baseRateName: { type: String },

package/shared/apprivo-sync-journey.model.js

@@ -12,8 +12,7 @@ const ApprivoSyncJourneySchema = new mongoose.Schema({
   isFirstPull: { type: String, required: true },
   jobRunId: { type: mongoose.Schema.Types.ObjectId, ref: "Job_Run"},
   startTime: {type: Date, default: null},
-  endTime: {type: Date, default: null},
-  timestamp: { type: Date, default: Date.now }
+  endTime: { type: Date, default: null},
 }, {timestamps: true});
 
 const ApprivoSyncJourneyModel = mongoose.model('ApprivoSyncJourney', ApprivoSyncJourneySchema);

package/shared/error-log.model.js

@@ -4,10 +4,10 @@ const errorSchema = new mongoose.Schema({
     error_message: { type: String, required: true },
     status_code: { type: Number, required: true },
     route: { type: String, required: true },
-    timestamp: { type: Date, default: Date.now },
     user_agent: { type: String, required: true },
     stack_trace: [{ type: String }]
-});
+},
+{ timestamps: true });
 
 const ErrorLogModel = mongoose.model("Error_Log", errorSchema);
 export default ErrorLogModel;

package/users/user.model.js

@@ -19,11 +19,11 @@ const userSchema = new mongoose.Schema({
     }],
     claims: [ClaimSchema],
     externalData: { type: mongoose.Schema.Types.Mixed },
-    modifiedOn: { type: Date },
+    modifiedOn: { type: String },
     modifiedById: { type: String },
-    createdOnInApprivo: { type: Date, default: Date.now },
+    createdOnInApprivo: { type: String},
     createdById: { type: String },
-    deletedOn: { type: Date },
+    deletedOn: { type: String },
     deletedById: { type: String },
     token: { type: String }
 }, {

package/utils/encryption.js

@@ -29,8 +29,12 @@ export const encryptObject = (obj, collectionName) => {
     let encryptedObj = {};
 
     for (const key in obj) {
-        if (key === "_id" || mongoose.isValidObjectId(obj[key])) {
-            encryptedObj[key] = obj[key]; // Don't encrypt _id
+        if (
+            key === "_id" ||
+            (Array.isArray(obj[key]) && obj[key].every(item => mongoose.isValidObjectId(item))) ||
+            mongoose.isValidObjectId(obj[key])
+        ) {
+            encryptedObj[key] = obj[key]; // Don't encrypt ObjectId references
         } else {
             const iv = crypto.randomBytes(IV_LENGTH); // Generate IV
             const cipher = crypto.createCipheriv("aes-256-gcm", SECRET_KEY, iv);