payservedb 6.6.9 → 6.7.1

package/package.json

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

package/src/models/powerMeterGateways.js

@@ -10,23 +10,24 @@ const powerMeterGatewaySchema = new mongoose.Schema({
         type: String,
         required: true
     },
-    gatewayNumber: {
+    gatewayId: {
         type: Number,
         required: false
-
     },
-    location: {
+    manufacturer: {
         type: String,
         required: true
-
+    },
+    location: {
+        type: String,
+        trim: true
     },
     type: {
         type: String,
         trim: true
     },
     status: {
-        type: String,
-        required: true
+        type: String
     }
 }, {
     timestamps: true

package/src/models/powerMeters.js

@@ -39,6 +39,18 @@ const powerMeterSchema = new mongoose.Schema({
         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
@@ -95,4 +107,4 @@ const powerMeterSchema = new mongoose.Schema({
 
 const PowerMeters = mongoose.model('PowerMeters', powerMeterSchema);
 
-module.exports = PowerMeters;
+module.exports = PowerMeters;

package/src/models/water_meter_account.js

@@ -68,6 +68,10 @@ const waterMeterAccountSchema = new mongoose.Schema({
     meter_id: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'WaterMeter',
+    },
+    accountBalance: {
+        type: Number,
+        default: 0
     }
 }, {
     timestamps: true