Compare commits
16 commits
13f565907c
...
4a8d689df9
Author | SHA1 | Date | |
---|---|---|---|
|
4a8d689df9 | ||
|
f34e738895 | ||
|
5962193f88 | ||
|
a9ae63bf8e | ||
289cf7e120 | |||
|
89d383cc5d | ||
|
7cb75e449a | ||
|
1db0eb9630 | ||
9fe23f3e90 | |||
60ee2e9bb2 | |||
ccaf234d28 | |||
2ca9cfbadb | |||
8dff301457 | |||
e6d3854fbd | |||
967946bee2 | |||
2f6222ff00 |
7 changed files with 313 additions and 12 deletions
103
api/pmt.yml
103
api/pmt.yml
|
@ -77,6 +77,45 @@ components:
|
|||
qualificationId:
|
||||
type: integer
|
||||
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:
|
||||
Unauthorized:
|
||||
description: "Unauthorized"
|
||||
|
@ -167,10 +206,10 @@ paths:
|
|||
format: int64
|
||||
required: true
|
||||
requestBody:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/AddEmployeeDTO"
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/AddEmployeeDTO"
|
||||
responses:
|
||||
204:
|
||||
description: "Employee successfully added to the specific Project"
|
||||
|
@ -179,7 +218,7 @@ paths:
|
|||
404:
|
||||
$ref: "#/components/responses/NotFound"
|
||||
409:
|
||||
$ref: "#/components/responses/Conflict"
|
||||
$ref: "#/components/responses/Conflict"
|
||||
422:
|
||||
$ref: "#/components/responses/UnprocessableContent"
|
||||
500:
|
||||
|
@ -210,3 +249,57 @@ paths:
|
|||
type: string
|
||||
500:
|
||||
$ref: "#/components/responses/InternalError"
|
||||
|
||||
/project/{id}/employee/{employeeId}:
|
||||
delete:
|
||||
operationId: "removeEmployeeFromProject"
|
||||
description: "Removes an employee from a Project"
|
||||
parameters:
|
||||
- in: path
|
||||
name: id
|
||||
schema:
|
||||
type: integer
|
||||
format: int64
|
||||
required: true
|
||||
- in: path
|
||||
name: employeeId
|
||||
schema:
|
||||
type: integer
|
||||
format: int64
|
||||
required: true
|
||||
responses:
|
||||
204:
|
||||
description: "Deletes the employee from the Project"
|
||||
401:
|
||||
$ref: "#/components/responses/Unauthorized"
|
||||
404:
|
||||
$ref: "#/components/responses/NotFound"
|
||||
409:
|
||||
$ref: "#/components/responses/Conflict"
|
||||
500:
|
||||
$ref: "#/components/responses/InternalError"
|
||||
503:
|
||||
$ref: "#/components/responses/ServiceUnavailable"
|
||||
|
||||
/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"
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
package de.hmmh.pmt;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import de.hmmh.pmt.db.Allocation;
|
||||
import de.hmmh.pmt.db.AllocationRepository;
|
||||
import de.hmmh.pmt.db.Project;
|
||||
import de.hmmh.pmt.db.ProjectRepository;
|
||||
|
||||
import de.hmmh.pmt.db.*;
|
||||
import de.hmmh.pmt.dtos.*;
|
||||
import de.hmmh.pmt.employee.ApiClientFactory;
|
||||
import de.hmmh.pmt.employee.api.EmployeeControllerApi;
|
||||
import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
|
||||
import de.hmmh.pmt.oas.DefaultApi;
|
||||
import de.hmmh.pmt.util.Mapper;
|
||||
|
@ -20,8 +19,8 @@ import org.springframework.web.client.HttpClientErrorException;
|
|||
import org.springframework.web.client.RestClientException;
|
||||
|
||||
import java.time.ZoneOffset;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("${openapi.projectManagement.base-path:/api/v1}")
|
||||
|
@ -143,4 +142,43 @@ public class ApiController implements DefaultApi {
|
|||
|
||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResponseEntity<Void> removeEmployeeFromProject(Long id, Long employeeId){
|
||||
Optional<Allocation> allocation = allocationRepository.findById(new AllocationId(id, employeeId));
|
||||
if (allocation.isEmpty()){
|
||||
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
||||
}
|
||||
|
||||
allocationRepository.delete(allocation.get());
|
||||
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> {
|
||||
|
||||
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.dtos.CreateProjectDTO;
|
||||
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 java.util.List;
|
||||
|
||||
@Component
|
||||
public class Mapper {
|
||||
public Project map(CreateProjectDTO dto) {
|
||||
|
@ -29,4 +35,30 @@ public class Mapper {
|
|||
dto.setPlannedEnd(project.getPlannedEnd());
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -164,7 +164,19 @@ public abstract class IntegrationTest {
|
|||
allocation1ToOverlapA.setEmployeeId(TEST_EMPLOYEE_A_ID);
|
||||
allocation1ToOverlapA.setRole(TEST_QUALIFICATION_A_ID);
|
||||
allocations.put("1>overlap-a", allocation1ToOverlapA);
|
||||
|
||||
|
||||
Allocation allocation1ToSpaceStation = new Allocation();
|
||||
allocation1ToSpaceStation.setProject(allProjects.get("space-station"));
|
||||
allocation1ToSpaceStation.setEmployeeId(TEST_EMPLOYEE_A_ID);
|
||||
allocation1ToSpaceStation.setRole(TEST_QUALIFICATION_A_ID);
|
||||
allocations.put("1>space-station", allocation1ToSpaceStation);
|
||||
|
||||
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());
|
||||
return allocations;
|
||||
}
|
||||
|
|
59
src/test/java/de/hmmh/pmt/project/DeleteEmployeeTest.java
Normal file
59
src/test/java/de/hmmh/pmt/project/DeleteEmployeeTest.java
Normal file
|
@ -0,0 +1,59 @@
|
|||
package de.hmmh.pmt.project;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.Mockito;
|
||||
import org.springframework.http.HttpStatus;
|
||||
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.HttpClientErrorException;
|
||||
|
||||
import de.hmmh.pmt.IntegrationTest;
|
||||
import de.hmmh.pmt.db.Allocation;
|
||||
import de.hmmh.pmt.db.Project;
|
||||
import de.hmmh.pmt.dtos.AddEmployeeDTO;
|
||||
|
||||
public class DeleteEmployeeTest extends IntegrationTest {
|
||||
@Test
|
||||
void shouldNotDeleteEmployeeWhenProjectIsNotFound() throws Exception {
|
||||
mvc
|
||||
.perform(delete(baseUri + "/project/1"))
|
||||
.andExpect(status().isNotFound())
|
||||
;
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldNotDeleteEmployeeWhenEmployeeIsNotAllocated() throws Exception {
|
||||
when(this.mockEmployeeApi.findById(Mockito.anyLong()))
|
||||
.thenThrow(new HttpClientErrorException(HttpStatus.NOT_FOUND));
|
||||
|
||||
Map<String, Project> allProjects = createTestProjectData();
|
||||
|
||||
this.mvc
|
||||
.perform(getRequest(allProjects.get("research-lab").getId(), 0L))
|
||||
.andExpect(status().isNotFound());
|
||||
}
|
||||
|
||||
@Test
|
||||
void employeeSuccessfullyDeletedFromProject() throws Exception {
|
||||
Map<String, Project> allProjects = createTestProjectData();
|
||||
Map<String, Allocation> allAllocations = createTestAllocationData(allProjects);
|
||||
Allocation allocation = allAllocations.get("1>space-station");
|
||||
|
||||
this.mvc
|
||||
.perform(getRequest(allocation.getProjectId(),allocation.getEmployeeId()))
|
||||
.andExpect(status().isNoContent());
|
||||
|
||||
}
|
||||
|
||||
private RequestBuilder getRequest(Long projectId, Long employeeId) {
|
||||
return MockMvcRequestBuilders
|
||||
.delete(baseUri + "/project/" + projectId + "/employee/" + employeeId);
|
||||
}
|
||||
}
|
|
@ -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