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

src/controllers/departmentController.js

@@ -79,7 +79,9 @@ const generateDepartmentId = async (city, departmentName) => {
         updatedBy,
         email,
         gstNo,
-        googleLocation
+        googleLocation,
+        latitude,
+        longitude
       } = request.body;
   
       // Generate unique cityId
@@ -118,6 +120,8 @@ const generateDepartmentId = async (city, departmentName) => {
         email,
          gstNo,
         googleLocation,
+          latitude,
+        longitude,
         createdBy,
         updatedBy,
       });
@@ -148,7 +152,10 @@ const generateDepartmentId = async (city, departmentName) => {
         createdBy,
         updatedBy,
         email,
-        nameoftheContactPerson
+        nameoftheContactPerson,
+        googleLocation,
+        latitude,
+        longitude
       } = request.body;
   
       // Generate departmentId based on departmentName
@@ -178,6 +185,9 @@ const generateDepartmentId = async (city, departmentName) => {
         pincode,
         email,
         nameoftheContactPerson,
+         googleLocation,
+        latitude,
+        longitude,
        // departmentName,
         createdBy,
         updatedBy,

src/models/Department.js

@@ -15,6 +15,8 @@ const citySchema = new mongoose.Schema(
       address2: String,
       pincode: { type: String },
       zone: { type: String },
+        longitude: { type: Number, default: 0.0 },
+        latitude: { type: Number, default: 0.0 },
       googleLocation: { type: String },
       gstNo: { type: String },
       city: { type: String },
@@ -54,6 +56,10 @@ const citySchema = new mongoose.Schema(
       zone: { type: String , default: "ALL"},
       city: { type: String },
       location: [{ type : String}],
+      googleLocation: { type: String },
+      longitude: { type: Number, default: 0.0 },
+      latitude: { type: Number, default: 0.0 },
+      googleLocation: { type: String },
       state: String,
       country: String,  
       nameoftheContactPerson: String, 

src/routes/departmentRoute.js

@@ -28,7 +28,8 @@ module.exports = function (fastify, opts, next) {
               pincode: { type: "string" },
               googleLocation: { type: "string" },
               gstNo: { type: "string" },
-
+              latitude: { type: 'number', default: 0.0 },
+              longitude: { type: 'number', default: 0.0 },
               //departmentName: { type: "string" },
             },
           },
@@ -567,7 +568,10 @@ module.exports = function (fastify, opts, next) {
                     address2: { type: "string" },
                     zone: { type: "string" },
                     pincode: { type: "string" },
-                    nameoftheContactPerson: { type: "string"}
+                    nameoftheContactPerson: { type: "string"},
+                     googleLocation: { type: "string" },
+              latitude: { type: 'number', default: 0.0 },
+              longitude: { type: 'number', default: 0.0 },
                     //departmentName: { type: "string" },
                   },
                 },