flykup_model_production 1.0.15 → 1.0.17

package/models/stock.model.js

@@ -1,105 +1,105 @@
-// models/Stock.js - Simplified
-import mongoose from "mongoose";
-const { Schema } = mongoose;
-
-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
-    }],
-    // ❌ REMOVED: totalReserved, flashSaleReservations
-    lowStockThreshold: {
-      type: Number,
-      default: 10
-    },
-    reorderQuantity: {
-      type: Number,
-      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 }
-);
-
-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 }
-// );
-
-// // Indexes
-// stockSchema.index({ productListingId: 1 });
-// stockSchema.index({ isInStock: 1 });
-// stockSchema.index({ quantity: 1 });
-
-// const Stock = mongoose.models.stocks || mongoose.model("stocks", stockSchema);
-// export default Stock;
-
+// models/Stock.js - Simplified
+import mongoose from "mongoose";
+const { Schema } = mongoose;
+
+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
+    }],
+    // ❌ REMOVED: totalReserved, flashSaleReservations
+    lowStockThreshold: {
+      type: Number,
+      default: 10
+    },
+    reorderQuantity: {
+      type: Number,
+      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 }
+);
+
+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 }
+// );
+
+// // Indexes
+// stockSchema.index({ productListingId: 1 });
+// stockSchema.index({ isInStock: 1 });
+// stockSchema.index({ quantity: 1 });
+
+// const Stock = mongoose.models.stocks || mongoose.model("stocks", stockSchema);
+// export default Stock;
+

package/models/ticket.model.js

@@ -1,115 +1,115 @@
-// models/Ticket.js
-import mongoose, { Schema, model } from 'mongoose';
-
-const replySchema = new mongoose.Schema({
-  message: {
-    type: String,
-    required: true,
-  },
-  repliedBy: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'users',
-    required: true,
-  },
-  repliedByRole: {
-    type: String,
-    enum: ['Admin', 'Seller'],
-    required: true,
-  },
-  repliedAt: {
-    type: Date,
-    default: Date.now,
-  },
-  attachments: [
-    {
-      type: String, // URLs or file paths for reply attachments
-      required: false,
-    },
-  ],
-});
-
-const ticketSchema = new mongoose.Schema(
-  {
-    ticketId: {
-      type: String,
-      required: true,
-      unique: true,
-    },
-    raisedBy: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'users',
-      required: true,
-    },
-    raisedByRole: {
-      type: String,
-      enum: ['User', 'Seller'],
-      required: true,
-    },
-
-     // NEW: Reference to the order this ticket is related to
-    orderId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'Order', // Assuming your order model is named 'orders'
-      required: false,
-    },
-    // NEW: Reference to the seller user associated with the order
-    sellerUserId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'users',
-      required: false,
-    },
-    ticketPurposeId: {
-      type: String,
-      required: true,
-    },
-    ticketPurposePage: {
-      type: String,
-      required: true,
-    },
-    attachments: [
-      {
-        type: String, // Assuming attachments are stored as URLs or file paths
-        required: false,
-      },
-    ],
-    issueType: {
-      type: String,
-      required: true,
-    },
-    description: {
-      type: String,
-      required: true,
-    },
-    status: {
-      type: String,
-      enum: ['Open', 'In Progress', 'Resolved', 'Closed'],
-      default: 'Open',
-    },
-    // New reply fields
-    sellerReply: {
-      type: replySchema,
-      required: false,
-    },
-    adminReply: {
-      type: replySchema,
-      required: false,
-    },
-    // Track multiple replies (conversation history)
-    replies: [replySchema],
-    // Last updated by (for tracking purposes)
-    lastUpdatedBy: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'users',
-      required: false,
-    },
-    lastUpdatedByRole: {
-      type: String,
-      enum: ['User', 'Seller', 'Admin'],
-      required: false,
-    },
-  },
-  { timestamps: true }
-);
-
-const Ticket = mongoose.models.Ticket || mongoose.model('Ticket', ticketSchema);
-export default Ticket;
+// models/Ticket.js
+import mongoose, { Schema, model } from 'mongoose';
+
+const replySchema = new mongoose.Schema({
+  message: {
+    type: String,
+    required: true,
+  },
+  repliedBy: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'users',
+    required: true,
+  },
+  repliedByRole: {
+    type: String,
+    enum: ['Admin', 'Seller'],
+    required: true,
+  },
+  repliedAt: {
+    type: Date,
+    default: Date.now,
+  },
+  attachments: [
+    {
+      type: String, // URLs or file paths for reply attachments
+      required: false,
+    },
+  ],
+});
+
+const ticketSchema = new mongoose.Schema(
+  {
+    ticketId: {
+      type: String,
+      required: true,
+      unique: true,
+    },
+    raisedBy: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'users',
+      required: true,
+    },
+    raisedByRole: {
+      type: String,
+      enum: ['User', 'Seller'],
+      required: true,
+    },
+
+     // NEW: Reference to the order this ticket is related to
+    orderId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Order', // Assuming your order model is named 'orders'
+      required: false,
+    },
+    // NEW: Reference to the seller user associated with the order
+    sellerUserId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'users',
+      required: false,
+    },
+    ticketPurposeId: {
+      type: String,
+      required: true,
+    },
+    ticketPurposePage: {
+      type: String,
+      required: true,
+    },
+    attachments: [
+      {
+        type: String, // Assuming attachments are stored as URLs or file paths
+        required: false,
+      },
+    ],
+    issueType: {
+      type: String,
+      required: true,
+    },
+    description: {
+      type: String,
+      required: true,
+    },
+    status: {
+      type: String,
+      enum: ['Open', 'In Progress', 'Resolved', 'Closed'],
+      default: 'Open',
+    },
+    // New reply fields
+    sellerReply: {
+      type: replySchema,
+      required: false,
+    },
+    adminReply: {
+      type: replySchema,
+      required: false,
+    },
+    // Track multiple replies (conversation history)
+    replies: [replySchema],
+    // Last updated by (for tracking purposes)
+    lastUpdatedBy: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'users',
+      required: false,
+    },
+    lastUpdatedByRole: {
+      type: String,
+      enum: ['User', 'Seller', 'Admin'],
+      required: false,
+    },
+  },
+  { timestamps: true }
+);
+
+const Ticket = mongoose.models.Ticket || mongoose.model('Ticket', ticketSchema);
+export default Ticket;

package/models/user.model.js

@@ -44,6 +44,7 @@ const UserSchema = new mongoose.Schema(
       maxLength: 60,
       index: true,
     },
+    isMandate: { type: Boolean, default: false },
     password: {
       type: String,
       required: function () {
@@ -60,6 +61,12 @@ const UserSchema = new mongoose.Schema(
       },
       default: null,
     },
+    gender: {
+  type: String,
+  enum: ["male", "female", "other", "prefer-not-to-say"],
+  lowercase: true,
+  default: null
+},
     accessAllowed: { type: Boolean, default: true },
     oAuth: {
       type: String,

package/package.json

@@ -1,18 +1,18 @@
-{
-  "name": "flykup_model_production",
-  "version": "1.0.15",
-  "main": "index.js",
-  "type": "module",
-  "private": false,
-  "publishConfig": {
-    "access": "public"
-  },
-  "dependencies": {
-    "bcrypt": "^5.1.0",
-    "crypto": "^1.0.1",
-    "dotenv": "^16.4.5",
-    "jsonwebtoken": "^9.0.0",
-    "mongoose": "^8.0.0",
-    "nanoid": "^5.1.5"
-  }
-}
+{
+  "name": "flykup_model_production",
+  "version": "1.0.17",
+  "main": "index.js",
+  "type": "module",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "bcrypt": "^5.1.0",
+    "crypto": "^1.0.1",
+    "dotenv": "^16.4.5",
+    "jsonwebtoken": "^9.0.0",
+    "mongoose": "^8.0.0",
+    "nanoid": "^5.1.5"
+  }
+}