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

src/controllers/departmentController.js

@@ -1856,12 +1856,17 @@ exports.getCitiesBasedState = async (request, reply) => {
 
 exports.getStaffDepartmentDetails = async (request, reply) => {
   try {
-    const officeName = request.params.officeName;
+    const { officeName, city } = request.params;
-    const city = request.params.city;
+
-    const department = await Deparments.find({ officeName, city });
+    const department = await Deparments.find({
-    if (!department) {
+      officeName: { $regex: officeName.trim(), $options: "i" }, // no ^$ anchors
-      return reply.status(404).send({ message: 'Department not found' });
+      city: { $regex: city.trim(), $options: "i" }
+    });
+
+    if (!department.length) {
+      return reply.status(404).send({ message: "Department not found" });
     }
+
     reply.send({ department });
   } catch (err) {
     reply.status(500).send({ message: err.message });
@@ -1870,6 +1875,8 @@ exports.getCitiesBasedState = async (request, reply) => {
 
 
 
+
+
 exports.updateBranchOrCompanyDetails = async (request, reply) => {
   try {
     const { id } = request.params;