flykup_model_development 3.0.9 → 3.1.1

package/models/order.modal.js

@@ -291,9 +291,7 @@ payment: {
 );
 
 
-const Order = mongoose.model('Order', orderSchema);
-export default Order;
 
 
-// const Order = mongoose.models.Order || mongoose.model('Order', orderSchema);
-// export default Order;
+const Order = mongoose.models.Order || mongoose.model('Order', orderSchema);
+export default Order;

package/models/orderPayment.model.js

@@ -59,7 +59,6 @@
 // const OrderPayment = mongoose.model('orderPayment', paymentSchema);
 // export default OrderPayment;
 
-
 // models/OrderPayment.js
 import mongoose from 'mongoose';
 
@@ -134,12 +133,35 @@ const paymentSchema = new mongoose.Schema({
       default: 'PENDING'
     }
   }]
-}, { timestamps: true });
+}, { 
+  timestamps: true,
+  // Add this to ensure conditional validation works properly
+  validateBeforeSave: true
+});
 
 // Create indexes for better performance
 paymentSchema.index({ razorpayOrderId: 1 });
 paymentSchema.index({ cfOrderId: 1 });
 paymentSchema.index({ orderId: 1 });
 
-const OrderPayment = mongoose.model('orderPayment', paymentSchema);
-export default OrderPayment;
+// Add a pre-save middleware to handle conditional validation
+paymentSchema.pre('save', function(next) {
+  // If using Razorpay, remove Cashfree fields
+  if (this.paymentGateway === 'RAZORPAY') {
+    this.cfPaymentSessionId = undefined;
+    this.cfOrderId = undefined;
+  }
+  // If using Cashfree, remove Razorpay fields
+  else if (this.paymentGateway === 'CASHFREE') {
+    this.razorpayOrderId = undefined;
+    this.razorpayPaymentId = undefined;
+  }
+  next();
+});
+
+
+
+const OrderPayment =
+  mongoose.models.OrderPayment || mongoose.model('OrderPayment', paymentSchema);
+
+export default OrderPayment;

package/package.json

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