payservedb 8.5.1 → 8.5.3

package/index.js

@@ -121,6 +121,7 @@ const models = {
   WaterMeter: require("./src/models/water_meters"),
   DailyConsumption: require("./src/models/smart_meter_daily_consumption"),
   WaterMeterSettings: require("./src/models/water_meter_settings"),
+  WaterCombinedMeterAccount: require("./src/models/water_meter_combined_accounts"),
   AnalogBilling: require("./src/models/water_meter_billing"),
   MeterSize: require("./src/models/water_meter_size"),
   WaterInvoice: require("./src/models/water_invoice"),
@@ -141,6 +142,7 @@ const models = {
   DefaultPaymentDetails: require("./src/models/default_payment_details"),
   Currency: require("./src/models/currency_settings"),
   WaterMeterAccount: require("./src/models/water_meter_account"),
+  WaterMeterLoanDeduction: require("./src/models/water_meter_loan_deduction"),
   SingleDayWaterMeterHistory: require("./src/models/water_meter_single_day_history"),
   DailyWaterMeterHistory: require("./src/models/water_meter_daily_history"),
   MonthlyWaterMeterHistory: require("./src/models/water_meter_monthly_history"),

package/package.json

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

package/src/models/water_meter_combined_accounts.js

@@ -0,0 +1,92 @@
+const mongoose = require('mongoose');
+
+const waterCombinedMeterAccountSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    account_no: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+    },
+    customerName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    phoneNumber: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    email: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    meterNumbers: [{
+        type: String,
+        required: true,
+        trim: true
+    }],
+
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+    },
+    unitName: {
+        type: String,
+        required: true,
+        trim: true,
+        index: true
+    },
+    payment_type: {
+        type: String,
+        required: true,
+        enum: ['Postpaid', 'Prepaid']
+    },
+    previousReading: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    currentReading: {
+        type: Number,
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Active', 'Inactive'],
+        default: 'Active'
+    },
+    created_on: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    meter_ids: [{
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeter',
+    }],
+
+    accountBalance: {
+        type: Number,
+        default: 0
+    }
+}, {
+    timestamps: true
+});
+
+const WaterCombinedMeterAccount = mongoose.model(
+    'WaterCombinedMeterAccount',
+    waterCombinedMeterAccountSchema
+);
+
+module.exports = WaterCombinedMeterAccount;

package/src/models/water_meter_loan_deduction.js

@@ -0,0 +1,135 @@
+const mongoose = require('mongoose');
+
+const waterMeterLoanDeductionSchema = new mongoose.Schema({
+  customerId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Customer',
+    required: true,
+    index: true
+  },
+  accountId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'WaterMeterAccount',
+    required: true,
+    index: true
+  },
+  meterId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'WaterMeter',
+    required: true,
+    index: true
+  },
+  amount: {
+    type: Number,
+    required: true,
+    min: 0
+  },
+  yearMonth: {
+    type: String,
+    required: true,
+    index: true,
+    // Format: YYYY-MM (e.g., "2026-01")
+    validate: {
+      validator: function(v) {
+        return /^\d{4}-(0[1-9]|1[0-2])$/.test(v);
+      },
+      message: "yearMonth must be in YYYY-MM format"
+    }
+  },
+  deductionDate: {
+    type: Date,
+    required: true,
+    default: Date.now
+  },
+  status: {
+    type: String,
+    enum: ['pending', 'completed', 'insufficient_balance'],
+    required: true,
+    default: 'pending',
+    index: true
+  },
+  debitRecordId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'WaterPrepaidDebit',
+    // Will be populated when deduction is completed
+  },
+  balanceAtAttempt: {
+    type: Number,
+    // Store balance when deduction was attempted
+  },
+  attempts: {
+    type: Number,
+    default: 0,
+    min: 0
+  },
+  lastAttemptDate: {
+    type: Date
+  },
+  completedDate: {
+    type: Date
+  },
+  notes: {
+    type: String,
+    trim: true
+  }
+}, {
+  timestamps: true
+});
+
+// Compound index to ensure one deduction per customer per month
+waterMeterLoanDeductionSchema.index(
+  { customerId: 1, yearMonth: 1 }, 
+  { unique: true }
+);
+
+// Index for finding pending deductions
+waterMeterLoanDeductionSchema.index({ status: 1, yearMonth: 1 });
+
+// Index for finding deductions by account
+waterMeterLoanDeductionSchema.index({ accountId: 1, yearMonth: 1 });
+
+// Static method to check if deduction exists for a customer in a given month
+waterMeterLoanDeductionSchema.statics.deductionExists = async function(customerId, yearMonth) {
+  const count = await this.countDocuments({ customerId, yearMonth });
+  return count > 0;
+};
+
+// Static method to get pending deductions
+waterMeterLoanDeductionSchema.statics.getPendingDeductions = async function() {
+  return this.find({ status: 'pending' })
+    .populate('accountId')
+    .populate('meterId')
+    .sort({ createdAt: 1 });
+};
+
+// Static method to get pending deductions for a specific month
+waterMeterLoanDeductionSchema.statics.getPendingDeductionsForMonth = async function(yearMonth) {
+  return this.find({ 
+    status: 'pending',
+    yearMonth: yearMonth 
+  })
+    .populate('accountId')
+    .populate('meterId')
+    .sort({ createdAt: 1 });
+};
+
+// Instance method to mark as completed
+waterMeterLoanDeductionSchema.methods.markCompleted = async function(debitRecordId) {
+  this.status = 'completed';
+  this.debitRecordId = debitRecordId;
+  this.completedDate = new Date();
+  return this.save();
+};
+
+// Instance method to mark as insufficient balance
+waterMeterLoanDeductionSchema.methods.markInsufficientBalance = async function(balance) {
+  this.status = 'insufficient_balance';
+  this.balanceAtAttempt = balance;
+  this.attempts += 1;
+  this.lastAttemptDate = new Date();
+  return this.save();
+};
+
+const WaterMeterLoanDeduction = mongoose.model('WaterMeterLoanDeduction', waterMeterLoanDeductionSchema);
+
+module.exports = WaterMeterLoanDeduction;