payservedb 6.4.3 → 6.4.4

package/src/models/dutyroster.js

@@ -1,136 +1,126 @@
-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,
-      ref: "Facility",
-      required: true,
-    },
-    staffId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "User",
-      required: true,
-    },
-    staffPosition: {
-      type: String,
-      enum: ["Head", "Deputy", "Assistant", "Normal"],
-      default: "Normal",
-    },
-    masterWorkplanId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "MasterWorkplanAssignment",
-      required: true,
-    },
-    startDate: {
-      type: Date,
-      required: true,
-    },
-    endDate: {
-      type: Date,
-      required: true,
-    },
-    weeklySchedule: {
-      monday: [timeSlotSchema],
-      tuesday: [timeSlotSchema],
-      wednesday: [timeSlotSchema],
-      thursday: [timeSlotSchema],
-      friday: [timeSlotSchema],
-      saturday: [timeSlotSchema],
-      sunday: [timeSlotSchema],
-    },
-    // For exceptions to the regular schedule
-    exceptions: [
-      {
-        date: {
-          type: Date,
-          required: true,
-        },
-        startTime: String,
-        endTime: String,
-        status: {
-          type: String,
-          enum: ["ON", "OFF", "AL", "CL", "ML/PL", "PH", "UI"],
-          required: true,
-        },
-        reason: String,
-      },
-    ],
-    // Metadata
-    metadata: {
-      period: {
-        startDate: Date,
-        endDate: Date,
-      },
-    },
-  },
-  {
-    timestamps: true,
-  },
-);
-
-// Add validation to ensure endDate is after startDate
-dutyRosterSchema.pre("save", function (next) {
-  // Validate date range
-  if (this.startDate && this.endDate && this.startDate >= this.endDate) {
-    return next(new Error("End date must be after start date"));
-  }
-
-  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();
-});
-
-// Status code definitions
-dutyRosterSchema.statics.STATUS_CODES = {
-  ON: "On Duty",
-  OFF: "Off Duty",
-  AL: "Annual Leave",
-  CL: "Casual Leave",
-  "ML/PL": "Medical/Paternity Leave",
-  PH: "Public Holiday",
-  UI: "Unplanned Issues",
-};
-
-// Add index for efficient date range queries
-dutyRosterSchema.index({ startDate: 1, endDate: 1 });
-dutyRosterSchema.index({ facilityId: 1, startDate: 1, endDate: 1 });
-
-module.exports = mongoose.model("DutyRoster", dutyRosterSchema);
+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,
+      ref: "Facility",
+      required: true,
+    },
+    staffId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "User",
+      required: true,
+    },
+    staffPosition: {
+      type: String,
+      enum: ["Head", "Deputy", "Assistant", "Normal"],
+      default: "Normal",
+    },
+    masterWorkplanId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "MasterWorkplanAssignment",
+      required: true,
+    },
+
+    // Regular weekly schedule - now array of time slots for each day
+    weeklySchedule: {
+      monday: [timeSlotSchema],
+      tuesday: [timeSlotSchema],
+      wednesday: [timeSlotSchema],
+      thursday: [timeSlotSchema],
+      friday: [timeSlotSchema],
+      saturday: [timeSlotSchema],
+      sunday: [timeSlotSchema],
+    },
+
+    // For exceptions to the regular schedule
+    exceptions: [
+      {
+        date: {
+          type: Date,
+          required: true,
+        },
+        startTime: String,
+        endTime: String,
+        status: {
+          type: String,
+          enum: ["ON", "OFF", "AL", "CL", "ML/PL", "PH", "UI"],
+          required: true,
+        },
+        reason: String,
+      },
+    ],
+
+    // Metadata
+    metadata: {
+      period: {
+        startDate: Date,
+        endDate: Date,
+      },
+    },
+  },
+  {
+    timestamps: true,
+  },
+);
+
+// Status code definitions
+dutyRosterSchema.statics.STATUS_CODES = {
+  ON: "On Duty",
+  OFF: "Off Duty",
+  AL: "Annual Leave",
+  CL: "Casual Leave",
+  "ML/PL": "Medical/Paternity Leave",
+  PH: "Public Holiday",
+  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/email.js

@@ -1,38 +1,38 @@
-const mongoose = require('mongoose');
-const FacilityEmailDetailsSchema = mongoose.Schema({
-    host: {
-        type: String,
-        required: true
-    },
-    port: {
-        type: Number,
-        required: true
-    },
-    secure: {
-        type: Boolean,
-        default: false
-    },
-    sender: {
-        type: String,
-        required: true
-    },
-    user: {
-        type: String,
-        required: true
-    },
-    pass: {
-        type: String,
-        required: true
-    },
-    rejectUnauthorized: {
-        type: Boolean,
-        default: false
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    }
-})
-const FacilityEmailDetails = mongoose.model('FacilityEmailDetails', FacilityEmailDetailsSchema);
+const mongoose = require('mongoose');
+const FacilityEmailDetailsSchema = mongoose.Schema({
+    host: {
+        type: String,
+        required: true
+    },
+    port: {
+        type: Number,
+        required: true
+    },
+    secure: {
+        type: Boolean,
+        default: false
+    },
+    sender: {
+        type: String,
+        required: true
+    },
+    user: {
+        type: String,
+        required: true
+    },
+    pass: {
+        type: String,
+        required: true
+    },
+    rejectUnauthorized: {
+        type: Boolean,
+        default: false
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    }
+})
+const FacilityEmailDetails = mongoose.model('FacilityEmailDetails', FacilityEmailDetailsSchema);
 module.exports = FacilityEmailDetails

package/src/models/email_sms_queue.js

@@ -1,61 +1,61 @@
-const mongoose = require("mongoose");
-
-const EmailSmsQueueSchema = new mongoose.Schema(
-  {
-    email: {
-      to: {
-        type: String,
-        required: function () {
-          return this.type === "email";
-        },
-      },
-      subject: {
-        type: String,
-        required: function () {
-          return this.type === "email";
-        },
-      },
-      text: {
-        type: String,
-        required: function () {
-          return this.type === "email";
-        },
-      },
-    },
-    sms: {
-      to: {
-        type: String,
-        required: function () {
-          return this.type === "sms";
-        },
-      },
-      message: {
-        type: String,
-        required: function () {
-          return this.type === "sms";
-        },
-      },
-    },
-    type: {
-      type: String,
-      required: true,
-      enum: ["email", "sms"],
-    },
-    status: {
-      type: String,
-      required: true,
-      enum: ["pending", "sent", "failed"],
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-    },
-  },
-  {
-    timestamps: true,
-  },
-);
-
-const EmailSmsQueue = mongoose.model("EmailSmsQueue", EmailSmsQueueSchema);
-module.exports = EmailSmsQueue;
+const mongoose = require("mongoose");
+
+const EmailSmsQueueSchema = new mongoose.Schema(
+  {
+    email: {
+      to: {
+        type: String,
+        required: function () {
+          return this.type === "email";
+        },
+      },
+      subject: {
+        type: String,
+        required: function () {
+          return this.type === "email";
+        },
+      },
+      text: {
+        type: String,
+        required: function () {
+          return this.type === "email";
+        },
+      },
+    },
+    sms: {
+      to: {
+        type: String,
+        required: function () {
+          return this.type === "sms";
+        },
+      },
+      message: {
+        type: String,
+        required: function () {
+          return this.type === "sms";
+        },
+      },
+    },
+    type: {
+      type: String,
+      required: true,
+      enum: ["email", "sms"],
+    },
+    status: {
+      type: String,
+      required: true,
+      enum: ["pending", "sent", "failed"],
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+  },
+  {
+    timestamps: true,
+  },
+);
+
+const EmailSmsQueue = mongoose.model("EmailSmsQueue", EmailSmsQueueSchema);
+module.exports = EmailSmsQueue;

package/src/models/entry_exit.js

@@ -1,53 +1,53 @@
-const mongoose = require('mongoose');
-
-const EntryExitSchema = mongoose.Schema({
-    name: {
-        type: String,
-        required: true
-    },
-    location: {
-        type: String,
-        required: true,
-    },
-    gps: {
-        type: { 
-            type: String, 
-            enum: ['Point'], 
-            required: true 
-        },
-        coordinates: {
-            type: [Number], // [longitude, latitude] format
-            required: true,
-            validate: {
-                validator: function (value) {
-                    return value.length === 2;
-                },
-                message: 'Coordinates must have longitude and latitude'
-            }
-        }
-    },
-    range: {
-        type: Number,
-        required: true
-    },
-    disabled: {
-        type: Boolean,
-        required: true
-    },
-    purpose: {
-        type: String,
-        required: true,
-        enum: ['entry/exit', 'entry', 'exit', 'emergency exit']
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    }
-});
-
-// Create a 2dsphere index on the gps field to support geospatial queries
-EntryExitSchema.index({ gps: '2dsphere' });
-
-const EntryExit = mongoose.model('EntryExit', EntryExitSchema);
-
-module.exports = EntryExit;
+const mongoose = require('mongoose');
+
+const EntryExitSchema = mongoose.Schema({
+    name: {
+        type: String,
+        required: true
+    },
+    location: {
+        type: String,
+        required: true,
+    },
+    gps: {
+        type: { 
+            type: String, 
+            enum: ['Point'], 
+            required: true 
+        },
+        coordinates: {
+            type: [Number], // [longitude, latitude] format
+            required: true,
+            validate: {
+                validator: function (value) {
+                    return value.length === 2;
+                },
+                message: 'Coordinates must have longitude and latitude'
+            }
+        }
+    },
+    range: {
+        type: Number,
+        required: true
+    },
+    disabled: {
+        type: Boolean,
+        required: true
+    },
+    purpose: {
+        type: String,
+        required: true,
+        enum: ['entry/exit', 'entry', 'exit', 'emergency exit']
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+    }
+});
+
+// Create a 2dsphere index on the gps field to support geospatial queries
+EntryExitSchema.index({ gps: '2dsphere' });
+
+const EntryExit = mongoose.model('EntryExit', EntryExitSchema);
+
+module.exports = EntryExit;