Merge pull request #149 from nisum-inc/FEATURE/MT-00

Import Employee details defect fixing

src/main/java/com/nisum/mytime/controller/ProjectController.java

@@ -84,10 +84,13 @@ public class ProjectController {
 		if (project.getAccountId() != null) {
 			List<Project> projects = projectRepo.findByAccountId(project.getAccountId());
 			for (Project existproject : projects) {
-				if (project.getProjectName().equalsIgnoreCase(existproject.getProjectName()))
-					projectNameCount++;		}
+				if (project.getProjectName().equalsIgnoreCase(existproject.getProjectName())
+						&& project.getProjectId() != existproject.getProjectId()) {
+					projectNameCount++;
+				}
+			}
 		}
-		if (projectNameCount>1)
+		if (projectNameCount>0)
 		{
 			MyTimeException myTimeException= new MyTimeException("Project name already exist !!! try with new");
 			return new ResponseEntity<>(myTimeException, HttpStatus.OK);

src/main/java/com/nisum/mytime/controller/ProjectTeamController.java

@@ -63,10 +63,9 @@ public class ProjectTeamController {
     @RequestMapping(value = "/updateEmployeeRole", method = RequestMethod.POST,
             produces = MediaType.APPLICATION_JSON_VALUE,
             consumes = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<EmployeeRoles> updateEmployeeRole(
-            @RequestBody EmployeeRoles employeeRoles) throws MyTimeException {
-        EmployeeRoles employeeRole = userService
-                .updateEmployeeRole(employeeRoles);
+    public ResponseEntity<EmployeeRoles> updateEmployeeRole(@RequestBody EmployeeRoles employeeRoles,
+    		@RequestParam(value="empId") String  loginEmpId) throws MyTimeException {
+        EmployeeRoles employeeRole = userService.updateEmployeeRole(employeeRoles, loginEmpId);
         return new ResponseEntity<>(employeeRole, HttpStatus.OK);
     }
 
@@ -138,8 +137,7 @@ public class ProjectTeamController {
 
 			projectController.addProject(project);
 		}*/
-        ProjectTeamMate teamMateDB = projectService
-                .addProjectTeamMate(teamMate);
+        ProjectTeamMate teamMateDB = projectService.addProjectTeamMate(teamMate);
         return new ResponseEntity<>(teamMateDB, HttpStatus.OK);
     }
 

src/main/java/com/nisum/mytime/controller/UserController.java

@@ -190,6 +190,7 @@ public class UserController {
     public ResponseEntity<List<Account>> getAccounts() throws MyTimeException {
         List<Account> technologies = userService.getAccounts().stream()
                 .filter(e -> "Y".equalsIgnoreCase(e.getStatus()))
+                .filter(a -> !("Nisum India".equalsIgnoreCase(a.getAccountName())))
                 // .map(Account::getAccountName).sorted()
                 .collect(Collectors.toList());
         return new ResponseEntity<>(technologies, HttpStatus.OK);

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

@@ -18,7 +18,6 @@ import com.nisum.mytime.model.EmployeeVisa;
 import com.nisum.mytime.model.TravelRequest;
 import com.nisum.mytime.model.Visa;
 import com.nisum.mytime.service.VisaService;
-import com.nisum.mytime.utils.MyTimeUtils;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/nisum/mytime/model/ProjectTeamMate.java

@@ -2,7 +2,6 @@ package com.nisum.mytime.model;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;

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

@@ -328,23 +328,19 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     public ProjectTeamMate addProjectTeamMate(ProjectTeamMate projectTeamMate)
             throws MyTimeException {
-        if (projectTeamMate.getRole() != null
-                && projectTeamMate.getRole().equals("Lead")) {
-            Project project = projectRepo
-                    .findByProjectId(projectTeamMate.getProjectId());
+        if (projectTeamMate.getRole() != null && projectTeamMate.getRole().equals("Lead")) {
+            Project project = projectRepo.findByProjectId(projectTeamMate.getProjectId());
             // project.getManagerIds().add(projectTeamMate.getEmployeeId());
             if (project.getManagerIds() != null)
                 project.getManagerIds().add(projectTeamMate.getEmployeeId());
             else
-                project.setManagerIds(
-                        Arrays.asList(projectTeamMate.getEmployeeId()));
+                project.setManagerIds(Arrays.asList(projectTeamMate.getEmployeeId()));
             projectRepo.save(project);
         }
-        
+
         updateProjectEndDateInProjectTeamMate(projectTeamMate);
         ProjectTeamMate pT = projectTeamMatesRepo.save(projectTeamMate);
-        List<BillingDetails> listBD = getEmployeeActiveNisumBench(
-                pT.getEmployeeId());
+        List<BillingDetails> listBD = getEmployeeActiveNisumBench(pT.getEmployeeId());
         for (BillingDetails b : listBD) {
             Date d = pT.getStartDate() != null ? pT.getStartDate() : new Date();
             b.setBillingEndDate(DateUtils.truncate(DateUtils.addDays(d, -1),
@@ -359,7 +355,7 @@ public class ProjectServiceImpl implements ProjectService {
         billings.setProjectName(pT.getProjectName());
         billings.setBillableStatus(pT.getBillableStatus());
         billings.setAccount(pT.getAccount());
-        billings.setActive(true);
+        billings.setActive(pT.isActive());
         if(pT.getProjectId().equals(MyTimeUtils.BENCH_PROJECT_ID))
         {
            billings.setBillingStartDate(pT.getStartDate() == null
@@ -556,11 +552,12 @@ public class ProjectServiceImpl implements ProjectService {
 
     public void addShiftDetails(ProjectTeamMate projectTeamMate) {
         EmpShiftDetails empShiftDetails = new EmpShiftDetails();
+        empShiftDetails.setCreateDate(new Date());
         empShiftDetails.setUpdatedDate(new Date());
         empShiftDetails.setEmployeeName(projectTeamMate.getEmployeeName());
         empShiftDetails.setEmployeeId(projectTeamMate.getEmployeeId());
         empShiftDetails.setShift(projectTeamMate.getShift());
-        empShiftDetails.setActive(true);
+        empShiftDetails.setActive(projectTeamMate.isActive());
         empShiftDetailsRepo.save(empShiftDetails);
     }
 
@@ -705,35 +702,19 @@ public class ProjectServiceImpl implements ProjectService {
     public List<ProjectTeamMate> getProjectDetails(String projectId,String statusFlag) {
 		List<ProjectTeamMate> teamMatesList = new ArrayList<>();
 		List<ProjectTeamMate> teamMates = projectTeamMatesRepo.findByProjectId(projectId);
-		if(projectId.equals(MyTimeUtils.BENCH_PROJECT_ID))
-		{
-			for (ProjectTeamMate projectTeamMate : teamMates) {
-				if(statusFlag.equals(MyTimeUtils.ACTIVE) && projectTeamMate.getEndDate()==null)
+		for (ProjectTeamMate projectTeamMate : teamMates) {
+			if (projectTeamMate.getEndDate() != null) {
+				// Active
+				if (statusFlag.equals(MyTimeUtils.ACTIVE) && projectTeamMate.getEndDate().compareTo(new Date()) >= 0)
 					teamMatesList.add(projectTeamMate);
-				else if(statusFlag.equals(MyTimeUtils.IN_ACTIVE) &&projectTeamMate.getEndDate()!=null)
+				else if (statusFlag.equals(MyTimeUtils.IN_ACTIVE)
+						&& projectTeamMate.getEndDate().compareTo(new Date()) < 0)
 					teamMatesList.add(projectTeamMate);
-				else if(statusFlag.equals(MyTimeUtils.BOTH))
+				else if (statusFlag.equals(MyTimeUtils.BOTH))
 					teamMatesList.add(projectTeamMate);
-			
-		   }
-		}
-		else
-		{
-			for (ProjectTeamMate projectTeamMate : teamMates) {
-				if (projectTeamMate.getEndDate() != null) {
-					// Active
-					if (statusFlag.equals(MyTimeUtils.ACTIVE) && projectTeamMate.getEndDate().compareTo(new Date()) >= 0)
-						teamMatesList.add(projectTeamMate);
-					else if (statusFlag.equals(MyTimeUtils.IN_ACTIVE)
-							&& projectTeamMate.getEndDate().compareTo(new Date()) < 0)
-						teamMatesList.add(projectTeamMate);
-					else if (statusFlag.equals(MyTimeUtils.BOTH))
-						teamMatesList.add(projectTeamMate);
-				}
 			}
 		}
 		return teamMatesList;
-
     }
 
     @Override
@@ -929,10 +910,8 @@ public class ProjectServiceImpl implements ProjectService {
         Map<String, Object> teamMatesMap = new HashMap();
         Map<String, Object> teamMatesStatusMap = new HashMap();
 
-        List<ProjectTeamMate> empRecords = projectTeamMatesRepo.findAll(); // find
-                                                                           // all
-                                                                           // active
-                                                                           // employees
+        // Find all active employees
+        List<ProjectTeamMate> empRecords = projectTeamMatesRepo.findAll();
         for (ProjectTeamMate pt : empRecords) {
             if (pt.isActive()) {
                 Project project = projectRepo
@@ -945,16 +924,8 @@ public class ProjectServiceImpl implements ProjectService {
                     if (projectTeamMate == null) {
                         List listOfObjects = new ArrayList<>();
                         listOfObjects.add(pt);
-                        teamMatesMap.put(pt.getEmployeeId(), listOfObjects);// TODO
-                                                                            // a
-                                                                            // person
-                                                                            // can
-                                                                            // have
-                                                                            // multiple
-                                                                            // active
-                                                                            // projects
-                                                                            // with
-                                                                            // billability
+                        // A person can have multiple active projects with billability
+                        teamMatesMap.put(pt.getEmployeeId(), listOfObjects);
                     } else {
                         List existingRecordsInMap = (List) teamMatesMap
                                 .get(pt.getEmployeeId());
@@ -1098,11 +1069,10 @@ public class ProjectServiceImpl implements ProjectService {
 			    
 			    projectMap.put("accountId", account!=null?account.getAccountId():ptm.getAccountId());
 			    projectMap.put("domainId",  domain!=null? domain.getDomainId() : ptm.getDomainId() );
-			    
-			    projectMap.put("status", project.getStatus()!=null?project.getStatus():"");
+			    projectMap.put("status", ptm.isActive());
+			    projectMap.put("projectStartDate",ptm.getStartDate());
+			    projectMap.put("projectEndDate",ptm.getEndDate());
 	            projectMap.put("employeeIds", ptm.getEmployeeId());
-	            projectMap.put("projectStartDate", project.getProjectStartDate());
-	            projectMap.put("projectEndDate", project.getProjectEndDate());
 	            projectMap.put("shift", ptm.getShift());
 	            projectMap.put("billableStatus", ptm.getBillableStatus());    
 	            

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

@@ -88,7 +88,7 @@ public class VisaServiceImpl implements VisaService {
     }
 
     @Override
-    public String exportDataFromExcelFile(MultipartFile file,String empId)
+    public String exportDataFromExcelFile(MultipartFile file, String empId)
             throws MyTimeException {
         String result = "Failure";
         int counter = 0;
@@ -157,16 +157,15 @@ public class VisaServiceImpl implements VisaService {
          * log.info("Inserted Employee record with Id: {}",
          * employee.getEmployeeId());
          */
-    	if(employee.getRole()!=null)
-        employee.setRole("Employee");
         
-        EmployeeRoles emp = userService
-                .getEmployeesRoleData(employee.getEmployeeId());
+        EmployeeRoles emp = userService.getEmployeesRoleData(employee.getEmployeeId());
         if (emp == null) {
             try {
+            	if(employee.getRole()==null || employee.getRole().isEmpty()) {
+            		employee.setRole("Employee");
+            	}
                 userService.assigingEmployeeRole(employee,empId);
             } catch (MyTimeException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
             }
         }