PMT-40: Fix Endpoint
This commit is contained in:
parent
096c25e33b
commit
6b430ae251
1 changed files with 10 additions and 7 deletions
|
@ -241,16 +241,19 @@ public class ApiController implements DefaultApi {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResponseEntity<EmployeeProjectsDTO> getAListOfAllProjectsFromASpecificEmployee(Long id) {
|
public ResponseEntity<EmployeeProjectsDTO> getAListOfAllProjectsFromASpecificEmployee(Long id) {
|
||||||
|
ApiTools.CheckEmployeeRecord employeeRecord = apiTools.checkEmployeeExists(id);
|
||||||
|
if (employeeRecord.status() != HttpStatus.OK) {
|
||||||
|
return new ResponseEntity<>(employeeRecord.status());
|
||||||
|
}
|
||||||
|
|
||||||
List<Allocation> allocationsByEmployee = allocationRepository.findAllByEmployeeId(id);
|
List<Allocation> allocationsByEmployee = allocationRepository.findAllByEmployeeId(id);
|
||||||
|
|
||||||
Set<Project> projects = allocationsByEmployee.stream()
|
|
||||||
.map(Allocation::getProject)
|
|
||||||
.collect(Collectors.toSet());
|
|
||||||
|
|
||||||
EmployeeProjectsDTO response = new EmployeeProjectsDTO();
|
EmployeeProjectsDTO response = new EmployeeProjectsDTO();
|
||||||
for (Project project : projects) {
|
response.setProjects(new ArrayList<>());
|
||||||
response.addProjectsItem(mapper.mapProject(project));
|
for (Allocation allocation : allocationsByEmployee) {
|
||||||
|
response.addProjectsItem(mapper.mapProject(allocation.getProject()));
|
||||||
}
|
}
|
||||||
return new ResponseEntity<>(HttpStatus.OK);
|
|
||||||
|
return ResponseEntity.ok(response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue