payservedb 3.0.9 → 3.1.0

package/package.json

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

package/src/models/water_meter.js

@@ -1,54 +1,50 @@
 const mongoose = require('mongoose');
 
-const concentratorSchema = new mongoose.Schema({
+const meterSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+    },
     serialNumber: {
         type: String,
         required: true,
         trim: true,
-        unique: true
+        unique: true,
     },
     manufacturer: {
         type: String,
         required: true,
-        trim: true
+        trim: true,
     },
-    range: {
-        type: Number,
+    protocol: {
+        type: String,
         required: true,
-        min: 0
-    },
-    isInstalled: {
-        type: Boolean,
-        default: false
-    },
-    isFaulty: {
-        type: Boolean,
-        default: false
+        trim: true,
     },
-    inStock: {
-        type: Boolean,
-        default: true
+    size: {
+        type: String,
+        required: true,
+        trim: true,
     },
     status: {
         type: String,
         required: true,
-        enum: ['Online', 'Offline', 'Maintenance'],
-        default: 'Offline'
+        enum: ['active', 'inactive', 'maintenance', 'faulty'],
+        default: 'active',
+    },
+    value: {
+        type: Number,
+        required: true,
+        min: 0,
+        default: 0,
     },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    }
 }, {
-    timestamps: true
+    timestamps: true,
 });
 
-// Add indexes for better query performance
-concentratorSchema.index({ serialNumber: 1 });
-concentratorSchema.index({ status: 1 });
-concentratorSchema.index({ manufacturer: 1 });
+// Add index for better query performance
+meterSchema.index({ serialNumber: 1 });
 
-const Concentrator = mongoose.model('Concentrator', concentratorSchema);
+const Meter = mongoose.model('Meter', meterSchema);
 
-module.exports = Concentrator;
+module.exports = Meter;

package/src/models/water_meters_concentrator.js

@@ -1,33 +1,52 @@
 const mongoose = require('mongoose');
 
 const concentratorSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    },
-    seriaNumber: {
+    serialNumber: {
         type: String,
         required: true,
         trim: true,
-        unique: true,
+        unique: true
     },
     manufacturer: {
         type: String,
         required: true,
-        trim: true,
+        trim: true
+    },
+    range: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    isInstalled: {
+        type: Boolean,
+        default: false
+    },
+    isFaulty: {
+        type: Boolean,
+        default: false
+    },
+    inStock: {
+        type: Boolean,
+        default: true
     },
     status: {
         type: String,
         required: true,
-        enum: ['active', 'inactive'],
-        default: 'active',
-    }
+        enum: ['Online', 'Offline', 'Maintenance'],
+        default: 'Offline'
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+    },
 }, {
-    timestamps: true,
+    timestamps: true
 });
 
-// Add index for better query performance
-concentratorSchema.index({ name: 1 });
+// Add indexes for better query performance
+concentratorSchema.index({ serialNumber: 1 });
+concentratorSchema.index({ status: 1 });
+concentratorSchema.index({ manufacturer: 1 });
 
 const Concentrator = mongoose.model('Concentrator', concentratorSchema);