payservedb 5.2.6 → 5.2.8

package/package.json

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

package/src/models/dutyroster.js

@@ -1,5 +1,16 @@
 const mongoose = require('mongoose');
 
+// Time slot schema for reuse
+const timeSlotSchema = new mongoose.Schema({
+  startTime: String,
+  endTime: String,
+  status: {
+    type: String,
+    enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
+    default: 'ON'
+  }
+}, { _id: false });
+
 const dutyRosterSchema = new mongoose.Schema({
   facilityId: {
     type: mongoose.Schema.Types.ObjectId,
@@ -22,71 +33,15 @@ const dutyRosterSchema = new mongoose.Schema({
     }
   },
 
-  // Regular weekly schedule
+  // Regular weekly schedule - now array of time slots for each day
   weeklySchedule: {
-    monday: {
-      startTime: String,
-      endTime: String,
-      status: {
-        type: String,
-        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
-        default: 'ON'
-      }
-    },
-    tuesday: {
-      startTime: String,
-      endTime: String,
-      status: {
-        type: String,
-        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
-        default: 'ON'
-      }
-    },
-    wednesday: {
-      startTime: String,
-      endTime: String,
-      status: {
-        type: String,
-        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
-        default: 'ON'
-      }
-    },
-    thursday: {
-      startTime: String,
-      endTime: String,
-      status: {
-        type: String,
-        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
-        default: 'ON'
-      }
-    },
-    friday: {
-      startTime: String,
-      endTime: String,
-      status: {
-        type: String,
-        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
-        default: 'ON'
-      }
-    },
-    saturday: {
-      startTime: String,
-      endTime: String,
-      status: {
-        type: String,
-        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
-        default: 'ON'
-      }
-    },
-    sunday: {
-      startTime: String,
-      endTime: String,
-      status: {
-        type: String,
-        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
-        default: 'ON'
-      }
-    }
+    monday: [timeSlotSchema],
+    tuesday: [timeSlotSchema],
+    wednesday: [timeSlotSchema],
+    thursday: [timeSlotSchema],
+    friday: [timeSlotSchema],
+    saturday: [timeSlotSchema],
+    sunday: [timeSlotSchema]
   },
 
   // For exceptions to the regular schedule
@@ -127,4 +82,27 @@ dutyRosterSchema.statics.STATUS_CODES = {
   UI: 'Unplanned Issues'
 };
 
+// Pre-save middleware to handle backward compatibility with old format
+dutyRosterSchema.pre('save', function (next) {
+  const schedule = this.weeklySchedule;
+
+  // Convert any day that's not an array to an array with a single element
+  for (const day of ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday']) {
+    if (schedule[day] && !Array.isArray(schedule[day])) {
+      schedule[day] = [schedule[day]];
+    }
+
+    // Ensure each day has at least one time slot
+    if (!schedule[day] || schedule[day].length === 0) {
+      schedule[day] = [{
+        startTime: "",
+        endTime: "",
+        status: "ON"
+      }];
+    }
+  }
+
+  next();
+});
+
 module.exports = mongoose.model('DutyRoster', dutyRosterSchema);

package/src/models/rfq_response.js

@@ -19,7 +19,7 @@ const rfqResponseSchema = new mongoose.Schema({
     required: true,
     index: true,
   },
-
+  
   items: [{
     itemId: {
       type: mongoose.Schema.Types.ObjectId,
@@ -40,15 +40,48 @@ const rfqResponseSchema = new mongoose.Schema({
       required: true,
       min: 0,
     },
+    notes: {
+      type: String,
+      trim: true,
+      default: '',
+    }
   }],
-
+  deliveryDays: {
+    type: Number,
+    required: true,
+    min: 1,
+    default: 7
+  },
+  
+  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,
@@ -60,7 +93,7 @@ const rfqResponseSchema = new mongoose.Schema({
       type: String,
       trim: true,
       default: ''
-    },
+    }
   },
 }, {
   timestamps: true,
@@ -69,4 +102,4 @@ const rfqResponseSchema = new mongoose.Schema({
 // Unique response per supplier per RFQ
 rfqResponseSchema.index({ rfqId: 1, supplierId: 1 }, { unique: true });
 
-module.exports = mongoose.model('RFQResponse', rfqResponseSchema);
+module.exports = mongoose.model('RFQResponse', rfqResponseSchema);