feat: Implement feature to acknowledge project time frames when assigning employees to projects (SCRUM-7 SCRUM-2) (!38)
Co-authored-by: Phan Huy Tran <p.tran@neusta.de> Reviewed-on: #38 Co-authored-by: Phan Huy Tran <ptran@noreply.localhost> Co-committed-by: Phan Huy Tran <ptran@noreply.localhost>
This commit is contained in:
parent
97e211946f
commit
5f6caa7fc2
@ -6,10 +6,10 @@ Content-Type: application/json
|
|||||||
{
|
{
|
||||||
"name": "name",
|
"name": "name",
|
||||||
"leading_employee": 1,
|
"leading_employee": 1,
|
||||||
"employees": [315, 312],
|
"employees": [312],
|
||||||
"contractor": 4,
|
"contractor": 4,
|
||||||
"contractor_name": "Peter File",
|
"contractor_name": "Peter File",
|
||||||
"comment": "goal of project",
|
"comment": "goal of project",
|
||||||
"start_date": "01.01.2000",
|
"start_date": "02.01.2020",
|
||||||
"planned_end_date": "01.01.2001"
|
"planned_end_date": "01.01.2023"
|
||||||
}
|
}
|
@ -1,5 +1,6 @@
|
|||||||
package de.szut.lf8_starter.project;
|
package de.szut.lf8_starter.project;
|
||||||
|
|
||||||
|
import de.szut.lf8_starter.project.dto.project.GetProjectDto;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -32,4 +33,18 @@ public class ProjectService {
|
|||||||
public void delete(Long id) {
|
public void delete(Long id) {
|
||||||
this.projectRepository.deleteById(id);
|
this.projectRepository.deleteById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isOverlapping(GetProjectDto getProjectDto, ProjectEntity existingProjectEntity) {
|
||||||
|
return isDateRangeOverlapping(getProjectDto, existingProjectEntity) || isDateEqual(getProjectDto, existingProjectEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isDateRangeOverlapping(GetProjectDto getProjectDto, ProjectEntity existingProjectEntity) {
|
||||||
|
return getProjectDto.getStartDate().isBefore(existingProjectEntity.getPlannedEndDate())
|
||||||
|
&& getProjectDto.getPlannedEndDate().isAfter(existingProjectEntity.getStartDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isDateEqual(GetProjectDto getProjectDto, ProjectEntity existingProjectEntity) {
|
||||||
|
return getProjectDto.getStartDate().isEqual(existingProjectEntity.getStartDate())
|
||||||
|
|| getProjectDto.getPlannedEndDate().isEqual(existingProjectEntity.getPlannedEndDate());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package de.szut.lf8_starter.project.action.crud;
|
package de.szut.lf8_starter.project.action.crud;
|
||||||
|
|
||||||
|
import de.szut.lf8_starter.employee.EmployeeService;
|
||||||
import de.szut.lf8_starter.project.ProjectEntity;
|
import de.szut.lf8_starter.project.ProjectEntity;
|
||||||
import de.szut.lf8_starter.project.ProjectService;
|
import de.szut.lf8_starter.project.ProjectService;
|
||||||
import de.szut.lf8_starter.project.dto.project.CreateProjectDto;
|
import de.szut.lf8_starter.project.dto.project.CreateProjectDto;
|
||||||
@ -12,15 +13,18 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
|||||||
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping(value = "/projects")
|
@RequestMapping(value = "/projects")
|
||||||
public class CreateProjectAction {
|
public class CreateProjectAction {
|
||||||
|
private final EmployeeService employeeService;
|
||||||
private final ProjectService projectService;
|
private final ProjectService projectService;
|
||||||
private final ProjectMapper projectMapper;
|
private final ProjectMapper projectMapper;
|
||||||
|
|
||||||
public CreateProjectAction(ProjectService projectService, ProjectMapper mappingService) {
|
public CreateProjectAction(EmployeeService employeeService, ProjectService projectService, ProjectMapper mappingService) {
|
||||||
|
this.employeeService = employeeService;
|
||||||
this.projectService = projectService;
|
this.projectService = projectService;
|
||||||
this.projectMapper = mappingService;
|
this.projectMapper = mappingService;
|
||||||
}
|
}
|
||||||
@ -29,14 +33,31 @@ public class CreateProjectAction {
|
|||||||
@ApiResponses(value = {
|
@ApiResponses(value = {
|
||||||
@ApiResponse(responseCode = "201", description = "created project", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = GetProjectDto.class))}),
|
@ApiResponse(responseCode = "201", description = "created project", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = GetProjectDto.class))}),
|
||||||
@ApiResponse(responseCode = "400", description = "invalid JSON posted", content = @Content),
|
@ApiResponse(responseCode = "400", description = "invalid JSON posted", content = @Content),
|
||||||
@ApiResponse(responseCode = "401", description = "not authorized", content = @Content)})
|
@ApiResponse(responseCode = "401", description = "not authorized", content = @Content),
|
||||||
|
@ApiResponse(responseCode = "409", description = "Project dates conflict", content = @Content)
|
||||||
|
})
|
||||||
@PostMapping
|
@PostMapping
|
||||||
@ResponseStatus(code = HttpStatus.CREATED)
|
@ResponseStatus(code = HttpStatus.CREATED)
|
||||||
public GetProjectDto create(@RequestBody @Valid CreateProjectDto createProjectDto) {
|
public ResponseEntity<Object> create(
|
||||||
ProjectEntity projectEntity = this.projectMapper.mapCreateDtoToEntity(createProjectDto);
|
@RequestBody @Valid CreateProjectDto createProjectDto,
|
||||||
|
@RequestHeader("Authorization") String accessToken
|
||||||
|
) {
|
||||||
|
ProjectEntity project = this.projectMapper.mapCreateDtoToEntity(createProjectDto);
|
||||||
|
|
||||||
projectEntity = this.projectService.create(projectEntity);
|
for (Long employeeId : createProjectDto.getEmployees()) {
|
||||||
|
if (!this.employeeService.employeeExists(accessToken, employeeId)) {
|
||||||
|
return new ResponseEntity<>("Employee with ID: " + employeeId + " not found", HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
return this.projectMapper.mapToGetDto(projectEntity);
|
for (GetProjectDto getProjectDto : this.employeeService.getProjects(employeeId)) {
|
||||||
|
if (projectService.isOverlapping(getProjectDto, project)) {
|
||||||
|
return new ResponseEntity<>("Project dates conflict with an existing project for Employee with ID: " + employeeId, HttpStatus.CONFLICT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.projectService.create(project);
|
||||||
|
|
||||||
|
return new ResponseEntity<>(this.projectMapper.mapToGetDto(project), HttpStatus.CREATED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package de.szut.lf8_starter.project.action;
|
package de.szut.lf8_starter.project.action.crud;
|
||||||
|
|
||||||
import de.szut.lf8_starter.project.ProjectEntity;
|
import de.szut.lf8_starter.project.ProjectEntity;
|
||||||
import de.szut.lf8_starter.project.ProjectService;
|
import de.szut.lf8_starter.project.ProjectService;
|
@ -3,6 +3,7 @@ package de.szut.lf8_starter.project.action.employee;
|
|||||||
import de.szut.lf8_starter.employee.EmployeeService;
|
import de.szut.lf8_starter.employee.EmployeeService;
|
||||||
import de.szut.lf8_starter.project.ProjectEntity;
|
import de.szut.lf8_starter.project.ProjectEntity;
|
||||||
import de.szut.lf8_starter.project.ProjectService;
|
import de.szut.lf8_starter.project.ProjectService;
|
||||||
|
import de.szut.lf8_starter.project.dto.project.GetProjectDto;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.media.Content;
|
import io.swagger.v3.oas.annotations.media.Content;
|
||||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||||
@ -29,7 +30,8 @@ public class AddEmployeeToProjectAction {
|
|||||||
@Operation(summary = "Add an employee to a project")
|
@Operation(summary = "Add an employee to a project")
|
||||||
@ApiResponses(value = {
|
@ApiResponses(value = {
|
||||||
@ApiResponse(responseCode = "204", description = "Employee added to project"),
|
@ApiResponse(responseCode = "204", description = "Employee added to project"),
|
||||||
@ApiResponse(responseCode = "404", description = "Project or employee not found", content = @Content)
|
@ApiResponse(responseCode = "404", description = "Project or employee not found", content = @Content),
|
||||||
|
@ApiResponse(responseCode = "409", description = "Project dates conflict", content = @Content)
|
||||||
})
|
})
|
||||||
@PostMapping("/projects/{projectId}/employees/{employeeId}")
|
@PostMapping("/projects/{projectId}/employees/{employeeId}")
|
||||||
public ResponseEntity<Object> create(
|
public ResponseEntity<Object> create(
|
||||||
@ -37,18 +39,26 @@ public class AddEmployeeToProjectAction {
|
|||||||
@PathVariable Long employeeId,
|
@PathVariable Long employeeId,
|
||||||
@RequestHeader("Authorization") String accessToken
|
@RequestHeader("Authorization") String accessToken
|
||||||
) {
|
) {
|
||||||
Optional<ProjectEntity> project = this.projectService.findById(projectId);
|
Optional<ProjectEntity> optionalProject = this.projectService.findById(projectId);
|
||||||
|
|
||||||
if (project.isEmpty()) {
|
if (optionalProject.isEmpty()) {
|
||||||
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ProjectEntity projectEntity = optionalProject.get();
|
||||||
|
|
||||||
if (!this.employeeService.employeeExists(accessToken, employeeId)) {
|
if (!this.employeeService.employeeExists(accessToken, employeeId)) {
|
||||||
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
||||||
}
|
}
|
||||||
|
|
||||||
project.get().getEmployees().add(employeeId);
|
for (GetProjectDto getProjectDto : this.employeeService.getProjects(employeeId)) {
|
||||||
this.projectService.update(project.get());
|
if (this.projectService.isOverlapping(getProjectDto, projectEntity)) {
|
||||||
|
return new ResponseEntity<>("Project dates conflict with an existing project for Employee with ID: " + employeeId, HttpStatus.CONFLICT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
projectEntity.getEmployees().add(employeeId);
|
||||||
|
this.projectService.update(projectEntity);
|
||||||
|
|
||||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
||||||
}
|
}
|
||||||
|
@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.http.*;
|
import org.springframework.http.*;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
import org.springframework.util.LinkedMultiValueMap;
|
import org.springframework.util.LinkedMultiValueMap;
|
||||||
import org.springframework.util.MultiValueMap;
|
import org.springframework.util.MultiValueMap;
|
||||||
@ -22,7 +23,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@AutoConfigureMockMvc(addFilters = false)
|
@AutoConfigureMockMvc(addFilters = false)
|
||||||
class AddEmployeeToProjectActionIntegrationTest {
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
||||||
|
class AddEmployeeToProjectTest {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MockMvc mockMvc;
|
private MockMvc mockMvc;
|
||||||
|
|
||||||
@ -56,6 +58,87 @@ class AddEmployeeToProjectActionIntegrationTest {
|
|||||||
assert updatedProject.getEmployees().contains(312L);
|
assert updatedProject.getEmployees().contains(312L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void addEmployeeToPastProjectTest() throws Exception {
|
||||||
|
ProjectEntity project = new ProjectEntity();
|
||||||
|
project.setComment("past project");
|
||||||
|
project.setContractor(1);
|
||||||
|
project.setContractorName("contractorName");
|
||||||
|
project.setPlannedEndDate(LocalDate.of(1991, 1, 1));
|
||||||
|
project.setLeadingEmployee(1);
|
||||||
|
project.setName("past project");
|
||||||
|
project.setStartDate(LocalDate.of(1990, 1, 1));
|
||||||
|
project.setEmployees(List.of(1L, 2L, 3L));
|
||||||
|
this.projectRepository.save(project);
|
||||||
|
|
||||||
|
mockMvc.perform(post("/projects/{projectId}/employees/{employeeId}", project.getId(), 312)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
.contentType(MediaType.APPLICATION_JSON))
|
||||||
|
.andExpect(status().isNoContent());
|
||||||
|
|
||||||
|
ProjectEntity updatedProject = projectRepository.findById(project.getId()).get();
|
||||||
|
|
||||||
|
assert updatedProject.getEmployees().contains(312L);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void addEmployeeToFutureProjectTest() throws Exception {
|
||||||
|
ProjectEntity project = new ProjectEntity();
|
||||||
|
project.setComment("future project");
|
||||||
|
project.setContractor(1);
|
||||||
|
project.setContractorName("contractorName");
|
||||||
|
project.setPlannedEndDate(LocalDate.of(2101, 1, 1));
|
||||||
|
project.setLeadingEmployee(1);
|
||||||
|
project.setName("future project");
|
||||||
|
project.setStartDate(LocalDate.of(2100, 1, 1));
|
||||||
|
project.setEmployees(List.of(1L, 2L, 3L));
|
||||||
|
this.projectRepository.save(project);
|
||||||
|
|
||||||
|
mockMvc.perform(post("/projects/{projectId}/employees/{employeeId}", project.getId(), 312)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
.contentType(MediaType.APPLICATION_JSON))
|
||||||
|
.andExpect(status().isNoContent());
|
||||||
|
|
||||||
|
ProjectEntity updatedProject = projectRepository.findById(project.getId()).get();
|
||||||
|
|
||||||
|
assert updatedProject.getEmployees().contains(312L);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void addEmployeeToProjectWithOverlappingDatesTest() throws Exception {
|
||||||
|
ProjectEntity project1 = new ProjectEntity();
|
||||||
|
project1.setComment("project 1");
|
||||||
|
project1.setContractor(1);
|
||||||
|
project1.setContractorName("contractorName");
|
||||||
|
project1.setPlannedEndDate(LocalDate.of(2023, 1, 1));
|
||||||
|
project1.setLeadingEmployee(1);
|
||||||
|
project1.setName("project 1");
|
||||||
|
project1.setStartDate(LocalDate.of(2022, 1, 1));
|
||||||
|
project1.setEmployees(List.of(1L, 2L, 3L));
|
||||||
|
this.projectRepository.save(project1);
|
||||||
|
|
||||||
|
ProjectEntity project2 = new ProjectEntity();
|
||||||
|
project2.setComment("project 2");
|
||||||
|
project2.setContractor(1);
|
||||||
|
project2.setContractorName("contractorName");
|
||||||
|
project2.setPlannedEndDate(LocalDate.of(2023, 6, 1));
|
||||||
|
project2.setLeadingEmployee(1);
|
||||||
|
project2.setName("project 2");
|
||||||
|
project2.setStartDate(LocalDate.of(2022, 6, 1));
|
||||||
|
project2.setEmployees(List.of(1L, 2L, 3L));
|
||||||
|
this.projectRepository.save(project2);
|
||||||
|
|
||||||
|
mockMvc.perform(post("/projects/{projectId}/employees/{employeeId}", project1.getId(), 312)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
.contentType(MediaType.APPLICATION_JSON))
|
||||||
|
.andExpect(status().isNoContent());
|
||||||
|
|
||||||
|
mockMvc.perform(post("/projects/{projectId}/employees/{employeeId}", project2.getId(), 312)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
.contentType(MediaType.APPLICATION_JSON))
|
||||||
|
.andExpect(status().isConflict());
|
||||||
|
}
|
||||||
|
|
||||||
private String getBearerToken() {
|
private String getBearerToken() {
|
||||||
String url = "https://keycloak.szut.dev/auth/realms/szut/protocol/openid-connect/token";
|
String url = "https://keycloak.szut.dev/auth/realms/szut/protocol/openid-connect/token";
|
||||||
|
|
||||||
|
@ -7,11 +7,17 @@ import org.junit.jupiter.api.Test;
|
|||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.*;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
|
import org.springframework.util.LinkedMultiValueMap;
|
||||||
|
import org.springframework.util.MultiValueMap;
|
||||||
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Arrays;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
@ -22,11 +28,14 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@AutoConfigureMockMvc(addFilters = false)
|
@AutoConfigureMockMvc(addFilters = false)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
||||||
class CreateProjectActionTest {
|
class CreateProjectActionTest {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MockMvc mockMvc;
|
private MockMvc mockMvc;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectRepository projectRepository;
|
private ProjectRepository projectRepository;
|
||||||
|
@Autowired
|
||||||
|
private RestTemplate restTemplate;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void createProjectTest() throws Exception {
|
void createProjectTest() throws Exception {
|
||||||
@ -34,7 +43,7 @@ class CreateProjectActionTest {
|
|||||||
{
|
{
|
||||||
"name": "name",
|
"name": "name",
|
||||||
"leading_employee": 1,
|
"leading_employee": 1,
|
||||||
"employees": [2, 3],
|
"employees": [312],
|
||||||
"contractor": 4,
|
"contractor": 4,
|
||||||
"contractor_name": "Peter File",
|
"contractor_name": "Peter File",
|
||||||
"comment": "goal of project",
|
"comment": "goal of project",
|
||||||
@ -44,12 +53,15 @@ class CreateProjectActionTest {
|
|||||||
""";
|
""";
|
||||||
|
|
||||||
final String contentAsString = this.mockMvc.perform(
|
final String contentAsString = this.mockMvc.perform(
|
||||||
post("/projects").content(content).contentType(MediaType.APPLICATION_JSON)
|
post("/projects")
|
||||||
|
.content(content)
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
)
|
)
|
||||||
.andExpect(status().isCreated())
|
.andExpect(status().isCreated())
|
||||||
.andExpect(jsonPath("name", is("name")))
|
.andExpect(jsonPath("name", is("name")))
|
||||||
.andExpect(jsonPath("leading_employee", is(1)))
|
.andExpect(jsonPath("leading_employee", is(1)))
|
||||||
.andExpect(jsonPath("employees", is(Arrays.asList(2, 3))))
|
.andExpect(jsonPath("employees", is(List.of(312))))
|
||||||
.andExpect(jsonPath("contractor", is(4)))
|
.andExpect(jsonPath("contractor", is(4)))
|
||||||
.andExpect(jsonPath("contractor_name", is("Peter File")))
|
.andExpect(jsonPath("contractor_name", is("Peter File")))
|
||||||
.andExpect(jsonPath("comment", is("goal of project")))
|
.andExpect(jsonPath("comment", is("goal of project")))
|
||||||
@ -70,4 +82,155 @@ class CreateProjectActionTest {
|
|||||||
assertThat(project.get().getStartDate()).isEqualTo(LocalDate.of(2000, 1, 1));
|
assertThat(project.get().getStartDate()).isEqualTo(LocalDate.of(2000, 1, 1));
|
||||||
assertThat(project.get().getPlannedEndDate()).isEqualTo(LocalDate.of(2001, 1, 1));
|
assertThat(project.get().getPlannedEndDate()).isEqualTo(LocalDate.of(2001, 1, 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createProjectShouldReturnConflictResponseOnConflictingProjects() throws Exception {
|
||||||
|
String content = """
|
||||||
|
{
|
||||||
|
"name": "name",
|
||||||
|
"leading_employee": 1,
|
||||||
|
"employees": [312],
|
||||||
|
"contractor": 4,
|
||||||
|
"contractor_name": "Peter File",
|
||||||
|
"comment": "goal of project",
|
||||||
|
"start_date": "01.01.2000",
|
||||||
|
"planned_end_date": "01.01.2001"
|
||||||
|
}
|
||||||
|
""";
|
||||||
|
|
||||||
|
this.mockMvc.perform(
|
||||||
|
post("/projects")
|
||||||
|
.content(content)
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
)
|
||||||
|
.andExpect(status().isCreated());
|
||||||
|
|
||||||
|
this.mockMvc.perform(
|
||||||
|
post("/projects")
|
||||||
|
.content(content)
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
)
|
||||||
|
.andExpect(status().isConflict());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createProjectWithPastStartDate() throws Exception {
|
||||||
|
String content = """
|
||||||
|
{
|
||||||
|
"name": "past project",
|
||||||
|
"leading_employee": 1,
|
||||||
|
"employees": [312],
|
||||||
|
"contractor": 4,
|
||||||
|
"contractor_name": "Past Contractor",
|
||||||
|
"comment": "past project",
|
||||||
|
"start_date": "01.01.1990",
|
||||||
|
"planned_end_date": "01.01.1991"
|
||||||
|
}
|
||||||
|
""";
|
||||||
|
|
||||||
|
this.mockMvc.perform(
|
||||||
|
post("/projects")
|
||||||
|
.content(content)
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
)
|
||||||
|
.andExpect(status().isCreated())
|
||||||
|
.andExpect(jsonPath("name", is("past project")))
|
||||||
|
.andExpect(jsonPath("start_date", is("01.01.1990")))
|
||||||
|
.andExpect(jsonPath("planned_end_date", is("01.01.1991")));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createProjectWithFutureStartDate() throws Exception {
|
||||||
|
String content = """
|
||||||
|
{
|
||||||
|
"name": "future project",
|
||||||
|
"leading_employee": 1,
|
||||||
|
"employees": [312],
|
||||||
|
"contractor": 4,
|
||||||
|
"contractor_name": "Future Contractor",
|
||||||
|
"comment": "future project",
|
||||||
|
"start_date": "01.01.2100",
|
||||||
|
"planned_end_date": "01.01.2101"
|
||||||
|
}
|
||||||
|
""";
|
||||||
|
|
||||||
|
this.mockMvc.perform(
|
||||||
|
post("/projects")
|
||||||
|
.content(content)
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
)
|
||||||
|
.andExpect(status().isCreated())
|
||||||
|
.andExpect(jsonPath("name", is("future project")))
|
||||||
|
.andExpect(jsonPath("start_date", is("01.01.2100")))
|
||||||
|
.andExpect(jsonPath("planned_end_date", is("01.01.2101")));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createProjectWithOverlappingDates() throws Exception {
|
||||||
|
String content1 = """
|
||||||
|
{
|
||||||
|
"name": "project 1",
|
||||||
|
"leading_employee": 1,
|
||||||
|
"employees": [312],
|
||||||
|
"contractor": 4,
|
||||||
|
"contractor_name": "Contractor 1",
|
||||||
|
"comment": "project 1",
|
||||||
|
"start_date": "01.01.2022",
|
||||||
|
"planned_end_date": "01.01.2023"
|
||||||
|
}
|
||||||
|
""";
|
||||||
|
|
||||||
|
String content2 = """
|
||||||
|
{
|
||||||
|
"name": "project 2",
|
||||||
|
"leading_employee": 1,
|
||||||
|
"employees": [312],
|
||||||
|
"contractor": 4,
|
||||||
|
"contractor_name": "Contractor 2",
|
||||||
|
"comment": "project 2",
|
||||||
|
"start_date": "01.06.2022",
|
||||||
|
"planned_end_date": "01.06.2023"
|
||||||
|
}
|
||||||
|
""";
|
||||||
|
|
||||||
|
this.mockMvc.perform(
|
||||||
|
post("/projects")
|
||||||
|
.content(content1)
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
)
|
||||||
|
.andExpect(status().isCreated());
|
||||||
|
|
||||||
|
this.mockMvc.perform(
|
||||||
|
post("/projects")
|
||||||
|
.content(content2)
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.header(HttpHeaders.AUTHORIZATION, getBearerToken())
|
||||||
|
)
|
||||||
|
.andExpect(status().isConflict());
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getBearerToken() {
|
||||||
|
String url = "https://keycloak.szut.dev/auth/realms/szut/protocol/openid-connect/token";
|
||||||
|
|
||||||
|
HttpHeaders headers = new HttpHeaders();
|
||||||
|
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
|
||||||
|
|
||||||
|
MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
|
||||||
|
map.add("grant_type", "password");
|
||||||
|
map.add("client_id", "employee-management-service");
|
||||||
|
map.add("username", "user");
|
||||||
|
map.add("password", "test");
|
||||||
|
|
||||||
|
HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(map, headers);
|
||||||
|
|
||||||
|
ResponseEntity<Map> response = this.restTemplate.exchange(url, HttpMethod.POST, request, Map.class);
|
||||||
|
|
||||||
|
return Objects.requireNonNull(response.getBody()).get("access_token").toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.http.*;
|
import org.springframework.http.*;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
import org.springframework.util.LinkedMultiValueMap;
|
import org.springframework.util.LinkedMultiValueMap;
|
||||||
import org.springframework.util.MultiValueMap;
|
import org.springframework.util.MultiValueMap;
|
||||||
@ -23,6 +24,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@AutoConfigureMockMvc(addFilters = false)
|
@AutoConfigureMockMvc(addFilters = false)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
||||||
class GetEmployeesFromProjectTest {
|
class GetEmployeesFromProjectTest {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MockMvc mockMvc;
|
private MockMvc mockMvc;
|
||||||
|
@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test;
|
|||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@ -18,6 +19,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@AutoConfigureMockMvc(addFilters = false)
|
@AutoConfigureMockMvc(addFilters = false)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
||||||
class GetProjectActionTest {
|
class GetProjectActionTest {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MockMvc mockMvc;
|
private MockMvc mockMvc;
|
||||||
|
@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.http.*;
|
import org.springframework.http.*;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
import org.springframework.util.LinkedMultiValueMap;
|
import org.springframework.util.LinkedMultiValueMap;
|
||||||
import org.springframework.util.MultiValueMap;
|
import org.springframework.util.MultiValueMap;
|
||||||
@ -23,6 +24,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@AutoConfigureMockMvc(addFilters = false)
|
@AutoConfigureMockMvc(addFilters = false)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
||||||
class GetProjectsFromEmployeeTest {
|
class GetProjectsFromEmployeeTest {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MockMvc mockMvc;
|
private MockMvc mockMvc;
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
package de.szut.lf8_starter.integration.project;
|
|
||||||
|
|
||||||
import de.szut.lf8_starter.project.ProjectRepository;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
|
||||||
import org.springframework.boot.test.web.client.TestRestTemplate;
|
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
|
||||||
|
|
||||||
|
|
||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
|
||||||
|
|
||||||
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
|
|
||||||
@AutoConfigureMockMvc(addFilters = true)
|
|
||||||
class ProjectFindAllNotAuthenticated {
|
|
||||||
@Autowired
|
|
||||||
private ProjectRepository projectRepository;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private MockMvc mockMvc;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private TestRestTemplate restTemplate;
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void findAllProjects() throws Exception {
|
|
||||||
this.mockMvc.perform(get("/projects"))
|
|
||||||
.andExpect(status().isUnauthorized());
|
|
||||||
}
|
|
||||||
}
|
|
@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test;
|
|||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@ -18,6 +19,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|||||||
|
|
||||||
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
|
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
|
||||||
@AutoConfigureMockMvc(addFilters = false)
|
@AutoConfigureMockMvc(addFilters = false)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
||||||
class ProjectFindAllSuccessTest {
|
class ProjectFindAllSuccessTest {
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectRepository projectRepository;
|
private ProjectRepository projectRepository;
|
||||||
|
4
src/test/java/de/szut/lf8_starter/integration/project/RemoveEmployeeFromProjectIntegrationTest.java
4
src/test/java/de/szut/lf8_starter/integration/project/RemoveEmployeeFromProjectIntegrationTest.java
@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.http.*;
|
import org.springframework.http.*;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
import org.springframework.util.LinkedMultiValueMap;
|
import org.springframework.util.LinkedMultiValueMap;
|
||||||
import org.springframework.util.MultiValueMap;
|
import org.springframework.util.MultiValueMap;
|
||||||
@ -17,11 +18,12 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@AutoConfigureMockMvc(addFilters = false)
|
@AutoConfigureMockMvc(addFilters = false)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
||||||
class RemoveEmployeeFromProjectIntegrationTest {
|
class RemoveEmployeeFromProjectIntegrationTest {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MockMvc mockMvc;
|
private MockMvc mockMvc;
|
||||||
|
@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test;
|
|||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@ -17,6 +18,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@AutoConfigureMockMvc(addFilters = false)
|
@AutoConfigureMockMvc(addFilters = false)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
||||||
class RemoveProjectActionTest {
|
class RemoveProjectActionTest {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MockMvc mockMvc;
|
private MockMvc mockMvc;
|
||||||
|
@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@ -23,6 +24,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@AutoConfigureMockMvc(addFilters = false)
|
@AutoConfigureMockMvc(addFilters = false)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
||||||
class UpdateProjectActionTest {
|
class UpdateProjectActionTest {
|
||||||
@Autowired
|
@Autowired
|
||||||
private MockMvc mockMvc;
|
private MockMvc mockMvc;
|
||||||
|
6
src/test/resources/application-test.properties
Normal file
6
src/test/resources/application-test.properties
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
|
||||||
|
spring.datasource.driverClassName=org.h2.Driver
|
||||||
|
spring.datasource.username=sa
|
||||||
|
spring.datasource.password=password
|
||||||
|
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
|
||||||
|
spring.jpa.hibernate.ddl-auto=create-drop
|
Loading…
Reference in New Issue
Block a user