flykup_model_development 3.1.1 → 3.1.2

package/models/orderPayment.model.js

@@ -59,6 +59,7 @@
 // const OrderPayment = mongoose.model('orderPayment', paymentSchema);
 // export default OrderPayment;
 
+// models/OrderPayment.js
 // models/OrderPayment.js
 import mongoose from 'mongoose';
 
@@ -80,30 +81,15 @@ const paymentSchema = new mongoose.Schema({
   },
   
   // Razorpay-specific fields
-  razorpayOrderId: {
-    type: String,
-    required: function() {
-      return this.paymentGateway === 'RAZORPAY';
-    }
-  },
+  razorpayOrderId: String,
   razorpayPaymentId: {
     type: String,
     default: null
   },
   
   // Cashfree-specific fields
-  cfPaymentSessionId: {
-    type: String,
-    required: function() {
-      return this.paymentGateway === 'CASHFREE';
-    }
-  },
-  cfOrderId: {
-    type: String,
-    required: function() {
-      return this.paymentGateway === 'CASHFREE';
-    }
-  },
+  cfPaymentSessionId: String,
+  cfOrderId: String,
 
   amount: {
     type: Number,
@@ -134,9 +120,7 @@ const paymentSchema = new mongoose.Schema({
     }
   }]
 }, { 
-  timestamps: true,
-  // Add this to ensure conditional validation works properly
-  validateBeforeSave: true
+  timestamps: true
 });
 
 // Create indexes for better performance
@@ -144,15 +128,23 @@ paymentSchema.index({ razorpayOrderId: 1 });
 paymentSchema.index({ cfOrderId: 1 });
 paymentSchema.index({ orderId: 1 });
 
-// Add a pre-save middleware to handle conditional validation
+// Add a pre-save middleware to handle validation
 paymentSchema.pre('save', function(next) {
-  // If using Razorpay, remove Cashfree fields
+  // If using Razorpay, validate Razorpay fields
   if (this.paymentGateway === 'RAZORPAY') {
+    if (!this.razorpayOrderId) {
+      return next(new Error('razorpayOrderId is required for RAZORPAY payments'));
+    }
+    // Remove Cashfree fields
     this.cfPaymentSessionId = undefined;
     this.cfOrderId = undefined;
   }
-  // If using Cashfree, remove Razorpay fields
+  // If using Cashfree, validate Cashfree fields
   else if (this.paymentGateway === 'CASHFREE') {
+    if (!this.cfPaymentSessionId || !this.cfOrderId) {
+      return next(new Error('cfPaymentSessionId and cfOrderId are required for CASHFREE payments'));
+    }
+    // Remove Razorpay fields
     this.razorpayOrderId = undefined;
     this.razorpayPaymentId = undefined;
   }
@@ -160,8 +152,7 @@ paymentSchema.pre('save', function(next) {
 });
 
 
-
 const OrderPayment =
-  mongoose.models.OrderPayment || mongoose.model('OrderPayment', paymentSchema);
+  mongoose.models.OrderPayment || mongoose.model('orderPayment', paymentSchema);
 
 export default OrderPayment;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flykup_model_development",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "main": "index.js",
   "type": "module",
   "private": false,