Compare commits
8 commits
4a8d689df9
...
13f565907c
Author | SHA1 | Date | |
---|---|---|---|
|
13f565907c | ||
|
413ee85e1a | ||
|
be0b7b8f7d | ||
|
8fa066b374 | ||
|
b3327ad351 | ||
|
94298293a8 | ||
|
9692f1f179 | ||
|
f941cad4b9 |
6 changed files with 202 additions and 7 deletions
62
api/pmt.yml
62
api/pmt.yml
|
@ -77,6 +77,45 @@ components:
|
||||||
qualificationId:
|
qualificationId:
|
||||||
type: integer
|
type: integer
|
||||||
format: int64
|
format: int64
|
||||||
|
Employee:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
id:
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
lastName:
|
||||||
|
type: string
|
||||||
|
firstName:
|
||||||
|
type: string
|
||||||
|
street:
|
||||||
|
type: string
|
||||||
|
postcode:
|
||||||
|
maxLength: 5
|
||||||
|
minLength: 5
|
||||||
|
type: string
|
||||||
|
city:
|
||||||
|
type: string
|
||||||
|
phone:
|
||||||
|
type: string
|
||||||
|
skillSet:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: '#/components/schemas/Qualification'
|
||||||
|
Qualification:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
skill:
|
||||||
|
type: string
|
||||||
|
id:
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
ProjectEmployeesDTO:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
employees:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/Employee"
|
||||||
responses:
|
responses:
|
||||||
Unauthorized:
|
Unauthorized:
|
||||||
description: "Unauthorized"
|
description: "Unauthorized"
|
||||||
|
@ -210,3 +249,26 @@ paths:
|
||||||
type: string
|
type: string
|
||||||
500:
|
500:
|
||||||
$ref: "#/components/responses/InternalError"
|
$ref: "#/components/responses/InternalError"
|
||||||
|
|
||||||
|
/project/{id}/employees:
|
||||||
|
get:
|
||||||
|
description: "getAllEmployees"
|
||||||
|
operationId: "Get a List of all Employees from a specific Project"
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: id
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
required: true
|
||||||
|
responses:
|
||||||
|
200:
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ProjectEmployeesDTO"
|
||||||
|
description: 'Get a List of all Employees from a specific Project '
|
||||||
|
404:
|
||||||
|
$ref: '#/components/responses/NotFound'
|
||||||
|
500:
|
||||||
|
$ref: "#/components/responses/InternalError"
|
||||||
|
|
|
@ -20,8 +20,8 @@ import org.springframework.web.client.HttpClientErrorException;
|
||||||
import org.springframework.web.client.RestClientException;
|
import org.springframework.web.client.RestClientException;
|
||||||
|
|
||||||
import java.time.ZoneOffset;
|
import java.time.ZoneOffset;
|
||||||
import java.util.List;
|
import java.util.*;
|
||||||
import java.util.Optional;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
@RequestMapping("${openapi.projectManagement.base-path:/api/v1}")
|
@RequestMapping("${openapi.projectManagement.base-path:/api/v1}")
|
||||||
|
@ -143,4 +143,32 @@ public class ApiController implements DefaultApi {
|
||||||
|
|
||||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ResponseEntity<ProjectEmployeesDTO> getAListOfAllEmployeesFromASpecificProject(Long id) {
|
||||||
|
if (!projectRepository.existsById(id)) {
|
||||||
|
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
ProjectEmployeesDTO dto = new ProjectEmployeesDTO();
|
||||||
|
List<Allocation> allocationsByProject = allocationRepository.findAllByProjectId(id);
|
||||||
|
if (allocationsByProject.isEmpty()) {
|
||||||
|
return new ResponseEntity<>(dto, HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
Set<Long> employeeIds = allocationsByProject.stream()
|
||||||
|
.map(Allocation::getEmployeeId)
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
|
||||||
|
try {
|
||||||
|
List<Employee> employees = apiClientFactory.getEmployeeApi().findAll1().stream()
|
||||||
|
.filter(employeeResponseDTO -> employeeIds.contains(employeeResponseDTO.getId()))
|
||||||
|
.map(mapper::map)
|
||||||
|
.toList();
|
||||||
|
dto.setEmployees(employees);
|
||||||
|
return new ResponseEntity<>(dto, HttpStatus.OK);
|
||||||
|
} catch (RestClientException exception) {
|
||||||
|
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,4 +7,5 @@ import java.util.List;
|
||||||
public interface AllocationRepository extends JpaRepository<Allocation, AllocationId> {
|
public interface AllocationRepository extends JpaRepository<Allocation, AllocationId> {
|
||||||
|
|
||||||
List<Allocation> findAllByEmployeeId(Long employeeId);
|
List<Allocation> findAllByEmployeeId(Long employeeId);
|
||||||
|
List<Allocation> findAllByProjectId(Long projectId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,8 +3,14 @@ package de.hmmh.pmt.util;
|
||||||
import de.hmmh.pmt.db.Project;
|
import de.hmmh.pmt.db.Project;
|
||||||
import de.hmmh.pmt.dtos.CreateProjectDTO;
|
import de.hmmh.pmt.dtos.CreateProjectDTO;
|
||||||
import de.hmmh.pmt.dtos.CreatedProjectDTO;
|
import de.hmmh.pmt.dtos.CreatedProjectDTO;
|
||||||
|
import de.hmmh.pmt.dtos.Employee;
|
||||||
|
import de.hmmh.pmt.dtos.Qualification ;
|
||||||
|
import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
|
||||||
|
import de.hmmh.pmt.employee.dtos.QualificationGetDTO;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class Mapper {
|
public class Mapper {
|
||||||
public Project map(CreateProjectDTO dto) {
|
public Project map(CreateProjectDTO dto) {
|
||||||
|
@ -29,4 +35,30 @@ public class Mapper {
|
||||||
dto.setPlannedEnd(project.getPlannedEnd());
|
dto.setPlannedEnd(project.getPlannedEnd());
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Employee map(EmployeeResponseDTO employeeResponseDTO) {
|
||||||
|
Employee dto = new Employee();
|
||||||
|
dto.setId(employeeResponseDTO.getId());
|
||||||
|
dto.setLastName(employeeResponseDTO.getLastName());
|
||||||
|
dto.setFirstName(employeeResponseDTO.getFirstName());
|
||||||
|
dto.setStreet(employeeResponseDTO.getStreet());
|
||||||
|
dto.setPostcode(employeeResponseDTO.getPostcode());
|
||||||
|
dto.setCity(employeeResponseDTO.getCity());
|
||||||
|
dto.setPhone(employeeResponseDTO.getPhone());
|
||||||
|
|
||||||
|
List<Qualification > skillSet = employeeResponseDTO.getSkillSet().stream()
|
||||||
|
.map(this::map)
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
dto.setSkillSet(skillSet);
|
||||||
|
return dto;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Qualification map(QualificationGetDTO qualificationGetDTO) {
|
||||||
|
Qualification dto = new Qualification ();
|
||||||
|
dto.setId(qualificationGetDTO.getId());
|
||||||
|
dto.setSkill(qualificationGetDTO.getSkill());
|
||||||
|
return dto;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,6 +165,12 @@ public abstract class IntegrationTest {
|
||||||
allocation1ToOverlapA.setRole(TEST_QUALIFICATION_A_ID);
|
allocation1ToOverlapA.setRole(TEST_QUALIFICATION_A_ID);
|
||||||
allocations.put("1>overlap-a", allocation1ToOverlapA);
|
allocations.put("1>overlap-a", allocation1ToOverlapA);
|
||||||
|
|
||||||
|
Allocation allocation1ToAiResearch = new Allocation();
|
||||||
|
allocation1ToAiResearch.setProject(allProjects.get("ai-research"));
|
||||||
|
allocation1ToAiResearch.setEmployeeId(TEST_EMPLOYEE_A_ID);
|
||||||
|
allocation1ToAiResearch.setRole(TEST_QUALIFICATION_A_ID);
|
||||||
|
allocations.put("1>ai-research", allocation1ToAiResearch);
|
||||||
|
|
||||||
allocationRepository.saveAllAndFlush(allocations.values());
|
allocationRepository.saveAllAndFlush(allocations.values());
|
||||||
return allocations;
|
return allocations;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,66 @@
|
||||||
|
package de.hmmh.pmt.project;
|
||||||
|
|
||||||
|
import de.hmmh.pmt.IntegrationTest;
|
||||||
|
import de.hmmh.pmt.db.Project;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.http.MediaType;
|
||||||
|
import org.springframework.test.web.servlet.RequestBuilder;
|
||||||
|
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
|
||||||
|
import org.springframework.web.client.RestClientException;
|
||||||
|
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||||
|
|
||||||
|
public class GetAllEmployeesByProjectTest extends IntegrationTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldReturnNotFoundWhenProjectDoesNotExist() throws Exception {
|
||||||
|
createTestProjectData();
|
||||||
|
|
||||||
|
this.mvc
|
||||||
|
.perform(getRequest(50L))
|
||||||
|
.andExpect(status().isNotFound());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldReturnOkWhenProjectHasNoEmployees() throws Exception {
|
||||||
|
Map<String, Project> allProjects = createTestProjectData();
|
||||||
|
|
||||||
|
this.mvc
|
||||||
|
.perform(getRequest(allProjects.get("research-lab").getId()))
|
||||||
|
.andExpect(status().isOk());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldReturnListOfEmployeesWhenAllParametersAreValid() throws Exception {
|
||||||
|
Map<String, Project> allProjects = createTestProjectData();
|
||||||
|
createTestAllocationData(allProjects);
|
||||||
|
|
||||||
|
this.mvc
|
||||||
|
.perform(getRequest(allProjects.get("ai-research").getId()))
|
||||||
|
.andExpect(status().isOk());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldReturnInternalServer() throws Exception {
|
||||||
|
when(this.mockEmployeeApi.findAll1())
|
||||||
|
.thenThrow(new RestClientException("Internal Server Error"));
|
||||||
|
|
||||||
|
Map<String, Project> allProjects = createTestProjectData();
|
||||||
|
createTestAllocationData(allProjects);
|
||||||
|
|
||||||
|
this.mvc
|
||||||
|
.perform(getRequest(allProjects.get("ai-research").getId()))
|
||||||
|
.andExpect(status().isInternalServerError());
|
||||||
|
}
|
||||||
|
|
||||||
|
private RequestBuilder getRequest(Long projectId) {
|
||||||
|
return MockMvcRequestBuilders
|
||||||
|
.get(baseUri + "/project/" + projectId + "/employees")
|
||||||
|
.contentType(MediaType.APPLICATION_JSON);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue