payservedb 9.1.0 → 9.1.2

package/src/models/powerMeters.js

@@ -1,150 +1,150 @@
-const mongoose = require('mongoose');
-
-const powerMeterSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    gatewayId: {
-        type: Number,
-        required: false
-    },
-    communicationProtocol: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'PowerMeterCommunicationProtocol'
-    },
-    meterSerialNumber: {
-        type: String,
-        required: true
-    },
-    deviceId: {
-        type: Number,
-        required: false
-    },
-    accountNumber: {
-        type: Number,
-        required: false
-    },
-    mqttId: {
-        type: String,
-        trim: true
-    },
-    previousMeterReading: {
-        type: Number,
-        required: true,
-        default: 0,
-    },
-    currentMeterReading: {
-        type: Number,
-        default: 0,
-    },
-    kwh: {
-        type: Number,
-        default: 0
-    },
-    pf: {
-        type: Number,
-        default: 1.0
-    },
-    wh: {
-        type: Number,
-        default: 0
-    },
-    lastUpdated: {
-        type: Date,
-        required: true
-    },
-    manufacturer: {
-        type: String,
-        required: true
-    },
-    
-    meterCategory: {
-        type: String,
-        required: true,
-        enum: ['unit', 'common_area', 'bulk'],
-        default: 'unit'
-    },
-
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        trim: true
-    },
-    unitName: {
-        type: String,
-        trim: true
-    },
-
-    // ─── Common Area / Bulk Meter Fields ──────────────────────────────────────
-    description: {
-        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: ['Off', 'On', 'Maintenance', 'Faulty'],
-        default: 'On'
-    },
-    gateWayLiveStatus: {
-        type: String,
-        enum: ['online', 'offline'],
-        default: 'offline'
-    },
-    meterLiveStatus: {
-        type: String,
-        enum: ['online', 'offline'],
-        default: 'offline'
-    },
-    meterLiveStatusUpdated: {
-        type: Date,
-    },
-    getWayLiveStatusUpdated: {
-        type: Date,
-        default: Date.now
-    },
-    meterStatus: {
-        type: String,
-        required: true,
-        enum: ['installed', 'not installed'],
-        default: 'installed',
-    }
-}, {
-    timestamps: true
-});
-
-powerMeterSchema.virtual('displayName').get(function () {
-    return this.meterCategory === 'unit'
-        ? this.unitName
-        : this.description;
-});
-powerMeterSchema.pre('save', function (next) {
-    if (this.meterCategory === 'unit') {
-        if (!this.unitId || !this.unitName) {
-            return next(new Error('Unit meters require both unitId and unitName.'));
-        }
-    } else {
-        // common_area or bulk
-        if (!this.description) {
-            return next(new Error(`${this.meterCategory} meters require a description.`));
-        }
-    }
-    next();
-});
-
-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
+    },
+    gatewayId: {
+        type: Number,
+        required: false
+    },
+    communicationProtocol: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeterCommunicationProtocol'
+    },
+    meterSerialNumber: {
+        type: String,
+        required: true
+    },
+    deviceId: {
+        type: Number,
+        required: false
+    },
+    accountNumber: {
+        type: Number,
+        required: false
+    },
+    mqttId: {
+        type: String,
+        trim: true
+    },
+    previousMeterReading: {
+        type: Number,
+        required: true,
+        default: 0,
+    },
+    currentMeterReading: {
+        type: Number,
+        default: 0,
+    },
+    kwh: {
+        type: Number,
+        default: 0
+    },
+    pf: {
+        type: Number,
+        default: 1.0
+    },
+    wh: {
+        type: Number,
+        default: 0
+    },
+    lastUpdated: {
+        type: Date,
+        required: true
+    },
+    manufacturer: {
+        type: String,
+        required: true
+    },
+    
+    meterCategory: {
+        type: String,
+        required: true,
+        enum: ['unit', 'common_area', 'bulk'],
+        default: 'unit'
+    },
+
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        trim: true
+    },
+    unitName: {
+        type: String,
+        trim: true
+    },
+
+    // ─── Common Area / Bulk Meter Fields ──────────────────────────────────────
+    description: {
+        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: ['Off', 'On', 'Maintenance', 'Faulty'],
+        default: 'On'
+    },
+    gateWayLiveStatus: {
+        type: String,
+        enum: ['online', 'offline'],
+        default: 'offline'
+    },
+    meterLiveStatus: {
+        type: String,
+        enum: ['online', 'offline'],
+        default: 'offline'
+    },
+    meterLiveStatusUpdated: {
+        type: Date,
+    },
+    getWayLiveStatusUpdated: {
+        type: Date,
+        default: Date.now
+    },
+    meterStatus: {
+        type: String,
+        required: true,
+        enum: ['installed', 'not installed'],
+        default: 'installed',
+    }
+}, {
+    timestamps: true
+});
+
+powerMeterSchema.virtual('displayName').get(function () {
+    return this.meterCategory === 'unit'
+        ? this.unitName
+        : this.description;
+});
+powerMeterSchema.pre('save', function (next) {
+    if (this.meterCategory === 'unit') {
+        if (!this.unitId || !this.unitName) {
+            return next(new Error('Unit meters require both unitId and unitName.'));
+        }
+    } else {
+        // common_area or bulk
+        if (!this.description) {
+            return next(new Error(`${this.meterCategory} meters require a description.`));
+        }
+    }
+    next();
+});
+
+const PowerMeters = mongoose.model('PowerMeters', powerMeterSchema);
+
 module.exports = PowerMeters;

package/src/models/powerMetersManufacturer.js

@@ -1,15 +1,15 @@
-const mongoose = require('mongoose');
-
-const powerMeterManufacturerSchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: true,
-
-    }
-}, {
-    timestamps: true
-});
-
-const PowerMeterManufacturer = mongoose.model('PowerMeterManufacturer', powerMeterManufacturerSchema);
-
+const mongoose = require('mongoose');
+
+const powerMeterManufacturerSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+
+    }
+}, {
+    timestamps: true
+});
+
+const PowerMeterManufacturer = mongoose.model('PowerMeterManufacturer', powerMeterManufacturerSchema);
+
 module.exports = PowerMeterManufacturer;