payservedb 8.8.2 → 8.8.3

package/package.json

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

package/src/models/servicerequest.js

@@ -42,6 +42,7 @@ const serviceRequestSchema = new mongoose.Schema({
     frequency: { type: String },
     amount: { type: Number },
     attachment: { type: String },
+    quote: { type: String },
     notes: { type: String },
 }, {
     timestamps: true

package/src/models/water_meters.js

@@ -99,27 +99,46 @@ const waterMeterSchema = new mongoose.Schema({
         type: String,
         trim: true
     },
-    valveType: { // Specific to smart meters
+    valveType: {
         type: String,
         enum: ['automatic', 'manual'],
         default: 'automatic'
     },
-    accountBalance: { // Specific to smart meters
+    accountBalance: {
         type: Number,
         default: 0
     },
-    negativeBalance: { // Specific to smart meters
+    negativeBalance: {
         type: Number,
         default: 0
     },
+
+    // --- Meter Classification ---
+    meterCategory: {
+        type: String,
+        required: true,
+        enum: ['unit', 'bulk', 'floor'],
+        default: 'unit',
+        index: true
+    },
+
+    // Retained for backward compatibility — mirrors meterCategory === 'bulk'
     bulkMeter: {
         type: Boolean,
-        default: false, // false means normal meter
+        default: false,
         index: true
     },
+
+    // Used when meterCategory === 'bulk'
     bulkMeterDescription: {
         type: String,
-        enum: ['City Council Bulk', 'Borehole Bulk', 'Bulk Inlet', 'Bulk Outlet','Bulk Borehole Outlet', 'Common Area'],
+        enum: ['City Council Bulk', 'Borehole Bulk', 'Bulk Inlet', 'Bulk Outlet', 'Bulk Borehole Outlet', 'Common Area'],
+        trim: true
+    },
+
+    // Used when meterCategory === 'floor' — free-text floor label e.g. "Ground Floor", "Floor 3"
+    floorDescription: {
+        type: String,
         trim: true
     }
 
@@ -127,6 +146,30 @@ const waterMeterSchema = new mongoose.Schema({
     timestamps: true
 });
 
+// --- Validation: enforce category-specific field rules ---
+waterMeterSchema.pre('validate', function (next) {
+    // Keep bulkMeter boolean in sync with meterCategory
+    if (this.meterCategory === 'bulk') {
+        this.bulkMeter = true;
+
+        if (!this.bulkMeterDescription) {
+            return next(new Error('bulkMeterDescription is required for bulk meters'));
+        }
+    } else {
+        this.bulkMeter = false;
+    }
+
+    if (this.meterCategory === 'floor' && !this.floorDescription) {
+        return next(new Error('floorDescription is required for floor meters'));
+    }
+
+    if (this.meterCategory === 'unit' && !this.unitId) {
+        return next(new Error('unitId is required for unit meters'));
+    }
+
+    next();
+});
+
 waterMeterSchema.index({ meterNumber: 1, status: 1 });
 
 const WaterMeter = mongoose.model('WaterMeter', waterMeterSchema);