flykup_model_development 3.0.7 → 3.0.9

package/models/order.modal.js

@@ -168,7 +168,7 @@ const orderSchema = new mongoose.Schema(
     },
     sourceType: {
       type: String,
-      enum: ['static', 'shoppable_video', 'livestream', 'auction'],
+      enum: ['static', 'shoppable_video', 'livestream', 'auction','flash_sale'],
       required: true
     },
     sourceRefId: String,
@@ -254,6 +254,19 @@ cancelSource: {
   enum: ['user', 'seller', 'system'],
   default: 'user'
 },
+  flashSaleItems: [{
+    productId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'productlistings'
+    },
+    flashSaleId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'FlashSale'
+    },
+    quantity: Number,
+    flashPrice: Number,
+    originalPrice: Number
+  }],
 payment: {
   type: mongoose.Schema.Types.ObjectId,
   ref: 'orderPayment'
@@ -273,6 +286,7 @@ payment: {
   },
   invoiceError: String
   },
+ 
   { timestamps: true }
 );
 

package/models/orderPayment.model.js

@@ -1,3 +1,66 @@
+// import mongoose from 'mongoose';
+
+// const paymentSchema = new mongoose.Schema({
+//   orderId: {
+//     type: mongoose.Schema.Types.ObjectId,
+//     ref: 'Order',
+//     required: true
+//   },
+//   userId: {
+//     type: mongoose.Schema.Types.ObjectId,
+//     ref: 'users',
+//     required: true
+//   },
+// paymentGateway: {
+//   type: String,
+//   enum: ['RAZORPAY', 'CASHFREE'],
+//   required: true
+// },
+// paymentGatewayOrderId: {
+//   type: String,
+//   required: false
+// },
+// paymentGatewayPaymentId: {
+//   type: String,
+//   required: false
+// },
+
+//   amount: {
+//     type: Number,
+//     required: true
+//   },
+//   currency: {
+//     type: String,
+//     default: 'INR'
+//   },
+//   status: {
+//     type: String,
+//     enum: ['PENDING', 'SUCCESS', 'FAILED', 'REFUNDED'],
+//     default: 'PENDING'
+//   },
+//   paymentMethod: String,
+//   transactionId: String,
+//   transactionTime: Date,
+//   sellerPayments: [{
+//     sellerId: {
+//       type: mongoose.Schema.Types.ObjectId,
+//       ref: 'users',
+//       required: true
+//     },
+//     amount: Number,
+//     settlementStatus: {
+//       type: String,
+//       enum: ['PENDING', 'SETTLED'],
+//       default: 'PENDING'
+//     }
+//   }]
+// }, { timestamps: true });
+
+// const OrderPayment = mongoose.model('orderPayment', paymentSchema);
+// export default OrderPayment;
+
+
+// models/OrderPayment.js
 import mongoose from 'mongoose';
 
 const paymentSchema = new mongoose.Schema({
@@ -11,19 +74,37 @@ const paymentSchema = new mongoose.Schema({
     ref: 'users',
     required: true
   },
-paymentGateway: {
-  type: String,
-  enum: ['RAZORPAY', 'CASHFREE'],
-  required: true
-},
-paymentGatewayOrderId: {
-  type: String,
-  required: false
-},
-paymentGatewayPaymentId: {
-  type: String,
-  required: false
-},
+  paymentGateway: {
+    type: String,
+    enum: ['RAZORPAY', 'CASHFREE'],
+    required: true
+  },
+  
+  // Razorpay-specific fields
+  razorpayOrderId: {
+    type: String,
+    required: function() {
+      return this.paymentGateway === 'RAZORPAY';
+    }
+  },
+  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';
+    }
+  },
 
   amount: {
     type: Number,
@@ -39,7 +120,6 @@ paymentGatewayPaymentId: {
     default: 'PENDING'
   },
   paymentMethod: String,
-  transactionId: String,
   transactionTime: Date,
   sellerPayments: [{
     sellerId: {
@@ -56,5 +136,10 @@ paymentGatewayPaymentId: {
   }]
 }, { timestamps: 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;
+export default OrderPayment;

package/models/productListing.model.js

@@ -122,15 +122,15 @@ const ProductListingSchema = new Schema(
         5: { type: Number, default: 0 },
       },
     },
-     flashSale: {
-      isActive: { type: Boolean, default: false },
-      flashSaleId: { type: mongoose.Schema.Types.ObjectId, ref: 'FlashSale' },
-      flashPrice: { type: Number, default: null },
-      flashStock: { type: Number, default: 0 },
-      originalPrice: { type: Number, default: null },
-      endsAt: { type: Date, default: null },
-      startsAt: { type: Date, default: null }
-    },
+    flashSale: {
+    isActive: { type: Boolean, default: false },
+    flashSaleId: { type: mongoose.Schema.Types.ObjectId, ref: 'FlashSale' },
+    flashPrice: { type: Number, default: null },
+    flashStock: { type: Number, default: 0 },
+    originalPrice: { type: Number, default: null },
+    endsAt: { type: Date, default: null },
+    startsAt: { type: Date, default: null }
+  },
     totalReviews: { type: Number, default: 0 },
   },
   { timestamps: true }

package/package.json

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