ManageTeam Issues (#73)

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

@@ -127,7 +127,7 @@ public class ProjectTeamController {
             @RequestBody ProjectTeamMate teamMate) throws MyTimeException {
         teamMate.setActive(true);
         // teamMate.setStartDate(new Date());
-		if (teamMate.getRole()!= null && teamMate.getRole().equals("Lead")) {
+		/*if (teamMate.getRole()!= null && teamMate.getRole().equals("Lead")) {
 			Project project = new Project();
 			project.setProjectName(teamMate.getProjectName());
 			project.setManagerIds(Arrays.asList(teamMate.getEmployeeId()));
@@ -136,7 +136,7 @@ public class ProjectTeamController {
 			project.setStatus("Active");
 
 			projectController.addProject(project);
-		}
+		}*/
         ProjectTeamMate teamMateDB = projectService
                 .addProjectTeamMate(teamMate);
         return new ResponseEntity<>(teamMateDB, HttpStatus.OK);

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

@@ -210,6 +210,7 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     public List<ProjectTeamMate> getTeamDetails(String empId) {
 		List<String> projectsId = new ArrayList<>();
+		List<ProjectTeamMate> listOfTeamMates=new ArrayList<>();
 		Query query = new Query(Criteria.where("employeeId").is(empId).and("role").is("Lead"));
 		List<ProjectTeamMate> projectMatesList = mongoTemplate.find(query, ProjectTeamMate.class);
 		for (ProjectTeamMate projectMate : projectMatesList)
@@ -217,10 +218,10 @@ public class ProjectServiceImpl implements ProjectService {
 		Query query1 = new Query(Criteria.where("projectId").in(projectsId));
 		List<ProjectTeamMate> projectMateList = mongoTemplate.find(query1, ProjectTeamMate.class);
 		for (ProjectTeamMate projectTeamMate : projectMateList) {
-			if (projectTeamMate.getEmployeeId().equals(empId))
-				projectMateList.remove(projectTeamMate);
+			if (!projectTeamMate.getEmployeeId().equals(empId))
+				listOfTeamMates.add(projectTeamMate);
 		}
-		return projectMateList;
+		return listOfTeamMates;
 
     }
     
@@ -234,7 +235,11 @@ 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());
+			project.getManagerIds().add(projectTeamMate.getEmployeeId());
+			projectRepo.save(project);
+		}
     	updateProjectEndDateInProjectTeamMate(projectTeamMate);
         ProjectTeamMate pT = projectTeamMatesRepo.save(projectTeamMate);
         List<BillingDetails> listBD = getEmployeeActiveNisumBench(