flykup_model_development 2.0.4 → 2.0.6

package/models/order.modal.js

@@ -48,6 +48,17 @@ const orderSchema = new mongoose.Schema(
         type: String,
         enum: ['CGST+SGST', 'IGST',"NON-GST"],
         required: true
+      },
+        isFlashSale: {
+        type: Boolean,
+        default: false
+      },
+      flashSaleId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'FlashSale'
+      },
+      flashPrice: {
+        type: Number
       }
     }],
     totalBaseAmount: {
@@ -166,9 +177,9 @@ const orderSchema = new mongoose.Schema(
       // default: 'ORDERED', // Default should be the initial state
       required: true
     },
-    sourceType: {
+     sourceType: {
       type: String,
-      enum: ['static', 'shoppable_video', 'livestream', 'auction'],
+      enum: ['static', 'shoppable_video', 'livestream', 'auction', 'flash_sale'], // Add flash_sale
       required: true
     },
     sourceRefId: String,

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,11 +44,13 @@ 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 },
@@ -80,9 +82,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
@@ -93,33 +95,43 @@ 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 }
-    }
-},
-totalReviews: { 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 },
   },
   { timestamps: true }
 );
@@ -128,5 +140,7 @@ totalReviews: { type: Number, default: 0 }
 // 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/models/stock.model.js

@@ -1,126 +1,125 @@
-import mongoose from "mongoose";
-const { Schema, model } = mongoose;
-
-const StockSchema = new Schema(
-    {
-        sellerId: {
-            type: Schema.Types.ObjectId,
-            ref: "sellers",
-        },
-        productListingId: {
-            type: Schema.Types.ObjectId,
-            ref: "productlistings",
-        },
-        title: String,
-        quantity: {
-            type: Number,
-            min: 0,
-            default: null,
-        },
-        images: [
-            {
-                key: { type: String, maxLength: 255, default: null },
-                blobName: { type: String, maxLength: 255, default: null },
-                azureUrl: { type: String, maxLength: 1024, default: null },
-            },
-        ],
-        mfgDate: {
-            type: String,
-            default: null,
-        },
-        expDate: {
-            type: String,
-            default: null,
-        },
-    },
-    { timestamps: true }
-);
-
-const Stock = mongoose.models.stocks || mongoose.model("stocks", StockSchema);
-export default Stock;
-
-
-// models/Stock.js
-// // models/Stock.js
 // import mongoose from "mongoose";
 // const { Schema, model } = mongoose;
 
 // const StockSchema = new Schema(
-//   {
-//     sellerId: {
-//       type: Schema.Types.ObjectId,
-//       ref: "sellers",
+//     {
+//         sellerId: {
+//             type: Schema.Types.ObjectId,
+//             ref: "sellers",
+//         },
+//         productListingId: {
+//             type: Schema.Types.ObjectId,
+//             ref: "productlistings",
+//         },
+//         title: String,
+//         quantity: {
+//             type: Number,
+//             min: 0,
+//             default: null,
+//         },
+//         images: [
+//             {
+//                 key: { type: String, maxLength: 255, default: null },
+//                 blobName: { type: String, maxLength: 255, default: null },
+//                 azureUrl: { type: String, maxLength: 1024, default: null },
+//             },
+//         ],
+//         mfgDate: {
+//             type: String,
+//             default: null,
+//         },
+//         expDate: {
+//             type: String,
+//             default: null,
+//         },
 //     },
-//     productListingId: {
-//       type: Schema.Types.ObjectId,
-//       ref: "productlistings",
-//     },
-//     title: String,
-//     quantity: {
-//       type: Number,
-//       min: 0,
-//       default: 0,
-//     },
-//     // Track reservations for current and upcoming flash sales
-//     flashSaleReservations: [{
-//       flashSaleId: {
-//         type: Schema.Types.ObjectId,
-//         ref: "FlashSale",
-//         required: true
-//       },
-//       productId: {
-//         type: Schema.Types.ObjectId,
-//         ref: "productlistings",
-//         required: true
-//       },
-//       quantity: {
-//         type: Number,
-//         min: 0,
-//         default: 0
-//       },
-//       status: {
-//         type: String,
-//         enum: ['reserved', 'active', 'released', 'sold', 'partially_sold'],
-//         default: 'reserved'
-//       },
-//       reservedAt: {
-//         type: Date,
-//         default: Date.now
-//       },
-//       releasedAt: Date,
-//       soldQuantity: {
-//         type: Number,
-//         default: 0
-//       }
-//     }],
-//     // Total reserved quantity (calculated field)
-//     totalReserved: {
-//       type: Number,
-//       min: 0,
-//       default: 0
-//     }
-//   },
-//   { timestamps: true }
+//     { timestamps: true }
 // );
 
-// // Update totalReserved when flashSaleReservations change
-// StockSchema.pre('save', function(next) {
-//   if (this.isModified('flashSaleReservations')) {
-//     this.totalReserved = this.flashSaleReservations.reduce((total, reservation) => {
-//       return total + (reservation.status === 'reserved' || reservation.status === 'active' ? reservation.quantity : 0);
-//     }, 0);
-//   }
-//   next();
-// });
+// const Stock = mongoose.models.stocks || mongoose.model("stocks", StockSchema);
+// export default Stock;
+
+
+// models/Stock.js
+import mongoose from "mongoose";
+const { Schema, model } = mongoose;
+
+const StockSchema = new Schema(
+  {
+    sellerId: {
+      type: Schema.Types.ObjectId,
+      ref: "sellers",
+    },
+    productListingId: {
+      type: Schema.Types.ObjectId,
+      ref: "productlistings",
+    },
+    title: String,
+    quantity: {
+      type: Number,
+      min: 0,
+      default: 0,
+    },
+    // Track reservations for current and upcoming flash sales
+    flashSaleReservations: [{
+      flashSaleId: {
+        type: Schema.Types.ObjectId,
+        ref: "FlashSale",
+        required: true
+      },
+      productId: {
+        type: Schema.Types.ObjectId,
+        ref: "productlistings",
+        required: true
+      },
+      quantity: {
+        type: Number,
+        min: 0,
+        default: 0
+      },
+      status: {
+        type: String,
+        enum: ['reserved', 'active', 'released', 'sold', 'partially_sold'],
+        default: 'reserved'
+      },
+      reservedAt: {
+        type: Date,
+        default: Date.now
+      },
+      releasedAt: Date,
+      soldQuantity: {
+        type: Number,
+        default: 0
+      }
+    }],
+    // Total reserved quantity (calculated field)
+    totalReserved: {
+      type: Number,
+      min: 0,
+      default: 0
+    }
+  },
+  { timestamps: true }
+);
+
+// Update totalReserved when flashSaleReservations change
+StockSchema.pre('save', function(next) {
+  if (this.isModified('flashSaleReservations')) {
+    this.totalReserved = this.flashSaleReservations.reduce((total, reservation) => {
+      return total + (reservation.status === 'reserved' || reservation.status === 'active' ? reservation.quantity : 0);
+    }, 0);
+  }
+  next();
+});
 
-// // Virtual for available quantity (total - reserved)
-// StockSchema.virtual('availableQuantity').get(function() {
-//   return Math.max(0, this.quantity - this.totalReserved);
-// });
+// Virtual for available quantity (total - reserved)
+StockSchema.virtual('availableQuantity').get(function() {
+  return Math.max(0, this.quantity - this.totalReserved);
+});
 
-// // Ensure virtuals are included in toJSON output
-// StockSchema.set('toJSON', { virtuals: true });
-// StockSchema.set('toObject', { virtuals: true });
+// Ensure virtuals are included in toJSON output
+StockSchema.set('toJSON', { virtuals: true });
+StockSchema.set('toObject', { virtuals: true });
 
-// const Stock = mongoose.models.stocks || mongoose.model("stocks", StockSchema);
-// export default Stock;
+const Stock = mongoose.models.stocks || mongoose.model("stocks", StockSchema);
+export default Stock;

package/package.json

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