payservedb 6.6.4 → 6.6.6

package/index.js

@@ -189,6 +189,7 @@ const models = {
   EmailSmsQueue: require("./src/models/email_sms_queue"),
   PurchaseOrderInvoice: require("./src/models/purchaseOrderInvoice"),
   PowerMeterCustomerBand: require("./src/models/powerMeterCustomerBand"),
+  PowerMeterCommunicationProtocol: require("./src/models/powerMeterCommunicationProtocol"),
   PowerMeterDailyReading: require("./src/models/powerMeterDailyReading"),
   PowerMeterPowerCharge: require("./src/models/powerMeterPowerCharges"),
   PowerMeterGateway: require("./src/models/powerMeterGateways"),

package/package.json

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

package/src/models/powerMeterCommunicationProtocol.js

@@ -0,0 +1,18 @@
+const mongoose = require('mongoose');
+
+const powerMeterCommunicationProtocolSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+        uppercase: true,
+        // Example: Acrel, Mqtt, LAN, etc.
+    }
+}, {
+    timestamps: true
+});
+
+const PowerMeterCommunicationProtocol = mongoose.model('PowerMeterCommunicationProtocol', powerMeterCommunicationProtocolSchema);
+
+module.exports = PowerMeterCommunicationProtocol;

package/src/models/powerMeters.js

@@ -6,6 +6,14 @@ const powerMeterSchema = new mongoose.Schema({
         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
@@ -18,10 +26,6 @@ const powerMeterSchema = new mongoose.Schema({
         type: Number,
         required: false
     },
-    gatewayId: {
-        type: String,
-        required: true
-    },
     mqttId: {
         type: String,
         required: true

package/src/models/visitLog.js

@@ -15,12 +15,16 @@ const visitLogSchema = new mongoose.Schema({
         type: String,
         required: false
     },
+    phoneNumber: {
+        type: String,
+        trim: true
+    },
     residentId: {
         type: mongoose.Schema.Types.ObjectId,
     },
-    qrCode:{
-        type:Boolean,
-        required:false
+    qrCode: {
+        type: Boolean,
+        required: false
     },
     houseNumber: {
         type: String,
@@ -34,26 +38,26 @@ const visitLogSchema = new mongoose.Schema({
         type: Date, // Changed to Date for better handling of time
         required: false
     },
-    days:{
-        type:Number,
-        required:false
+    days: {
+        type: Number,
+        required: false
     },
-    division:{
-        type:String,
-        required:false
+    division: {
+        type: String,
+        required: false
     },
-    entryPoint:{
-        type:String,
-        required:false
+    entryPoint: {
+        type: String,
+        required: false
     },
-    exitPoint:{
-        type:String,
-        required:false
+    exitPoint: {
+        type: String,
+        required: false
     },
     status: {
         type: String,
         required: true,
-        enum: ['Visit Confirmation', 'Scheduled', 'Checked In','Checked Out', 'Cancelled'] // Define valid statuses
+        enum: ['Visit Confirmation', 'Scheduled', 'Checked In', 'Checked Out', 'Cancelled'] // Define valid statuses
         // Define valid statuses
     },
     vehicle: {
@@ -66,10 +70,10 @@ const visitLogSchema = new mongoose.Schema({
         type: Number,
         required: false
     },
-    requestedBy:{
-        type:mongoose.Schema.Types.ObjectId,
-        ref:"User",
-        required:false
+    requestedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "User",
+        required: false
     },
     facilityId: {
         type: mongoose.Schema.Types.ObjectId,