flykup_model_development 3.1.15 → 3.1.16

package/models/order.modal.js

@@ -8,7 +8,7 @@ const orderSchema = new mongoose.Schema(
       type: String,
       required: true,
       unique: true,
-      default: () => `FLY-ORD-${nanoid(8)}`
+      default: () => `ORD-${nanoid(8)}`
     },
     userId: {
       type: mongoose.Schema.Types.ObjectId,
@@ -182,6 +182,7 @@ const orderSchema = new mongoose.Schema(
     sourceRefId: String,
     deliveryCharge: {
       type: Number,
+      default: 40
     },
     statusTimeline: {
       ordered: Date,

package/models/shows.model.js

@@ -1,99 +1,6 @@
 import mongoose from "mongoose";
 const { Schema } = mongoose;
 
-
-// Comment Schema
-const commentSchema = new Schema({
-  user: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: "users", // Reference to the User model
-  },
-  text: {
-    type: String,
-  },
-  timeStamp: {
-    type: Date,
-    default: Date.now,
-  },
-  createdAt: {
-    type: Date,
-    default: Date.now,
-  },
-});
-
-const bidSchema = new mongoose.Schema({
-  user: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: "users", // Reference to the User model
-    required: true,
-  },
-  amount: {
-    type: Number,
-    required: true,
-  },
-  createdAt: {
-    type: Date,
-    default: Date.now,
-  },
-});
-
-// Auction Schema
-const auctionSchema = new mongoose.Schema(
-  {
-    streamId: {
-      type: String,
-      required: true,
-    },
-    product: {
-      type: String,
-    },
-    auctionType: {
-      type: String, // 'default' or other types
-    },
-    startingBid: {
-      type: Number,
-    },
-    increment: {
-      type: Number,
-      default: 500,
-    },
-    currentHighestBid: {
-      type: Number,
-      default: 0,
-    },
-    nextBid1: {
-      type: Number,
-      default: 0,
-    },
-    nextBid2: {
-      type: Number,
-      default: 0,
-    },
-    highestBidder: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "users", // Store reference to the highest bidder
-      default: null,
-    },
-    bidderWon: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "users", // Store reference to the highest bidder
-      default: null,
-    },
-    bids: [bidSchema], // Array of bids
-    endsAt: {
-      type: Date,
-    },
-    isActive: {
-      type: Boolean,
-      default: true,
-    },
-    uniqueStreamId: {
-      type: String,
-    },
-  },
-  { timestamps: true }
-);
-
 const giveawayProductSchema = new Schema({
   _id: false,
   productId: { type: Schema.Types.ObjectId, ref: "productlistings", required: true },
@@ -119,22 +26,22 @@ const giveawayProductSchema = new Schema({
 // Show Schema
 const showSchema = new Schema(
   {
-    // === MODIFIED START: Host Information ===
-    sellerId: {  // <--- REMOVE or comment out this line
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "sellers",
-    },
-    host: { // New field for the host (Seller or Dropshipper)
+
+      sellerId: {  // <--- REMOVE or comment out this line
+            type: mongoose.Schema.Types.ObjectId,
+            ref: "sellers",
+        },
+    // === Host Information ===
+    host: { // Host (Seller or Dropshipper)
       type: mongoose.Schema.Types.ObjectId,
       required: true,
       refPath: 'hostModel' // Dynamic reference
     },
-    hostModel: { // New field to define the type of host
+    hostModel: { // Type of host
       type: String,
       required: true,
       enum: ['sellers', 'dropshippers'] // Allowed host types
     },
-    // === MODIFIED END: Host Information ===
 
     title: {
       type: String,
@@ -191,7 +98,6 @@ const showSchema = new Schema(
       enum: ['created', 'live', 'cancelled', 'ended'],
       default: 'created'
     },
-    comments: [commentSchema], // Array of comments
     likes: {
       type: Number,
       default: 0,
@@ -201,14 +107,16 @@ const showSchema = new Schema(
       ref: 'users',
       default: [],
     },
-    // auctions: [auctionSchema], // Array of auctions
-    currentAuction: auctionSchema,
+    currentAuction: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'auctions',
+      default: null
+    },
     buyNowProducts: {
       type: [
         {
           _id: false,
           productId: { type: Schema.Types.ObjectId, ref: "productlistings" },
-          // --- ADDED productOwnerSellerId ---
           productOwnerSellerId: { type: Schema.Types.ObjectId, ref: 'sellers', required: true },
           productPrice: { type: Number, min: 0, default: null }, // Price set by host for this show
         },
@@ -220,64 +128,10 @@ const showSchema = new Schema(
         {
           _id: false,
           productId: { type: Schema.Types.ObjectId, ref: "productlistings" },
-          // --- ADDED productOwnerSellerId ---
           productOwnerSellerId: { type: Schema.Types.ObjectId, ref: 'sellers', required: true },
           startingPrice: { type: Number, min: 0, default: null },
           reservedPrice: { type: Number, min: 0, default: null },
-          isAuctionEnded: {
-            type: Boolean,
-            default: false
-          },
-          streamId: {
-            type: String,
-          },
-          // product: {
-          //     type: String,
-          // },
-          auctionType: {
-            type: String, // 'default' or other types
-          },
-          startingBid: {
-            type: Number,
-          },
-          increment: {
-            type: Number,
-            default: 5,
-          },
-          currentHighestBid: {
-            type: Number,
-            default: 0,
-          },
-          nextBid1: {
-            type: Number,
-            default: 0,
-          },
-          nextBid2: {
-            type: Number,
-            default: 0,
-          },
-          highestBidder: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: "users", // Store reference to the highest bidder
-            default: null,
-          },
-          bidderWon: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: "users", // Store reference to the highest bidder
-            default: null,
-          },
-          bids: [bidSchema], // Array of bids
-          endsAt: {
-            type: Date,
-          },
-          isActive: {
-            type: Boolean,
-            default: true,
-          },
-          uniqueStreamId: {
-            type: String,
-          },
-          auctionNumber: {  // <-- New field in auctionProducts sub-schema
+          auctionNumber: {
             type: Number,
           }
         },
@@ -291,16 +145,14 @@ const showSchema = new Schema(
     },
 
     enabledProductTypes: {
-  buyNow:   { type: Boolean, default: false },
-  auction:  { type: Boolean, default: false },
-  giveaway: { type: Boolean, default: false }
-}
-,
+      buyNow:   { type: Boolean, default: false },
+      auction:  { type: Boolean, default: false },
+      giveaway: { type: Boolean, default: false }
+    },
     notes: {
       type: String,
       default: ''
     },
-    // giveaways: [giveawaySchema], // Array of giveaways
   },
   { timestamps: true }
 );

package/package.json

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