payservedb 6.9.0 → 6.9.2

package/src/models/water_meter_manufacturer.js

@@ -1,36 +1,36 @@
-const mongoose = require('mongoose');
-
-const manufacturerSchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true
-    },
-    country: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    contactPerson: {
-        type: String,
-        trim: true
-    },
-    email: {
-        type: String,
-        required: true,
-        trim: true,
-        lowercase: true
-    },
-    phoneNumber: {
-        type: String,
-        required: true,
-        trim: true
-    }
-}, {
-    timestamps: true
-});
-
-const MeterManufacturer = mongoose.model('MeterManufacturer', manufacturerSchema);
-
+const mongoose = require('mongoose');
+
+const manufacturerSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    country: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    contactPerson: {
+        type: String,
+        trim: true
+    },
+    email: {
+        type: String,
+        required: true,
+        trim: true,
+        lowercase: true
+    },
+    phoneNumber: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    timestamps: true
+});
+
+const MeterManufacturer = mongoose.model('MeterManufacturer', manufacturerSchema);
+
 module.exports = MeterManufacturer;

package/src/models/water_meter_monthly_history.js

@@ -1,37 +1,37 @@
-const mongoose = require('mongoose');
-
-const monthlyWaterMeterHistorySchema = new mongoose.Schema({
-    meterId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'WaterMeter',
-        required: true,
-        index: true
-    },
-    yearMonth: {
-        type: String,
-        required: true
-    },
-    initialReading: {
-        type: Number,
-        required: true,
-        min: 0
-    },
-    finalReading: {
-        type: Number,
-        required: true,
-        min: 0
-    },
-    consumption: {
-        type: Number,
-        default: function() {
-            return this.finalReading - this.initialReading;
-        }
-    }
-}, {
-    timestamps: true
-});
-
-monthlyWaterMeterHistorySchema.index({ meterId: 1, yearMonth: 1 });
-const MonthlyWaterMeterHistory = mongoose.model('MonthlyWaterMeterHistory', monthlyWaterMeterHistorySchema);
-
+const mongoose = require('mongoose');
+
+const monthlyWaterMeterHistorySchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeter',
+        required: true,
+        index: true
+    },
+    yearMonth: {
+        type: String,
+        required: true
+    },
+    initialReading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    finalReading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    consumption: {
+        type: Number,
+        default: function() {
+            return this.finalReading - this.initialReading;
+        }
+    }
+}, {
+    timestamps: true
+});
+
+monthlyWaterMeterHistorySchema.index({ meterId: 1, yearMonth: 1 });
+const MonthlyWaterMeterHistory = mongoose.model('MonthlyWaterMeterHistory', monthlyWaterMeterHistorySchema);
+
 module.exports = MonthlyWaterMeterHistory;

package/src/models/water_meter_negative_amounts.js

@@ -1,39 +1,44 @@
-const mongoose = require('mongoose');
-
-const negativeBalanceSchema = new mongoose.Schema({
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-        required: true
-    },
-    accountId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'WaterMeterAccount',
-        required: true
-    },
-    customerName: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    meterNumber: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    amount: {
-        type: Number,
-        required: true
-    },
-    dateRecorded: {
-        type: Date,
-        required: true,
-        default: Date.now
-    }
-}, {
-    timestamps: true
-});
-
-const NegativeBalance = mongoose.model('NegativeBalance', negativeBalanceSchema);
-
-module.exports = NegativeBalance;
+const mongoose = require('mongoose');
+
+const negativeBalanceSchema = new mongoose.Schema({
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+        required: true
+    },
+    accountId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeterAccount',
+        required: true
+    },
+    customerName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    meterNumber: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    amount: {
+        type: Number,
+        required: true
+    },
+    type: {  
+        type: String,
+        enum: ['Credit', 'Debit'],
+        required: true
+    },
+    dateRecorded: {
+        type: Date,
+        required: true,
+        default: Date.now
+    }
+}, {
+    timestamps: true
+});
+
+const NegativeBalance = mongoose.model('NegativeBalance', negativeBalanceSchema);
+
+module.exports = NegativeBalance;

package/src/models/water_meter_settings.js

@@ -1,228 +1,228 @@
-const mongoose = require('mongoose');
-
-const waterMeterSettingsSchema = new mongoose.Schema({
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility',
-    required: true
-  },
-  minAmount: {
-    type: Number,
-    required: true,
-    default: 1
-  },
-  maxAmount: {
-    type: Number,
-    required: true,
-    default: 10000
-  },
-  lowThreshold: {
-    type: Number,
-  },
-  highThreshold: {
-    type: Number,
-  },
-  gracePeriod: {
-    type: Number,
-    required: true,
-    default: 10
-  },
-  invoiceDay: {
-    type: Number,
-    required: true,
-    min: 0,
-    max: 30,
-    default: 3
-  },
-  enforcePayment: {
-    type: String,
-    enum: ['yes', 'no'],
-    required: true,
-    default: 'no'
-  },
-  minimumPaymentAmount: {
-    type: Number,
-    required: true,
-    default: 0
-  },
-  tariff: {
-    type: String,
-    enum: ['yes', 'no'],
-    required: true,
-    default: 'no'
-  },
-  tariffAmount: {
-    type: Number,
-    required: true,
-    default: 0
-  },
-  tariffAmountSmart: {
-    type: Number,
-    default: 0
-  },
-  fixedTariffAmount: {
-    type: Number,
-    required: true,
-    default: 0
-  },
-  meterLoan: {
-    type: Number,
-    required: true,
-    default: 0
-  },
-  
-  // Updated notification structure
-  notifications: {
-    usageAlerts: {
-      enabled: {
-        type: Boolean,
-        default: false
-      },
-      daily: {
-        type: Boolean,
-        default: false
-      },
-      weekly: {
-        type: Boolean,
-        default: false
-      },
-      monthly: {
-        type: Boolean,
-        default: false
-      }
-    },
-    statements: {
-      enabled: {
-        type: Boolean,
-        default: false
-      }
-    }
-  },
-  dailyNotifications: {
-    type: Boolean,
-    default: false
-  },
-  weeklyNotifications: {
-    type: Boolean,
-    default: false
-  },
-  allNotifications: {
-    type: Boolean,
-    default: false
-  },
-
-  // Add other charges section
-  otherCharges: {
-    type: String,
-    enum: ['yes', 'no'],
-    default: 'no'
-  },
-  sewerageCharge: {
-    type: Number,
-    default: 0
-  },
-  fixedCharge: {
-    type: Number,
-    default: 0
-  },
-  vatPercentage: {
-    type: Number,
-    min: 0,
-    max: 100,
-    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 for Invoice Generation
-  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,
-    }
-  },
-
-  glAccounts: {
-    invoice: {
-      debit: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: "GLAccount",
-        required: false,
-      },
-      credit: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: "GLAccount",
-        required: false,
-      }
-    },
-    payment: {
-      debit: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: "GLAccount",
-        required: false,
-      },
-      credit: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: "GLAccount",
-        required: false,
-      }
-    }
-  },
-}, {
-  timestamps: true
-});
-
-const WaterMeterSettings = mongoose.model('WaterMeterSettings', waterMeterSettingsSchema);
-
+const mongoose = require('mongoose');
+
+const waterMeterSettingsSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true
+  },
+  minAmount: {
+    type: Number,
+    required: true,
+    default: 1
+  },
+  maxAmount: {
+    type: Number,
+    required: true,
+    default: 10000
+  },
+  lowThreshold: {
+    type: Number,
+  },
+  highThreshold: {
+    type: Number,
+  },
+  gracePeriod: {
+    type: Number,
+    required: true,
+    default: 10
+  },
+  invoiceDay: {
+    type: Number,
+    required: true,
+    min: 0,
+    max: 30,
+    default: 3
+  },
+  enforcePayment: {
+    type: String,
+    enum: ['yes', 'no'],
+    required: true,
+    default: 'no'
+  },
+  minimumPaymentAmount: {
+    type: Number,
+    required: true,
+    default: 0
+  },
+  tariff: {
+    type: String,
+    enum: ['yes', 'no'],
+    required: true,
+    default: 'no'
+  },
+  tariffAmount: {
+    type: Number,
+    required: true,
+    default: 0
+  },
+  tariffAmountSmart: {
+    type: Number,
+    default: 0
+  },
+  fixedTariffAmount: {
+    type: Number,
+    required: true,
+    default: 0
+  },
+  meterLoan: {
+    type: Number,
+    required: true,
+    default: 0
+  },
+  
+  // Updated notification structure
+  notifications: {
+    usageAlerts: {
+      enabled: {
+        type: Boolean,
+        default: false
+      },
+      daily: {
+        type: Boolean,
+        default: false
+      },
+      weekly: {
+        type: Boolean,
+        default: false
+      },
+      monthly: {
+        type: Boolean,
+        default: false
+      }
+    },
+    statements: {
+      enabled: {
+        type: Boolean,
+        default: false
+      }
+    }
+  },
+  dailyNotifications: {
+    type: Boolean,
+    default: false
+  },
+  weeklyNotifications: {
+    type: Boolean,
+    default: false
+  },
+  allNotifications: {
+    type: Boolean,
+    default: false
+  },
+
+  // Add other charges section
+  otherCharges: {
+    type: String,
+    enum: ['yes', 'no'],
+    default: 'no'
+  },
+  sewerageCharge: {
+    type: Number,
+    default: 0
+  },
+  fixedCharge: {
+    type: Number,
+    default: 0
+  },
+  vatPercentage: {
+    type: Number,
+    min: 0,
+    max: 100,
+    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 for Invoice Generation
+  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,
+    }
+  },
+
+  glAccounts: {
+    invoice: {
+      debit: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "GLAccount",
+        required: false,
+      },
+      credit: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "GLAccount",
+        required: false,
+      }
+    },
+    payment: {
+      debit: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "GLAccount",
+        required: false,
+      },
+      credit: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "GLAccount",
+        required: false,
+      }
+    }
+  },
+}, {
+  timestamps: true
+});
+
+const WaterMeterSettings = mongoose.model('WaterMeterSettings', waterMeterSettingsSchema);
+
 module.exports = WaterMeterSettings;