MT-122 :SNS :: My_Project_Allocations (#124)

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

 package com.nisum.mytime.controller;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -25,6 +25,7 @@ import com.nisum.mytime.model.ProjectTeamMate;
 import com.nisum.mytime.repository.EmployeeVisaRepo;
 import com.nisum.mytime.service.ProjectService;
 import com.nisum.mytime.service.UserService;
+import com.nisum.mytime.utils.MyTimeUtils;
 
 @RestController
 @RequestMapping("/projectTeam")
@@ -39,8 +40,6 @@ public class ProjectTeamController {
     @Autowired
     private EmployeeVisaRepo employeeVisaRepo;
     
-    @Autowired
-    private ProjectController projectController;
 
     @RequestMapping(value = "/employee", method = RequestMethod.GET,
             produces = MediaType.APPLICATION_JSON_VALUE)
@@ -215,7 +214,8 @@ public class ProjectTeamController {
     @RequestMapping(value = "/getProjectDetails", method = RequestMethod.GET,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<List<ProjectTeamMate>> getProjectDetails(
-            @RequestParam("projectId") String projectId,@RequestParam("status") String status)
+            @RequestParam("projectId") String projectId,
+            @RequestParam(value = "status", required = false, defaultValue  = MyTimeUtils.ACTIVE) String status)
             throws MyTimeException {
         List<ProjectTeamMate> employeesRoles = projectService
                 .getProjectDetails(projectId,status);
@@ -225,12 +225,13 @@ public class ProjectTeamController {
     @RequestMapping(value = "/getMyProjectAllocations",
             method = RequestMethod.GET,
             produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<List<ProjectTeamMate>> getMyProjectAllocations(
+    public ResponseEntity<List<HashMap<Object, Object>>> getMyProjectAllocations(
             @RequestParam("employeeId") String employeeId)
             throws MyTimeException {
-        List<ProjectTeamMate> projectAllocations = projectService
-                .getMyProjectAllocations(employeeId);
-        return new ResponseEntity<>(projectAllocations, HttpStatus.OK);
+        //List<ProjectTeamMate> projectAllocations = projectService
+       //         .getMyProjectAllocations(employeeId);
+    	List<HashMap<Object, Object>> empPrjtsInfo = projectService.projectsInfoByEmpId(employeeId);
+        return new ResponseEntity<>(empPrjtsInfo, HttpStatus.OK);
     }
 
     @RequestMapping(value = "/getEmployeeBillingDetails",

src/main/java/com/nisum/mytime/repository/ProjectTeamMatesRepo.java

@@ -34,5 +34,7 @@ public interface ProjectTeamMatesRepo
 
     List<ProjectTeamMate> findByAccountAndActiveAndBillableStatus(
             String account, boolean status, String billableStatus);
+    
+    List<ProjectTeamMate> findByEmployeeIdOrderByStartDateAsc(String employeeId);
 
 }

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

@@ -86,5 +86,7 @@ public interface ProjectService {
     
     public String addProjectTeamMateWithCheck(ProjectTeamMate projectTeamMate)
             throws MyTimeException;
+    
+    public List<HashMap<Object, Object>>  projectsInfoByEmpId(String empId);
 
 }

src/main/java/com/nisum/mytime/utils/MyTimeUtils.java

@@ -107,5 +107,7 @@ public class MyTimeUtils {
 	public final static  String BENCH_ACCOUNT="Nisum India";
 	public final static  String BENCH_PROJECT_ID="Nisum0000";
 	public final static  String BENCH_BILLABILITY_STATUS="Non-Billable";
+	
+	public final static  int INT_ZERO = 0;
 
 }