payservedb 3.2.0 → 3.2.2

package/index.js

@@ -111,6 +111,7 @@ const models = {
     MeterProtocol:require('./src/models/water_meter_communication'),
     MeterManufacturer:require('./src/models/water_meter_manufacturer'),
     MeterIotCard:require('./src/models/water_meter_iot_cards'),
+    MetersDelivery:require('./src/models/water_meters_delivery'),
     Concentrator:require('./src/models/water_meter_concentrator'),
     Handover:require('./src/models/handover')
    

package/package.json

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

package/src/models/water_meter.js

@@ -12,25 +12,22 @@ const meterSchema = new mongoose.Schema({
         unique: true,
     },
     manufacturer: {
-        type: String,
-        required: true,
-        trim: true,
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'MeterManufacturer',
     },
     protocol: {
-        type: String,
-        required: true,
-        trim: true,
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'MeterProtocol',
     },
     size: {
-        type: String,
-        required: true,
-        trim: true,
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'MeterSize',
     },
     status: {
         type: String,
         required: true,
         enum: ['active', 'inactive', 'maintenance', 'faulty'],
-        default: 'active',
+        default: 'inactive',
     },
     value: {
         type: Number,

package/src/models/water_meter_iot_cards.js

@@ -13,9 +13,8 @@ const iotCardSchema = new mongoose.Schema({
         trim: true
     },
     concentrator: {
-        type: String,
-        required: true,
-        trim: true
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Concentrator'
     },
     location: {
         type: String,

package/src/models/water_meters_delivery.js

@@ -0,0 +1,61 @@
+const mongoose = require('mongoose');
+
+const deliverySchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    facilityName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    deliveredBy: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    deliveryDate: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    notes: {
+        type: String,
+        trim: true
+    },
+    concentrators: [{
+        concentratorId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Concentrator',
+            required: true
+        },
+        serialNumber: {
+            type: String,
+            required: true
+        }
+    }],
+    meters: [{
+        meterId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Meter',
+            required: true
+        },
+        serialNumber: {
+            type: String,
+            required: true
+        }
+    }],
+    status: {
+        type: String,
+        enum: ['pending', 'completed', 'cancelled'],
+        default: 'pending'
+    }
+}, {
+    timestamps: true
+});
+
+const MetersDelivery = mongoose.model('MetersDelivery', deliverySchema);
+
+module.exports = MetersDelivery;