Merge pull request #134 from nisum-inc/FEATURE/CodeRefactoringForAddEmployeeToTeam

CodeRefactoringForAddEmployeeToTeam

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

@@ -999,24 +999,23 @@ public class ProjectServiceImpl implements ProjectService {
     
 	@Override
 	public String addProjectTeamMateWithCheck(ProjectTeamMate projectTeamMate) throws MyTimeException {
-		int count = 0;
+		boolean flag = false;
 		String projectName = null;
 		String fromDate = null;
 		String toDate = null;
-		List<ProjectTeamMate> teamMateList = projectTeamMatesRepo.findAll();
+		List<ProjectTeamMate> teamMateList = projectTeamMatesRepo.findByEmployeeId(projectTeamMate.getEmployeeId());
 		for (ProjectTeamMate projectMate : teamMateList) {
-			if (projectTeamMate.getEmployeeId().equals(projectMate.getEmployeeId()) && projectMate.getEndDate()!=null && (projectMate.getEndDate().compareTo(new Date())>0)
+			if (projectMate.getEndDate()!=null && (projectMate.getEndDate().compareTo(new Date())>0)
 					&& !projectMate.getProjectId().equals("Nisum0000")) {
-				if (++count == 1)
-				{
+				    flag=true; 
 					projectName = projectMate.getProjectName();
 					fromDate = projectMate.getStartDate().toString();
 					toDate = projectMate.getEndDate().toString();
-				}
+				
 				break;
 			}
 		}
-		if (count > 0)
+		if (flag==true)
 			return "Resource " + projectTeamMate.getEmployeeId() + " already Assigned to the " + projectName
 					+ " Project" + " from " + fromDate + "to " + toDate;
 		else