MT-97_6 : SNS :: Update_RoleTable_While_Account_CRUD_operations (#82)

src/main/java/com/nisum/mytime/service/AccountServiceImpl.java

@@ -85,20 +85,9 @@ public class AccountServiceImpl implements AccountService {
 			
 			List<Account> accounts = accountRepo.findAll();
 			
-			if(accounts!= null && !accounts.isEmpty() && accounts.size()>0 ){
-				for(Account accObj : accounts){
-					flag = accObj.getAccountName().trim().equalsIgnoreCase(account.getAccountName().trim());
-					if(flag){
-						break;
-					}
-				}
-			}
-			
-			if(flag) {
-				response ="Account already exist";
-				return response;
-			}
+			Account accountBeforeUpdate = accountRepo.findByAccountId(account.getAccountId());
 			
+			if(accountBeforeUpdate.getAccountName().equalsIgnoreCase(account.getAccountName())) {
 				List<String> employeeIds = null;
 				List<Account> accountList = null;
 				List<String> dmsAddedByUser = null;
@@ -106,7 +95,7 @@ public class AccountServiceImpl implements AccountService {
 		        
 		        Map<String, Integer> dmsCount = new HashMap<String,Integer>();
 		        
-	        Account accountBeforeUpdate = accountRepo.findByAccountId(account.getAccountId());
+		        
 		        
 				List<String> updatedAccDms = account.getDeliveryManagers();
 				List<String> beforeAccUpdateDms = accountBeforeUpdate.getDeliveryManagers();
@@ -144,6 +133,24 @@ public class AccountServiceImpl implements AccountService {
 		       accountResult = accountRepo.save(account);
 			   roleMappingService.saveUniqueEmployeeAndRole(dmsAddedByUser, roleId);
 			   response="Updated succesfully";
+			   return response;
+			}
+			
+			if(accounts!= null && !accounts.isEmpty() && accounts.size()>0 ){
+				for(Account accObj : accounts){
+					flag = accObj.getAccountName().trim().equalsIgnoreCase(account.getAccountName().trim());
+					if(flag){
+						break;
+					}
+				}
+			}
+			
+			if(flag) {
+				response ="Account already exist";
+				return response;
+			}
+			
+
 		}
 		return response;
 	}