payservedb 4.8.2 → 4.8.4

package/src/models/workorder.js

@@ -1,49 +1,49 @@
-const mongoose = require('mongoose');
-
-const workOrderSchema = new mongoose.Schema({
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility',
-    required: true,
-  },
-  requester: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'User', 
-    required: true,
-  },
-  assigneeName: {
-    type: String,
-    trim: true,
-  },
-  description: {
-    type: String,
-    required: true,
-    trim: true,
-  },
-  pricing: {
-    type: Number,
-    required: true,
-    min: 0,
-  },
-  status: {
-    type: String,
-    enum: ['in progress', 'completed', 'suspended', 'pending', 'cancelled'],
-    default: 'pending',
-  },
-  type: {
-    type: String,
-    enum: ['scheduled', 'unscheduled'],
-    required: true,
-  },
-  orderNumber: {
-    type: Number,
-    unique: true,
-    required: true,
-  },
-}, {
-  timestamps: true, 
-});
-
-const WorkOrder = mongoose.model('WorkOrder', workOrderSchema);
-
-module.exports = WorkOrder;
+const mongoose = require('mongoose');
+
+const workOrderSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+  },
+  requester: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'User', 
+    required: true,
+  },
+  assigneeName: {
+    type: String,
+    trim: true,
+  },
+  description: {
+    type: String,
+    required: true,
+    trim: true,
+  },
+  pricing: {
+    type: Number,
+    required: true,
+    min: 0,
+  },
+  status: {
+    type: String,
+    enum: ['in progress', 'completed', 'suspended', 'pending', 'cancelled'],
+    default: 'pending',
+  },
+  type: {
+    type: String,
+    enum: ['scheduled', 'unscheduled'],
+    required: true,
+  },
+  orderNumber: {
+    type: Number,
+    unique: true,
+    required: true,
+  },
+}, {
+  timestamps: true, 
+});
+
+const WorkOrder = mongoose.model('WorkOrder', workOrderSchema);
+
+module.exports = WorkOrder;

package/src/models/quotation.js

@@ -1,268 +0,0 @@
-const mongoose = require('mongoose');
-
-const rfqSchema = 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,
-        default: 'KES',
-        trim: true
-    },
-    rfqType: {
-        type: String,
-        required: true,
-        enum: ['open', 'closed'],
-        default: 'closed'
-    },
-    rfqFee: {
-        type: Number,
-        default: 0
-    },
-    rfqEvaluationType: {
-        type: String,
-        required: true,
-        enum: ['automatic', 'approvers'],
-        default: 'approvers'
-    },
-    notes: {
-        type: String,
-        trim: true
-    },
-    status: {
-        type: String,
-        enum: ['open','closed', 'awarded', 'canceled'],
-        default: 'open',
-        index: true
-    },
-    // RFQ Categories (Products or Services)
-    categories: [{
-        name: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        // For Product type
-        products: [{
-            productName: {
-                type: String,
-                trim: true,
-                required: function() {
-                    return this.parent().categoryType === 'product';
-                }
-            },
-            sku: {
-                type: String,
-                trim: true
-            },
-            quantity: {
-                type: Number,
-                required: function() {
-                    return this.parent().categoryType === 'product';
-                }
-            },
-            unitOfMeasure: {
-                type: String,
-                trim: true
-            },
-            estimatedUnitPrice: {
-                type: Number
-            }
-        }],
-        // For Service type
-        services: [{
-            serviceDescription: {
-                type: String,
-                trim: true,
-                required: function() {
-                    return this.parent().categoryType === 'service';
-                }
-            },
-            quantity: {
-                type: Number,
-                required: function() {
-                    return this.parent().categoryType === 'service';
-                }
-            },
-            unitOfMeasure: {
-                type: String,
-                trim: true
-            },
-            estimatedUnitPrice: {
-                type: Number
-            }
-        }]
-    }],
-    
-    // Suppliers invited to respond to the RFQ
-    suppliers: [{
-        supplierId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Supplier',
-            required: true
-        },
-        supplierName: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        invitationStatus: {
-            type: String,
-            enum: ['pending', 'accepted', 'declined', 'no-response'],
-            default: 'pending'
-        },
-        invitationDate: {
-            type: Date,
-            default: Date.now
-        },
-        responseDate: {
-            type: Date
-        },
-        quotationSubmitted: {
-            type: Boolean,
-            default: false
-        },
-        quotationDetails: {
-            submissionDate: {
-                type: Date
-            },
-            totalAmount: {
-                type: Number
-            },
-            items: [{
-                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
-        }
-    }],
-    
-    
-    // Award details after RFQ is closed
-    awardDetails: {
-        awarded: {
-            type: Boolean,
-            default: false
-        },
-        awardedSupplierId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Supplier'
-        },
-        awardedSupplierName: {
-            type: String,
-            trim: true
-        },
-        awardDate: {
-            type: Date
-        },
-        awardNotes: {
-            type: String,
-            trim: true
-        },
-        purchaseOrderCreated: {
-            type: Boolean,
-            default: false
-        },
-        purchaseOrderId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'PurchaseOrder'
-        }
-    }
-}, {
-    timestamps: true
-});
-
-// Virtual for tracking participation rate
-rfqSchema.virtual('participationRate').get(function() {
-    if (!this.suppliers || this.suppliers.length === 0) return 0;
-    
-    const respondedCount = this.suppliers.filter(
-        supplier => supplier.quotationSubmitted === true
-    ).length;
-    
-    return (respondedCount / this.suppliers.length) * 100;
-});
-
-// Index for efficient querying by date ranges
-rfqSchema.index({ startDate: 1, closingDate: 1 });
-
-const RFQ = mongoose.model('RFQ', rfqSchema);
-
-module.exports = RFQ;