Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

src/controllers/installationController.js

@@ -6065,6 +6065,7 @@ exports.getDisconnectedIssuesBySupportId = async (req, reply) => {
           support_lora_last_check_time: masterSensor.support_lora_last_check_time,
           team_member_support_gsm_last_check_time: masterSensor.team_member_support_gsm_last_check_time,
           team_member_support_lora_last_check_time: masterSensor.team_member_support_lora_last_check_time,
+          outDoor_status: masterSensor.outDoor_status || "",
           connected_slave_count: 0,
           connected_slaves: [],
           lastTicketRaisedAt: lastTicketRaisedAt
@@ -8779,7 +8780,8 @@ exports.particularCategory = async (req, reply) => {
         comments: masterComments,
 
         movedAt: category !== "Resolved" ? (issue?.movedAt || null) : null,
-        resolvedAt: category === "Resolved" ? (issue?.resolvedAt || null) : null
+        resolvedAt: category === "Resolved" ? (issue?.resolvedAt || null) : null,
+        category: issue?.category || category
       });
     }
 

src/models/store.js

@@ -635,7 +635,12 @@ lora_last_disconnect_time : { type: String, default: null },
     connecting_to_slave: { result: String },
     data_sending: { result: String },
     connected_slave_count: {type : String},
-lastTicketRaisedAt: { type: String },    
+lastTicketRaisedAt: { type: String },  
+outDoor_status: {
+    type: String,
+    enum: ['inprogress', 'ready to pick up', 'dispatched'],
+    default: 'inprogress' // optional: set default
+  },  
 distance_check: {
       result: String,
       steps: [