payservedb 5.2.4 → 5.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payservedb",
-  "version": "5.2.4",
+  "version": "5.2.6",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/models/rfq_response.js

@@ -1,109 +1,72 @@
 const mongoose = require('mongoose');
 
 const rfqResponseSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        index: true,
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+    index: true,
+  },
+  rfqId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'RFQDetails',
+    required: true,
+    index: true,
+  },
+  supplierId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Supplier',
+    required: true,
+    index: true,
+  },
+
+  items: [{
+    itemId: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: true,
+    },
+    unitPrice: {
+      type: Number,
+      required: true,
+      min: 0,
     },
-    rfqId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'RFQDetails',
-        required: true,
-        unique: true,
-        index: true,
+    quantity: {
+      type: Number,
+      required: true,
+      min: 1,
     },
+    totalPrice: {
+      type: Number,
+      required: true,
+      min: 0,
+    },
+  }],
 
-    // track each supplier’s progress & quotation
-    suppliers: [{
-        supplierId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Supplier',
-            required: true,
-        },
-        invitationStatus: {
-            type: String,
-            enum: ['pending', 'accepted', 'declined', 'no-response'],
-            default: 'pending',
-        },
-        invitationDate: {
-            type: Date,
-            default: Date.now,
-        },
-        responseDate: Date,
-        quotationSubmitted: {
-            type: Boolean,
-            default: false,
-        },
-        quotationDetails: {
-            submissionDate: Date,
-            totalAmount: Number,
-            items: [{
-                // tie back to the Details’ item index or category
-                categoryId: { type: mongoose.Schema.Types.ObjectId, required: true },
-                itemId: { type: mongoose.Schema.Types.ObjectId, required: true },
-                unitPrice: { type: Number, required: true },
-                quantity: { type: Number, required: true },
-                totalPrice: { type: Number, required: true },
-                notes: { type: String, trim: true },
-            }],
-            attachments: [{
-                name: { type: String, required: true },
-                fileType: { type: String, required: true },
-                filePath: { type: String, required: true },
-                uploadDate: { type: Date, default: Date.now },
-            }],
-            notes: { type: String, trim: true },
-        },
-        evaluationScore: { type: Number, min: 0, max: 100 },
-        evaluationNotes: { type: String, trim: true },
-    }],
+  status: {
+    type: String,
+    enum: ['pending', 'submitted', 'evaluated', 'awarded'],
+    default: 'pending',
+    index: true,
+  },
 
-    // overall lifecycle & award
-    status: {
-        type: String,
-        enum: ['open', 'closed', 'awarded', 'canceled'],
-        default: 'open',
-        index: true,
+  evaluation: {
+    score: {
+      type: Number,
+      min: 0,
+      max: 100,
+      default: null,
     },
-    awardDetails: {
-        awarded: {
-            type: Boolean,
-            default: false,
-        },
-        awardedSupplierId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Supplier',
-        },
-        awardedSupplierName: {
-            type: String,
-            trim: true,
-        },
-        awardDate: Date,
-        awardNotes: { type: String, trim: true },
-
-        purchaseOrderCreated: {
-            type: Boolean,
-            default: false,
-        },
-        purchaseOrderId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'PurchaseOrder',
-        },
+    notes: {
+      type: String,
+      trim: true,
+      default: ''
     },
-
+  },
 }, {
-    timestamps: true,
-});
-
-// participation rate virtual
-rfqResponseSchema.virtual('participationRate').get(function () {
-    if (!this.suppliers.length) return 0;
-    const responded = this.suppliers.filter(s => s.quotationSubmitted).length;
-    return (responded / this.suppliers.length) * 100;
+  timestamps: true,
 });
 
-const RFQResponse = mongoose.model('RFQResponse', rfqResponseSchema);
+// Unique response per supplier per RFQ
+rfqResponseSchema.index({ rfqId: 1, supplierId: 1 }, { unique: true });
 
-module.exports = RFQResponse;
+module.exports = mongoose.model('RFQResponse', rfqResponseSchema);