payservedb 8.3.8 → 8.3.9

package/src/models/rfq_details.js

@@ -1,131 +1,131 @@
-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 },
-  }],
-  approvalWorkflowId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'ApprovalWorkflow',
-    required: true
-  },
-  approvalStatus: {
-    type: String,
-    enum: ['pending', 'in_progress', 'approved', 'rejected'],
-    default: 'pending',
-    index: true
-  },
-  currentStep: {
-    type: Number,
-    default: 1,
-    min: 1
-  },
-  approvals: [{
-    stepNumber: {
-      type: Number,
-      required: true
-    },
-    stepName: {
-      type: String,
-      required: true
-    },
-    approvers: [{
-      userId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User',
-        required: true
-      },
-      status: {
-        type: String,
-        enum: ['pending', 'approved', 'rejected'],
-        default: 'pending'
-      },
-      actionDate: {
-        type: Date
-      },
-      comments: {
-        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 },
+  }],
+  approvalWorkflowId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'ApprovalWorkflow',
+    required: true
+  },
+  approvalStatus: {
+    type: String,
+    enum: ['pending', 'in_progress', 'approved', 'rejected'],
+    default: 'pending',
+    index: true
+  },
+  currentStep: {
+    type: Number,
+    default: 1,
+    min: 1
+  },
+  approvals: [{
+    stepNumber: {
+      type: Number,
+      required: true
+    },
+    stepName: {
+      type: String,
+      required: true
+    },
+    approvers: [{
+      userId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true
+      },
+      status: {
+        type: String,
+        enum: ['pending', 'approved', 'rejected'],
+        default: 'pending'
+      },
+      actionDate: {
+        type: Date
+      },
+      comments: {
+        type: String,
+        trim: true
+      }
+    }]
+  }]
+}, {
+  timestamps: true
+});
+
+const RFQDetails = mongoose.model('RFQDetails', rfqDetailsSchema);
+
+module.exports = RFQDetails;

package/src/models/rfq_response.js

@@ -1,154 +1,154 @@
-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,
-    },
-    itemName: { type: String, required: true, trim: 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: '',
-    }
-  }],
-  
-  // VAT Information
-  vatPercentage: {
-    type: Number,
-    required: false,
-    min: 0,
-    max: 100,
-    default: 0,
-  },
-  vatAmount: {
-    type: Number,
-    required: false,
-    min: 0,
-    default: 0,
-  },
-  
-  // Delivery Information
-  deliveryDays: {
-    type: Number,
-    required: true,
-    min: 1,
-    default: 7
-  },
-  deliveryMarks: {
-    type: Number,
-    required: true,
-    min: 0,
-    default: 0
-  },
-  
-  // Payment Terms Information
-  paymentTerm: {
-    type: String,
-    required: true,
-    trim: true,
-    default: 'Net 30'
-  },
-  paymentTermMarks: {
-    type: Number,
-    required: true,
-    min: 0,
-    default: 0
-  },
-  
-  // Legacy field for backward compatibility
-  deliveryTimeline: {
-    value: { type: Number },
-    unit: { type: String },
-    daysEquivalent: { type: Number }
-  },
-  
-  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', 'declined'],
-    default: 'pending',
-    index: true,
-  },
-  
-  evaluation: {
-    deliveryScore: {
-      type: Number,
-      min: 0,
-      max: 100,
-      default: null,
-    },
-    paymentScore: {
-      type: Number,
-      min: 0,
-      max: 100,
-      default: null,
-    },
-    notes: {
-      type: String,
-      trim: true,
-      default: ''
-    }
-  },
-}, {
-  timestamps: true,
-});
-
-
+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,
+    },
+    itemName: { type: String, required: true, trim: 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: '',
+    }
+  }],
+  
+  // VAT Information
+  vatPercentage: {
+    type: Number,
+    required: false,
+    min: 0,
+    max: 100,
+    default: 0,
+  },
+  vatAmount: {
+    type: Number,
+    required: false,
+    min: 0,
+    default: 0,
+  },
+  
+  // Delivery Information
+  deliveryDays: {
+    type: Number,
+    required: true,
+    min: 1,
+    default: 7
+  },
+  deliveryMarks: {
+    type: Number,
+    required: true,
+    min: 0,
+    default: 0
+  },
+  
+  // Payment Terms Information
+  paymentTerm: {
+    type: String,
+    required: true,
+    trim: true,
+    default: 'Net 30'
+  },
+  paymentTermMarks: {
+    type: Number,
+    required: true,
+    min: 0,
+    default: 0
+  },
+  
+  // Legacy field for backward compatibility
+  deliveryTimeline: {
+    value: { type: Number },
+    unit: { type: String },
+    daysEquivalent: { type: Number }
+  },
+  
+  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', 'declined'],
+    default: 'pending',
+    index: true,
+  },
+  
+  evaluation: {
+    deliveryScore: {
+      type: Number,
+      min: 0,
+      max: 100,
+      default: null,
+    },
+    paymentScore: {
+      type: Number,
+      min: 0,
+      max: 100,
+      default: null,
+    },
+    notes: {
+      type: String,
+      trim: true,
+      default: ''
+    }
+  },
+}, {
+  timestamps: 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