payservedb 6.5.3 → 6.5.4

package/src/models/water_invoice.js

@@ -1,306 +1,306 @@
-const mongoose = require('mongoose');
-
-const waterInvoiceSchema = new mongoose.Schema(
-  {
-    // Basic identifiers
-    invoiceNumber: {
-      type: String,
-      required: true,
-      unique: true
-    },
-    accountNumber: {
-      type: String,
-      required: true
-    },
-    unitName: {
-      type: String,
-      required: true,
-    },
-    yearMonth: {
-      type: String,
-      required: true,
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      required: true
-    },
-    customerId: {
-      type: mongoose.Schema.Types.ObjectId,
-      required: true
-    },
-    billingType: {
-      type: String,
-      enum: ['postpaid'],
-    },
-    balanceBroughtForward: {
-      type: Number,
-      default: 0
-    },
-
-    // PAYMENTS
-    paymentMethods: {
-      mobilePayment: {
-        status: {
-          type: Boolean,
-          default: false
-        },
-        paymentId: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: 'FacilityPaymentDetails'
-        }
-      },
-      bankPayment: {
-        status: {
-          type: Boolean,
-          default: false
-        },
-        paymentId: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: 'BankDetails'
-        }
-      }
-    },
-
-    // Biller Address Information (added from WaterMeterSettings)
-    billerAddress: {
-      name: {
-        type: String,
-        required: [true, "Biller name is required"],
-        trim: true,
-        minlength: [1, "Biller name must be at least 1 character long"],
-      },
-      email: {
-        type: String,
-        required: [true, "Biller email is required"],
-        trim: true,
-        lowercase: true,
-        validate: {
-          validator: function (v) {
-            return /^\w+([\.-]?\w+)@\w+([\.-]?\w+)(\.\w{2,3})+$/.test(v);
-          },
-          message: "Please enter a valid email address"
-        }
-      },
-      phone: {
-        type: String,
-        required: [true, "Biller phone is required"],
-        trim: true,
-      },
-      address: {
-        type: String,
-        required: [true, "Biller address is required"],
-        trim: true,
-      },
-      city: {
-        type: String,
-        required: [true, "Biller city is required"],
-        trim: true,
-      }
-    },
-
-    // Dates
-    dateIssued: {
-      type: Date,
-      default: Date.now
-    },
-    dueDate: {
-      type: Date,
-      required: true
-    },
-
-    // Meter & Consumption Details
-    meterNumber: {
-      type: String,
-      required: true
-    },
-    meterReadings: {
-      previousReading: {
-        type: Number,
-        required: true
-      },
-      currentReading: {
-        type: Number,
-        required: true
-      },
-      usage: {
-        type: Number,
-        required: true,
-      }
-    },
-    consumptionPeriod: {
-      startDate: {
-        type: Date,
-        required: true
-      },
-      endDate: {
-        type: Date,
-        required: true
-      }
-    },
-
-    // Charges
-    charges: {
-      waterCharge: {
-        type: Number,
-        required: true
-      },
-      sewerCharge: {
-        type: Number,
-        default: 0
-      },
-      tax: {
-        type: Number,
-        default: 0
-      },
-      fixedCharge: {
-        type: Number,
-        default: 0
-      },
-      totalMonthlyBill: {
-        type: Number,
-        required: true
-      }
-    },
-    amountPaid: {
-      type: Number,
-      default: 0
-    },
-    imageUrl: { type: String, trim: true },
-
-    // Invoice Note & Status
-    invoiceNote: {
-      type: String,
-      default: 'Payment is due within 10 days'
-    },
-    status: {
-      type: String,
-      required: true,
-      enum: ['Pending', 'Paid', 'Partially Paid', 'Cancelled', 'Overdue', 'Unpaid'],
-      default: 'Pending'
-    },
-
-    // Currency Info
-    currency: {
-      id: {
-        type: mongoose.Schema.Types.ObjectId
-      },
-      name: {
-        type: String,
-        default: 'Kenyan Shilling'
-      },
-      code: {
-        type: String,
-        default: 'KES'
-      },
-      symbol: {
-        type: String,
-        default: 'KSh'
-      }
-    },
-    notificationsSent: {
-      type: {
-        sms: {
-          type: Boolean,
-          default: false
-        },
-        email: {
-          type: Boolean,
-          default: false
-        },
-        sentAt: {
-          type: Date,
-          default: null
-        },
-        lastAttempt: {
-          type: Date,
-          default: null
-        },
-        attempts: {
-          type: Number,
-          default: 0
-        },
-        smsDetails: {
-          type: {
-            success: Boolean,
-            error: String,
-            sentAt: Date,
-            phoneNumber: String
-          },
-          default: null
-        },
-        emailDetails: {
-          type: {
-            success: Boolean,
-            error: String,
-            sentAt: Date,
-            emailAddress: String
-          },
-          default: null
-        }
-      },
-      default: {
-        sms: false,
-        email: false,
-        sentAt: null,
-        lastAttempt: null,
-        attempts: 0,
-        smsDetails: null,
-        emailDetails: null
-      }
-    },
-
-    // Payment & Reconciliation
-    reconciliationHistory: [
-      {
-        date: {
-          type: Date,
-          default: Date.now
-        },
-        amount: {
-          type: Number,
-          required: true
-        },
-        type: {
-          type: String,
-          default: 'Manual'
-        },
-        paymentReference: {
-          type: String
-        },
-        paymentCompletion: {
-          type: String,
-          default: 'Completed'
-        },
-        sourceInvoice: {
-          type: String
-        },
-        destinationInvoice: {
-          type: String
-        },
-        notes: {
-          type: String
-        },
-        remainingBalance: {
-          type: Number
-        }
-      }
-    ],
-  },
-  {
-    timestamps: true
-  }
-);
-
-waterInvoiceSchema.pre('save', function (next) {
-  if (this.isModified('dueDate') || this.isNew) {
-    const today = new Date();
-    if (this.dueDate < today && this.status === 'Pending') {
-      this.status = 'Overdue';
-    }
-  }
-  next();
-});
-
-const WaterInvoice = mongoose.model('WaterInvoice', waterInvoiceSchema);
-
+const mongoose = require('mongoose');
+
+const waterInvoiceSchema = new mongoose.Schema(
+  {
+    // Basic identifiers
+    invoiceNumber: {
+      type: String,
+      required: true,
+      unique: true
+    },
+    accountNumber: {
+      type: String,
+      required: true
+    },
+    unitName: {
+      type: String,
+      required: true,
+    },
+    yearMonth: {
+      type: String,
+      required: true,
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: true
+    },
+    customerId: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: true
+    },
+    billingType: {
+      type: String,
+      enum: ['postpaid'],
+    },
+    balanceBroughtForward: {
+      type: Number,
+      default: 0
+    },
+
+    // PAYMENTS
+    paymentMethods: {
+      mobilePayment: {
+        status: {
+          type: Boolean,
+          default: false
+        },
+        paymentId: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: 'FacilityPaymentDetails'
+        }
+      },
+      bankPayment: {
+        status: {
+          type: Boolean,
+          default: false
+        },
+        paymentId: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: 'BankDetails'
+        }
+      }
+    },
+
+    // Biller Address Information (added from WaterMeterSettings)
+    billerAddress: {
+      name: {
+        type: String,
+        required: [true, "Biller name is required"],
+        trim: true,
+        minlength: [1, "Biller name must be at least 1 character long"],
+      },
+      email: {
+        type: String,
+        required: [true, "Biller email is required"],
+        trim: true,
+        lowercase: true,
+        validate: {
+          validator: function (v) {
+            return /^\w+([\.-]?\w+)@\w+([\.-]?\w+)(\.\w{2,3})+$/.test(v);
+          },
+          message: "Please enter a valid email address"
+        }
+      },
+      phone: {
+        type: String,
+        required: [true, "Biller phone is required"],
+        trim: true,
+      },
+      address: {
+        type: String,
+        required: [true, "Biller address is required"],
+        trim: true,
+      },
+      city: {
+        type: String,
+        required: [true, "Biller city is required"],
+        trim: true,
+      }
+    },
+
+    // Dates
+    dateIssued: {
+      type: Date,
+      default: Date.now
+    },
+    dueDate: {
+      type: Date,
+      required: true
+    },
+
+    // Meter & Consumption Details
+    meterNumber: {
+      type: String,
+      required: true
+    },
+    meterReadings: {
+      previousReading: {
+        type: Number,
+        required: true
+      },
+      currentReading: {
+        type: Number,
+        required: true
+      },
+      usage: {
+        type: Number,
+        required: true,
+      }
+    },
+    consumptionPeriod: {
+      startDate: {
+        type: Date,
+        required: true
+      },
+      endDate: {
+        type: Date,
+        required: true
+      }
+    },
+
+    // Charges
+    charges: {
+      waterCharge: {
+        type: Number,
+        required: true
+      },
+      sewerCharge: {
+        type: Number,
+        default: 0
+      },
+      tax: {
+        type: Number,
+        default: 0
+      },
+      fixedCharge: {
+        type: Number,
+        default: 0
+      },
+      totalMonthlyBill: {
+        type: Number,
+        required: true
+      }
+    },
+    amountPaid: {
+      type: Number,
+      default: 0
+    },
+    imageUrl: { type: String, trim: true },
+
+    // Invoice Note & Status
+    invoiceNote: {
+      type: String,
+      default: 'Payment is due within 10 days'
+    },
+    status: {
+      type: String,
+      required: true,
+      enum: ['Pending', 'Paid', 'Partially Paid', 'Cancelled', 'Overdue', 'Unpaid'],
+      default: 'Pending'
+    },
+
+    // Currency Info
+    currency: {
+      id: {
+        type: mongoose.Schema.Types.ObjectId
+      },
+      name: {
+        type: String,
+        default: 'Kenyan Shilling'
+      },
+      code: {
+        type: String,
+        default: 'KES'
+      },
+      symbol: {
+        type: String,
+        default: 'KSh'
+      }
+    },
+    notificationsSent: {
+      type: {
+        sms: {
+          type: Boolean,
+          default: false
+        },
+        email: {
+          type: Boolean,
+          default: false
+        },
+        sentAt: {
+          type: Date,
+          default: null
+        },
+        lastAttempt: {
+          type: Date,
+          default: null
+        },
+        attempts: {
+          type: Number,
+          default: 0
+        },
+        smsDetails: {
+          type: {
+            success: Boolean,
+            error: String,
+            sentAt: Date,
+            phoneNumber: String
+          },
+          default: null
+        },
+        emailDetails: {
+          type: {
+            success: Boolean,
+            error: String,
+            sentAt: Date,
+            emailAddress: String
+          },
+          default: null
+        }
+      },
+      default: {
+        sms: false,
+        email: false,
+        sentAt: null,
+        lastAttempt: null,
+        attempts: 0,
+        smsDetails: null,
+        emailDetails: null
+      }
+    },
+
+    // Payment & Reconciliation
+    reconciliationHistory: [
+      {
+        date: {
+          type: Date,
+          default: Date.now
+        },
+        amount: {
+          type: Number,
+          required: true
+        },
+        type: {
+          type: String,
+          default: 'Manual'
+        },
+        paymentReference: {
+          type: String
+        },
+        paymentCompletion: {
+          type: String,
+          default: 'Completed'
+        },
+        sourceInvoice: {
+          type: String
+        },
+        destinationInvoice: {
+          type: String
+        },
+        notes: {
+          type: String
+        },
+        remainingBalance: {
+          type: Number
+        }
+      }
+    ],
+  },
+  {
+    timestamps: true
+  }
+);
+
+waterInvoiceSchema.pre('save', function (next) {
+  if (this.isModified('dueDate') || this.isNew) {
+    const today = new Date();
+    if (this.dueDate < today && this.status === 'Pending') {
+      this.status = 'Overdue';
+    }
+  }
+  next();
+});
+
+const WaterInvoice = mongoose.model('WaterInvoice', waterInvoiceSchema);
+
 module.exports = WaterInvoice;

package/src/models/water_meter_Command_Queue.js

@@ -1,33 +1,33 @@
-const mongoose = require('mongoose');
-
-const meterCommandQueueSchema = new mongoose.Schema({
-    meterNumber: {
-        type: String,
-        required: true
-    },
-    concentratorSerialNumber: {
-        type: String,
-        required: true
-    },
-    commandType: {
-        type: String,
-        enum: ['open', 'close', 'read'],
-        required: true
-    },
-    status: {
-        type: String,
-        enum: ['pending', 'sent', 'acknowledged', 'failed'],
-        default: 'pending'
-    },
-    retryCount: {
-        type: Number,
-        default: 0
-    },
-    sentAt: {
-        type: Date
-    }
-}, { timestamps: true });
-
-const MeterCommandQueue = mongoose.model('MeterCommandQueue', meterCommandQueueSchema);
-
-module.exports = MeterCommandQueue;
+const mongoose = require('mongoose');
+
+const meterCommandQueueSchema = new mongoose.Schema({
+    meterNumber: {
+        type: String,
+        required: true
+    },
+    concentratorSerialNumber: {
+        type: String,
+        required: true
+    },
+    commandType: {
+        type: String,
+        enum: ['open', 'close', 'read'],
+        required: true
+    },
+    status: {
+        type: String,
+        enum: ['pending', 'sent', 'acknowledged', 'failed'],
+        default: 'pending'
+    },
+    retryCount: {
+        type: Number,
+        default: 0
+    },
+    sentAt: {
+        type: Date
+    }
+}, { timestamps: true });
+
+const MeterCommandQueue = mongoose.model('MeterCommandQueue', meterCommandQueueSchema);
+
+module.exports = MeterCommandQueue;