@dynamatix/gb-schemas 0.21.0 → 0.21.2

package/applications/application-audit.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const applicationAuditSchema = new mongoose.Schema({
     auditId: {

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

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const checkListItemSchema = new mongoose.Schema({
   additionalOfferConditions: { type: String, default: "" },

package/applications/application-company-model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const companySchema = new mongoose.Schema({
   addressCity: { type: String, default: "" },

package/applications/application-document.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const documentSchema = new mongoose.Schema({
     applicationId: {

package/applications/application-fieldconfig.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const fieldConfigSchema = new mongoose.Schema({
     fieldName: { type: String, required: true, unique: true },

package/applications/application-mortgage.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const mortgageSchema = new mongoose.Schema({
     depositComeFrom: { type: String, required: true },          

package/applications/application-note.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const noteSchema = new mongoose.Schema({
     applicationId: { type: mongoose.Schema.Types.ObjectId, ref: "Application", required: true },

package/applications/application-onboarding.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const onboardingSchema = new mongoose.Schema({
   errors: { type: String, default: "" }, 

package/applications/application-rationale.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const rationaleSchema = new mongoose.Schema({
   applicationId: { type: mongoose.Schema.Types.ObjectId, ref: "Application", required: true },

package/applications/application-risk-narrative.model.js

@@ -1,5 +1,5 @@
 import mongoose from 'mongoose';
-import mongooseEncryption from '../utils/encryption.middleware';
+import mongooseEncryption from '../utils/encryption.middleware.js';
 
 const applicantionRiskNarrativeSchema = new mongoose.Schema({
     call1RequestedOn: { type: String },

package/applications/broker.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const brokerSchema = new mongoose.Schema({
     brokerId: { type: Number },

package/applications/document.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const documentSchema = new mongoose.Schema({
     applicationId: {

package/applications/productfeatures.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const feeSchema = new mongoose.Schema({
     feeType: { type: String, required: true },

package/package.json

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

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

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const productCatalogueSchema = new mongoose.Schema({
     productCatalogueId: { type: String, required: true }, 

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

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const ruleSchema = new mongoose.Schema({
     ruleId: { type: String, required: true }, 

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

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const productVariantSchema = new mongoose.Schema({
     productCatalogueId: { ref: "ProductCatalogue", type: mongoose.Schema.Types.ObjectId, required: true },

package/properties/property.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const dataStreetSchema = new mongoose.Schema({
     floorArea: { type: String, default: '' },

package/shared/alert.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const alertSchema = new mongoose.Schema({
     alertTypeLid: {

package/shared/checklist.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const checklistSchema = new mongoose.Schema({
     checkTypeLid: {

package/shared/lookup-group.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const lookupGroupSchema = new mongoose.Schema({
     name: {

package/shared/lookup.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const lookupSchema = new mongoose.Schema({
     name: {

package/shared/task-document.model.js

@@ -1,5 +1,5 @@
 import mongoose from 'mongoose';
-import mongooseEncryption from '../utils/encryption.middleware';
+import mongooseEncryption from '../utils/encryption.middleware.js';
 
 // Define the schema for TaskDocumentType
 const taskDocumentTypeSchema = new mongoose.Schema({

package/shared/task.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const { Schema } = mongoose;
 

package/users/user.model.js

@@ -1,5 +1,5 @@
 import mongoose from "mongoose";
-import mongooseEncryption from "../utils/encryption.middleware";
+import mongooseEncryption from "../utils/encryption.middleware.js";
 
 const ClaimSchema = new mongoose.Schema({
     key: { type: String, required: true },

package/utils/encryption.middleware.js

@@ -37,6 +37,16 @@ export default function mongooseEncryption(schema, options) {
         }
     });
 
+
+    // Encrypt before update operations (single or multiple documents)
+    schema.pre("update", function (result) {
+        if (Array.isArray(result)) {
+            result.forEach(doc => doc.set(decryptObject(doc.toObject(), collectionName)));
+        } else {
+            result.set(encryptObject(result.toObject(), collectionName)); // Decrypt single document
+        }
+    });
+
     // Decrypt after update operations (single or multiple documents)
     schema.post("update", function (result) {
         if (Array.isArray(result)) {
@@ -46,6 +56,13 @@ export default function mongooseEncryption(schema, options) {
         }
     });
 
+    // Encrypt after updateOne operations
+    schema.pre("updateOne", function (result) {
+        if (result && result.toObject) {
+            result.set(encryptObject(result.toObject(), collectionName)); // Decrypt single document
+        }
+    });
+
     // Decrypt after updateOne operations
     schema.post("updateOne", function (result) {
         if (result && result.toObject) {
@@ -53,6 +70,12 @@ export default function mongooseEncryption(schema, options) {
         }
     });
 
+    schema.pre("findOneAndUpdate", function (result) {
+        if (result && result.toObject) {
+            result.set(encryptObject(result.toObject(), collectionName)); // Decrypt single document
+        }
+    });
+
     // Decrypt after find operations (e.g., find, findMany)
     schema.post("find", function (docs) {
         console.log("find", docs);
@@ -73,6 +96,7 @@ export default function mongooseEncryption(schema, options) {
         if (doc) doc.set(decryptObject(doc.toObject(), collectionName)); // Decrypt single document
     });
 
+
     // Decrypt after findOneAndUpdate operations
     schema.post("findOneAndUpdate", function (doc) {
         console.log("findOneAndUpdate", doc);