payservedb 4.7.5 → 4.7.6

package/src/models/customer.js

@@ -1,200 +1,200 @@
-const mongoose = require('mongoose');
-
-const CustomerSchema = new mongoose.Schema({
-    customerNumber: {
-        type: Number,
-        required: true
-    },
-    firstName: {
-        type: String,
-        required: true,
-    },
-    lastName: {
-        type: String,
-        required: true,
-    },
-    phoneNumber: {
-        type: String,
-        required: true,
-    },
-    idNumber: {
-        type: String,
-        required: true,
-    },
-    email: {
-        type: String,
-        required: true
-    },
-    nextOfKinName: {
-        type: String,
-        required: true
-    },
-    nextOfKinRelationship: {
-        type: String,
-        required: true
-    },
-    nextOfKinContact: {
-        type: String,
-        required: true
-    },
-    customerType: {
-        type: String,
-        required: true
-    },
-    residentType: {
-        type: String,
-        required: true
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility'
-    },
-    status: {
-        type: String,
-        required: false,
-        enum: ['Active', 'Inactive']
-    },
-    quickBooksId: {
-        type: String,
-    },
-    nonResidentUsage: {
-        type: String,
-    },
-
-    familyMembers: [
-        {
-            no: {
-                type: Number,
-                required: false
-            },
-            name: {
-                type: String,
-                required: false,
-            },
-            phoneNumber: {
-                type: String,
-                required: false,
-            },
-            email: {
-                type: String,
-                required: false
-            },
-            relation: {
-                type: String,
-                required: false,
-            },
-            qrCode: {
-                type: Boolean,
-                required: false
-            },
-            addVisitor: {
-                type: Boolean,
-                required: false
-            },
-            receiveMessage: {
-                type: Boolean,
-                required: false
-            },
-            qrUniqueCode:
-            {
-                type: String,
-                unique: false
-            },
-            disabled: {
-                type: Boolean,
-                required: false
-            }
-        },
-    ],
-    staff: [
-        {
-            no: {
-                type: Number,
-                required: false
-            },
-            name: {
-                type: String,
-                required: false,
-            },
-            phoneNumber: {
-                type: String,
-                required: false,
-            },
-            jobRole: {
-                type: String,
-                required: false,
-            },
-            qrCode: {
-                type: Boolean,
-                required: false
-            },
-            qrUniqueCode:
-                { type: String, unique: false },
-
-            disabled: {
-                type: Boolean,
-                required: false
-            },
-
-        },
-    ],
-    vehicles: [
-        {
-            no: {
-                type: Number,
-                required: false
-            },
-            registration: {
-                type: String,
-                required: false
-            },
-            name: {
-                type: String,
-                required: false
-            },
-            model: {
-                type: String,
-                required: false
-            },
-            color: {
-                type: String,
-                required: false
-            },
-            plateNumber: {
-                type: String,
-                required: false
-            },
-
-            qrCode: {
-                type: Boolean,
-                required: false
-            },
-            qrUniqueCode: { type: String, unique: false }
-            ,
-            disabled: {
-                type: Boolean,
-                required: false
-            }
-        },
-    ],
-    customerDocuments: [
-        {
-            documentName: {
-                type: String,
-                required: true
-            },
-            documentType: {
-                type: String,
-                required: true
-            },
-            document: {
-                type: String,
-                required: true
-            }
-        }
-    ]
-});
-
-const Customer = mongoose.model('Customer', CustomerSchema);
-
-module.exports = Customer;
+const mongoose = require('mongoose');
+
+const CustomerSchema = new mongoose.Schema({
+    customerNumber: {
+        type: Number,
+        required: true
+    },
+    firstName: {
+        type: String,
+        required: true,
+    },
+    lastName: {
+        type: String,
+        required: true,
+    },
+    phoneNumber: {
+        type: String,
+        required: true,
+    },
+    idNumber: {
+        type: String,
+        required: true,
+    },
+    email: {
+        type: String,
+        required: true
+    },
+    nextOfKinName: {
+        type: String,
+        required: true
+    },
+    nextOfKinRelationship: {
+        type: String,
+        required: true
+    },
+    nextOfKinContact: {
+        type: String,
+        required: true
+    },
+    customerType: {
+        type: String,
+        required: true
+    },
+    residentType: {
+        type: String,
+        required: true
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility'
+    },
+    status: {
+        type: String,
+        required: false,
+        enum: ['Active', 'Inactive']
+    },
+    quickBooksId: {
+        type: String,
+    },
+    nonResidentUsage: {
+        type: String,
+    },
+
+    familyMembers: [
+        {
+            no: {
+                type: Number,
+                required: false
+            },
+            name: {
+                type: String,
+                required: false,
+            },
+            phoneNumber: {
+                type: String,
+                required: false,
+            },
+            email: {
+                type: String,
+                required: false
+            },
+            relation: {
+                type: String,
+                required: false,
+            },
+            qrCode: {
+                type: Boolean,
+                required: false
+            },
+            addVisitor: {
+                type: Boolean,
+                required: false
+            },
+            receiveMessage: {
+                type: Boolean,
+                required: false
+            },
+            qrUniqueCode:
+            {
+                type: String,
+                unique: false
+            },
+            disabled: {
+                type: Boolean,
+                required: false
+            }
+        },
+    ],
+    staff: [
+        {
+            no: {
+                type: Number,
+                required: false
+            },
+            name: {
+                type: String,
+                required: false,
+            },
+            phoneNumber: {
+                type: String,
+                required: false,
+            },
+            jobRole: {
+                type: String,
+                required: false,
+            },
+            qrCode: {
+                type: Boolean,
+                required: false
+            },
+            qrUniqueCode:
+                { type: String, unique: false },
+
+            disabled: {
+                type: Boolean,
+                required: false
+            },
+
+        },
+    ],
+    vehicles: [
+        {
+            no: {
+                type: Number,
+                required: false
+            },
+            registration: {
+                type: String,
+                required: false
+            },
+            name: {
+                type: String,
+                required: false
+            },
+            model: {
+                type: String,
+                required: false
+            },
+            color: {
+                type: String,
+                required: false
+            },
+            plateNumber: {
+                type: String,
+                required: false
+            },
+
+            qrCode: {
+                type: Boolean,
+                required: false
+            },
+            qrUniqueCode: { type: String, unique: false }
+            ,
+            disabled: {
+                type: Boolean,
+                required: false
+            }
+        },
+    ],
+    customerDocuments: [
+        {
+            documentName: {
+                type: String,
+                required: true
+            },
+            documentType: {
+                type: String,
+                required: true
+            },
+            document: {
+                type: String,
+                required: true
+            }
+        }
+    ]
+});
+
+const Customer = mongoose.model('Customer', CustomerSchema);
+
+module.exports = Customer;

package/src/models/default_payment_details.js

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

package/src/models/dutyroster.js

@@ -1,52 +1,130 @@
-const mongoose = require('mongoose');
-
-const dutyRosterSchema = new mongoose.Schema({
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility',
-    required: true,
-  },
-  name: {
-    type: String,
-    required: true,
-  },
-  phone: {
-    type: String,
-    required: true,
-  },
-  activity: {
-    type: String,
-    required: true,
-  },
-  startTime: {
-    type: String,
-    required: true
-  },
-  endTime: {
-    type: String,
-    required: true
-  },
-  approved: {
-    type: Boolean,
-    default: false
-  },
-  approvedBy: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'User'
-  },
-  schedule: [{
-    date: {
-      type: Date,
-      required: true
-    },
-    status: {
-      type: String,
-      enum: ['pending', 'completed', 'missed', 'rescheduled'],
-      default: 'pending'
-    }
-  }]
-}, {
-  timestamps: true
-});
-
+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'
+};
+
 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