payservedb 6.6.3 → 6.6.4

package/src/models/powerMeterMonthlyReading.js

@@ -1,35 +1,35 @@
-const mongoose = require('mongoose');
-
-const powerMeterMonthlyReadingSchema = new mongoose.Schema({
-    meterId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'PowerMeter',
-        required: 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
-});
-
-const PowerMeterMonthlyReading = mongoose.model('PowerMeterMonthlyReading', powerMeterMonthlyReadingSchema);
-
+const mongoose = require('mongoose');
+
+const powerMeterMonthlyReadingSchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeter',
+        required: 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
+});
+
+const PowerMeterMonthlyReading = mongoose.model('PowerMeterMonthlyReading', powerMeterMonthlyReadingSchema);
+
 module.exports = PowerMeterMonthlyReading;

package/src/models/powerMeterPowerCharges.js

@@ -1,53 +1,53 @@
-const mongoose = require('mongoose');
-
-const powerMeterPowerChargeSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    yearMonth: {
-        type: String,
-        required: true
-    },
-    // KPLC Power Charges
-    fuelCostCharge: {
-        type: Number,
-        required: true
-    },
-    forexAdjustment: {
-        type: Number,
-        required: true
-    },
-    inflationAdjustment: {
-        type: Number,
-        required: true
-    },
-    waterResourceManagementLevy: {
-        type: Number,
-        required: true
-    },
-    energyRegulatoryLevy: {
-        type: Number,
-        required: true
-    },
-    ruralElectrificationLevy: {
-        type: Number,
-        required: true
-    },
-    valueAddedTax: {
-        type: Number,
-        required: true
-    },
-    totalCharge: {
-        type: Number,
-        required: true
-    }
-
-}, {
-    timestamps: true
-});
-
-const PowerMeterPowerCharge = mongoose.model('PowerMeterPowerCharge', powerMeterPowerChargeSchema);
-
-module.exports = PowerMeterPowerCharge;
+const mongoose = require('mongoose');
+
+const powerMeterPowerChargeSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    yearMonth: {
+        type: String,
+        required: true
+    },
+    // KPLC Power Charges
+    fuelCostCharge: {
+        type: Number,
+        required: true
+    },
+    forexAdjustment: {
+        type: Number,
+        required: true
+    },
+    inflationAdjustment: {
+        type: Number,
+        required: true
+    },
+    waterResourceManagementLevy: {
+        type: Number,
+        required: true
+    },
+    energyRegulatoryLevy: {
+        type: Number,
+        required: true
+    },
+    ruralElectrificationLevy: {
+        type: Number,
+        required: true
+    },
+    valueAddedTax: {
+        type: Number,
+        required: true
+    },
+    totalCharge: {
+        type: Number,
+        required: true
+    }
+
+}, {
+    timestamps: true
+});
+
+const PowerMeterPowerCharge = mongoose.model('PowerMeterPowerCharge', powerMeterPowerChargeSchema);
+
+module.exports = PowerMeterPowerCharge;

package/src/models/powerMeterSettings.js

@@ -1,139 +1,139 @@
-const mongoose = require('mongoose');
-
-const powerMeterSettingsSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        unique: true // Ensure one settings record per facility
-    },
-    
-    // Billing Amounts
-    minAmount: {
-        type: Number,
-        default: 0,
-        min: 0
-    },
-    maxAmount: {
-        type: Number,
-        default: 50000,
-        min: 0
-    },
-    
-    // Suspicious Meter Reading Thresholds
-    lowThreshold: {
-        type: Number,
-        default: 0,
-        min: 0
-    },
-    highThreshold: {
-        type: Number,
-        default: 0,
-        min: 0
-    },
-    
-    // Billing Schedule
-    gracePeriod: {
-        type: Number,
-        default: 10,
-        min: 0
-    },
-    invoiceDay: {
-        type: Number,
-        default: 3,
-        min: 0,
-        max: 30
-    },
-    
-    // Payment Enforcement
-    enforcePayment: {
-        type: String,
-        enum: ['yes', 'no', ''],
-        default: ''
-    },
-    minimumPaymentAmount: {
-        type: Number,
-        default: 0,
-        min: 0
-    },
-    
-    // Tariff Settings
-    tariff: {
-        type: String,
-        enum: ['yes', 'no', ''],
-        default: ''
-    },
-    tariffAmount: {
-        type: Number,
-        default: 0,
-        min: 0
-    },
-    fixedTariffAmount: {
-        type: Number,
-        default: 0,
-        min: 0
-    },
-    meterLoan: {
-        type: Number,
-        default: 0,
-        min: 0
-    },
-    
-    // GL Account Configuration (following your sample pattern)
-    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,
-            }
-        }
-    },
-    
-    // Other Charges
-    otherCharges: {
-        type: String,
-        enum: ['yes', 'no', ''],
-        default: ''
-    },
-    // Notifications
-    notifications: {
-        type: Boolean,
-        default: false
-    },
-    dailyNotifications: {
-        type: Boolean,
-        default: false
-    },
-    weeklyNotifications: {
-        type: Boolean,
-        default: false
-    },
-    allNotifications: {
-        type: Boolean,
-        default: false
-    }
-}, {
-    timestamps: true
-});
-
-const PowerMeterSettings = mongoose.model('PowerMeterSettings', powerMeterSettingsSchema);
-
+const mongoose = require('mongoose');
+
+const powerMeterSettingsSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        unique: true // Ensure one settings record per facility
+    },
+    
+    // Billing Amounts
+    minAmount: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    maxAmount: {
+        type: Number,
+        default: 50000,
+        min: 0
+    },
+    
+    // Suspicious Meter Reading Thresholds
+    lowThreshold: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    highThreshold: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    
+    // Billing Schedule
+    gracePeriod: {
+        type: Number,
+        default: 10,
+        min: 0
+    },
+    invoiceDay: {
+        type: Number,
+        default: 3,
+        min: 0,
+        max: 30
+    },
+    
+    // Payment Enforcement
+    enforcePayment: {
+        type: String,
+        enum: ['yes', 'no', ''],
+        default: ''
+    },
+    minimumPaymentAmount: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    
+    // Tariff Settings
+    tariff: {
+        type: String,
+        enum: ['yes', 'no', ''],
+        default: ''
+    },
+    tariffAmount: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    fixedTariffAmount: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    meterLoan: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    
+    // GL Account Configuration (following your sample pattern)
+    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,
+            }
+        }
+    },
+    
+    // Other Charges
+    otherCharges: {
+        type: String,
+        enum: ['yes', 'no', ''],
+        default: ''
+    },
+    // Notifications
+    notifications: {
+        type: Boolean,
+        default: false
+    },
+    dailyNotifications: {
+        type: Boolean,
+        default: false
+    },
+    weeklyNotifications: {
+        type: Boolean,
+        default: false
+    },
+    allNotifications: {
+        type: Boolean,
+        default: false
+    }
+}, {
+    timestamps: true
+});
+
+const PowerMeterSettings = mongoose.model('PowerMeterSettings', powerMeterSettingsSchema);
+
 module.exports = PowerMeterSettings;

package/src/models/powerMeterSingleDayReading.js

@@ -1,33 +1,33 @@
-const mongoose = require('mongoose');
-
-const powerMeterSingleDayReadingSchema = new mongoose.Schema({
-    meterId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'PowerMeter',
-        required: true
-    },
-     date: {
-        type: String,
-        required: true
-    },
-    reading: {
-        type: Number,
-        required: true,
-        min: 0
-    },
-    status: {
-        type: String,
-        enum: ['on', 'off', 'maintenance', 'faulty'],
-        default: 'on',
-    },
-    time: {
-        type: String,
-        required: true
-    }
-}, {
-    timestamps: true
-});
-
-const PowerMeterSingleDayReading = mongoose.model('PowerMeterSingleDayReading', powerMeterSingleDayReadingSchema);
-
+const mongoose = require('mongoose');
+
+const powerMeterSingleDayReadingSchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeter',
+        required: true
+    },
+     date: {
+        type: String,
+        required: true
+    },
+    reading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    status: {
+        type: String,
+        enum: ['on', 'off', 'maintenance', 'faulty'],
+        default: 'on',
+    },
+    time: {
+        type: String,
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+const PowerMeterSingleDayReading = mongoose.model('PowerMeterSingleDayReading', powerMeterSingleDayReadingSchema);
+
 module.exports = PowerMeterSingleDayReading;

package/src/models/powerMeters.js

@@ -1,66 +1,94 @@
-const mongoose = require('mongoose');
-
-const powerMeterSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    meterSerialNumber: {
-        type: String,
-        required: true
-    },
-    deviceId: {
-        type: Number,
-        required: false
-
-    },
-    gatewayId: {
-        type: String,
-        required: true
-
-    },
-    meterReading: {
-        type: Number,
-        required: true,
-        default: 0,
-    },
-    currentMeterReading: {
-        type: Number,
-        default: 0,
-    },
-    lastUpdated: {
-        type: Date,
-        required: true
-    },
-    manufacturer: {
-        type: String,
-        required: true
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        trim: true
-    },
-    unitName: {
-        type: String,
-        trim: true
-    },
-    type: {
-        type: String,
-        required: true,
-        enum: ['2 phase', '3 phase'],
-        default: '2 phase'
-
-    },
-    status: {
-        type: String,
-        required: true
-    }
-}, {
-    timestamps: true
-});
-
-const PowerMeters = mongoose.model('PowerMeters', powerMeterSchema);
-
+const mongoose = require('mongoose');
+
+const powerMeterSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    meterSerialNumber: {
+        type: String,
+        required: true
+    },
+    deviceId: {
+        type: Number,
+        required: false
+    },
+    accountNumber: {
+        type: Number,
+        required: false
+    },
+    gatewayId: {
+        type: String,
+        required: true
+    },
+    mqttId: {
+        type: String,
+        required: true
+    },
+    previousMeterReading: {
+        type: Number,
+        required: true,
+        default: 0,
+    },
+    currentMeterReading: {
+        type: Number,
+        default: 0,
+    },
+    lastUpdated: {
+        type: Date,
+        required: true
+    },
+    manufacturer: {
+        type: String,
+        required: true
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        trim: true
+    },
+    unitName: {
+        type: String,
+        trim: true
+    },
+    type: {
+        type: String,
+        required: true,
+        enum: ['2 phase', '3 phase'],
+        default: '2 phase'
+    },
+    communicationStatus: {
+        type: Boolean,
+        default: false,
+        required: true
+    },
+    liveStatus: {
+        type: String,
+        enum: ['ON', 'OFF'],
+        default: 'OFF'
+    },
+    gatewayLiveStatus: {
+        type: String,
+        enum: ['ON', 'OFF'],
+        default: 'OFF'
+    },
+    meterStatus: {
+        type: String,
+        required: true,
+        enum: ['installed', 'not installed'],
+        default: 'installed',
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['on', 'off', 'maintenance', 'faulty'],
+        default: 'on',
+    }
+}, {
+    timestamps: true
+});
+
+const PowerMeters = mongoose.model('PowerMeters', powerMeterSchema);
+
 module.exports = PowerMeters;