payservedb 3.1.6 → 3.1.8

package/index.js

@@ -107,7 +107,11 @@ const models = {
     ServiceRequest:require('./src/models/servicerequest'),
     CountryTaxRate:require('./src/models/country_tax'),
     Meter:require('./src/models/water_meter'),
-    Concentrator:require('./src/models/water_meters_concentrator'),
+    MeterSize:require('./src/models/water_meter_size'),
+    MeterProtocol:require('./src/models/water_meter_communication'),
+    MeterManufacturer:require('./src/models/water_meter_manufacturer'),
+    MeterIotCard:require('./src/models/water_meter_iot_cards'),
+    Concentrator:require('./src/models/water_meter_concentrator'),
     Handover:require('./src/models/handover')
    
     

package/package.json

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

package/src/models/servicerequest.js

@@ -20,7 +20,7 @@ const serviceRequestSchema = new mongoose.Schema({
     status: {
         type: String,
         required: true,
-        enum: ['Pending', 'In Progress', 'Completed', 'Cancelled'],
+        enum: ['Pending', 'Awaiting', 'In Progress', 'Completed', 'Cancelled'],
     },
     customerId: {
         type: mongoose.Schema.Types.ObjectId,

package/src/models/tickets.js

@@ -63,6 +63,10 @@ const ticketSchema = new mongoose.Schema({
   assessImage: {
     type: String,
   },
+  closingReason: {
+    type: String,
+    required: false,
+  },
   reviewText: {
     type: String,
     required: false,

package/src/models/water_meter_communication.js

@@ -0,0 +1,18 @@
+const mongoose = require('mongoose');
+
+const protocolSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+        uppercase: true,
+        // Example: TCP, GPRS, API, etc.
+    }
+}, {
+    timestamps: true
+});
+
+const MeterProtocol = mongoose.model('MeterProtocol', protocolSchema);
+
+module.exports = MeterProtocol;

package/src/models/water_meter_iot_cards.js

@@ -0,0 +1,37 @@
+const mongoose = require('mongoose');
+
+const iotCardSchema = new mongoose.Schema({
+    serialNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    provider: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    concentrator: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    location: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['active', 'inactive', 'suspended'],
+        default: 'active'
+    }
+}, {
+    timestamps: true
+});
+
+const MeterIotCard = mongoose.model('MeterIotCard', iotCardSchema);
+
+module.exports = MeterIotCard;

package/src/models/water_meter_manufacturer.js

@@ -0,0 +1,36 @@
+const mongoose = require('mongoose');
+
+const manufacturerSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    country: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    contactPerson: {
+        type: String,
+        trim: true
+    },
+    email: {
+        type: String,
+        required: true,
+        trim: true,
+        lowercase: true
+    },
+    phoneNumber: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    timestamps: true
+});
+
+const MeterManufacturer = mongoose.model('MeterManufacturer', manufacturerSchema);
+
+module.exports = MeterManufacturer;

package/src/models/water_meter_size.js

@@ -0,0 +1,16 @@
+const mongoose = require('mongoose');
+
+const meterSizeSchema = new mongoose.Schema({
+    code: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true, // Example: DN-15, DN-20, etc.
+    }
+}, {
+    timestamps: true
+});
+
+const MeterSize = mongoose.model('MeterSize', meterSizeSchema);
+
+module.exports = MeterSize;