payservedb 6.3.2 → 6.3.4

package/index.js

@@ -200,7 +200,9 @@ const models = {
   FacilityWalletTransactionsMetadata: require("./src/models/facilityWalletTransactionsMetadata"),
   PowerMeterCustomerAccount: require("./src/models/powerMeterCustomerAccount"),
   SmsNotification: require("./src/models/sms_balance_notification"),
-  NegativeBalance: require("./src/models/water_meter_negative_amounts")
+  NegativeBalance: require("./src/models/water_meter_negative_amounts"),
+  MasterWorkplan: require("./src/models/master_workplan"),
+  MasterWorkplanChild: require("./src/models/master_workplan_child"),
 };
 
 // Function to get models dynamically from a specific database connection

package/package.json

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

package/src/models/dutyroster.js

@@ -1,108 +1,126 @@
-const mongoose = require('mongoose');
+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: {
+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,
     },
-    phone: {
-      type: String,
+    staffId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "User",
       required: true,
     },
-    role: {
+    staffPosition: {
       type: String,
+      enum: ["Head", "Deputy", "Assistant", "Normal"],
+      default: "Normal",
+    },
+    masterWorkplanId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "MasterWorkplanAssignment",
       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
+
+    // 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],
     },
-    reason: String
-  }],
 
-  // Metadata
-  metadata: {
-    period: {
-      startDate: Date,
-      endDate: Date
-    }
-  }
-}, {
-  timestamps: true
-});
+    // 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'
+  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) {
+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']) {
+  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"
-      }];
+      schedule[day] = [
+        {
+          startTime: "",
+          endTime: "",
+          status: "ON",
+        },
+      ];
     }
   }
 
   next();
 });
 
-module.exports = mongoose.model('DutyRoster', dutyRosterSchema);
+module.exports = mongoose.model("DutyRoster", dutyRosterSchema);

package/src/models/facilityWalletTransactionsMetadata.js

@@ -115,7 +115,6 @@ const facilityWalletTransactionsMetadataSchema = new mongoose.Schema(
 );
 
 // Indexes for better query performance
-facilityWalletTransactionsMetadataSchema.index({ invoiceId: 1 });
 facilityWalletTransactionsMetadataSchema.index({ facility: 1, status: 1 });
 facilityWalletTransactionsMetadataSchema.index({ walletId: 1, status: 1 });
 facilityWalletTransactionsMetadataSchema.index({ status: 1, createdAt: -1 });

package/src/models/master_workplan.js

@@ -0,0 +1,29 @@
+const mongoose = require("mongoose");
+const masterWorkplanSchema = new Schema({
+  facility: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: "Facility",
+    required: true,
+  },
+  title: {
+    type: String,
+    required: true,
+  },
+  description: {
+    type: String,
+    required: true,
+  },
+  life: {
+    type: String,
+    enum: ["Active", "Inactive"],
+    default: "Active",
+  },
+  status: {
+    type: Enum(["Approved", "Rejected", "Pending"]),
+    default: "Approved",
+  },
+});
+
+const MasterWorkplan = mongoose.model("MasterWorkplan", masterWorkplanSchema);
+
+module.exports = MasterWorkplan;

package/src/models/master_workplan_child.js

@@ -0,0 +1,34 @@
+const mongoose = require("mongoose");
+
+const MasterWorkplanChildSchema = new mongoose.Schema(
+  {
+    name: {
+      type: String,
+      required: true,
+    },
+    description: {
+      type: String,
+      required: true,
+    },
+    parent: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "MasterWorkplan",
+      required: true,
+    },
+    status: {
+      type: String,
+      enum: ["Completed", "Pending", "In Progress", "Undone"],
+      default: "Pending",
+    },
+  },
+  {
+    timestamps: true,
+  },
+);
+
+const MasterWorkplanChild = mongoose.model(
+  "ChildWorkplan",
+  MasterWorkplanChildSchema,
+);
+
+module.exports = MasterWorkplanChild;