flykup_model_development 3.1.2 → 3.1.4

package/models/notification.model.js

@@ -18,7 +18,8 @@ const notificationSchema = new mongoose.Schema(
         'new_video',
         "new_product",
         'admin_broadcast',
-        'seller_broadcast'
+        'seller_broadcast',
+        'live_stream_start'
       ],
       required: true,
     },

package/models/orderPayment.model.js

@@ -58,9 +58,6 @@
 
 // const OrderPayment = mongoose.model('orderPayment', paymentSchema);
 // export default OrderPayment;
-
-// models/OrderPayment.js
-// models/OrderPayment.js
 import mongoose from 'mongoose';
 
 const paymentSchema = new mongoose.Schema({
@@ -79,17 +76,35 @@ const paymentSchema = new mongoose.Schema({
     enum: ['RAZORPAY', 'CASHFREE'],
     required: true
   },
-  
+
   // Razorpay-specific fields
-  razorpayOrderId: String,
+  razorpayOrderId: {
+    type: String,
+    // ✅ This field is now required only if the gateway is RAZORPAY
+    required: function() {
+      return this.paymentGateway === 'RAZORPAY';
+    }
+  },
   razorpayPaymentId: {
     type: String,
     default: null
   },
-  
+
   // Cashfree-specific fields
-  cfPaymentSessionId: String,
-  cfOrderId: String,
+  cfPaymentSessionId: {
+    type: String,
+    // ✅ This field is now required only if the gateway is CASHFREE
+    required: function() {
+      return this.paymentGateway === 'CASHFREE';
+    }
+  },
+  cfOrderId: {
+    type: String,
+    // ✅ This field is now required only if the gateway is CASHFREE
+    required: function() {
+      return this.paymentGateway === 'CASHFREE';
+    }
+  },
 
   amount: {
     type: Number,
@@ -119,7 +134,7 @@ const paymentSchema = new mongoose.Schema({
       default: 'PENDING'
     }
   }]
-}, { 
+}, {
   timestamps: true
 });
 
@@ -128,31 +143,9 @@ paymentSchema.index({ razorpayOrderId: 1 });
 paymentSchema.index({ cfOrderId: 1 });
 paymentSchema.index({ orderId: 1 });
 
-// Add a pre-save middleware to handle validation
-paymentSchema.pre('save', function(next) {
-  // 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, 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;
-  }
-  next();
-});
-
+// ❌ The pre-save middleware is no longer needed and should be removed.
 
 const OrderPayment =
   mongoose.models.OrderPayment || mongoose.model('orderPayment', paymentSchema);
 
-export default OrderPayment;
+export default OrderPayment;

package/models/productListing.model.js

@@ -11,7 +11,7 @@ const ProductListingSchema = new Schema(
     images: [
       {
         key: { type: String, maxLength: 255, default: null },
-      },
+      }
     ],
     category: String,
     subcategory: String,
@@ -44,13 +44,11 @@ const ProductListingSchema = new Schema(
     countryOfOrigin: String,
     netQuantity: { type: String, default: null }, // ADDED (String to accommodate units like '500g')
     packagingType: { type: String, default: null }, // ADDED
-    weight: {
-      // For shipping calculations
+    weight: { // For shipping calculations
       value: { type: Number, default: null },
       unit: { type: String, default: null },
     },
-    dimensions: {
-      // For shipping calculations
+    dimensions: { // For shipping calculations
       length: { type: Number, default: null },
       width: { type: Number, default: null },
       height: { type: Number, default: null },
@@ -82,9 +80,9 @@ const ProductListingSchema = new Schema(
     },
     commissionRate: {
       type: Number,
-      min: [0, "Commission rate cannot be negative."],
+      min: [0, 'Commission rate cannot be negative.'],
       // max: [100, 'Commission rate cannot exceed 100%.'], // Max was 25, changed to 100 based on frontend
-      max: [100, "Commission rate cannot exceed 100%."],
+      max: [100, 'Commission rate cannot exceed 100%.'],
       default: null,
       // Removed Mongoose-level required validation dependent on allowDropshipping
       // Let application logic handle this if needed, or adjust validator
@@ -95,52 +93,37 @@ const ProductListingSchema = new Schema(
       // validate: { ... } // Keep or remove validation as needed
     },
     hasReturn: {
-      type: Boolean,
-      default: false,
-    },
-    returnDays: {
-      type: Number,
-      min: 0,
-      default: null,
-    },
-    size: {
-      type: String,
-      default: null,
-    },
+  type: Boolean,
+  default: false
+},
+returnDays: {
+  type: Number,
+  min: 0,
+  default: null
+},
+size: {
+  type: String,
+  default: null
+},
     isActive: {
       type: Boolean,
       default: true,
-    },
-    ratingSummary: {
-      averageRating: { type: Number, default: 0 },
-      totalRatings: { type: Number, default: 0 },
-      ratingDistribution: {
+    },ratingSummary: {
+    averageRating: { type: Number, default: 0 },
+    totalRatings: { type: Number, default: 0 },
+    ratingDistribution: {
         1: { type: Number, default: 0 },
         2: { type: Number, default: 0 },
         3: { type: Number, default: 0 },
         4: { type: Number, default: 0 },
-        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 }
-  },
-    totalReviews: { type: Number, default: 0 },
+        5: { type: Number, default: 0 }
+    }
+},
+totalReviews: { type: Number, default: 0 }
   },
   { timestamps: true }
 );
 
-// Optional: Ensure strict mode is not preventing fields if you intended flexibility (default is true)
-// ProductListingSchema.set('strict', false); // Use with caution
-
 // Safe export to prevent OverwriteModelError
-const ProductListing =
-  mongoose.models.productlistings ||
-  mongoose.model("productlistings", ProductListingSchema);
+const ProductListing = mongoose.models.productlistings || mongoose.model("productlistings", ProductListingSchema);
 export default ProductListing;

package/package.json

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