payservedb 5.2.5 → 5.2.7

package/src/models/rfq_details.js

@@ -1,87 +1,87 @@
-const mongoose = require('mongoose');
-
-const rfqDetailsSchema = new mongoose.Schema({
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility',
-    required: true,
-    index: true,
-  },
-  name: {
-    type: String,
-    required: true,
-    trim: true,
-    index: true,
-  },
-  rfqNumber: {
-    type: String,
-    required: true,
-    unique: true,
-    trim: true,
-    index: true,
-  },
-
-  startDate: {
-    type: Date,
-    required: true,
-  },
-  closingDate: {
-    type: Date,
-    required: true,
-  },
-
-  currency: {
-    type: String,
-    required: true,
-    enum: ['KES', 'USD', 'EUR', 'GBP'],
-    default: 'KES',
-  },
-  rfqType: {
-    type: String,
-    required: true,
-    enum: ['open', 'closed'],
-    default: 'closed',
-  },
-  rfqFee: {
-    type: Number,
-    default: 0,
-  },
-  rfqEvaluationType: {
-    type: String,
-    required: true,
-    enum: ['automatic', 'approvers'],
-    default: 'automatic',
-  },
-  notes: {
-    type: String,
-    trim: true,
-  },
-  category: {
-    type: String,
-    trim: true,
-  },
-  status: {
-    type: String,
-    enum: ['Pending', 'Active', 'Closed'],
-    default: 'Pending',
-    trim: true,
-  },
-  suppliers: [{
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Supplier',
-  }],
-  items: [{
-    itemName: { type: String, required: true, trim: true },
-    description: { type: String, trim: true },
-    quantity: { type: Number, required: true, min: 1 },
-    unitOfMeasure: { type: String, trim: true },
-    specifications: { type: String, trim: true },
-  }],
-
-}, {
-  timestamps: true,
-});
-
-const RFQDetails = mongoose.model('RFQDetails', rfqDetailsSchema);
-
-module.exports = RFQDetails;
+const mongoose = require('mongoose');
+
+const rfqDetailsSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+    index: true,
+  },
+  name: {
+    type: String,
+    required: true,
+    trim: true,
+    index: true,
+  },
+  rfqNumber: {
+    type: String,
+    required: true,
+    unique: true,
+    trim: true,
+    index: true,
+  },
+
+  startDate: {
+    type: Date,
+    required: true,
+  },
+  closingDate: {
+    type: Date,
+    required: true,
+  },
+
+  currency: {
+    type: String,
+    required: true,
+    enum: ['KES', 'USD', 'EUR', 'GBP'],
+    default: 'KES',
+  },
+  rfqType: {
+    type: String,
+    required: true,
+    enum: ['open', 'closed'],
+    default: 'closed',
+  },
+  rfqFee: {
+    type: Number,
+    default: 0,
+  },
+  rfqEvaluationType: {
+    type: String,
+    required: true,
+    enum: ['automatic', 'approvers'],
+    default: 'automatic',
+  },
+  notes: {
+    type: String,
+    trim: true,
+  },
+  category: {
+    type: String,
+    trim: true,
+  },
+  status: {
+    type: String,
+    enum: ['Pending', 'Active', 'Closed'],
+    default: 'Pending',
+    trim: true,
+  },
+  suppliers: [{
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Supplier',
+  }],
+  items: [{
+    itemName: { type: String, required: true, trim: true },
+    description: { type: String, trim: true },
+    quantity: { type: Number, required: true, min: 1 },
+    unitOfMeasure: { type: String, trim: true },
+    specifications: { type: String, trim: true },
+  }],
+
+}, {
+  timestamps: true,
+});
+
+const RFQDetails = mongoose.model('RFQDetails', rfqDetailsSchema);
+
+module.exports = RFQDetails;

package/src/models/rfq_response.js

@@ -1,109 +1,99 @@
-const mongoose = require('mongoose');
-
-const rfqResponseSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        index: true,
-    },
-    rfqId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'RFQDetails',
-        required: true,
-        unique: true,
-        index: true,
-    },
-
-    // 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 },
-    }],
-
-    // overall lifecycle & award
-    status: {
-        type: String,
-        enum: ['open', 'closed', 'awarded', 'canceled'],
-        default: 'open',
-        index: true,
-    },
-    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',
-        },
-    },
-
-}, {
-    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;
-});
-
-const RFQResponse = mongoose.model('RFQResponse', rfqResponseSchema);
-
-module.exports = RFQResponse;
+const mongoose = require('mongoose');
+
+const rfqResponseSchema = new mongoose.Schema({
+  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,
+    },
+    quantity: {
+      type: Number,
+      required: true,
+      min: 1,
+    },
+    totalPrice: {
+      type: Number,
+      required: true,
+      min: 0,
+    },
+    notes: {
+      type: String,
+      trim: true,
+      default: '',
+    }
+  }],
+  
+  notes: {
+    type: String,
+    trim: true,
+    default: '',
+  },
+  
+  attachments: [{
+    fileName: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    filePath: {
+      type: String,
+      required: true,
+    },
+    uploadedAt: {
+      type: Date,
+      default: Date.now,
+    }
+  }],
+  
+  status: {
+    type: String,
+    enum: ['pending', 'submitted', 'evaluated', 'awarded'],
+    default: 'pending',
+    index: true,
+  },
+  
+  evaluation: {
+    score: {
+      type: Number,
+      min: 0,
+      max: 100,
+      default: null,
+    },
+    notes: {
+      type: String,
+      trim: true,
+      default: ''
+    },
+  },
+}, {
+  timestamps: true,
+});
+
+// Unique response per supplier per RFQ
+rfqResponseSchema.index({ rfqId: 1, supplierId: 1 }, { unique: true });
+
+module.exports = mongoose.model('RFQResponse', rfqResponseSchema);

package/src/models/service_charge_invoice_upload.js

@@ -1,43 +1,43 @@
-const mongoose = require("mongoose")
-
-const ServiceChargeInvoiceUploadSchema = new mongoose.Schema({
-	facilityId: {
-		type: mongoose.Schema.Types.ObjectId,
-		ref: 'Facility',
-		required: true,
-	},
-	customerId: {
-		type: String,
-		required: true,
-	},
-	item: {
-		type: String,
-		required: true,
-	},
-	description: {
-		type: String,
-		required: true,
-	},
-	quantity: {
-		type: Number,
-		required: true,
-	},
-	rate: {
-		type: Number,
-		required: true,
-	},
-	vat: {
-		type: Number,
-		required: true,
-	},
-	account: {
-		type: String,
-		required: true,
-	}
-})
-
-const ServiceChargeInvoiceUpload = mongoose.model(
-	"ServiceChargeInvoiceUpload",
-	ServiceChargeInvoiceUploadSchema
-)
+const mongoose = require("mongoose")
+
+const ServiceChargeInvoiceUploadSchema = new mongoose.Schema({
+	facilityId: {
+		type: mongoose.Schema.Types.ObjectId,
+		ref: 'Facility',
+		required: true,
+	},
+	customerId: {
+		type: String,
+		required: true,
+	},
+	item: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+		required: true,
+	},
+	quantity: {
+		type: Number,
+		required: true,
+	},
+	rate: {
+		type: Number,
+		required: true,
+	},
+	vat: {
+		type: Number,
+		required: true,
+	},
+	account: {
+		type: String,
+		required: true,
+	}
+})
+
+const ServiceChargeInvoiceUpload = mongoose.model(
+	"ServiceChargeInvoiceUpload",
+	ServiceChargeInvoiceUploadSchema
+)
 module.exports = ServiceChargeInvoiceUpload

package/src/models/service_charge_payments.js

@@ -1,28 +1,28 @@
-const mongoose = require("mongoose");
-
-const ServiceChargePaymentSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-    },
-    customerId: {
-        type: String,
-        required: true,
-    },
-    amount: {
-        type: Number,
-        required: true,
-    },
-    account: {
-        type: String,
-        required: true,
-    },
-});
-
-const ServiceChargePayment = mongoose.model(
-    "ServiceChargePayment",
-    ServiceChargePaymentSchema
-);
-
+const mongoose = require("mongoose");
+
+const ServiceChargePaymentSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    customerId: {
+        type: String,
+        required: true,
+    },
+    amount: {
+        type: Number,
+        required: true,
+    },
+    account: {
+        type: String,
+        required: true,
+    },
+});
+
+const ServiceChargePayment = mongoose.model(
+    "ServiceChargePayment",
+    ServiceChargePaymentSchema
+);
+
 module.exports = ServiceChargePayment;

package/src/models/servicerequest.js

@@ -1,56 +1,56 @@
-const mongoose = require('mongoose');
-
-const serviceRequestSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true,
-        ref: 'Facility'
-    },
-    date: {
-        type: Date,
-    },
-    time: {
-        type: String,
-    },
-    serviceId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true,
-        ref: 'Service'
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Pending', 'Awaiting', 'In Progress', 'Completed', 'Cancelled'],
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true,
-        ref: 'Customer'
-    },
-    assigneeId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'VasVendor'
-    },
-    unit: {
-        type: String,
-    },
-    frequency: {
-        type: String,
-    },
-    amount: {
-        type: Number,
-    },
-    percentage: {
-        type: Number,
-    },
-    isCommissionSelected: {
-        type: Boolean,
-        default: false
-    }
-}, {
-    timestamps: true
-});
-
-const ServiceRequest = mongoose.model('ServiceRequest', serviceRequestSchema);
-
+const mongoose = require('mongoose');
+
+const serviceRequestSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true,
+        ref: 'Facility'
+    },
+    date: {
+        type: Date,
+    },
+    time: {
+        type: String,
+    },
+    serviceId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true,
+        ref: 'Service'
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Pending', 'Awaiting', 'In Progress', 'Completed', 'Cancelled'],
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true,
+        ref: 'Customer'
+    },
+    assigneeId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'VasVendor'
+    },
+    unit: {
+        type: String,
+    },
+    frequency: {
+        type: String,
+    },
+    amount: {
+        type: Number,
+    },
+    percentage: {
+        type: Number,
+    },
+    isCommissionSelected: {
+        type: Boolean,
+        default: false
+    }
+}, {
+    timestamps: true
+});
+
+const ServiceRequest = mongoose.model('ServiceRequest', serviceRequestSchema);
+
 module.exports = ServiceRequest;