Compare commits
No commits in common. "cec89e27667535af4d9b120038ad1579773848e9" and "b9a1329a4edf905d544bdda559fd8ae9044b59a7" have entirely different histories.
cec89e2766
...
b9a1329a4e
10 changed files with 60 additions and 432 deletions
79
api/pmt.yml
79
api/pmt.yml
|
@ -46,25 +46,6 @@ components:
|
||||||
plannedEnd:
|
plannedEnd:
|
||||||
type: string
|
type: string
|
||||||
format: date-time
|
format: date-time
|
||||||
UpdateProjectDTO:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
goal:
|
|
||||||
type: string
|
|
||||||
customerId:
|
|
||||||
type: integer
|
|
||||||
format: int64
|
|
||||||
administratorId:
|
|
||||||
type: integer
|
|
||||||
format: int64
|
|
||||||
start:
|
|
||||||
type: string
|
|
||||||
format: date-time
|
|
||||||
plannedEnd:
|
|
||||||
type: string
|
|
||||||
format: date-time
|
|
||||||
CreatedProjectDTO:
|
CreatedProjectDTO:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
@ -211,7 +192,8 @@ paths:
|
||||||
$ref: "#/components/responses/InternalError"
|
$ref: "#/components/responses/InternalError"
|
||||||
503:
|
503:
|
||||||
$ref: "#/components/responses/ServiceUnavailable"
|
$ref: "#/components/responses/ServiceUnavailable"
|
||||||
|
|
||||||
|
|
||||||
/project/{id}:
|
/project/{id}:
|
||||||
post:
|
post:
|
||||||
operationId: "addEmployee"
|
operationId: "addEmployee"
|
||||||
|
@ -243,36 +225,7 @@ paths:
|
||||||
$ref: "#/components/responses/InternalError"
|
$ref: "#/components/responses/InternalError"
|
||||||
503:
|
503:
|
||||||
$ref: "#/components/responses/ServiceUnavailable"
|
$ref: "#/components/responses/ServiceUnavailable"
|
||||||
put:
|
|
||||||
operationId: "updateProject"
|
|
||||||
description: "Updates a project"
|
|
||||||
parameters:
|
|
||||||
- in: path
|
|
||||||
name: id
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int64
|
|
||||||
required: true
|
|
||||||
requestBody:
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/UpdateProjectDTO"
|
|
||||||
responses:
|
|
||||||
204:
|
|
||||||
description: "Project updated successfully"
|
|
||||||
401:
|
|
||||||
$ref: "#/components/responses/Unauthorized"
|
|
||||||
404:
|
|
||||||
$ref: "#/components/responses/NotFound"
|
|
||||||
409:
|
|
||||||
$ref: "#/components/responses/Conflict"
|
|
||||||
422:
|
|
||||||
$ref: "#/components/responses/UnprocessableContent"
|
|
||||||
500:
|
|
||||||
$ref: "#/components/responses/InternalError"
|
|
||||||
503:
|
|
||||||
$ref: "#/components/responses/ServiceUnavailable"
|
|
||||||
delete:
|
delete:
|
||||||
operationId: "deleteProject"
|
operationId: "deleteProject"
|
||||||
description: "Delete a specific Project"
|
description: "Delete a specific Project"
|
||||||
|
@ -289,27 +242,11 @@ paths:
|
||||||
401:
|
401:
|
||||||
$ref: "#/components/responses/Unauthorized"
|
$ref: "#/components/responses/Unauthorized"
|
||||||
404:
|
404:
|
||||||
$ref: "#/components/responses/NotFound"
|
description: "Project not found"
|
||||||
500:
|
content:
|
||||||
$ref: "#/components/responses/InternalError"
|
text/plain:
|
||||||
/project/{id}/completed:
|
schema:
|
||||||
post:
|
type: string
|
||||||
operationId: "completeProject"
|
|
||||||
description: "Complete a specific project"
|
|
||||||
parameters:
|
|
||||||
- in: path
|
|
||||||
name: id
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int64
|
|
||||||
required: true
|
|
||||||
responses:
|
|
||||||
204:
|
|
||||||
description: "Completed"
|
|
||||||
401:
|
|
||||||
$ref: "#/components/responses/Unauthorized"
|
|
||||||
404:
|
|
||||||
$ref: "#/components/responses/NotFound"
|
|
||||||
500:
|
500:
|
||||||
$ref: "#/components/responses/InternalError"
|
$ref: "#/components/responses/InternalError"
|
||||||
|
|
||||||
|
|
|
@ -5,20 +5,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import de.hmmh.pmt.db.*;
|
import de.hmmh.pmt.db.*;
|
||||||
import de.hmmh.pmt.dtos.*;
|
import de.hmmh.pmt.dtos.*;
|
||||||
import de.hmmh.pmt.employee.ApiClientFactory;
|
import de.hmmh.pmt.employee.ApiClientFactory;
|
||||||
|
import de.hmmh.pmt.employee.api.EmployeeControllerApi;
|
||||||
import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
|
import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
|
||||||
import de.hmmh.pmt.oas.DefaultApi;
|
import de.hmmh.pmt.oas.DefaultApi;
|
||||||
import de.hmmh.pmt.util.ApiTools;
|
|
||||||
import de.hmmh.pmt.util.Mapper;
|
import de.hmmh.pmt.util.Mapper;
|
||||||
import de.hmmh.pmt.util.Validator;
|
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.client.HttpClientErrorException;
|
||||||
import org.springframework.web.client.RestClientException;
|
import org.springframework.web.client.RestClientException;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.ZoneOffset;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@ -30,10 +30,6 @@ public class ApiController implements DefaultApi {
|
||||||
@Autowired
|
@Autowired
|
||||||
private ApiClientFactory apiClientFactory;
|
private ApiClientFactory apiClientFactory;
|
||||||
@Autowired
|
@Autowired
|
||||||
private Validator validator;
|
|
||||||
@Autowired
|
|
||||||
private ApiTools apiTools;
|
|
||||||
@Autowired
|
|
||||||
private ProjectRepository projectRepository;
|
private ProjectRepository projectRepository;
|
||||||
@Autowired
|
@Autowired
|
||||||
AllocationRepository allocationRepository;
|
AllocationRepository allocationRepository;
|
||||||
|
@ -72,61 +68,26 @@ public class ApiController implements DefaultApi {
|
||||||
return ResponseEntity.ok(response);
|
return ResponseEntity.ok(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public ResponseEntity<Void> updateProject(Long id, UpdateProjectDTO body) {
|
|
||||||
Optional<Project> optionalProject = projectRepository.findById(id);
|
|
||||||
if (optionalProject.isEmpty()) {
|
|
||||||
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
Project project = optionalProject.get();
|
|
||||||
|
|
||||||
if (!project.getName().equals(body.getName()) && projectRepository.existsByName(body.getName())) {
|
|
||||||
return new ResponseEntity<>(HttpStatus.CONFLICT);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (project.getAdministratorId().equals(body.getAdministratorId())) {
|
|
||||||
HttpStatus status = apiTools.checkEmployeeExists(body.getAdministratorId()).status();
|
|
||||||
if (status != HttpStatus.OK) {
|
|
||||||
return new ResponseEntity<>(status);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Project finalProject = mapper.map(project, body);
|
|
||||||
if (!validator.isValidProject(project)) {
|
|
||||||
return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (validator.areAllocationTimeRangesOverlapping(
|
|
||||||
project.getStart(),
|
|
||||||
project.getPlannedEnd(),
|
|
||||||
allocationRepository
|
|
||||||
.findAllByProjectId(finalProject.getId())
|
|
||||||
.stream()
|
|
||||||
.map(Allocation::getEmployeeId)
|
|
||||||
.flatMap(employeeId -> allocationRepository.findAllByEmployeeId(employeeId).stream())
|
|
||||||
.filter(employeeAllocation -> employeeAllocation.getProjectId().equals(finalProject.getId()))
|
|
||||||
.toList()
|
|
||||||
)) {
|
|
||||||
return new ResponseEntity<>(HttpStatus.CONFLICT);
|
|
||||||
}
|
|
||||||
|
|
||||||
projectRepository.save(project);
|
|
||||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResponseEntity<CreatedProjectDTO> createProject(CreateProjectDTO body) {
|
public ResponseEntity<CreatedProjectDTO> createProject(CreateProjectDTO body) {
|
||||||
if (projectRepository.existsByName(body.getName())) {
|
if (projectRepository.existsByName(body.getName())) {
|
||||||
return new ResponseEntity<>(HttpStatus.CONFLICT);
|
return new ResponseEntity<>(HttpStatus.CONFLICT);
|
||||||
}
|
}
|
||||||
|
|
||||||
HttpStatus status = apiTools.checkEmployeeExists(body.getAdministratorId()).status();
|
try {
|
||||||
if (status != HttpStatus.OK) {
|
apiClientFactory.getEmployeeApi().findById(body.getAdministratorId());
|
||||||
return new ResponseEntity<>(status);
|
} catch (HttpClientErrorException exception) {
|
||||||
|
return new ResponseEntity<>(
|
||||||
|
exception.getStatusCode().equals(HttpStatus.NOT_FOUND)
|
||||||
|
? HttpStatus.NOT_FOUND
|
||||||
|
: HttpStatus.SERVICE_UNAVAILABLE
|
||||||
|
);
|
||||||
|
} catch (RestClientException exception) {
|
||||||
|
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
|
||||||
}
|
}
|
||||||
|
|
||||||
Project project = mapper.map(body);
|
Project project = mapper.map(body);
|
||||||
if (!validator.isValidProject(project)) {
|
if (!project.isValid()) {
|
||||||
return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
|
return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
|
||||||
}
|
}
|
||||||
projectRepository.save(project);
|
projectRepository.save(project);
|
||||||
|
@ -143,13 +104,16 @@ public class ApiController implements DefaultApi {
|
||||||
}
|
}
|
||||||
Project project = optionalProject.get();
|
Project project = optionalProject.get();
|
||||||
|
|
||||||
|
EmployeeResponseDTO employee;
|
||||||
ApiTools.CheckEmployeeRecord employeeRecord = apiTools.checkEmployeeExists(body.getEmployeeId());
|
try {
|
||||||
if (employeeRecord.status() != HttpStatus.OK) {
|
employee = apiClientFactory.getEmployeeApi().findById(body.getEmployeeId());
|
||||||
return new ResponseEntity<>(employeeRecord.status());
|
} catch (HttpClientErrorException exception) {
|
||||||
|
return new ResponseEntity<>(exception.getStatusCode().equals(HttpStatus.NOT_FOUND)
|
||||||
|
? HttpStatus.NOT_FOUND
|
||||||
|
: HttpStatus.SERVICE_UNAVAILABLE);
|
||||||
|
} catch (RestClientException exception) {
|
||||||
|
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
|
||||||
}
|
}
|
||||||
EmployeeResponseDTO employee = employeeRecord.employee();
|
|
||||||
|
|
||||||
|
|
||||||
if (employee.getSkillSet()
|
if (employee.getSkillSet()
|
||||||
.stream()
|
.stream()
|
||||||
|
@ -157,11 +121,16 @@ public class ApiController implements DefaultApi {
|
||||||
return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
|
return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (validator.areAllocationTimeRangesOverlapping(
|
long start = project.getStart().toEpochSecond(ZoneOffset.UTC);
|
||||||
project.getStart(),
|
long plannedEnd = project.getPlannedEnd().toEpochSecond(ZoneOffset.UTC);
|
||||||
project.getPlannedEnd(),
|
List<Allocation> allocations = allocationRepository.findAllByEmployeeId(body.getEmployeeId());
|
||||||
allocationRepository.findAllByEmployeeId(body.getEmployeeId())
|
if (allocations.stream()
|
||||||
)) {
|
.map(Allocation::getProject)
|
||||||
|
.anyMatch(allocatedProject -> {
|
||||||
|
long allocatedStart = allocatedProject.getStart().toEpochSecond(ZoneOffset.UTC);
|
||||||
|
long allocatedPlannedEnd = allocatedProject.getPlannedEnd().toEpochSecond(ZoneOffset.UTC);
|
||||||
|
return Math.max(start, allocatedStart) <= Math.min(plannedEnd, allocatedPlannedEnd);
|
||||||
|
})) {
|
||||||
return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
|
return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -174,19 +143,6 @@ public class ApiController implements DefaultApi {
|
||||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public ResponseEntity<Void> completeProject(Long id) {
|
|
||||||
Optional<Project> optionalProject = projectRepository.findById(id);
|
|
||||||
if (optionalProject.isEmpty()) {
|
|
||||||
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
Project project = optionalProject.get();
|
|
||||||
|
|
||||||
project.setRealEnd(LocalDateTime.now());
|
|
||||||
projectRepository.save(project);
|
|
||||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResponseEntity<Void> removeEmployeeFromProject(Long id, Long employeeId){
|
public ResponseEntity<Void> removeEmployeeFromProject(Long id, Long employeeId){
|
||||||
Optional<Allocation> allocation = allocationRepository.findById(new AllocationId(id, employeeId));
|
Optional<Allocation> allocation = allocationRepository.findById(new AllocationId(id, employeeId));
|
||||||
|
|
|
@ -47,4 +47,16 @@ public class Project {
|
||||||
private LocalDateTime plannedEnd;
|
private LocalDateTime plannedEnd;
|
||||||
|
|
||||||
private LocalDateTime realEnd; // Cant be named just "end" because it's and SQL Keyword
|
private LocalDateTime realEnd; // Cant be named just "end" because it's and SQL Keyword
|
||||||
|
|
||||||
|
|
||||||
|
public boolean isValid() {
|
||||||
|
Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
|
||||||
|
Set<ConstraintViolation<Project>> violations = validator.validate(this);
|
||||||
|
|
||||||
|
return violations.isEmpty() &&
|
||||||
|
plannedEnd.isAfter(start) &&
|
||||||
|
(realEnd == null || realEnd.isAfter(start));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
package de.hmmh.pmt.util;
|
|
||||||
|
|
||||||
import de.hmmh.pmt.employee.ApiClientFactory;
|
|
||||||
import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import org.springframework.web.client.HttpClientErrorException;
|
|
||||||
import org.springframework.web.client.RestClientException;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
public class ApiTools {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ApiClientFactory apiClientFactory;
|
|
||||||
|
|
||||||
public record CheckEmployeeRecord(EmployeeResponseDTO employee, HttpStatus status) {}
|
|
||||||
public CheckEmployeeRecord checkEmployeeExists(long id) {
|
|
||||||
EmployeeResponseDTO employee;
|
|
||||||
try {
|
|
||||||
employee =apiClientFactory.getEmployeeApi().findById(id);
|
|
||||||
} catch (HttpClientErrorException exception) {
|
|
||||||
return new CheckEmployeeRecord(
|
|
||||||
null,
|
|
||||||
exception.getStatusCode().equals(HttpStatus.NOT_FOUND)
|
|
||||||
? HttpStatus.NOT_FOUND
|
|
||||||
: HttpStatus.SERVICE_UNAVAILABLE
|
|
||||||
);
|
|
||||||
} catch (RestClientException exception) {
|
|
||||||
return new CheckEmployeeRecord(null, HttpStatus.INTERNAL_SERVER_ERROR);
|
|
||||||
}
|
|
||||||
return new CheckEmployeeRecord(employee, HttpStatus.OK);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -7,7 +7,6 @@ import de.hmmh.pmt.dtos.Employee;
|
||||||
import de.hmmh.pmt.dtos.Qualification ;
|
import de.hmmh.pmt.dtos.Qualification ;
|
||||||
import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
|
import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
|
||||||
import de.hmmh.pmt.employee.dtos.QualificationGetDTO;
|
import de.hmmh.pmt.employee.dtos.QualificationGetDTO;
|
||||||
import de.hmmh.pmt.dtos.UpdateProjectDTO;
|
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -62,14 +61,4 @@ public class Mapper {
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public Project map(Project project, UpdateProjectDTO dto) {
|
|
||||||
project.setName(dto.getName());
|
|
||||||
project.setGoal(dto.getGoal());
|
|
||||||
project.setCustomerId(dto.getCustomerId());
|
|
||||||
project.setAdministratorId(dto.getAdministratorId());
|
|
||||||
project.setStart(dto.getStart());
|
|
||||||
project.setPlannedEnd(dto.getPlannedEnd());
|
|
||||||
return project;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
package de.hmmh.pmt.util;
|
|
||||||
|
|
||||||
import de.hmmh.pmt.db.Allocation;
|
|
||||||
import de.hmmh.pmt.db.Project;
|
|
||||||
import jakarta.validation.ConstraintViolation;
|
|
||||||
import jakarta.validation.Validation;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.time.ZoneOffset;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
public class Validator {
|
|
||||||
|
|
||||||
public boolean isValidProject(Project project) {
|
|
||||||
jakarta.validation.Validator validator = Validation
|
|
||||||
.buildDefaultValidatorFactory()
|
|
||||||
.getValidator();
|
|
||||||
Set<ConstraintViolation<Project>> violations = validator.validate(project);
|
|
||||||
|
|
||||||
LocalDateTime start = project.getStart();
|
|
||||||
LocalDateTime plannedEnd = project.getPlannedEnd();
|
|
||||||
LocalDateTime realEnd = project.getRealEnd();
|
|
||||||
|
|
||||||
return violations.isEmpty() &&
|
|
||||||
plannedEnd.isAfter(start) &&
|
|
||||||
(realEnd == null || realEnd.isAfter(start));
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean areAllocationTimeRangesOverlapping(
|
|
||||||
LocalDateTime start,
|
|
||||||
LocalDateTime plannedEnd,
|
|
||||||
List<Allocation> allocations
|
|
||||||
){
|
|
||||||
long startUnix = start.toEpochSecond(ZoneOffset.UTC);
|
|
||||||
long plannedEndUnix = plannedEnd.toEpochSecond(ZoneOffset.UTC);
|
|
||||||
return allocations.stream()
|
|
||||||
.map(Allocation::getProject)
|
|
||||||
.anyMatch(allocatedProject -> {
|
|
||||||
long allocatedStart = allocatedProject.getStart().toEpochSecond(ZoneOffset.UTC);
|
|
||||||
long allocatedPlannedEnd = allocatedProject.getPlannedEnd().toEpochSecond(ZoneOffset.UTC);
|
|
||||||
return Math.max(startUnix, allocatedStart) <= Math.min(plannedEndUnix, allocatedPlannedEnd);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,7 +1,12 @@
|
||||||
<FindBugsFilter xmlns="https://raw.githubusercontent.com/spotbugs/spotbugs/4.8.6/spotbugs/etc/findbugsfilter.xsd">
|
<FindBugsFilter xmlns="https://raw.githubusercontent.com/spotbugs/spotbugs/4.8.6/spotbugs/etc/findbugsfilter.xsd">
|
||||||
<Match>
|
<Match>
|
||||||
<Source name="~.*"/>
|
<!-- We Want This Exposure of Resources the Way it is for our usage -->
|
||||||
<Bug code="EI,EI2"/> <!-- We don't care about these codes -->
|
<Class name="de.hmmh.pmt.employee.ApiClientFactory"/>
|
||||||
|
<Bug code="M,V,EI"/>
|
||||||
|
</Match>
|
||||||
|
<Match>
|
||||||
|
<Class name="de.hmmh.pmt.db.Allocation"/>
|
||||||
|
<Bug code="M,V,EI,EI2"/>
|
||||||
</Match>
|
</Match>
|
||||||
<Match>
|
<Match>
|
||||||
<!--Ignore Auto Generated Code -->
|
<!--Ignore Auto Generated Code -->
|
||||||
|
|
|
@ -114,15 +114,6 @@ public abstract class IntegrationTest {
|
||||||
medicalResearchProject.setPlannedEnd(LocalDateTime.of(2026, 8, 20, 9, 15));
|
medicalResearchProject.setPlannedEnd(LocalDateTime.of(2026, 8, 20, 9, 15));
|
||||||
projects.put("medical-research", medicalResearchProject);
|
projects.put("medical-research", medicalResearchProject);
|
||||||
|
|
||||||
Project futureResearchProject = new Project();
|
|
||||||
futureResearchProject.setName("What is the Future?");
|
|
||||||
futureResearchProject.setGoal("Develop new Future (possibly through Genocide).");
|
|
||||||
futureResearchProject.setCustomerId(95L);
|
|
||||||
futureResearchProject.setAdministratorId(TEST_EMPLOYEE_A_ID);
|
|
||||||
futureResearchProject.setStart(LocalDateTime.of(2077, 1, 12, 2, 0));
|
|
||||||
futureResearchProject.setPlannedEnd(LocalDateTime.of(3000, 6, 19, 4, 0));
|
|
||||||
projects.put("future-research", futureResearchProject);
|
|
||||||
|
|
||||||
Project overlappingProjectA = new Project();
|
Project overlappingProjectA = new Project();
|
||||||
overlappingProjectA.setName("Overlap A");
|
overlappingProjectA.setName("Overlap A");
|
||||||
overlappingProjectA.setGoal("A Project That Overlaps with another one for Testing");
|
overlappingProjectA.setGoal("A Project That Overlaps with another one for Testing");
|
||||||
|
@ -186,18 +177,6 @@ public abstract class IntegrationTest {
|
||||||
allocation1ToAiResearch.setRole(TEST_QUALIFICATION_A_ID);
|
allocation1ToAiResearch.setRole(TEST_QUALIFICATION_A_ID);
|
||||||
allocations.put("1>ai-research", allocation1ToAiResearch);
|
allocations.put("1>ai-research", allocation1ToAiResearch);
|
||||||
|
|
||||||
Allocation allocation1ToMedical = new Allocation();
|
|
||||||
allocation1ToMedical.setProject(allProjects.get("medical-research"));
|
|
||||||
allocation1ToMedical.setEmployeeId(TEST_EMPLOYEE_A_ID);
|
|
||||||
allocation1ToMedical.setRole(TEST_QUALIFICATION_A_ID);
|
|
||||||
allocations.put("1>medical-research", allocation1ToMedical);
|
|
||||||
|
|
||||||
Allocation allocation1ToFuture = new Allocation();
|
|
||||||
allocation1ToFuture.setProject(allProjects.get("future-research"));
|
|
||||||
allocation1ToFuture.setEmployeeId(TEST_EMPLOYEE_A_ID);
|
|
||||||
allocation1ToFuture.setRole(TEST_QUALIFICATION_A_ID);
|
|
||||||
allocations.put("1>future-research", allocation1ToFuture);
|
|
||||||
|
|
||||||
allocationRepository.saveAllAndFlush(allocations.values());
|
allocationRepository.saveAllAndFlush(allocations.values());
|
||||||
return allocations;
|
return allocations;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
package de.hmmh.pmt.project;
|
|
||||||
|
|
||||||
import de.hmmh.pmt.IntegrationTest;
|
|
||||||
import de.hmmh.pmt.db.Project;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
|
||||||
|
|
||||||
public class CompleteTest extends IntegrationTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void shouldReturnNotFoundWhenProjectDoesntExist() throws Exception {
|
|
||||||
this.mvc
|
|
||||||
.perform(post(baseUri + "/project/0/completed"))
|
|
||||||
.andExpect(status().isNotFound());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void successfullyComplete() throws Exception {
|
|
||||||
|
|
||||||
Map<String, Project> allProjects = createTestProjectData();
|
|
||||||
Project projectToComplete = allProjects.get("medical-research");
|
|
||||||
|
|
||||||
this.mvc
|
|
||||||
.perform(post(baseUri + "/project/" + projectToComplete.getId() + "/completed"))
|
|
||||||
.andExpect(status().isNoContent());
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,137 +0,0 @@
|
||||||
package de.hmmh.pmt.project;
|
|
||||||
|
|
||||||
import de.hmmh.pmt.IntegrationTest;
|
|
||||||
import de.hmmh.pmt.db.Allocation;
|
|
||||||
import de.hmmh.pmt.db.Project;
|
|
||||||
import de.hmmh.pmt.dtos.UpdateProjectDTO;
|
|
||||||
import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
|
|
||||||
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 java.time.LocalDateTime;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
|
||||||
|
|
||||||
public class EditTest extends IntegrationTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void successfullyRenamed() throws Exception {
|
|
||||||
when(this.mockEmployeeApi.findById(Mockito.anyLong()))
|
|
||||||
.thenReturn(new EmployeeResponseDTO());
|
|
||||||
|
|
||||||
Map<String, Project> allProjects = createTestProjectData();
|
|
||||||
Project projectToEdit = allProjects.get("medical-research");
|
|
||||||
|
|
||||||
UpdateProjectDTO dto = getDto(projectToEdit);
|
|
||||||
dto.setName("Mafia Drug Ring");
|
|
||||||
|
|
||||||
this.mvc
|
|
||||||
.perform(getRequest(projectToEdit.getId(), dto))
|
|
||||||
.andExpect(status().isNoContent());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void shouldReturnNotFoundWhenProjectDoesntExist() throws Exception {
|
|
||||||
when(this.mockEmployeeApi.findById(Mockito.anyLong()))
|
|
||||||
.thenReturn(new EmployeeResponseDTO());
|
|
||||||
|
|
||||||
Map<String, Project> allProjects = createTestProjectData();
|
|
||||||
Project projectToEdit = allProjects.get("medical-research");
|
|
||||||
|
|
||||||
UpdateProjectDTO dto = getDto(projectToEdit);
|
|
||||||
|
|
||||||
this.mvc
|
|
||||||
.perform(getRequest(0L, dto))
|
|
||||||
.andExpect(status().isNotFound());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void shouldReturnNotFoundWhenNewAdministratorDoesntExist() throws Exception {
|
|
||||||
when(this.mockEmployeeApi.findById(Mockito.anyLong()))
|
|
||||||
.thenThrow(new HttpClientErrorException(HttpStatus.NOT_FOUND));
|
|
||||||
|
|
||||||
Map<String, Project> allProjects = createTestProjectData();
|
|
||||||
Project projectToEdit = allProjects.get("medical-research");
|
|
||||||
|
|
||||||
UpdateProjectDTO dto = getDto(projectToEdit);
|
|
||||||
|
|
||||||
this.mvc
|
|
||||||
.perform(getRequest(projectToEdit.getId(), dto))
|
|
||||||
.andExpect(status().isNotFound());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void shouldReturnUnprocessableWhenNewTimestampsAreInvalid() throws Exception {
|
|
||||||
when(this.mockEmployeeApi.findById(Mockito.anyLong()))
|
|
||||||
.thenReturn(new EmployeeResponseDTO());
|
|
||||||
|
|
||||||
Map<String, Project> allProjects = createTestProjectData();
|
|
||||||
Project projectToEdit = allProjects.get("medical-research");
|
|
||||||
|
|
||||||
UpdateProjectDTO dto = getDto(projectToEdit);
|
|
||||||
dto.setPlannedEnd(dto.getStart().minusDays(1));
|
|
||||||
|
|
||||||
this.mvc
|
|
||||||
.perform(getRequest(projectToEdit.getId(), dto))
|
|
||||||
.andExpect(status().isUnprocessableEntity());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void shouldReturnConflictWhenUpdateWouldCreateNameConflict() throws Exception {
|
|
||||||
when(this.mockEmployeeApi.findById(Mockito.anyLong()))
|
|
||||||
.thenReturn(new EmployeeResponseDTO());
|
|
||||||
|
|
||||||
Map<String, Project> allProjects = createTestProjectData();
|
|
||||||
Project projectToEdit = allProjects.get("medical-research");
|
|
||||||
|
|
||||||
UpdateProjectDTO dto = getDto(projectToEdit);
|
|
||||||
dto.setName(allProjects.get("renewable-energy").getName());
|
|
||||||
|
|
||||||
this.mvc
|
|
||||||
.perform(getRequest(projectToEdit.getId(), dto))
|
|
||||||
.andExpect(status().isConflict());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void shouldReturnConflictWhenAllocationsWouldConflictAfterUpdate() throws Exception {
|
|
||||||
when(this.mockEmployeeApi.findById(Mockito.anyLong()))
|
|
||||||
.thenReturn(new EmployeeResponseDTO());
|
|
||||||
|
|
||||||
Map<String, Project> allProjects = createTestProjectData();
|
|
||||||
Map<String, Allocation> allAllocations = createTestAllocationData(allProjects);
|
|
||||||
Project projectToEdit = allAllocations.get("1>future-research").getProject();
|
|
||||||
|
|
||||||
UpdateProjectDTO dto = getDto(projectToEdit);
|
|
||||||
dto.setStart(LocalDateTime.of(1970, 1, 1, 0, 0));
|
|
||||||
dto.setStart(LocalDateTime.of(3000, 1, 1, 0, 0));
|
|
||||||
|
|
||||||
this.mvc
|
|
||||||
.perform(getRequest(projectToEdit.getId(), dto))
|
|
||||||
.andExpect(status().isConflict());
|
|
||||||
}
|
|
||||||
|
|
||||||
private UpdateProjectDTO getDto(Project project) {
|
|
||||||
UpdateProjectDTO dto = new UpdateProjectDTO();
|
|
||||||
dto.setName(project.getName());
|
|
||||||
dto.setGoal(project.getGoal());
|
|
||||||
dto.setCustomerId(project.getCustomerId());
|
|
||||||
dto.setAdministratorId(project.getAdministratorId());
|
|
||||||
dto.setStart(project.getStart());
|
|
||||||
dto.setPlannedEnd(project.getPlannedEnd());
|
|
||||||
return dto;
|
|
||||||
}
|
|
||||||
|
|
||||||
private RequestBuilder getRequest(long id, UpdateProjectDTO dto) throws Exception {
|
|
||||||
return MockMvcRequestBuilders
|
|
||||||
.put(baseUri + "/project/" + id)
|
|
||||||
.content(this.objectMapper.writeValueAsString(dto))
|
|
||||||
.contentType(MediaType.APPLICATION_JSON);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in a new issue