From 2ca69b04929cdb2094e7ce24f477e6145d6e03d4 Mon Sep 17 00:00:00 2001
From: Bhaskar <bhaskarakishore@armintasolutions.com>
Date: Fri, 21 Mar 2025 15:07:41 +0530
Subject: [PATCH] chnages

---
 src/controllers/departmentController.js | 33 +++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/controllers/departmentController.js b/src/controllers/departmentController.js
index 0e38bcf2..f8b7eb0f 100644
--- a/src/controllers/departmentController.js
+++ b/src/controllers/departmentController.js
@@ -60,7 +60,6 @@ const generateDepartmentId = async (city, departmentName) => {
     return `AW${cityPrefix}${departmentPrefix}${result.seq}`; // Generate ID
   };
   
-
   exports.addCity = async (request, reply) => {
     try {
       const {
@@ -79,19 +78,27 @@ const generateDepartmentId = async (city, departmentName) => {
         email
       } = request.body;
   
-      // Generate departmentId based on departmentName
-    //   const prefix = departmentName.substring(0, 2).toUpperCase(); // Extract first two letters and convert to uppercase
-       const c_id = await generateCityId();
-       const cityId = `AWCI${c_id}`;
-
+      // Generate unique cityId
+      const c_id = await generateCityId();
+      const cityId = `AWCI${c_id}`;
   
-      // Check for existing department
-      const existingStore = await City.findOne({ cityId });
-      if (existingStore) {
-        return reply.status(400).send({ message: 'City is already registered' });
+      // Check for existing records with specific fields
+      const existingPhone = await City.findOne({ phone });
+      if (existingPhone) {
+        return reply.status(400).send({ message: 'Phone number already exists' });
       }
   
-      // Create new department
+      const existingOfficeName = await City.findOne({ officeName });
+      if (existingOfficeName) {
+        return reply.status(400).send({ message: 'Office name already exists' });
+      }
+  
+      const existingCityId = await City.findOne({ cityId });
+      if (existingCityId) {
+        return reply.status(400).send({ message: 'City ID already exists' });
+      }
+  
+      // Create new city record
       const citys = new City({
         cityId,
         phone,
@@ -105,18 +112,18 @@ const generateDepartmentId = async (city, departmentName) => {
         country,
         pincode,
         email,
-       // departmentName,
         createdBy,
         updatedBy,
       });
   
       await citys.save();
   
-      reply.send({ citys, message: 'Account Created Successfully' });
+      reply.send({ citys, message: 'City Created Successfully' });
     } catch (err) {
       reply.status(500).send({ message: err.message });
     }
   };
+  
 
   exports.addBranch = async (request, reply) => {
     try {