payservedb 5.2.3 → 5.2.5

package/src/models/dutyroster.js

@@ -1,130 +1,108 @@
-const mongoose = require('mongoose');
-
-const dutyRosterSchema = new mongoose.Schema({
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility',
-    required: true,
-  },
-  staffDetails: {
-    name: {
-      type: String,
-      required: true,
-    },
-    phone: {
-      type: String,
-      required: true,
-    },
-    role: {
-      type: String,
-      required: true,
-      // Examples: 'Site Manager', 'GRE', 'Site support staff', 'Plumber', etc.
-    }
-  },
-
-  // Regular weekly schedule
-  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'
-      }
-    }
-  },
-
-  // 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'
-};
-
+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,
+  },
+  staffDetails: {
+    name: {
+      type: String,
+      required: true,
+    },
+    phone: {
+      type: String,
+      required: true,
+    },
+    role: {
+      type: String,
+      required: true,
+      // Examples: 'Site Manager', 'GRE', 'Site support staff', 'Plumber', etc.
+    }
+  },
+
+  // 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,25 +1,25 @@
-const mongoose = require('mongoose');
-const EmailSchema = mongoose.Schema({
-    user: {
-        type: String,
-        required: true
-    },
-    from: {
-        type: String,
-        required: true
-    },
-    host: {
-        type: String,
-        required: true
-    },
-    port: {
-        type: Number,
-        required: true
-    },
-    auth: {
-        user: String,
-        pass: String
-    }
-})
-const Email = mongoose.model('Email', EmailSchema);
+const mongoose = require('mongoose');
+const EmailSchema = mongoose.Schema({
+    user: {
+        type: String,
+        required: true
+    },
+    from: {
+        type: String,
+        required: true
+    },
+    host: {
+        type: String,
+        required: true
+    },
+    port: {
+        type: Number,
+        required: true
+    },
+    auth: {
+        user: String,
+        pass: String
+    }
+})
+const Email = mongoose.model('Email', EmailSchema);
 module.exports = Email

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;

package/src/models/expense.js

@@ -1,56 +1,56 @@
-const mongoose = require('mongoose');
-
-const expenseSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    categoryId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'BudgetCategory',
-        required: true
-    },
-    name: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    amount: {
-        type: Number,
-        required: true
-    },
-    type: {
-        type: String,
-        enum: ['RECURRING', 'ONE_TIME'],
-        required: true
-    },
-    date: {
-        type: Date,
-        required: true,
-        default: Date.now
-    },
-    status: {
-        type: String,
-        enum: ['PAID', 'UNPAID'],
-        default: 'UNPAID'
-    },
-    approval: {
-        type: Boolean,
-        default: false
-    },
-    description: {
-        type: String,
-        trim: true
-    },
-    receiptUrl: {
-        type: String,
-        trim: true
-    }
-}, {
-    timestamps: true
-});
-
-const Expense = mongoose.model('Expense', expenseSchema);
-
+const mongoose = require('mongoose');
+
+const expenseSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    categoryId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BudgetCategory',
+        required: true
+    },
+    name: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    amount: {
+        type: Number,
+        required: true
+    },
+    type: {
+        type: String,
+        enum: ['RECURRING', 'ONE_TIME'],
+        required: true
+    },
+    date: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    status: {
+        type: String,
+        enum: ['PAID', 'UNPAID'],
+        default: 'UNPAID'
+    },
+    approval: {
+        type: Boolean,
+        default: false
+    },
+    description: {
+        type: String,
+        trim: true
+    },
+    receiptUrl: {
+        type: String,
+        trim: true
+    }
+}, {
+    timestamps: true
+});
+
+const Expense = mongoose.model('Expense', expenseSchema);
+
 module.exports = Expense;

package/src/models/facility.js

@@ -1,61 +1,61 @@
-const mongoose = require('mongoose');
-
-// Define the schema for facilities
-const facilitySchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: [true, 'Facility name is required'],
-        trim: true,
-        minlength: [1, 'Facility name must be at least 1 character long']
-    },
-    location: {
-        type: String,
-        required: true
-    },
-    subDivision: { type: String, required: true },
-    isEnabled: { type: Boolean, required: true },
-    divisionArray: [],
-    landReferenceNumbers: [],
-    defaultMeasurement: { type: String, required: false },
-    totalCommonArea: { type: String, required: false },
-    totalLettableArea: { type: String, required: false },
-    modules: {
-        visitor: { type: Boolean, },
-        levy: { type: Boolean, },
-        maintenance: { type: Boolean, },
-        lease: { type: Boolean, },
-        vas: { type: Boolean, },
-        tickets: { type: Boolean, },
-        utility: { type: Boolean, },
-        booking: { type: Boolean, },
-        handover: { type: Boolean, },
-        expense: { type: Boolean, },
-        campaign: { type: Boolean, },
-        procurement: { type: Boolean, },
-        accounts: { type: Boolean, },
-    },
-
-    logo: {
-        type: String,
-        trim: false,
-        default: null
-    },
-    dbName: {
-        type: String,
-        required: [true, 'Database name is required'],
-        unique: true,
-        trim: true
-    }
-
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Indexes for improved performance
-facilitySchema.index({ name: 1 });
-facilitySchema.index({ dbName: 1 });
-
-// Compile the model from the schema
-const Facility = mongoose.model('Facility', facilitySchema);
-
-module.exports = Facility;
+const mongoose = require('mongoose');
+
+// Define the schema for facilities
+const facilitySchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: [true, 'Facility name is required'],
+        trim: true,
+        minlength: [1, 'Facility name must be at least 1 character long']
+    },
+    location: {
+        type: String,
+        required: true
+    },
+    subDivision: { type: String, required: true },
+    isEnabled: { type: Boolean, required: true },
+    divisionArray: [],
+    landReferenceNumbers: [],
+    defaultMeasurement: { type: String, required: false },
+    totalCommonArea: { type: String, required: false },
+    totalLettableArea: { type: String, required: false },
+    modules: {
+        visitor: { type: Boolean, },
+        levy: { type: Boolean, },
+        maintenance: { type: Boolean, },
+        lease: { type: Boolean, },
+        vas: { type: Boolean, },
+        tickets: { type: Boolean, },
+        utility: { type: Boolean, },
+        booking: { type: Boolean, },
+        handover: { type: Boolean, },
+        expense: { type: Boolean, },
+        campaign: { type: Boolean, },
+        procurement: { type: Boolean, },
+        accounts: { type: Boolean, },
+    },
+
+    logo: {
+        type: String,
+        trim: false,
+        default: null
+    },
+    dbName: {
+        type: String,
+        required: [true, 'Database name is required'],
+        unique: true,
+        trim: true
+    }
+
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+// Indexes for improved performance
+facilitySchema.index({ name: 1 });
+facilitySchema.index({ dbName: 1 });
+
+// Compile the model from the schema
+const Facility = mongoose.model('Facility', facilitySchema);
+
+module.exports = Facility;

package/src/models/facility_payment_details.js

@@ -1,21 +1,21 @@
-const mongoose = require("mongoose");
-
-const facilityPaymentDetailsSchema = new mongoose.Schema({
-    facility: {
-        type: mongoose.Schema.Types.ObjectId,
-    },
-    shortCode: { type: String },
-    passkey: { type: String },
-    authorizationKey: {
-        type: String,
-    },
-    module: {
-        type: String,
-        enum: ["All", "Water", "Electricity", "Levy","Lease"],
-        default: "All"
-    },
-});
-
-const FacilityPaymentDetails = mongoose.model('FacilityPaymentDetails', facilityPaymentDetailsSchema);
-
+const mongoose = require("mongoose");
+
+const facilityPaymentDetailsSchema = new mongoose.Schema({
+    facility: {
+        type: mongoose.Schema.Types.ObjectId,
+    },
+    shortCode: { type: String },
+    passkey: { type: String },
+    authorizationKey: {
+        type: String,
+    },
+    module: {
+        type: String,
+        enum: ["All", "Water", "Electricity", "Levy","Lease"],
+        default: "All"
+    },
+});
+
+const FacilityPaymentDetails = mongoose.model('FacilityPaymentDetails', facilityPaymentDetailsSchema);
+
 module.exports = FacilityPaymentDetails;