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

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

@@ -85,6 +85,57 @@ public class AccountServiceImpl implements AccountService {
 			
 			List<Account> accounts = accountRepo.findAll();
 			
+			Account accountBeforeUpdate = accountRepo.findByAccountId(account.getAccountId());
+			
+			if(accountBeforeUpdate.getAccountName().equalsIgnoreCase(account.getAccountName())) {
+				List<String> employeeIds = null;
+				List<Account> accountList = null;
+				List<String> dmsAddedByUser = null;
+		        List<String> dmsDeletedByUser = null;
+		        
+		        Map<String, Integer> dmsCount = new HashMap<String,Integer>();
+		        
+		        
+		        
+				List<String> updatedAccDms = account.getDeliveryManagers();
+				List<String> beforeAccUpdateDms = accountBeforeUpdate.getDeliveryManagers();
+				
+				
+				dmsAddedByUser = CommomUtil.getAddedManagersList(beforeAccUpdateDms, updatedAccDms);
+				dmsDeletedByUser = CommomUtil.getDeletedManagersList(beforeAccUpdateDms, updatedAccDms);
+				
+				accountList = accountRepo.findAll();
+				
+				if(accountList != null && !accountList.isEmpty() && accountList.size() >0) {
+			        for (Account acc : accountList) {
+			            employeeIds = acc.getDeliveryManagers();
+			            if(employeeIds != null && !employeeIds.isEmpty() && employeeIds.size() >0) {
+				             for(String eId:employeeIds) {
+				            	  if(dmsCount.get(eId) != null) 
+				            		  dmsCount.put(eId, dmsCount.get(eId)+1);
+				                  else
+				                	  dmsCount.put(eId, 1);
+				             	employeeIds = null;
+				             }
+			            }
+			         }
+				}
+				
+		        for (String empId : dmsDeletedByUser) {
+		        	if(dmsCount.get(empId)==1) {   		
+		                //Service call for RoleMapping 
+		                roleMappingService.deleteRole(empId,roleId);
+		        	}
+		       } 
+		        
+		       account.setStatus(accountBeforeUpdate.getStatus());
+		       account.setAccountName(account.getAccountName().trim());
+		       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());
@@ -99,51 +150,7 @@ public class AccountServiceImpl implements AccountService {
 				return response;
 			}
 			
-			List<String> employeeIds = null;
-			List<Account> accountList = null;
-			List<String> dmsAddedByUser = null;
-	        List<String> dmsDeletedByUser = null;
-	        
-	        Map<String, Integer> dmsCount = new HashMap<String,Integer>();
-	        
-	        Account accountBeforeUpdate = accountRepo.findByAccountId(account.getAccountId());
-	        
-			List<String> updatedAccDms = account.getDeliveryManagers();
-			List<String> beforeAccUpdateDms = accountBeforeUpdate.getDeliveryManagers();
-			
-			
-			dmsAddedByUser = CommomUtil.getAddedManagersList(beforeAccUpdateDms, updatedAccDms);
-			dmsDeletedByUser = CommomUtil.getDeletedManagersList(beforeAccUpdateDms, updatedAccDms);
-			
-			accountList = accountRepo.findAll();
-			
-			if(accountList != null && !accountList.isEmpty() && accountList.size() >0) {
-		        for (Account acc : accountList) {
-		            employeeIds = acc.getDeliveryManagers();
-		            if(employeeIds != null && !employeeIds.isEmpty() && employeeIds.size() >0) {
-			             for(String eId:employeeIds) {
-			            	  if(dmsCount.get(eId) != null) 
-			            		  dmsCount.put(eId, dmsCount.get(eId)+1);
-			                  else
-			                	  dmsCount.put(eId, 1);
-			             	employeeIds = null;
-			             }
-		            }
-		         }
-			}
-			
-	        for (String empId : dmsDeletedByUser) {
-	        	if(dmsCount.get(empId)==1) {   		
-	                //Service call for RoleMapping 
-	                roleMappingService.deleteRole(empId,roleId);
-	        	}
-	       } 
-	        
-	       account.setStatus(accountBeforeUpdate.getStatus());
-	       account.setAccountName(account.getAccountName().trim());
-	       accountResult = accountRepo.save(account);
-		   roleMappingService.saveUniqueEmployeeAndRole(dmsAddedByUser, roleId);
-		   response="Updated succesfully";
+
 		}
 		return response;
 	}