payservedb 9.1.1 → 9.1.2

package/src/models/water_meters.js

@@ -1,177 +1,177 @@
-const mongoose = require('mongoose');
-
-const waterMeterSchema = new mongoose.Schema({
-    meterType: {
-        type: String,
-        required: true,
-        enum: ['analog', 'smart']
-    },
-    meterNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true,
-        index: true
-    },
-    serialNumber: {
-        type: String,
-        unique: true,
-        trim: true,
-        index: true
-    },
-    accountNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-    },
-    manufacturer: {
-        type: String,
-        required: true,
-    },
-    protocol: {
-        type: String,
-        required: true,
-    },
-    size: {
-        type: String,
-        required: true,
-    },
-    initialReading: {
-        type: Number,
-        required: true,
-        min: 0,
-        default: 0
-    },
-    previousReading: {
-        type: Number,
-        min: 0,
-    },
-    currentReading: {
-        type: Number,
-        min: 0,
-        default: 0
-    },
-    lastReadingDate: {
-        type: Date,
-        default: Date.now
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['opened', 'closed', 'maintenance', 'faulty'],
-        default: 'opened',
-    },
-    installationStatus: {
-        type: String,
-        required: true,
-        enum: ['installed', 'not installed'],
-        default: 'installed',
-    },
-    customerType: {
-        type: String,
-        enum: ['postpaid', 'prepaid'],
-    },
-    isInstalled: {
-        type: Boolean,
-        default: false
-    },
-    enforcement: {
-        type: Boolean,
-        default: false
-    },
-    concentratorSerialNumber: {
-        type: String
-    },
-    imageUrl: {
-        type: String,
-        trim: true
-    },
-    valveType: {
-        type: String,
-        enum: ['automatic', 'manual'],
-        default: 'automatic'
-    },
-    accountBalance: {
-        type: Number,
-        default: 0
-    },
-    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,
-        index: true
-    },
-
-    // Used when meterCategory === 'bulk'
-    bulkMeterDescription: {
-        type: String,
-        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
-    }
-
-}, {
-    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);
-
+const mongoose = require('mongoose');
+
+const waterMeterSchema = new mongoose.Schema({
+    meterType: {
+        type: String,
+        required: true,
+        enum: ['analog', 'smart']
+    },
+    meterNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+        index: true
+    },
+    serialNumber: {
+        type: String,
+        unique: true,
+        trim: true,
+        index: true
+    },
+    accountNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+    },
+    manufacturer: {
+        type: String,
+        required: true,
+    },
+    protocol: {
+        type: String,
+        required: true,
+    },
+    size: {
+        type: String,
+        required: true,
+    },
+    initialReading: {
+        type: Number,
+        required: true,
+        min: 0,
+        default: 0
+    },
+    previousReading: {
+        type: Number,
+        min: 0,
+    },
+    currentReading: {
+        type: Number,
+        min: 0,
+        default: 0
+    },
+    lastReadingDate: {
+        type: Date,
+        default: Date.now
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['opened', 'closed', 'maintenance', 'faulty'],
+        default: 'opened',
+    },
+    installationStatus: {
+        type: String,
+        required: true,
+        enum: ['installed', 'not installed'],
+        default: 'installed',
+    },
+    customerType: {
+        type: String,
+        enum: ['postpaid', 'prepaid'],
+    },
+    isInstalled: {
+        type: Boolean,
+        default: false
+    },
+    enforcement: {
+        type: Boolean,
+        default: false
+    },
+    concentratorSerialNumber: {
+        type: String
+    },
+    imageUrl: {
+        type: String,
+        trim: true
+    },
+    valveType: {
+        type: String,
+        enum: ['automatic', 'manual'],
+        default: 'automatic'
+    },
+    accountBalance: {
+        type: Number,
+        default: 0
+    },
+    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,
+        index: true
+    },
+
+    // Used when meterCategory === 'bulk'
+    bulkMeterDescription: {
+        type: String,
+        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
+    }
+
+}, {
+    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);
+
 module.exports = WaterMeter;

package/src/models/water_meters_delivery.js

@@ -1,77 +1,77 @@
-const mongoose = require('mongoose');
-
-const deliverySchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    facilityName: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    deliveryNumber: {  
-        type: String,  
-        required: true,
-        unique: true   
-    },
-    deliveredBy: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    receivedBy: {
-        type: String,
-        trim: true
-    },
-    deliveryDate: {
-        type: Date,
-        required: true
-    },
-    notes: {
-        type: String,
-        trim: true
-    },
-    postNotes: {
-        type: String,
-        trim: true
-    },
-    fileUrl: {
-        type: String,
-        trim: true
-    },
-    concentrators: [{
-        concentratorId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Concentrator',
-            required: true
-        },
-        serialNumber: {
-            type: String,
-            required: true
-        }
-    }],
-    meters: [{
-        meterId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Meter',
-            required: true
-        },
-        meterNumber: {
-            type: String,
-            required: true
-        }
-    }],
-    status: {
-        type: String,
-        enum: ['pending', 'completed', 'cancelled'],
-        default: 'pending'
-    }
-}, {
-    timestamps: true
-});
-
-const MetersDelivery = mongoose.model('MetersDelivery', deliverySchema);
-
+const mongoose = require('mongoose');
+
+const deliverySchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    facilityName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    deliveryNumber: {  
+        type: String,  
+        required: true,
+        unique: true   
+    },
+    deliveredBy: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    receivedBy: {
+        type: String,
+        trim: true
+    },
+    deliveryDate: {
+        type: Date,
+        required: true
+    },
+    notes: {
+        type: String,
+        trim: true
+    },
+    postNotes: {
+        type: String,
+        trim: true
+    },
+    fileUrl: {
+        type: String,
+        trim: true
+    },
+    concentrators: [{
+        concentratorId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Concentrator',
+            required: true
+        },
+        serialNumber: {
+            type: String,
+            required: true
+        }
+    }],
+    meters: [{
+        meterId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Meter',
+            required: true
+        },
+        meterNumber: {
+            type: String,
+            required: true
+        }
+    }],
+    status: {
+        type: String,
+        enum: ['pending', 'completed', 'cancelled'],
+        default: 'pending'
+    }
+}, {
+    timestamps: true
+});
+
+const MetersDelivery = mongoose.model('MetersDelivery', deliverySchema);
+
 module.exports = MetersDelivery;

package/src/models/water_prepaid_credit.js

@@ -1,47 +1,47 @@
-const mongoose = require('mongoose');
-
-const waterPrepaidCreditSchema = new mongoose.Schema({
-    accountId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'WaterMeterAccount',
-        required: true,
-    },
-    meterId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'WaterMeter',
-        required: true,
-    },
-    ref: {
-        type: String,
-        required: true,
-    },
-    amount: {
-        type: Number,
-        required: true,
-        default: 0
-    },
-    time: {
-        type: String,
-        required: true,
-    },
-    addedOn: {
-        type: String,
-        required: true,
-    },
-    reason: {
-        type: String,
-        required: true,
-    },
-    type: {
-        type: String,
-        enum: ['Mobile Money', 'Bank', 'Manual'],
-        required: true
-    },
-
-}, {
-    timestamps: true
-});
-
-const WaterPrepaidCredit = mongoose.model('WaterPrepaidCredit', waterPrepaidCreditSchema);
-
-module.exports = WaterPrepaidCredit;
+const mongoose = require('mongoose');
+
+const waterPrepaidCreditSchema = new mongoose.Schema({
+    accountId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeterAccount',
+        required: true,
+    },
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeter',
+        required: true,
+    },
+    ref: {
+        type: String,
+        required: true,
+    },
+    amount: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    time: {
+        type: String,
+        required: true,
+    },
+    addedOn: {
+        type: String,
+        required: true,
+    },
+    reason: {
+        type: String,
+        required: true,
+    },
+    type: {
+        type: String,
+        enum: ['Mobile Money', 'Bank', 'Manual'],
+        required: true
+    },
+
+}, {
+    timestamps: true
+});
+
+const WaterPrepaidCredit = mongoose.model('WaterPrepaidCredit', waterPrepaidCreditSchema);
+
+module.exports = WaterPrepaidCredit;