Mt 98 domain changes (#77)

* update code changes

* changes done for saving with Id and Name

* changes done for response for UI

* MT-79 code fix

* changes for defect fixing

* duplicate check in update domain

* defect fix changes

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

@@ -51,8 +51,8 @@ public class DomainServiceImpl implements DomainService {
     @Override
 	public String addDomains(Domains d) throws MyTimeException {
         String response=null;
-        boolean isDuplicate=duplicateCheck(d.getDomainName(), d.getAccountId());
-        if(isDuplicate) {
+        List<Domains> domainList=domainRepo.findByDomainNameAndAccountId(d.getDomainName(), d.getAccountId());
+        if(domainList.size()>0) {
         	return response="Domain already exists";
         }
         
@@ -62,9 +62,9 @@ public class DomainServiceImpl implements DomainService {
         d.setStatus(MyTimeUtils.ACTIVE);
         
         if(d.getId()==null){
-            response="Domain saved succesfully";
+            response="Domain saved successfully";
         }else{
-            response="Domain updated succesfully";
+            response="Domain updated successfully";
         }
         domainRepo.save(d);
         String roleId = roleInfoService.getRole(MyTimeUtils.DOMAIN);
@@ -112,10 +112,7 @@ public class DomainServiceImpl implements DomainService {
     @Override
 	public String updateDomain(Domains d) throws MyTimeException{
         String response = null;
-        boolean isDuplicate=duplicateCheck(d.getDomainName(), d.getAccountId());
-        if(isDuplicate) {
-        	return response="Domain already exists";
-        }
+       
         List<String> deliveryManagersListFromUser = null;
         List<String> deliveryManagersListFromDb = null;
         List<String> managersAddedByUser = null;
@@ -128,6 +125,13 @@ public class DomainServiceImpl implements DomainService {
         if (null != domainDetailsFromDb)
             deliveryManagersListFromDb = domainDetailsFromDb.getDeliveryManagers();
         
+        boolean isDuplicate=duplicateCheck(d.getDomainName(), d.getAccountId(),deliveryManagersListFromDb,d.getDeliveryManagers());
+        if(isDuplicate) {
+        	return response="Domain already exists";
+        }else{
+            response="Domain updated successfully";
+        }
+        
         managersAddedByUser = CommomUtil.getAddedManagersList(deliveryManagersListFromDb, deliveryManagersListFromUser);
         managersDeletedByUser = CommomUtil.getDeletedManagersList(deliveryManagersListFromDb, deliveryManagersListFromUser);
 
@@ -193,11 +197,12 @@ public class DomainServiceImpl implements DomainService {
          return null;
     }
     
-    private boolean duplicateCheck(String domainName,String accountId)
+    private boolean duplicateCheck(String domainName,String accountId,List<String> fromDB,List<String> fromUser)
     {
     	boolean check=false;
+    	boolean deleveryManagersCheck=fromDB.toString().contentEquals(fromUser.toString());
     	List<Domains> domainList=domainRepo.findByDomainNameAndAccountId(domainName, accountId);
-        if(domainList.size()>0) 
+        if(domainList.size()>0 && deleveryManagersCheck) 
         	check= true;
         return check;
     }

src/main/webapp/WEB-INF/controllers/DomainController.js

@@ -307,7 +307,7 @@ myApp.controller("domainController",
 			}
 
 			function updatingGridBasedOnStatus(status, response,result) {
-				if (response == "Domain saved succesfully") {
+				if (response == "Domain saved successfully") {
 					updateGrid("Add", result);
 				} else if (response == "Domain updated successfully") {
 					updateGrid("Update", result);