payservedb 6.2.8 → 6.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payservedb",
-  "version": "6.2.8",
+  "version": "6.2.9",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/models/facilityWalletTransactionsMetadata.js

@@ -138,37 +138,9 @@ facilityWalletTransactionsMetadataSchema
     return ["approved", "rejected", "cancelled"].includes(this.status);
   });
 
-// Pre-save middleware to validate status transitions
+// Simple pre-save middleware to set timestamps
 facilityWalletTransactionsMetadataSchema.pre("save", function (next) {
-  if (this.isModified("status")) {
-    const validTransitions = {
-      pending: ["approved", "rejected", "cancelled"],
-      partial: ["paid", "cancelled"],
-      approved: ["paid", "cancelled"],
-      rejected: ["pending"], // Allow resubmission
-      paid: [], // Terminal state
-      cancelled: ["pending"], // Allow reactivation
-    };
-
-    if (this.isNew) {
-      // New documents can have any status
-      return next();
-    }
-
-    const previousStatus = this.$locals.previousStatus;
-    if (
-      previousStatus &&
-      !validTransitions[previousStatus]?.includes(this.status)
-    ) {
-      return next(
-        new Error(
-          `Invalid status transition from ${previousStatus} to ${this.status}`,
-        ),
-      );
-    }
-  }
-
-  // Set approval/rejection timestamps
+  // Set approval/rejection timestamps when status changes
   if (this.isModified("status")) {
     if (this.status === "approved" && !this.approvedAt) {
       this.approvedAt = new Date();
@@ -177,19 +149,6 @@ facilityWalletTransactionsMetadataSchema.pre("save", function (next) {
       this.rejectedAt = new Date();
     }
   }
-
-  next();
-});
-
-// Pre-save middleware to store previous status
-facilityWalletTransactionsMetadataSchema.pre("save", function (next) {
-  if (!this.isNew && this.isModified("status")) {
-    this.$locals.previousStatus = this.$locals.wasNew
-      ? undefined
-      : this.$__.wasModified("status")
-        ? this.$__.$originalValue.status
-        : this.status;
-  }
   next();
 });
 
@@ -223,7 +182,7 @@ facilityWalletTransactionsMetadataSchema.statics.getSummaryStats = function (
   ]);
 };
 
-// Instance method to approve metadata
+// Instance method to approve metadata (with validation)
 facilityWalletTransactionsMetadataSchema.methods.approve = function (
   approvedBy,
   notes,
@@ -240,7 +199,7 @@ facilityWalletTransactionsMetadataSchema.methods.approve = function (
   return this.save();
 };
 
-// Instance method to reject metadata
+// Instance method to reject metadata (with validation)
 facilityWalletTransactionsMetadataSchema.methods.reject = function (
   rejectedBy,
   reason,
@@ -257,6 +216,21 @@ facilityWalletTransactionsMetadataSchema.methods.reject = function (
   return this.save();
 };
 
+// Static method to validate status transitions (call manually if needed)
+facilityWalletTransactionsMetadataSchema.statics.isValidStatusTransition =
+  function (fromStatus, toStatus) {
+    const validTransitions = {
+      pending: ["approved", "rejected", "cancelled"],
+      partial: ["paid", "cancelled"],
+      approved: ["paid", "cancelled"],
+      rejected: ["pending"], // Allow resubmission
+      paid: [], // Terminal state
+      cancelled: ["pending"], // Allow reactivation
+    };
+
+    return validTransitions[fromStatus]?.includes(toStatus) || false;
+  };
+
 const FacilityWalletTransactionsMetadata = mongoose.model(
   "FacilityWalletTransactionsMetadata",
   facilityWalletTransactionsMetadataSchema,