flykup_model_development 3.1.53 → 3.1.55

package/models/productListing.model.js

@@ -1,26 +1,21 @@
-
-
-
-
-// backend/models/ProductListing.js (or similar path)
 import mongoose from "mongoose";
 const { Schema } = mongoose;
 
 const ProductListingSchema = new Schema(
   {
     sellerId: { type: Schema.Types.ObjectId, ref: "sellers" },
-    stockId: { type: Schema.Types.ObjectId, ref: "stocks" },
+    stockId: { type: Schema.Types.ObjectId, ref: "stocks" }, // ✅ KEEP THIS - for main inventory management
     title: String,
     description: String,
-      flashSale: {
-    isActive: { type: Boolean, default: false },
-    flashSaleId: { type: mongoose.Schema.Types.ObjectId, ref: 'FlashSale' },
-    flashPrice: { type: Number, default: 0 },
-    flashStock: { type: Number, default: 0 },
-    originalPrice: { type: Number, default: 0 },
-    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: 0 },
+      // ❌ REMOVED: flashStock field - now using main quantity
+      originalPrice: { type: Number, default: 0 },
+      endsAt: { type: Date, default: null },
+      startsAt: { type: Date, default: null }
+    },
     sku: {
       type: String,
       required: true,
@@ -54,7 +49,7 @@ const ProductListingSchema = new Schema(
       min: 0,
       default: null,
     },
-     logisticsType: {
+    logisticsType: {
       type: String,
       enum: ["flykupLogistics", "selfShipment"],
       default: null,
@@ -65,47 +60,45 @@ const ProductListingSchema = new Schema(
       default: null,
     },
     estimatedDeliveryDate: {
-      type: Number, // Change from Date to Number
+      type: Number,
       min: 0,
       default: null,
     },
-  
-    // --- ADDED/UPDATED FIELDS FROM FRONTEND ---
-    brand: { type: String, default: null }, // ADDED
+    brand: { type: String, default: null },
     manufacturer: String,
-    manufacturerAddress: String, // ADDED in frontend, already exists here
+    manufacturerAddress: String,
     countryOfOrigin: String,
-    netQuantity: { type: String, default: null }, // ADDED (String to accommodate units like '500g')
-    packagingType: { type: String, default: null }, // ADDED
-    weight: { // For shipping calculations
+    netQuantity: { type: String, default: null },
+    packagingType: { type: String, default: null },
+    weight: {
       value: { type: Number, default: null },
       unit: { type: String, default: null },
     },
-    dimensions: { // For shipping calculations
+    dimensions: {
       length: { type: Number, default: null },
       width: { type: Number, default: null },
       height: { type: Number, default: null },
     },
-    expiryDate: { type: Date, default: null }, // ADDED in frontend, already exists here (changed to allow null)
-    shelfLife: { type: String, default: null }, // ADDED in frontend, already exists here (changed to allow null)
-    batchNumber: { type: String, default: null }, // ADDED in frontend, already exists here (changed to allow null)
-    gstRate: { type: Number, default: null }, // Changed to allow null if needed
+    expiryDate: { type: Date, default: null },
+    shelfLife: { type: String, default: null },
+    batchNumber: { type: String, default: null },
+    gstRate: { type: Number, default: null },
     sellerName: String,
-    sellerContact: { type: String, default: null }, // ADDED
-    sellerGSTIN: { type: String, default: null }, // ADDED
+    sellerContact: { type: String, default: null },
+    sellerGSTIN: { type: String, default: null },
     returnPolicy: [String],
     warranty: {
-      hasWarranty: { type: Boolean, default: false }, // Default added
-      duration: { type: String, default: null }, // Default added
+      hasWarranty: { type: Boolean, default: false },
+      duration: { type: String, default: null },
     },
-    fssaiLicenseNo: { type: String, default: null }, // ADDED in frontend, already exists here (changed to allow null)
-    bisCertification: { type: String, default: null }, // ADDED in frontend, already exists here (changed to allow null)
-    importerName: { type: String, default: null }, // Default added
-    importerAddress: { type: String, default: null }, // Default added
-    importerGSTIN: { type: String, default: null }, // Default added
-    eWasteCompliance: { type: Boolean, default: false }, // Default added
-    recyclablePackaging: { type: Boolean, default: false }, // Default added
-    hazardousMaterials: { type: String, default: null }, // Default added
+    fssaiLicenseNo: { type: String, default: null },
+    bisCertification: { type: String, default: null },
+    importerName: { type: String, default: null },
+    importerAddress: { type: String, default: null },
+    importerGSTIN: { type: String, default: null },
+    eWasteCompliance: { type: Boolean, default: false },
+    recyclablePackaging: { type: Boolean, default: false },
+    hazardousMaterials: { type: String, default: null },
     allowDropshipping: {
       type: Boolean,
       default: false,
@@ -114,65 +107,47 @@ const ProductListingSchema = new Schema(
     commissionRate: {
       type: Number,
       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%.'],
       default: null,
-      // Removed Mongoose-level required validation dependent on allowDropshipping
-      // Let application logic handle this if needed, or adjust validator
-      // required: [
-      //   function () { return this.allowDropshipping === true; },
-      //   'Commission rate is required when allowing dropshipping.'
-      // ],
-      // 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: {
-        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 }
+    },
+    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 }
   },
   { timestamps: true }
 );
-ProductListingSchema.index({ title: 'text', description: 'text', category: 'text' });
 
+ProductListingSchema.index({ title: 'text', description: 'text', category: 'text' });
 
-// Safe export to prevent OverwriteModelError
 const ProductListing = mongoose.models.productlistings || mongoose.model("productlistings", ProductListingSchema);
 export default ProductListing;
 
-
-
-
-
-
-
-
-
-
-
 // // backend/models/ProductListing.js (or similar path)
 // import mongoose from "mongoose";
 // const { Schema } = mongoose;
@@ -192,25 +167,11 @@ export default ProductListing;
 //     endsAt: { type: Date, default: null },
 //     startsAt: { type: Date, default: null }
 //   },
-  
-// //new fields added 
-
-// returnPolicy: {
-//       hasReturn: { type: Boolean, default: false },
-//       returnType: { 
-//         type: [String], 
-//         enum: ['refund', 'replacement'],
-//         default: []
-//       },
-//       returnDays: { type: Number, min: 0, default: null },
-//       terms: [String] // Keep existing terms for backward compatibility
-//     },
 //     sku: {
 //       type: String,
 //       required: true,
-//       match: [/^[A-Za-z0-9-]{6,}$/, 'SKU must be at least 6 alphanumeric characters']
+//       index: true
 //     },
-// // ----------end of new fields added
 //     images: [
 //       {
 //         key: { type: String, maxLength: 255, default: null },
@@ -239,7 +200,22 @@ export default ProductListing;
 //       min: 0,
 //       default: null,
 //     },
-
+//      logisticsType: {
+//       type: String,
+//       enum: ["flykupLogistics", "selfShipment"],
+//       default: null,
+//     },
+//     deliveryCharge: {
+//       type: Number,
+//       min: 0,
+//       default: null,
+//     },
+//     estimatedDeliveryDate: {
+//       type: Number, // Change from Date to Number
+//       min: 0,
+//       default: null,
+//     },
+  
 //     // --- ADDED/UPDATED FIELDS FROM FRONTEND ---
 //     brand: { type: String, default: null }, // ADDED
 //     manufacturer: String,
@@ -324,13 +300,10 @@ export default ProductListing;
 // },
 // totalReviews: { type: Number, default: 0 }
 //   },
-
-
-  
 //   { timestamps: true }
 // );
 // ProductListingSchema.index({ title: 'text', description: 'text', category: 'text' });
-// ProductListingSchema.index({ sellerId: 1, sku: 1 }, { unique: true });
+
 
 // // Safe export to prevent OverwriteModelError
 // const ProductListing = mongoose.models.productlistings || mongoose.model("productlistings", ProductListingSchema);
@@ -339,4 +312,3 @@ export default ProductListing;
 
 
 
-

package/models/stock.model.js

@@ -1,90 +1,101 @@
-
-// models/Stock.js
+// models/Stock.js - Simplified
 import mongoose from "mongoose";
 const { Schema } = mongoose;
 
-// Sub-schema for manual stock updates
-const StockUpdateHistorySchema = new Schema({
-  change: { type: Number, required: true }, // e.g., +50 or -10
-  previousQuantity: { type: Number, required: true },
-  newQuantity: { type: Number, required: true },
-  reason: { type: String, default: "Manual update by seller" },
-  updatedAt: { type: Date, default: Date.now }
-});
-
-
-const StockSchema = new Schema(
+const stockSchema = new mongoose.Schema(
   {
-    sellerId: {
-      type: Schema.Types.ObjectId,
-      ref: "sellers",
-    },
     productListingId: {
       type: Schema.Types.ObjectId,
       ref: "productlistings",
+      required: true,
+      unique: true
+    },
+    quantity: {
+      type: Number,
+      default: 0,
+      min: 0
     },
     title: String,
     images: [{
       key: String,
       url: String
     }],
-    quantity: {
+    // ❌ REMOVED: totalReserved, flashSaleReservations
+    lowStockThreshold: {
       type: Number,
-      min: 0,
-      default: 0,
+      default: 10
     },
-    // History for manual stock adjustments
-    stockUpdateHistory: [StockUpdateHistorySchema],
-    
-    // Track reservations for flash sales
-   flashSaleReservations: [{
-  flashSaleId: {
-    type: Schema.Types.ObjectId,
-    ref: "FlashSale",
-    required: true
-  },
-  quantity: { type: Number, min: 0, default: 0 },
-  status: {
-    type: String,
-    enum: ['reserved', 'active', 'released', 'sold', 'partially_sold'],
-    default: 'reserved'
-  },
-  source: {
-    type: String,
-    enum: ['normal', 'live_stream'],
-    default: 'normal'
-  },
-  reservedAt: { type: Date, default: Date.now },
-  releasedAt: Date,
-  soldQuantity: { type: Number, default: 0 }
-}],
-    totalReserved: {
+    reorderQuantity: {
       type: Number,
-      min: 0,
-      default: 0
-    }
+      default: 50
+    },
+    isInStock: {
+      type: Boolean,
+      default: true
+    },
+    lastRestocked: {
+      type: Date,
+      default: null
+    },
+    stockUpdateHistory: [{
+      change: Number,
+      previousQuantity: Number,
+      newQuantity: Number,
+      reason: String,
+      updatedAt: { type: Date, default: Date.now }
+    }]
   },
   { timestamps: true }
 );
 
-// Pre-save hook to calculate totalReserved
-StockSchema.pre('save', function(next) {
-  if (this.isModified('flashSaleReservations')) {
-    this.totalReserved = this.flashSaleReservations.reduce((total, reservation) => {
-      return total + (['reserved', 'active'].includes(reservation.status) ? reservation.quantity : 0);
-    }, 0);
-  }
-  next();
-});
+const Stock = mongoose.models.stocks || mongoose.model("stocks", stockSchema);
+export default Stock;
+
+
+// // models/Stock.js - Simplified version without flash sale reservations
+// import mongoose from "mongoose";
+// const { Schema } = mongoose;
+
+// const stockSchema = new mongoose.Schema(
+//   {
+//     productListingId: {
+//       type: Schema.Types.ObjectId,
+//       ref: "productlistings",
+//       required: true,
+//       unique: true
+//     },
+//     quantity: {
+//       type: Number,
+//       default: 0,
+//       min: 0
+//     },
+//     // REMOVED: totalReserved field since we don't need reservations
+//     // REMOVED: flashSaleReservations array completely
+//     lowStockThreshold: {
+//       type: Number,
+//       default: 10
+//     },
+//     reorderQuantity: {
+//       type: Number,
+//       default: 50
+//     },
+//     isInStock: {
+//       type: Boolean,
+//       default: true
+//     },
+//     lastRestocked: {
+//       type: Date,
+//       default: null
+//     }
+//   },
+//   { timestamps: true }
+// );
 
-// Virtual for available quantity
-StockSchema.virtual('availableQuantity').get(function() {
-  return Math.max(0, this.quantity - this.totalReserved);
-});
+// // Indexes
+// stockSchema.index({ productListingId: 1 });
+// stockSchema.index({ isInStock: 1 });
+// stockSchema.index({ quantity: 1 });
 
-// Ensure virtuals are included in JSON 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": "3.1.53",
+  "version": "3.1.55",
   "main": "index.js",
   "type": "module",
   "private": false,