payservedb 3.5.4 → 3.5.6

package/package.json

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

package/src/models/leaseagreement.js

@@ -1,6 +1,5 @@
 const mongoose = require('mongoose');
 
-// Define the schema for Lease Agreements
 const leaseAgreementSchema = new mongoose.Schema({
     facilityId: {
         type: mongoose.Schema.Types.ObjectId,
@@ -38,42 +37,34 @@ const leaseAgreementSchema = new mongoose.Schema({
                 enum: ['Bank Transfer', 'Mobile Money', 'Cash', 'Cheque']
             },
             details: {
-                // For Bank Transfer
                 bankName: String,
                 accountName: String,
                 accountNumber: String,
                 branch: String,
                 swiftCode: String,
-                // For Mobile Money
                 phoneNumber: String,
                 provider: String,
                 mobileAccountName: String,
-                // For Cheque
                 bankToDraft: String,
                 chequeAccountNumber: String,
-                // For Cash
                 preferredCashLocation: String
             },
             isPrimary: { type: Boolean, default: false }
         }],
         securityDeposit: { type: Number, required: true },
-        penaltyId: { // Reference to Penalty collection
+        penaltyId: {
             type: mongoose.Schema.Types.ObjectId,
             ref: 'Penalty'
         }
     },
     billingCycle: {
-        frequency: { type: String, enum: ['Monthly', 'Quarterly', 'Annually'], required: true },
+        frequency: { 
+            type: String, 
+            enum: ['Monthly', 'Quarterly', 'Annually'], 
+            required: true 
+        },
         nextInvoiceDate: { type: Date },
-        autoSend: { type: Boolean, default: false },
-        overdue: {
-            reminderDays: {
-                type: Number,
-                default: 7,
-                min: 0,
-                max: 30 // Reasonable limit for overdue reminders
-            }
-        }
+        autoSend: { type: Boolean, default: false }
     },
     invoices: [
         { type: mongoose.Schema.Types.ObjectId, ref: 'Invoice' }
@@ -92,11 +83,15 @@ const leaseAgreementSchema = new mongoose.Schema({
     ],
     reminders: [
         {
-            reminderId: { // Reference to Reminder collection
+            reminderId: {
                 type: mongoose.Schema.Types.ObjectId,
                 ref: 'Reminder'
             },
-            status: { type: String, enum: ['Pending', 'Sent'], default: 'Pending' }
+            status: { 
+                type: String, 
+                enum: ['Pending', 'Sent'], 
+                default: 'Pending' 
+            }
         }
     ],
     status: {
@@ -106,7 +101,11 @@ const leaseAgreementSchema = new mongoose.Schema({
     },
     payments: [
         {
-            invoiceId: { type: mongoose.Schema.Types.ObjectId, ref: 'Invoice', required: true },
+            invoiceId: { 
+                type: mongoose.Schema.Types.ObjectId, 
+                ref: 'Invoice', 
+                required: true 
+            },
             method: {
                 type: {
                     type: String,
@@ -114,7 +113,6 @@ const leaseAgreementSchema = new mongoose.Schema({
                     required: true
                 },
                 details: {
-                    // Capture specific details of the payment method used
                     bankName: String,
                     accountNumber: String,
                     transactionId: String,
@@ -123,7 +121,11 @@ const leaseAgreementSchema = new mongoose.Schema({
                 }
             },
             amount: { type: Number, required: true },
-            receivedBy: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: true },
+            receivedBy: { 
+                type: mongoose.Schema.Types.ObjectId, 
+                ref: 'User', 
+                required: true 
+            },
             receivedAt: { type: Date, default: Date.now }
         }
     ],

package/src/models/smart_water_meter.js

@@ -22,6 +22,14 @@ const meterSchema = new mongoose.Schema({
         trim: true,
         unique: true
     },
+    accountBalance: {
+        type: Number,
+        trim: true,
+    },
+    negativeBalance: {
+        type: Number,
+        trim: true,
+    },
     userType: {
         type: String,
         enum: ['postpaid', 'prepaid'],