payservedb 3.6.5 → 3.6.7

package/package.json

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

package/src/models/penalty.js

@@ -1,6 +1,5 @@
 const mongoose = require("mongoose");
 
-// Define the schema for Penalty
 const penaltySchema = new mongoose.Schema(
   {
     name: {
@@ -10,23 +9,36 @@ const penaltySchema = new mongoose.Schema(
     type: {
       type: String,
       required: true,
+      enum: ['percentage', 'fixed']
     },
     effectDays: {
       type: Number,
       required: true,
+      min: [1, "Effect days must be at least 1"]
     },
     percentage: {
       type: Number,
-      required: false,
-      min: [0, "Percentage must be at least 0"],
+      required: function () {
+        return this.type === 'percentage';
+      },
+      min: [0, "Percentage must be at least 0"]
     },
     amount: {
       type: Number,
-      min: [0, "Amount must be a positive number"],
+      required: function () {
+        return this.type === 'fixed';
+      },
+      min: [0, "Amount must be a positive number"]
     },
     module: {
-        type: String,
-        required: true,
+      type: String,
+      required: true,
+      enum: ['levy', 'lease', 'utility']
+    },
+    moduleId: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: true,
+      refPath: 'module'
     },
     isActive: {
       type: Boolean,
@@ -36,13 +48,30 @@ const penaltySchema = new mongoose.Schema(
       type: mongoose.Schema.Types.ObjectId,
       ref: "Facility",
       required: true,
-    },
+      index: true
+    }
   },
   {
     timestamps: true,
+    indexes: [
+      { facilityId: 1, isActive: 1 },
+      { moduleId: 1, module: 1 },
+      { name: 1, facilityId: 1 }
+    ]
   }
 );
 
+// Add any custom methods or middleware here if needed
+penaltySchema.pre('save', function (next) {
+  // Clear the irrelevant field based on penalty type
+  if (this.type === 'percentage') {
+    this.amount = null;
+  } else if (this.type === 'fixed') {
+    this.percentage = null;
+  }
+  next();
+});
+
 const Penalty = mongoose.model("Penalty", penaltySchema);
 
-module.exports = Penalty;
+module.exports = Penalty;

package/src/models/reminder.js

@@ -17,9 +17,14 @@ const reminderSchema = new mongoose.Schema(
     module: {
       type: String,
       required: true,
-      enum: ['levy', 'lease'],
+      enum: ['levy', 'lease', 'utility'],
       default: 'levy'
     },
+    moduleId: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: true,
+      refPath: 'module'
+    },
     remindOn: {
       invoiceDate: {
         type: Boolean,
@@ -87,20 +92,6 @@ const reminderSchema = new mongoose.Schema(
       type: String,
       maxLength: [500, 'Message cannot exceed 500 characters']
     },
-    levyId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Levy",
-      required: function() {
-        return this.module === 'levy';
-      }
-    },
-    leaseId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "LeaseAgreement",
-      required: function() {
-        return this.module === 'lease';
-      }
-    },
     facilityId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: "Facility",
@@ -126,14 +117,13 @@ const reminderSchema = new mongoose.Schema(
       { facilityId: 1, isActive: 1, 'remindOn.invoiceDate': 1 },
       { facilityId: 1, isActive: 1, 'remindOn.dueDate': 1 },
       { facilityId: 1, isActive: 1, 'remindOn.afterOverdue.enabled': 1 },
-      { levyId: 1, isActive: 1 },
-      { leaseId: 1, isActive: 1 },
+      { moduleId: 1, isActive: 1 },
       { facilityId: 1, lastProcessed: 1 }
     ]
   }
 );
 
-// Add method to check if reminder should be processed
+// Add methods to reminder schema
 reminderSchema.methods.shouldProcess = function (currentTime, invoice) {
   if (!this.isActive || !invoice) return false;
 
@@ -142,20 +132,16 @@ reminderSchema.methods.shouldProcess = function (currentTime, invoice) {
   const dueDate = moment(invoice.dueDate);
   const today = moment().startOf('day');
 
-  // Check if we should process based on time
   if (!this.isTimeToProcess(now)) return false;
 
-  // Check invoice date reminder
   if (this.remindOn.invoiceDate && invoiceDate.isSame(today, 'day')) {
     return true;
   }
 
-  // Check due date reminder
   if (this.remindOn.dueDate && dueDate.isSame(today, 'day')) {
     return true;
   }
 
-  // Check overdue reminders
   if (this.remindOn.afterOverdue.enabled && dueDate.isBefore(today, 'day')) {
     const daysOverdue = today.diff(dueDate, 'days');
     return this.remindOn.afterOverdue.days.includes(daysOverdue);
@@ -164,13 +150,10 @@ reminderSchema.methods.shouldProcess = function (currentTime, invoice) {
   return false;
 };
 
-// Helper method to check if current time matches reminder time
 reminderSchema.methods.isTimeToProcess = function (currentTime) {
   const reminderMoment = moment(this.time, 'HH:mm');
   const currentMoment = moment(currentTime).format('HH:mm');
   const diffMinutes = moment(currentMoment, 'HH:mm').diff(reminderMoment, 'minutes');
-
-  // Allow processing within 5-minute window
   return Math.abs(diffMinutes) <= 5;
 };
 

package/src/models/smart_water_meter.js

@@ -18,7 +18,7 @@ const meterSchema = new mongoose.Schema({
         required: true,
         trim: true,
         unique: true,
-        index: true  
+        index: true
     },
     accountNumber: {
         type: String,
@@ -41,8 +41,8 @@ const meterSchema = new mongoose.Schema({
     valveType: {
         type: String,
         enum: ['automatic', 'manual'],
-        default:'manual'
-    },  
+        default: 'manual'
+    },
     isInstalled: {
         type: Boolean,
         default: false
@@ -73,7 +73,7 @@ const meterSchema = new mongoose.Schema({
     readingHistory: [{
         reading: Number,
         date: Date,
-        readBy: String
+        time: Date
     }],
     currentReading: {
         type: Number,