payservedb 6.6.3 → 6.6.5

package/src/models/powerMeters.js

@@ -1,66 +1,98 @@
-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
+    },
+    gatewayId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeterGateway'
+    },
+    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,
+        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;

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;