Merge branch 'FEATURE/REFRACTING_UI' into 'master'

Feature/refracting ui

See merge request hr/mytime!3

src/main/java/com/nisum/myteam/SwaggerConfig.java → src/main/java/com/nisum/myteam/configuration/SwaggerConfig.java

-package com.nisum.myteam;
+package com.nisum.myteam.configuration;
 
 
 import org.springframework.context.annotation.Bean;
@@ -18,8 +18,9 @@ public class SwaggerConfig {
    public Docket api() { 
        return new Docket(DocumentationType.SWAGGER_2)  
          .select()                                  
-         .apis(RequestHandlerSelectors.any())              
-         .paths(PathSelectors.any())                          
+         //.apis(RequestHandlerSelectors.any())
+               .apis(RequestHandlerSelectors.basePackage("com.nisum.myteam.controller"))
+               .paths(PathSelectors.any())
          .build();                                           
    }
 }
\ No newline at end of file

src/main/java/com/nisum/myteam/controller/AttendanceController.java

@@ -17,9 +17,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.model.AttendenceData;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 import com.nisum.myteam.service.IAttendanceService;
-import com.nisum.myteam.service.IEmployeeService;
 
 @RestController
 @RequestMapping("/attendance")

src/main/java/com/nisum/myteam/controller/BillingController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Billing;
+import com.nisum.myteam.model.dao.Billing;
 import com.nisum.myteam.service.IBillingService;
 
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/nisum/myteam/controller/DesignationController.java

@@ -16,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Designation;
+import com.nisum.myteam.model.dao.Designation;
 import com.nisum.myteam.service.IDesignationService;
-import com.nisum.myteam.service.impl.DesignationService;
 
 @RestController
 public class DesignationController {

src/main/java/com/nisum/myteam/controller/DomainController.java

 package com.nisum.myteam.controller;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Domain;
+import com.nisum.myteam.model.dao.Domain;
 import com.nisum.myteam.service.IDomainService;
-import com.nisum.myteam.utils.MyTeamUtils;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -64,14 +58,6 @@ public class DomainController {
 
 	}
 
-	@RequestMapping(value = "/domains", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> getDomains(HttpServletRequest request) throws MyTeamException {
-
-		ResponseDetails getRespDetails = new ResponseDetails(new Date(), 804, "Retrieved the domains successfully",
-				"Domains list", domainService.getDomainsList(), request.getRequestURI(), "details", null);
-
-		return new ResponseEntity<ResponseDetails>(getRespDetails, HttpStatus.OK);
-	}
 
 	@RequestMapping(value = "/domains", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> updateDomain(@RequestBody Domain domain, HttpServletRequest request)
@@ -104,6 +90,16 @@ public class DomainController {
 	}
 
 
+
+	@RequestMapping(value = "/domains", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<?> getDomains(HttpServletRequest request) throws MyTeamException {
+
+		ResponseDetails getRespDetails = new ResponseDetails(new Date(), 804, "Retrieved the domains successfully",
+				"Domains list", domainService.getDomainsList(), request.getRequestURI(), "details", null);
+
+		return new ResponseEntity<ResponseDetails>(getRespDetails, HttpStatus.OK);
+	}
+
    //getting domains list under accountId which is an active. 
 	@RequestMapping(value = "/domains/{accountId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<Domain>> getDomains(@PathVariable("accountId") String accountId) throws MyTeamException {
@@ -112,4 +108,7 @@ public class DomainController {
 		return new ResponseEntity<>(domains, HttpStatus.OK);
 	}
 
+
+
+
 }
\ No newline at end of file

src/main/java/com/nisum/myteam/controller/EmployeeController.java

@@ -7,7 +7,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -22,8 +21,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.service.IEmployeeRoleService;
 import com.nisum.myteam.service.IEmployeeService;
 
@@ -40,10 +39,10 @@ public class EmployeeController {
 	private IEmployeeRoleService employeeRoleService;
 
 	@RequestMapping(value = "/employees/{empId}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> createEmployee(@Valid @RequestBody Employee employeeReq,
+	public ResponseEntity<?> createEmployee( @RequestBody Employee employeeReq,
 			@PathVariable(value = "empId") String loginEmpId, HttpServletRequest request) throws MyTeamException {
 
-		if (!empService.isEmployeeExistsById(loginEmpId)) {
+		if (empService.isEmployeeExistsById(loginEmpId)) {
 			Employee employeePersisted = empService.createEmployee(employeeReq, loginEmpId);
 			
 			ResponseDetails createRespDetails = new ResponseDetails(new Date(), 901, "Employee has been created",
@@ -191,14 +190,14 @@ public class EmployeeController {
 
 	}
 
-	@RequestMapping(value = "/getEmployeeRoleDataForSearchCriteria", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "/employee/searchCriteria", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Employee> getEmployeeRoleDataForSearchCriteria(@RequestParam("searchId") String searchId,
 			@RequestParam("searchAttribute") String searchAttribute) throws MyTeamException {
 		Employee employeesRole = empService.getEmployeeRoleDataForSearchCriteria(searchId, searchAttribute);
 		return new ResponseEntity<>(employeesRole, HttpStatus.OK);
 	}
 
-	@RequestMapping(value = "/getEmployeeDetailsForAutocomplete", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "/employee/autocomplete", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<String>> getEmployeeDetailsForAutocomplete() throws MyTeamException {
 		List<String> details = empService.getEmployeeDetailsForAutocomplete();
 		return new ResponseEntity<>(details, HttpStatus.OK);

src/main/java/com/nisum/myteam/controller/EmployeeLocationController.java

@@ -12,14 +12,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.EmployeeLocation;
+import com.nisum.myteam.model.dao.EmployeeLocation;
 import com.nisum.myteam.service.IEmployeeLocationService;
-import com.nisum.myteam.service.impl.EmployeeLocationService;
 
 @RestController
 public class EmployeeLocationController {

src/main/java/com/nisum/myteam/controller/MasterDataController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.MasterData;
+import com.nisum.myteam.model.dao.MasterData;
 import com.nisum.myteam.service.IMasterDataService;
 
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/nisum/myteam/controller/OrgLocationController.java

@@ -6,8 +6,6 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -18,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.OrgLocation;
+import com.nisum.myteam.model.dao.OrgLocation;
 import com.nisum.myteam.service.IOrgLocationService;
-import com.nisum.myteam.service.impl.OrgLocationService;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/nisum/myteam/controller/ReportsController.java

@@ -32,17 +32,14 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Billing;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Billing;
 import com.nisum.myteam.model.ColumnChartData;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.model.GroupByCount;
 import com.nisum.myteam.model.ReportSeriesRecord;
-import com.nisum.myteam.model.Resource;
-import com.nisum.myteam.repository.BillingRepo;
-import com.nisum.myteam.repository.EmployeeVisaRepo;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.service.IEmployeeService;
-import com.nisum.myteam.service.IProjectService;
 import com.nisum.myteam.service.IResourceService;
 
 @RestController

src/main/java/com/nisum/myteam/controller/ShiftController.java

@@ -16,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Shift;
+import com.nisum.myteam.model.dao.Shift;
 import com.nisum.myteam.service.IShiftService;
-import com.nisum.myteam.service.impl.ShiftService;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/nisum/myteam/controller/SkillController.java

@@ -16,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Skill;
+import com.nisum.myteam.model.dao.Skill;
 import com.nisum.myteam.service.ISkillService;
-import com.nisum.myteam.service.impl.SkillService;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/nisum/myteam/controller/VisaController.java

@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmployeeVisa;
-import com.nisum.myteam.model.TravelRequest;
-import com.nisum.myteam.model.Visa;
+import com.nisum.myteam.model.dao.EmployeeVisa;
+import com.nisum.myteam.model.dao.TravelRequest;
+import com.nisum.myteam.model.dao.Visa;
 import com.nisum.myteam.service.IVisaService;
 
 @RestController
@@ -79,4 +79,5 @@ public class VisaController {
 		visaService.deleteEmployeeVisas(eVisa);
 		return new ResponseEntity<>("Success", HttpStatus.OK);
 	}
-}
+}
\ No newline at end of file
+

src/main/java/com/nisum/myteam/model/DateCompare.java

@@ -4,6 +4,7 @@ import java.text.ParseException;
 import java.util.Comparator;
 import java.util.Date;
 
+import com.nisum.myteam.model.dao.EmpLoginData;
 import com.nisum.myteam.utils.MyTeamLogger;
 import com.nisum.myteam.utils.MyTeamUtils;
 

src/main/java/com/nisum/myteam/model/Account.java → src/main/java/com/nisum/myteam/model/dao/Account.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.List;
@@ -17,6 +17,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.bson.types.ObjectId;
 
 @Setter
 @Getter
@@ -28,10 +29,10 @@ public class Account implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    
-   // private ObjectId id;
-   
     @Id
+    private ObjectId id;
+   
+
     private String accountId;
     @NotNull
     @Size(min=2,max=50,message="Name should have atlast 2 and less than 50 characters")

src/main/java/com/nisum/myteam/model/Billing.java → src/main/java/com/nisum/myteam/model/dao/Billing.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;
 
+import com.nisum.myteam.model.AuditFields;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

src/main/java/com/nisum/myteam/model/Designation.java → src/main/java/com/nisum/myteam/model/dao/Designation.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Domain.java → src/main/java/com/nisum/myteam/model/dao/Domain.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.List;
@@ -15,6 +15,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.bson.types.ObjectId;
 
 @Setter
 @Getter
@@ -26,8 +27,9 @@ public class Domain implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	// private ObjectId id;
 	@Id
+	private ObjectId id;
+
 	private String domainId;
 	@NotNull
 	@Size(min = 2, max = 80, message = "Domain Name should have atlast 2 and less than 80 characters")

src/main/java/com/nisum/myteam/model/EmpLoginData.java → src/main/java/com/nisum/myteam/model/dao/EmpLoginData.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Employee.java → src/main/java/com/nisum/myteam/model/dao/Employee.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -72,12 +72,12 @@ public class Employee implements Serializable {
     @ExcelCellName("Skills")
     private String technologyKnown;
 
-    @NotBlank
+  
     @Pattern(regexp="(^$|[0-9]{10})",message="Invalid mobile number")
     @ExcelCellName("Primary Mobile")
     private String mobileNumber;
 
-    @NotBlank
+   
     @Pattern(regexp="(^$|[0-9]{10})",message="Invalid alternate mobile number")
     @ExcelCellName("Alternate Mobile")
     private String alternateMobileNumber;

src/main/java/com/nisum/myteam/model/EmployeeLocation.java → src/main/java/com/nisum/myteam/model/dao/EmployeeLocation.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/nisum/myteam/model/EmployeeRole.java → src/main/java/com/nisum/myteam/model/dao/EmployeeRole.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import org.bson.types.ObjectId;

src/main/java/com/nisum/myteam/model/EmployeeShift.java → src/main/java/com/nisum/myteam/model/dao/EmployeeShift.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
+import com.nisum.myteam.model.AuditFields;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
@@ -15,7 +16,7 @@ import lombok.ToString;
 @NoArgsConstructor
 @ToString
 @Document(collection = "employeeShifts")
-public class EmployeeShift extends AuditFields  {
+public class EmployeeShift extends AuditFields {
 
 	@Id
 	private String id;

src/main/java/com/nisum/myteam/model/EmployeeVisa.java → src/main/java/com/nisum/myteam/model/dao/EmployeeVisa.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.util.Date;
 

src/main/java/com/nisum/myteam/model/MasterData.java → src/main/java/com/nisum/myteam/model/dao/MasterData.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/OrgLocation.java → src/main/java/com/nisum/myteam/model/dao/OrgLocation.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Project.java → src/main/java/com/nisum/myteam/model/dao/Project.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+import com.nisum.myteam.model.AuditFields;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -30,13 +31,13 @@ public class Project extends AuditFields implements Serializable {
     private ObjectId id;
     private String projectId;
     private String projectName;
- 
+    private String domainId;
     private String domain;
+    private String accountId;
     private String status;
     private List<String> employeeIds;
     private List<String> managerIds;
-    private String accountId;
-    private String domainId;
+
     @DateTimeFormat(iso = ISO.DATE)
     private Date projectStartDate;
     @DateTimeFormat(iso = ISO.DATE)

src/main/java/com/nisum/myteam/model/Resource.java → src/main/java/com/nisum/myteam/model/dao/Resource.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;
 
+import com.nisum.myteam.model.AuditFields;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

src/main/java/com/nisum/myteam/model/Role.java → src/main/java/com/nisum/myteam/model/dao/Role.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Shift.java → src/main/java/com/nisum/myteam/model/dao/Shift.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Skill.java → src/main/java/com/nisum/myteam/model/dao/Skill.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/TravelRequest.java → src/main/java/com/nisum/myteam/model/dao/TravelRequest.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.util.Date;
 

src/main/java/com/nisum/myteam/model/Visa.java → src/main/java/com/nisum/myteam/model/dao/Visa.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import org.springframework.data.mongodb.core.mapping.Document;
 

src/main/java/com/nisum/myteam/model/vo/DomainVO.java

+package com.nisum.myteam.model.vo;
+
+import lombok.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class DomainVO {
+
+    private String Id;
+
+    private String domainId;
+
+    private String domainName;
+
+    private String accountId;
+
+    private String accountName;
+
+    private String status;
+
+    private List<HashMap<String,String>> deliveryManagers;
+
+}

src/main/java/com/nisum/myteam/model/EmployeeDashboardVO.java → src/main/java/com/nisum/myteam/model/vo/EmployeeDashboardVO.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.vo;
 
 import java.util.Date;
 

src/main/java/com/nisum/myteam/repository/AccountRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Account;
+import com.nisum.myteam.model.dao.Account;
 
 public interface AccountRepo extends MongoRepository<Account, String> {
 	
@@ -15,4 +15,4 @@ public interface AccountRepo extends MongoRepository<Account, String> {
 	List<Account> findByaccountNameAndAccountId(String accountName,String accountId);
 	
 	Account findByAccountNameIgnoreCase(String accountName);
-} 
+}
\ No newline at end of file

src/main/java/com/nisum/myteam/repository/BillingRepo.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Billing;
+import com.nisum.myteam.model.dao.Billing;
 
 public interface BillingRepo extends MongoRepository<Billing, String> {
 

src/main/java/com/nisum/myteam/repository/DesignationRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Designation;
+import com.nisum.myteam.model.dao.Designation;
 
 public interface DesignationRepo extends MongoRepository<Designation, String> {
 	

src/main/java/com/nisum/myteam/repository/DomainRepo.java

@@ -2,11 +2,13 @@ package com.nisum.myteam.repository;
 import java.util.List;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Domain;
+import com.nisum.myteam.model.dao.Domain;
 
 public interface DomainRepo extends MongoRepository<Domain, String> {
 
 	List<Domain> findByDomainNameAndAccountId(String domianName,String accountId);
+
+	List<Domain> findByDomainIdAndAccountId(String domianId,String accountId);
 	
 	List<Domain> findByAccountId(String accountId);
 	

src/main/java/com/nisum/myteam/repository/EmployeeAttendanceRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 
 public interface EmployeeAttendanceRepo extends MongoRepository<EmpLoginData, Long> {
 

src/main/java/com/nisum/myteam/repository/EmployeeLocationRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmployeeLocation;
+import com.nisum.myteam.model.dao.EmployeeLocation;
 
 public interface EmployeeLocationRepo extends MongoRepository<EmployeeLocation, String> {
 

src/main/java/com/nisum/myteam/repository/EmployeeRepo.java

 package com.nisum.myteam.repository;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Employee;
 
 public interface EmployeeRepo
         extends MongoRepository<Employee, String> {

src/main/java/com/nisum/myteam/repository/EmployeeRoleRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmployeeRole;
+import com.nisum.myteam.model.dao.EmployeeRole;
 
 public interface EmployeeRoleRepo extends MongoRepository<EmployeeRole, String> {
 

src/main/java/com/nisum/myteam/repository/EmployeeShiftRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmployeeShift;
+import com.nisum.myteam.model.dao.EmployeeShift;
 
 public interface EmployeeShiftRepo extends MongoRepository<EmployeeShift, String> {
 	

src/main/java/com/nisum/myteam/repository/EmployeeVisaRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmployeeVisa;
+import com.nisum.myteam.model.dao.EmployeeVisa;
 
 public interface EmployeeVisaRepo extends MongoRepository<EmployeeVisa, String> {
 	List<EmployeeVisa> findByVisaName(String visaName);

src/main/java/com/nisum/myteam/repository/MasterDataRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.MasterData;
+import com.nisum.myteam.model.dao.MasterData;
 
 public interface MasterDataRepo extends MongoRepository<MasterData, String> {
 	List<MasterData> findByMasterDataTypeAndMasterDataNameAndActiveStatus(String masterDataType, String masterDataName, boolean activeStatus);

src/main/java/com/nisum/myteam/repository/OrgLocationRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.OrgLocation;
+import com.nisum.myteam.model.dao.OrgLocation;
 
 public interface OrgLocationRepo extends MongoRepository<OrgLocation, String> {
 	List<OrgLocation> findByLocationAndActiveStatus(String location, boolean activeStatus);

src/main/java/com/nisum/myteam/repository/ProjectRepo.java

@@ -5,12 +5,14 @@ import java.util.Set;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Project;
+import com.nisum.myteam.model.dao.Project;
 
 public interface ProjectRepo extends MongoRepository<Project, String> {
 
 	Project findByProjectId(String projectId);
 
+	Project findByProjectName(String projectName);
+
 	List<Project> findByDeliveryLeadIds(String empId);
 
 	// List<Project> findByManagerId(String managerId);

src/main/java/com/nisum/myteam/repository/ResourceRepo.java

@@ -6,7 +6,7 @@ import java.util.Optional;
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.Resource;
 
 public interface ResourceRepo
         extends MongoRepository<Resource, String> {

src/main/java/com/nisum/myteam/repository/RoleRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Role;
+import com.nisum.myteam.model.dao.Role;
 
 public interface RoleRepo extends MongoRepository<Role, String> {
 

src/main/java/com/nisum/myteam/repository/ShiftRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Shift;
+import com.nisum.myteam.model.dao.Shift;
 
 public interface ShiftRepo extends MongoRepository<Shift, String> {
 	

src/main/java/com/nisum/myteam/repository/SkillRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Skill;
+import com.nisum.myteam.model.dao.Skill;
 
 
 public interface SkillRepo extends MongoRepository<Skill, String> {

src/main/java/com/nisum/myteam/repository/TravelRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.TravelRequest;
+import com.nisum.myteam.model.dao.TravelRequest;
 
 public interface TravelRepo extends MongoRepository<TravelRequest, String> {
 	

src/main/java/com/nisum/myteam/repository/VisaRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Visa;
+import com.nisum.myteam.model.dao.Visa;
 
 public interface VisaRepo extends MongoRepository<Visa, String> {
 	

src/main/java/com/nisum/myteam/service/IAccountService.java

@@ -6,16 +6,22 @@ import java.util.Map;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Account;
+import com.nisum.myteam.model.dao.Account;
 
 @Service
 public interface IAccountService {
 
 	Account createAccount(Account account) throws MyTeamException;
 	
-	Account updateAccount(Account account) throws MyTeamException;
+	Account updateAccountAndRolesForDMS(Account account) throws MyTeamException;
+
+	public Account updateAccountSequence(Account account);
 
 	boolean isAccountExists(Account account);
+
+	boolean isAccountExists(String accountId);
+
+	public Account getAccountById(String accountId);
 	
 	List<Account> getAccounts() throws MyTeamException;
 
@@ -25,4 +31,6 @@ public interface IAccountService {
 
 	
 	public List<Account> getAccountsAll() throws MyTeamException;
+
+
 }

src/main/java/com/nisum/myteam/service/IAttendanceService.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.model.AttendenceData;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 
 public interface IAttendanceService {
 

src/main/java/com/nisum/myteam/service/IBillingService.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Billing;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Billing;
+import com.nisum.myteam.model.dao.Employee;
 
 @Service
 public interface IBillingService {

src/main/java/com/nisum/myteam/service/IDesignationService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Designation;
+import com.nisum.myteam.model.dao.Designation;
 
 @Service
 public interface IDesignationService {

src/main/java/com/nisum/myteam/service/IDomainService.java

 package com.nisum.myteam.service;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
+import com.nisum.myteam.model.vo.DomainVO;
 import org.springframework.stereotype.Service;
 
 import com.mongodb.WriteResult;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Domain;
+import com.nisum.myteam.model.dao.Domain;
 
 /**
  * @author Vijay
@@ -27,15 +27,13 @@ public interface IDomainService {
 
 	WriteResult delete(String id) throws MyTeamException;
 
-	List<Domain> getDomainsList() throws MyTeamException;
+	List<DomainVO> getDomainsList() throws MyTeamException;
 	
 	Set<String> accountsAssignedToDeliveryLead(String empId) throws MyTeamException;
 	
 	 List<Domain> getDomainsUnderAccount(String accountId)throws MyTeamException;
 	 
 	 Domain getDomainById(String domainId);
-	 
-	 
-	 
+
 			 
 }

src/main/java/com/nisum/myteam/service/IEmployeeDataService.java

@@ -3,7 +3,7 @@ package com.nisum.myteam.service;
 import java.util.List;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 
 public interface IEmployeeDataService {
 	List<EmpLoginData> fetchEmployeeLoginsBasedOnDates(long employeeId, String fromDate, String toDate) throws MyTeamException;

src/main/java/com/nisum/myteam/service/IEmployeeLocationService.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.EmployeeLocation;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.EmployeeLocation;
 
 @Service
 public interface IEmployeeLocationService {

src/main/java/com/nisum/myteam/service/IEmployeeRoleService.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import com.mongodb.WriteResult;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmployeeRole;
+import com.nisum.myteam.model.dao.EmployeeRole;
 
 @Service
 public interface IEmployeeRoleService {

src/main/java/com/nisum/myteam/service/IEmployeeService.java

@@ -6,8 +6,8 @@ import java.util.Set;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Employee;
 
 @Service
 public interface IEmployeeService {

src/main/java/com/nisum/myteam/service/IEmployeeShiftService.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.service;
 
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.Resource;
 
 @Service
 public interface IEmployeeShiftService {

src/main/java/com/nisum/myteam/service/IMasterDataService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.MasterData;
+import com.nisum.myteam.model.dao.MasterData;
 
 @Service
 public interface IMasterDataService  {

src/main/java/com/nisum/myteam/service/IOrgLocationService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.OrgLocation;
+import com.nisum.myteam.model.dao.OrgLocation;
 
 @Service
 public interface IOrgLocationService {

src/main/java/com/nisum/myteam/service/IProjectService.java

@@ -5,11 +5,8 @@ import java.util.List;
 import java.util.Set;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmpLoginData;
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.EmployeeDashboardVO;
-import com.nisum.myteam.model.Project;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.*;
+import com.nisum.myteam.model.vo.EmployeeDashboardVO;
 
 public interface IProjectService {
 
@@ -37,7 +34,7 @@ public interface IProjectService {
 
 	public List<EmployeeDashboardVO> getEmployeesDashBoard();
 
-	public String addProjectTeamMateWithCheck(Resource projectTeamMate, String loginEmpId) throws MyTeamException;
+	public HashMap<String,Object>  addProjectTeamMateWithCheck(Resource projectTeamMate, String loginEmpId) throws MyTeamException;
 
 	public List<HashMap<Object, Object>> getProjectsForEmployee(String empId);
 
@@ -46,4 +43,18 @@ public interface IProjectService {
 	public List<HashMap<Object, Object>> deliveryLeadProjects(String empId) throws MyTeamException;
 
 	public List<Project> getAllProjects();
+
+	public boolean isProjectExists(String projectName);
+
+	public boolean isProjectExistsById(String projectId);
+
+	public long getProjectsCount();
+
+	public Account getProjectAccount(String accountId);
+
+	public Account updateProjSeqinAccount(Account account) throws MyTeamException;
+
+
+	public List<HashMap<Object, Object>> getRoleBasedProjects(String empId) throws MyTeamException;
+	public List<HashMap<Object, Object>> getProjectsInsteadOfRole() throws MyTeamException;
 }

src/main/java/com/nisum/myteam/service/IResourceService.java

@@ -6,9 +6,8 @@ import org.bson.types.ObjectId;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Billing;
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.Resource;
 
 @Service
 public interface IResourceService {
@@ -17,7 +16,7 @@ public interface IResourceService {
 
 	String updateResource(Resource projectTeamMate, String loginEmpId) throws MyTeamException;
 
-	void deleteResource(String empId, String projectId, ObjectId id, String loginEmpId);
+	Resource deleteResource(String empId, String projectId, ObjectId id, String loginEmpId);
 
 	Resource save(Resource resource);
 

src/main/java/com/nisum/myteam/service/IRoleService.java

@@ -3,7 +3,7 @@ package com.nisum.myteam.service;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Role;
+import com.nisum.myteam.model.dao.Role;
 
 @Service
 public interface IRoleService {

src/main/java/com/nisum/myteam/service/IShiftService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Shift;
+import com.nisum.myteam.model.dao.Shift;
 
 @Service
 public interface IShiftService {

src/main/java/com/nisum/myteam/service/ISkillService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Skill;
+import com.nisum.myteam.model.dao.Skill;
 
 @Service
 public interface ISkillService {

src/main/java/com/nisum/myteam/service/IVisaService.java

@@ -5,12 +5,9 @@ package com.nisum.myteam.service;
 
 import java.util.List;
 
-import org.springframework.web.multipart.MultipartFile;
-
-import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmployeeVisa;
-import com.nisum.myteam.model.TravelRequest;
-import com.nisum.myteam.model.Visa;
+import com.nisum.myteam.model.dao.EmployeeVisa;
+import com.nisum.myteam.model.dao.TravelRequest;
+import com.nisum.myteam.model.dao.Visa;
 
 /**
  * @author nisum

src/main/java/com/nisum/myteam/service/impl/AttendanceService.java

@@ -3,13 +3,8 @@ package com.nisum.myteam.service.impl;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -20,8 +15,8 @@ import org.springframework.stereotype.Service;
 import com.nisum.myteam.configuration.DbConnection;
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.model.AttendenceData;
-import com.nisum.myteam.model.EmpLoginData;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.EmpLoginData;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.repository.ResourceRepo;
 import com.nisum.myteam.service.IAttendanceService;
 import com.nisum.myteam.utils.CommomUtil;

src/main/java/com/nisum/myteam/service/impl/BillingService.java

@@ -10,8 +10,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Billing;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Billing;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.repository.BillingRepo;
 import com.nisum.myteam.service.IBillingService;
 import com.nisum.myteam.utils.MyTeamUtils;
@@ -52,8 +52,8 @@ public class BillingService implements IBillingService {
 		if (billingsList == null || billingsList.size() == 0) {
 			return billingsList;
 		} else {
-			return billingsList.stream().sorted(Comparator.comparing(Billing::getCreatedOn).reversed())
-					.collect(Collectors.toList());
+			//return billingsList.stream().sorted(Comparator.comparing(Billing::getCreatedOn).reversed()).collect(Collectors.toList());
+			return billingsList.stream().sorted(Comparator.comparing(Billing::getBillingStartDate).reversed()).collect(Collectors.toList());
 		}
 
 	}
@@ -64,8 +64,10 @@ public class BillingService implements IBillingService {
 		if (billingsList == null || billingsList.size() == 0) {
 			return billingsList;
 		} else {
-			return billingsList.stream().sorted(Comparator.comparing(Billing::getCreatedOn).reversed())
-					.collect(Collectors.toList());
+			log.info("The billing list before sorting::"+billingsList);
+			//return billingsList.stream().sorted(Comparator.comparing(Billing::getCreatedOn).reversed()).collect(Collectors.toList());
+			return billingsList.stream().sorted(Comparator.comparing(Billing::getBillingStartDate).reversed()).collect(Collectors.toList());
+
 		}
 	}
 

src/main/java/com/nisum/myteam/service/impl/DesignationService.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Designation;
+import com.nisum.myteam.model.dao.Designation;
 import com.nisum.myteam.repository.DesignationRepo;
 import com.nisum.myteam.service.IDesignationService;
 

src/main/java/com/nisum/myteam/service/impl/DomainService.java

 package com.nisum.myteam.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 import com.mongodb.WriteResult;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Domain;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Domain;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.vo.DomainVO;
 import com.nisum.myteam.repository.DomainRepo;
+import com.nisum.myteam.service.IAccountService;
 import com.nisum.myteam.service.IDomainService;
 import com.nisum.myteam.service.IEmployeeRoleService;
 import com.nisum.myteam.service.IRoleService;
 import com.nisum.myteam.utils.CommomUtil;
 import com.nisum.myteam.utils.MyTeamUtils;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.*;
 
 /**
  * @author Vijay
@@ -49,12 +43,14 @@ public class DomainService implements IDomainService {
 	@Autowired
 	private IEmployeeRoleService roleMappingService;
 
-	
+	@Autowired
+	private IAccountService accountService;
+
 
 	public boolean isDomainExists(Domain domainReq) {
 		boolean isDomainExists = false;
 		int count = 0;
-		List<Domain> domainListByName = domainRepo.findByDomainNameAndAccountId(domainReq.getDomainName(),
+		List<Domain> domainListByName = domainRepo.findByDomainIdAndAccountId(domainReq.getDomainId(),
 				domainReq.getAccountId());
 		List<Domain> domainListbyAccountId = domainRepo.findByAccountId(domainReq.getAccountId());
 
@@ -95,6 +91,7 @@ public class DomainService implements IDomainService {
 		log.info("updating the domain details");
 		domainReq.setStatus(MyTeamUtils.ACTIVE);
 		Domain domainPersisted = domainRepo.save(domainReq);
+
 		log.info("After update the domain details::" + domainPersisted);
 
 		return domainPersisted;
@@ -140,13 +137,25 @@ public class DomainService implements IDomainService {
 	}
 
 	@Override
-	public List<Domain> getDomainsList() throws MyTeamException {
-		List<Domain> domainsPersistedList = domainRepo.findAll();
-		for (Domain domainPersisted : domainsPersistedList) {
-			domainPersisted.setDeliveryManagers(prepareEmployeeList(domainPersisted));
+	public List<DomainVO> getDomainsList() throws MyTeamException {
+
+		List<DomainVO> domainVOS = new ArrayList<>();
+
+		for (Domain domainPersisted : domainRepo.findAll()) {
+			DomainVO domainVO = new DomainVO();
+			domainVO.setId(domainPersisted.getId().toString());
+			domainVO.setAccountId(domainPersisted.getAccountId());
+			domainVO.setAccountName(accountService.getAccountById(domainPersisted.getAccountId()).getAccountName());
+			domainVO.setDomainId(domainPersisted.getDomainId());
+			domainVO.setDomainName(domainPersisted.getDomainName());
+			domainVO.setStatus(domainPersisted.getStatus());
+			domainVO.setDeliveryManagers(prepareEmployeeList(domainPersisted));
+
+			domainVOS.add(domainVO);
+
 		}
 
-		return domainsPersistedList;
+		return domainVOS;
 	}
 
 	@Override

src/main/java/com/nisum/myteam/service/impl/EmployeeDataService.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 
 import com.nisum.myteam.configuration.DbConnection;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 import com.nisum.myteam.service.IEmployeeDataService;
 import com.nisum.myteam.utils.CommomUtil;
 import com.nisum.myteam.utils.MyTeamLogger;

src/main/java/com/nisum/myteam/service/impl/EmployeeLocationService.java

@@ -10,8 +10,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.EmployeeLocation;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.EmployeeLocation;
 import com.nisum.myteam.repository.EmployeeLocationRepo;
 import com.nisum.myteam.service.IEmployeeLocationService;
 

src/main/java/com/nisum/myteam/service/impl/EmployeeRoleService.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
 
 import com.mongodb.WriteResult;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmployeeRole;
+import com.nisum.myteam.model.dao.EmployeeRole;
 import com.nisum.myteam.repository.EmployeeRoleRepo;
 import com.nisum.myteam.repository.RoleRepo;
 import com.nisum.myteam.service.IEmployeeRoleService;

src/main/java/com/nisum/myteam/service/impl/EmployeeService.java

 package com.nisum.myteam.service.impl;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.nisum.myteam.exception.handler.MyTeamException;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Domain;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.Resource;
+import com.nisum.myteam.repository.EmployeeRepo;
+import com.nisum.myteam.service.*;
+import com.nisum.myteam.utils.MyTeamUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.FindAndModifyOptions;
@@ -16,29 +18,15 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
-import com.mongodb.WriteResult;
-import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Domain;
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.EmployeeRole;
-import com.nisum.myteam.model.Resource;
-import com.nisum.myteam.repository.EmployeeRepo;
-import com.nisum.myteam.service.IAccountService;
-import com.nisum.myteam.service.IDomainService;
-import com.nisum.myteam.service.IEmployeeLocationService;
-import com.nisum.myteam.service.IEmployeeRoleService;
-import com.nisum.myteam.service.IEmployeeService;
-import com.nisum.myteam.service.IProjectService;
-import com.nisum.myteam.service.IResourceService;
-import com.nisum.myteam.utils.MyTeamUtils;
-
-import lombok.extern.slf4j.Slf4j;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
 public class EmployeeService implements IEmployeeService {
 
+
+
 	@Autowired
 	private EmployeeRepo employeeRepo;
 	
@@ -196,7 +184,11 @@ public class EmployeeService implements IEmployeeService {
 
 	@Override
 	public Employee getEmployeeById(String employeeId) {
-		return employeeRepo.findByEmployeeId(employeeId);
+		log.info("The employeeId::"+employeeId);
+
+		Employee employee=employeeRepo.findByEmployeeId(employeeId);
+		log.info("Employee Found in Repo::"+employee);
+		return employee;
 	}
 
 	@Override
@@ -296,13 +288,26 @@ public class EmployeeService implements IEmployeeService {
 	@Override
 	public boolean verifyEmployeeRole(String empId, String roleName) {
 		boolean flag = false;
-		String role = getEmployeeById(empId).getRole();
+
+		log.info("The employeeId::" + empId);
+
+		Employee employee = getEmployeeById(empId);
+		log.info("Employee::::in EmployeeService::" + employee);
+
+		String role = employee.getRole();
+		log.info("The employee role::" + role);
 		if (null != role && "" != role && !"Admin".equalsIgnoreCase(role)) {
-			Set<String> roleSet = employeeRoleService.empRolesMapInfoByEmpId(empId);
-			if (null != roleSet && !roleSet.isEmpty() && MyTeamUtils.INT_ZERO < roleSet.size()) {
-				if (roleSet.contains(roleName)) {
-					flag = true;
+
+			if ("FM".equalsIgnoreCase(role) || "Delivery Lead".equalsIgnoreCase(role)) {
+				flag = true;
+			} else {
+				Set<String> roleSet = employeeRoleService.empRolesMapInfoByEmpId(empId);
+				if (null != roleSet && !roleSet.isEmpty() && MyTeamUtils.INT_ZERO < roleSet.size()) {
+					if (roleSet.contains(roleName)) {
+						flag = true;
+					}
 				}
+
 			}
 
 		}
@@ -319,6 +324,10 @@ public class EmployeeService implements IEmployeeService {
 		return employeeRepo.findAll();
 	}
 	 
-	
+
+
+
+
+
 	
 }

src/main/java/com/nisum/myteam/service/impl/EmployeeShiftService.java

@@ -6,8 +6,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.EmployeeShift;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.EmployeeShift;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.repository.EmployeeShiftRepo;
 import com.nisum.myteam.service.IEmployeeShiftService;
 import com.nisum.myteam.utils.MyTeamUtils;

src/main/java/com/nisum/myteam/service/impl/MasterDataService.java

@@ -6,10 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.MasterData;
+import com.nisum.myteam.model.dao.MasterData;
 import com.nisum.myteam.repository.MasterDataRepo;
 import com.nisum.myteam.service.IMasterDataService;
-import com.nisum.myteam.utils.MyTeamUtils;
 
 @Service("masterDataService")
 public class MasterDataService implements IMasterDataService {

src/main/java/com/nisum/myteam/service/impl/OrgLocationService.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.OrgLocation;
+import com.nisum.myteam.model.dao.OrgLocation;
 import com.nisum.myteam.repository.OrgLocationRepo;
 import com.nisum.myteam.service.IOrgLocationService;
 

src/main/java/com/nisum/myteam/service/impl/RoleService.java

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Role;
+import com.nisum.myteam.model.dao.Role;
 import com.nisum.myteam.repository.RoleRepo;
 import com.nisum.myteam.service.IRoleService;
 

src/main/java/com/nisum/myteam/service/impl/ShiftService.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Shift;
+import com.nisum.myteam.model.dao.Shift;
 import com.nisum.myteam.repository.ShiftRepo;
 import com.nisum.myteam.service.IShiftService;
 

src/main/java/com/nisum/myteam/service/impl/SkillService.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Skill;
+import com.nisum.myteam.model.dao.Skill;
 import com.nisum.myteam.repository.SkillRepo;
 import com.nisum.myteam.service.ISkillService;
 

src/main/java/com/nisum/myteam/service/impl/UploadXLService.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.service.IUploadXLService;
 import com.nisum.myteam.utils.DataValidations;
 import com.nisum.myteam.utils.MyTeamUtils;

src/main/java/com/nisum/myteam/service/impl/VisaService.java

@@ -8,9 +8,9 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.EmployeeVisa;
-import com.nisum.myteam.model.TravelRequest;
-import com.nisum.myteam.model.Visa;
+import com.nisum.myteam.model.dao.EmployeeVisa;
+import com.nisum.myteam.model.dao.TravelRequest;
+import com.nisum.myteam.model.dao.Visa;
 import com.nisum.myteam.repository.EmployeeRepo;
 import com.nisum.myteam.repository.EmployeeVisaRepo;
 import com.nisum.myteam.repository.TravelRepo;
@@ -37,7 +37,7 @@ public class VisaService implements IVisaService {
     private IEmployeeService userService;
     
     @Autowired
-    private EmployeeRepo employeeRolesRepo;
+    private EmployeeRepo employeeRepo;
     
 
     @Override

src/main/java/com/nisum/myteam/statuscodes/AccountStatus.java

+package com.nisum.myteam.statuscodes;
+
+
+public enum AccountStatus {
+
+    CREATE(600, "Account has been created"),
+    UPDATE(601, "Account has been updated"),
+    DELETE(602, "Account has been deleted successfully"),
+    GET_ACCOUNTS(603, "Retrieved the accounts successfully"),
+    GET_ACCOUNT(604, "Retrieved the account successfully"),
+    GET_ACCOUNT_NAMES(605, "Retrieved the account names successfully"),
+    ALREADY_EXISTED(606, "An Account is already existed"),
+    NOT_FOUND(607, "Account is Not found"),
+    NOT_VALID_ID(608, "AccountId is not valid");
+
+    private int code;
+    private String message;
+    private String description;
+
+    private AccountStatus(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+}
\ No newline at end of file

src/main/java/com/nisum/myteam/statuscodes/BillingStatus.java

+package com.nisum.myteam.statuscodes;
+
+public class BillingStatus {
+}

src/main/java/com/nisum/myteam/statuscodes/DomainStatus.java

+package com.nisum.myteam.statuscodes;
+
+public enum DomainStatus {
+
+    CREATE(600, "Account has been created"),
+    UPDATE(601, "Account has been updated");
+    private int code;
+    private String message;
+
+    private DomainStatus(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+}

src/main/java/com/nisum/myteam/statuscodes/EmployeeStatus.java

+package com.nisum.myteam.statuscodes;
+
+public enum EmployeeStatus {
+}

src/main/java/com/nisum/myteam/statuscodes/ProjectStatus.java

+package com.nisum.myteam.statuscodes;
+
+public class ProjectStatus {
+}

src/main/java/com/nisum/myteam/statuscodes/ResourceStatus.java

+package com.nisum.myteam.statuscodes;
+
+public class ResourceStatus {
+}