flykup_model_development 3.1.58 → 3.1.60

package/models/order.modal.js

@@ -351,6 +351,10 @@ cancelSource: {
     flashPrice: Number,
     originalPrice: Number
   }],
+  labelPrinted: {
+    type: Boolean,
+    default: false
+  },
 payment: {
   type: mongoose.Schema.Types.ObjectId,
   ref: 'orderPayment'

package/models/shows.model.js

@@ -20,7 +20,6 @@ const giveawayProductSchema = new Schema({
   createdAt: { type: Date, default: Date.now }
 });
 
-// Live Flash Sale Schema
 const liveFlashSaleSchema = new Schema({
   _id: false,
   productId: { 
@@ -41,7 +40,7 @@ const liveFlashSaleSchema = new Schema({
   duration: {
     type: Number,
     required: true,
-    enum: [10, 20, 30, 40, 50, 60,240]
+    enum: [10, 20, 30, 40, 50, 60, 240]
   },
   initialStock: {
     type: Number,
@@ -73,14 +72,14 @@ const liveFlashSaleSchema = new Schema({
     default: Date.now
   }
 });
-// Show Schema
+
+// Show Schema with FIXED validation
 const showSchema = new Schema(
   {
     sellerId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: "sellers",
     },
-    // === Host Information ===
     host: {
       type: mongoose.Schema.Types.ObjectId,
       required: true,
@@ -91,7 +90,6 @@ const showSchema = new Schema(
       required: true,
       enum: ['sellers', 'dropshippers']
     },
-
     title: {
       type: String,
       required: true,
@@ -122,7 +120,6 @@ const showSchema = new Schema(
       type: [String],
       default: [],
     },
-
     thumbnailImage: {
       type: String,
       default: null,
@@ -142,8 +139,6 @@ const showSchema = new Schema(
       type: String,
       default: null,
     },
-
-    // === Stream Layout Configuration ===
     orientation: {
       type: String,
       enum: ['horizontal', 'vertical'],
@@ -154,7 +149,6 @@ const showSchema = new Schema(
       enum: ['side-by-side', 'top-bottom'],
       default: 'side-by-side'
     },
-
     showStatus: {
       type: String,
       enum: ['created', 'live', 'cancelled', 'ended'],
@@ -170,29 +164,52 @@ const showSchema = new Schema(
       default: [],
     },
   
+    // ✅ FIXED: Better validation for buyNowProducts
     buyNowProducts: {
       type: [
         {
           _id: false,
           productId: { type: Schema.Types.ObjectId, ref: "productlistings" },
-          productOwnerSellerId: { type: Schema.Types.ObjectId, ref: 'sellers', required: true },
+          productOwnerSellerId: { 
+            type: Schema.Types.ObjectId, 
+            ref: 'sellers',
+            required: function() {
+              // Only require if productId exists
+              return this.productId != null;
+            }
+          },
           productPrice: { type: Number, min: 0, default: null },
         },
       ],
       default: [],
+      validate: {
+        validator: function(products) {
+          // Custom validation to ensure productOwnerSellerId exists when productId exists
+          return products.every(product => 
+            !product.productId || (product.productId && product.productOwnerSellerId)
+          );
+        },
+        message: 'productOwnerSellerId is required when productId is provided'
+      }
     },
-     auctionProducts: {
+    
+    auctionProducts: {
       type: [
         {
           _id: false,
           productId: { type: Schema.Types.ObjectId, ref: "productlistings" },
-          productOwnerSellerId: { type: Schema.Types.ObjectId, ref: 'sellers', required: true },
+          productOwnerSellerId: { 
+            type: Schema.Types.ObjectId, 
+            ref: 'sellers',
+            required: function() {
+              return this.productId != null;
+            }
+          },
           startingPrice: { type: Number, min: 0, default: null },
           reservedPrice: { type: Number, min: 0, default: null },
           auctionNumber: {
             type: Number,
           },
-          // BGA Integration - Reference to BGA auction document
           auctionObjectId: { 
             type: Schema.Types.ObjectId, 
             required: true, 
@@ -208,10 +225,9 @@ const showSchema = new Schema(
       default: []
     },
 
-    // === LIVE FLASH SALE FIELDS (ADD THESE) ===
     liveFlashSales: {
       type: [liveFlashSaleSchema],
-      default: [] // This ensures it's always an array
+      default: []
     },
     currentFlashSale: {
       type: Schema.Types.ObjectId,
@@ -232,9 +248,39 @@ const showSchema = new Schema(
   { timestamps: true }
 );
 
-showSchema.pre('save', function (next) {
+// ✅ ADD THIS PRE-SAVE MIDDLEWARE TO CLEAN INVALID DATA
+showSchema.pre('save', function(next) {
   const doc = this;
 
+  // Clean up buyNowProducts - remove items without required fields
+  if (doc.buyNowProducts && Array.isArray(doc.buyNowProducts)) {
+    doc.buyNowProducts = doc.buyNowProducts.filter(product => 
+      product && 
+      product.productId && 
+      product.productOwnerSellerId
+    );
+  }
+
+  // Clean up auctionProducts
+  if (doc.auctionProducts && Array.isArray(doc.auctionProducts)) {
+    doc.auctionProducts = doc.auctionProducts.filter(product => 
+      product && 
+      product.productId && 
+      product.productOwnerSellerId &&
+      product.auctionObjectId
+    );
+  }
+
+  // Clean up giveawayProducts
+  if (doc.giveawayProducts && Array.isArray(doc.giveawayProducts)) {
+    doc.giveawayProducts = doc.giveawayProducts.filter(product => 
+      product && 
+      product.productId && 
+      product.productOwnerSellerId &&
+      product.giveawayObjectId
+    );
+  }
+
   // Set liveDrop based on product types
   const hasBuyNow = doc.buyNowProducts && doc.buyNowProducts.length > 0;
   const hasAuction = doc.auctionProducts && doc.auctionProducts.length > 0;
@@ -249,15 +295,22 @@ showSchema.pre('save', function (next) {
   next();
 });
 
-const Show = mongoose.model("shows", showSchema);
+// ✅ ADD THIS PRE-VALIDATION MIDDLEWARE FOR EXTRA SAFETY
+showSchema.pre('validate', function(next) {
+  // Ensure all arrays exist (prevent undefined errors)
+  if (!this.buyNowProducts) this.buyNowProducts = [];
+  if (!this.auctionProducts) this.auctionProducts = [];
+  if (!this.giveawayProducts) this.giveawayProducts = [];
+  if (!this.liveFlashSales) this.liveFlashSales = [];
+  
+  next();
+});
 
+const Show = mongoose.model("shows", showSchema);
 export default Show;
 
 
 
-
-
-
 // import mongoose from "mongoose";
 // const { Schema } = mongoose;
 
@@ -266,41 +319,90 @@ export default Show;
 //   productId: { type: Schema.Types.ObjectId, ref: "productlistings", required: true },
 //   productOwnerSellerId: { type: Schema.Types.ObjectId, ref: 'sellers', required: true },
 //   productTitle: { type: String },
-
-//   // BGA Integration Fields
 //   giveawayObjectId: { type: Schema.Types.ObjectId, required: true, index: true },
 //   giveawayStatus: {
 //     type: String,
 //     enum: ['preparing', 'ready', 'active', 'ended', 'failed'],
 //     default: 'preparing'
 //   },
-//  requireAutoFollow: {
+//   requireAutoFollow: {
 //     type: Boolean,
 //     default: false
 //   },
-
 //   activatedAt: { type: Date, default: null },
 //   createdAt: { type: Date, default: Date.now }
 // });
 
+// // Live Flash Sale Schema
+// const liveFlashSaleSchema = new Schema({
+//   _id: false,
+//   productId: { 
+//     type: Schema.Types.ObjectId, 
+//     ref: "productlistings", 
+//     required: true 
+//   },
+//   stockId: {
+//     type: Schema.Types.ObjectId,
+//     ref: "stocks",
+//     required: true
+//   },
+//   flashPrice: {
+//     type: Number,
+//     required: true,
+//     min: 1
+//   },
+//   duration: {
+//     type: Number,
+//     required: true,
+//     enum: [10, 20, 30, 40, 50, 60,240]
+//   },
+//   initialStock: {
+//     type: Number,
+//     required: true,
+//     min: 1
+//   },
+//   currentStock: {
+//     type: Number,
+//     required: true,
+//     min: 0
+//   },
+//   sold: {
+//     type: Number,
+//     default: 0
+//   },
+//   status: {
+//     type: String,
+//     enum: ['scheduled', 'active', 'ended', 'cancelled'],
+//     default: 'scheduled'
+//   },
+//   startTime: Date,
+//   endTime: Date,
+//   flashSaleId: {
+//     type: Schema.Types.ObjectId,
+//     ref: 'FlashSale'
+//   },
+//   createdAt: {
+//     type: Date,
+//     default: Date.now
+//   }
+// });
 // // Show Schema
 // const showSchema = new Schema(
 //   {
-
-//       sellerId: {  // <--- REMOVE or comment out this line
-//             type: mongoose.Schema.Types.ObjectId,
-//             ref: "sellers",
-//         },
+//     sellerId: {
+//       type: mongoose.Schema.Types.ObjectId,
+//       ref: "sellers",
+//     },
 //     // === Host Information ===
-//     host: { // Host (Seller or Dropshipper)
+//     host: {
 //       type: mongoose.Schema.Types.ObjectId,
 //       required: true,
-//       refPath: 'hostModel' // Dynamic reference
+//       refPath: 'hostModel'
 //     },
-//     hostModel: { // Type of host
+//     hostModel: {
 //       type: String,
 //       required: true,
-//       enum: ['sellers', 'dropshippers'] // Allowed host types
+//       enum: ['sellers', 'dropshippers']
 //     },
 
 //     title: {
@@ -315,7 +417,7 @@ export default Show;
 //     },
 //     scheduledAt: {
 //       type: Date,
-//       index: true // Add index for better query performance
+//       index: true
 //     },
 //     category: {
 //       type: String,
@@ -335,11 +437,11 @@ export default Show;
 //     },
 
 //     thumbnailImage: {
-//       type: String, // URL or file path
+//       type: String,
 //       default: null,
 //     },
 //     previewVideo: {
-//       type: String, // URL or file path
+//       type: String,
 //       default: null,
 //     },
 //     language: {
@@ -350,21 +452,21 @@ export default Show;
 //       default: false,
 //     },
 //     streamUrl: {
-//       type: String, // URL for the live stream
+//       type: String,
 //       default: null,
 //     },
 
-//     // === Stream Layout Configuration (NEW) ===
-// orientation: {
-//   type: String,
-//   enum: ['horizontal', 'vertical'],
-//   default: 'horizontal'
-// },
-// layout: {
-//   type: String,
-//   enum: ['side-by-side', 'top-bottom'],
-//   default: 'side-by-side'
-// },
+//     // === Stream Layout Configuration ===
+//     orientation: {
+//       type: String,
+//       enum: ['horizontal', 'vertical'],
+//       default: 'horizontal'
+//     },
+//     layout: {
+//       type: String,
+//       enum: ['side-by-side', 'top-bottom'],
+//       default: 'side-by-side'
+//     },
 
 //     showStatus: {
 //       type: String,
@@ -387,12 +489,12 @@ export default Show;
 //           _id: false,
 //           productId: { type: Schema.Types.ObjectId, ref: "productlistings" },
 //           productOwnerSellerId: { type: Schema.Types.ObjectId, ref: 'sellers', required: true },
-//           productPrice: { type: Number, min: 0, default: null }, // Price set by host for this show
+//           productPrice: { type: Number, min: 0, default: null },
 //         },
 //       ],
 //       default: [],
 //     },
-//     auctionProducts: {
+//      auctionProducts: {
 //       type: [
 //         {
 //           _id: false,
@@ -402,6 +504,12 @@ export default Show;
 //           reservedPrice: { type: Number, min: 0, default: null },
 //           auctionNumber: {
 //             type: Number,
+//           },
+//           // BGA Integration - Reference to BGA auction document
+//           auctionObjectId: { 
+//             type: Schema.Types.ObjectId, 
+//             required: true, 
+//             index: true 
 //           }
 //         },
 //       ],
@@ -413,6 +521,17 @@ export default Show;
 //       default: []
 //     },
 
+//     // === LIVE FLASH SALE FIELDS (ADD THESE) ===
+//     liveFlashSales: {
+//       type: [liveFlashSaleSchema],
+//       default: [] // This ensures it's always an array
+//     },
+//     currentFlashSale: {
+//       type: Schema.Types.ObjectId,
+//       ref: 'FlashSale',
+//       default: null
+//     },
+
 //     enabledProductTypes: {
 //       buyNow:   { type: Boolean, default: false },
 //       auction:  { type: Boolean, default: false },
@@ -445,4 +564,7 @@ export default Show;
 
 // const Show = mongoose.model("shows", showSchema);
 
-// export default Show;
+// export default Show;
+
+
+

package/package.json

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