flykup_model_development 3.1.26 → 3.1.28

package/models/BankVerification.js

@@ -8,6 +8,16 @@ const bankVerificationSchema = new mongoose.Schema({
     required: true,
     unique: true, // Ensures only one bank verification per user
     index: true
+  },
+   sellerId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'sellers', 
+    
+  },
+  role: {
+    type: String,
+    enum: ['user', 'seller', 'admin'], 
+   
   },
   accountNumber: {
     type: String,

package/models/order.modal.js

@@ -1,355 +1,3 @@
-// // order.model.js - CORRECTED SCHEMA STRUCTURE
-// import mongoose from 'mongoose';
-// import { nanoid } from 'nanoid';
-
-// const orderSchema = new mongoose.Schema(
-//   {
-//     orderId: {
-//       type: String,
-//       required: true,
-//       unique: true,
-//       default: () => `FLY-ORD-${nanoid(8)}`
-//     },
-//     userId: {
-//       type: mongoose.Schema.Types.ObjectId,
-//       ref: 'users',
-//       required: true,
-//       index: true
-//     },
-//     products: [{
-//       productId: {
-//         type: mongoose.Schema.Types.ObjectId,
-//         ref: 'productlistings',
-//         required: true
-//       },
-//       sellerUserId: {
-//         type: mongoose.Schema.Types.ObjectId,
-//         ref: 'users',
-//         required: true
-//       },
-//       quantity: {
-//         type: Number,
-//         required: true,
-//         min: 1
-//       },
-//       basePrice: {
-//         type: Number,
-//         required: true
-//       },
-//       gstRate: {
-//         type: Number,
-//         required: true
-//       },
-//       gstAmount: {
-//         type: Number,
-//         required: true
-//       },
-//       gstType: {
-//         type: String,
-//         enum: ['CGST+SGST', 'IGST',"NON-GST"],
-//         required: true
-//       }
-//     }],
-//     totalBaseAmount: {
-//       type: Number,
-//       required: true
-//     },
-//     totalGstAmount: {
-//       type: Number,
-//       required: true
-//     },
-//     totalAmount: {
-//       type: Number,
-//       required: true
-//     },
-//     gstSplit: {
-//       cgst: {
-//         rate: Number,
-//         amount: Number
-//       },
-//       sgst: {
-//         rate: Number,
-//         amount: Number
-//       },
-//       igst: {
-//         rate: Number,
-//         amount: Number
-//       }
-//     },
-//     deliveryAddress: {
-//       name: { type: String, maxLength: 50, trim: true, required: true },
-//       mobile: { type: String, trim: true, maxLength: 15, required: true },
-//       alternateMobile: { type: String, trim: true, maxLength: 15, default: null },
-//       line1: { type: String, trim: true, maxLength: 100, required: true },
-//       line2: { type: String, trim: true, maxLength: 100, default: "" },
-//       city: { type: String, trim: true, maxLength: 50, required: true },
-//       state: { type: String, trim: true, maxLength: 50, required: true },
-//       pincode: { type: String, maxLength: 6, trim: true, required: true },
-//       addressType: {
-//         type: String,
-//         enum: ['home', 'work', 'other'],
-//         default: 'home'
-//       },
-//       addressModified: {
-//         type: Boolean,
-//         default: false
-//       },
-//       addressModifiedAt: {
-//         type: Date,
-//         default: null
-//       }
-//     },
-//     // CORRECT PLACEMENT - TOP LEVEL FIELDS
-//     logisticsDetails: {
-//       shipmentMethod: {
-//         type: String,
-//         enum: ['self_shipment', 'flykup_logistics'],
-//         default: 'flykup_logistics'
-//       },
-//       awbNumber: String,
-//       carrier: String,
-//       carrierId: String,
-//       trackingNumber: String,
-//       trackingUrl: String,
-//       expectedDeliveryDate: Date,
-//       shipmentBookedAt: Date,
-//       logisticsResponse: mongoose.Schema.Types.Mixed,
-//       shipmentBookingStatus: {
-//         type: String,
-//         enum: ['pending', 'booked', 'failed'],
-//         default: 'pending'
-//       },
-//       shipmentBookingError: String,
-//       multipleSellers: {
-//         type: Boolean,
-//         default: false
-//       },
-//       selectedCourier: {
-//         courierId: String,
-//         courierName: String,
-//         deliveryCharges: Number,
-//         estimatedDays: Number,
-//         deliveryDate: String
-//       },
-//       cancellationAttemptedAt: Date,
-//       cancellationResult: {
-//         success: Boolean,
-//         message: String,
-//         error: String,
-//         responseData: mongoose.Schema.Types.Mixed
-//       },
-//       cancellationEligibility: {
-//         eligible: Boolean,
-//         reason: String
-//       }
-//     },
-//     packageDetails: {
-//       totalWeight: Number,
-//       weightUnit: {
-//         type: String,
-//         default: 'grams'
-//       },
-//       dimensions: {
-//         length: Number,
-//         width: Number,
-//         height: Number
-//       },
-//       volumetricWeight: Number
-//     },
-//     pickupAddresses: [{
-//       sellerUserId: {
-//         type: mongoose.Schema.Types.ObjectId,
-//         ref: 'users',
-//         required: true
-//       },
-//       name: String,
-//       mobile: String,
-//       addressLine1: {
-//         type: String,
-//         trim: true,
-//         maxLength: 150,
-//       },
-//       addressLine2: {
-//         type: String,
-//         trim: true,
-//         maxLength: 150,
-//       },
-//       city: {
-//         type: String,
-//         trim: true,
-//         maxLength: 50,
-//       },
-//       state: {
-//         type: String,
-//         trim: true,
-//         maxLength: 50,
-//       },
-//       pincode: {
-//         type: String,
-//         trim: true,
-//         maxLength: 6,
-//       },
-//     }],
-//     paymentMethod: {
-//       type: String,
-//        enum: ['CARD', 'UPI', 'NETBANKING', 'WALLET', 'COD', "PENDING_PAYMENT", "CASHFREE","RAZORPAY", "Online"],
-//       required: true
-//     },
-//     paymentStatus: {
-//       type: String,
-//       enum: ['PENDING', 'PAID', 'FAILED', 'REFUNDED'],
-//       default: 'PENDING',
-//       required: true
-//     },
-//     orderStatus: {
-//       type: String,
-//       enum: [
-//         'PENDING_PAYMENT',
-//         'ORDERED',
-//         'PACKED',
-//         'SHIPPED',
-//         'OUT_FOR_DELIVERY',
-//         'DELIVERED',
-//         'CANCELLED',
-//         'RETURN_REQUESTED',
-//         'RETURN_APPROVED',
-//         'RETURN_SHIPPED',
-//         'RETURN_RECEIVED',
-//         'REFUNDED',
-//         'REPLACEMENT_SHIPPED',
-//         'REPLACEMENT_DELIVERED'
-//       ],
-//       // default: 'ORDERED', // Default should be the initial state
-//       required: true
-//     },
-//     sourceType: {
-//       type: String,
-//       enum: ['static', 'shoppable_video', 'livestream', 'auction'],
-//       required: true
-//     },
-//     sourceRefId: String,
-//     deliveryCharge: {
-//       type: Number,
-//       default: 40
-//     },
-//     statusTimeline: {
-//       ordered: Date,
-//       paid: Date,
-//       packed: Date,
-//       shipped: Date,
-//       outForDelivery: Date,
-//       delivered: Date,
-//       cancelled: Date,
-//       returnRequested: Date,
-//       returnApproved: Date,
-//       returnShipped: Date,
-//       returnReceived: Date,
-//       refunded: Date,
-//       replacementShipped: Date,
-//       replacementDelivered: Date
-//     },
-//     courierDetails: { 
-//       carrier: String,
-//       trackingNumber: String,
-//       estimatedDelivery: Date
-//     },
-//     returnDetails: {
-//       reason: String,
-//       type: {
-//         type: String,
-//         enum: ['REFUND', 'REPLACE']
-//       },
-//       items: [{
-//         productId: mongoose.Schema.Types.ObjectId,
-//         quantity: Number
-//       }]
-//     },
-//     refundDetails: {
-//       amount: Number,
-//       method: String,
-//       transactionId: String
-//     },
-//     replacementDetails: {
-//       trackingNumber: String,
-//       replacementOrderId: mongoose.Schema.Types.ObjectId
-//     },
-//     returnRequests: [{
-//   _id: { type: mongoose.Schema.Types.ObjectId, auto: true },
-//   orderItemId: {  // Reference to the specific item in the order
-//     type: mongoose.Schema.Types.ObjectId,
-//     required: true
-//   },
-//   reason: String,
-//   additionalNotes: String,
-//   images: [String],
-//   status: {
-//     type: String,
-//     enum: ['PENDING', 
-//             'APPROVED', 
-//             'REJECTED', 
-//             'RETURN_SHIPPED', 
-//             'RETURN_RECEIVED', 
-//             'REFUNDED'],
-//     default: 'PENDING'
-//   },
-//    shipmentDetails: {
-//     carrier: String,
-//     trackingNumber: String,
-//     receiptImage: String, // S3 key for uploaded image
-//     shippedAt: Date
-//     },
-//     receivedAt: Date,
-//     refundProcessedAt: Date,
-//   sellerResponse: String,
-//   requestedAt: Date,
-//   processedAt: Date
-// }],
-// cancelReason: String,
-// cancelSource: {
-//   type: String,
-//   enum: ['user', 'seller', 'system'],
-//   default: 'user'
-// },
-// payment: {
-//   type: mongoose.Schema.Types.ObjectId,
-//   ref: 'orderPayment'
-// },  
-//  invoiceKey: {
-//       type: String,
-//       default: null
-//     },
-//      invoiceStatus: {
-//     type: String,
-//     enum: ['pending', 'processing', 'completed', 'failed'],
-//     default: 'pending'
-//   },
-//   invoiceRetries: {
-//     type: Number,
-//     default: 0
-//   },
-//   invoiceError: String
-
-
-
-
-
-  
-//   },
-  
-//   { timestamps: true }
-// );
-
-
-// const Order = mongoose.model('Order', orderSchema);
-// export default Order;
-
-
-// const Order = mongoose.models.Order || mongoose.model('Order', orderSchema);
-// export default Order;
-
-
-
-
 
 // order.modal.js
 import mongoose from 'mongoose';
@@ -361,7 +9,7 @@ const orderSchema = new mongoose.Schema(
       type: String,
       required: true,
       unique: true,
-      default: () => `ORD-${nanoid(8)}`
+      default: () => `FLY-ORD-${nanoid(8)}`
     },
     userId: {
       type: mongoose.Schema.Types.ObjectId,

package/models/productListing.model.js

@@ -156,172 +156,3 @@ export default ProductListing;
 
 
 
-
-
-// // 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" },
-//     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 }
-//   },
-  
-// //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']
-//     },
-// // ----------end of new fields added
-//     images: [
-//       {
-//         key: { type: String, maxLength: 255, default: null },
-//       }
-//     ],
-//     category: String,
-//     subcategory: String,
-//     hsnNo: String,
-//     MRP: {
-//       type: Number,
-//       min: 0,
-//       default: null,
-//     },
-//     productPrice: {
-//       type: Number,
-//       min: 0,
-//       default: null,
-//     },
-//     startingPrice: {
-//       type: Number,
-//       min: 0,
-//       default: null,
-//     },
-//     reservedPrice: {
-//       type: Number,
-//       min: 0,
-//       default: null,
-//     },
-
-//     // --- ADDED/UPDATED FIELDS FROM FRONTEND ---
-//     brand: { type: String, default: null }, // ADDED
-//     manufacturer: String,
-//     manufacturerAddress: String, // ADDED in frontend, already exists here
-//     countryOfOrigin: String,
-//     netQuantity: { type: String, default: null }, // ADDED (String to accommodate units like '500g')
-//     packagingType: { type: String, default: null }, // ADDED
-//     weight: { // For shipping calculations
-//       value: { type: Number, default: null },
-//       unit: { type: String, default: null },
-//     },
-//     dimensions: { // For shipping calculations
-//       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
-//     sellerName: String,
-//     sellerContact: { type: String, default: null }, // ADDED
-//     sellerGSTIN: { type: String, default: null }, // ADDED
-//     returnPolicy: [String],
-//     warranty: {
-//       hasWarranty: { type: Boolean, default: false }, // Default added
-//       duration: { type: String, default: null }, // Default added
-//     },
-//     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
-//     allowDropshipping: {
-//       type: Boolean,
-//       default: false,
-//       index: true,
-//     },
-//     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
-// },
-//     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 }
-//   },
-
-
-  
-//   { 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);
-// export default ProductListing;
-
-
-
-
-

package/models/shoppableVideo.model.js

@@ -37,8 +37,8 @@ const ShoppableVideoSchema = new Schema(
       required: false,
       trim: true,
     },
-    category: { type: String, required: true, trim: false},
-    subcategory: { type: String, required: true, trim: false },
+    category: { type: String, required: false, trim: false},
+    subcategory: { type: String, required: false, trim: false },
     // thumbnailURL might be set initially or updated by the processing service
    isThumbnailEnabled: {
       type: Boolean,

package/models/stock.model.js

@@ -1,43 +1,3 @@
-// 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
 import mongoose from "mongoose";

package/package.json

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