Merge pull request 'PMT-37: Alle informationen eines bestimmten Projektes abrufen' (!19) from story/PMT-37-alles-informationen-eines into trunk
Reviewed-on: #19
This commit is contained in:
commit
06360ad1c6
4 changed files with 114 additions and 5 deletions
50
api/pmt.yml
50
api/pmt.yml
|
@ -27,6 +27,31 @@ components:
|
||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
$ref: "#/components/schemas/ProjectInfo"
|
$ref: "#/components/schemas/ProjectInfo"
|
||||||
|
GetAllProjectInfoDTO:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
id:
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
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
|
||||||
|
realEnd:
|
||||||
|
type: string
|
||||||
|
format: date-time
|
||||||
CreateProjectDTO:
|
CreateProjectDTO:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
@ -213,6 +238,31 @@ paths:
|
||||||
$ref: "#/components/responses/ServiceUnavailable"
|
$ref: "#/components/responses/ServiceUnavailable"
|
||||||
|
|
||||||
/project/{id}:
|
/project/{id}:
|
||||||
|
get:
|
||||||
|
operationId: "getProjectInfo"
|
||||||
|
description: "Get a list of all Project Informations"
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: id
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
required: true
|
||||||
|
responses:
|
||||||
|
200:
|
||||||
|
description: "Project Info recieved"
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/GetAllProjectInfoDTO"
|
||||||
|
401:
|
||||||
|
$ref: "#/components/responses/Unauthorized"
|
||||||
|
404:
|
||||||
|
$ref: "#/components/responses/NotFound"
|
||||||
|
500:
|
||||||
|
$ref: "#/components/responses/InternalError"
|
||||||
|
503:
|
||||||
|
$ref: "#/components/responses/ServiceUnavailable"
|
||||||
post:
|
post:
|
||||||
operationId: "addEmployee"
|
operationId: "addEmployee"
|
||||||
description: "Adds an employee to a specific Project"
|
description: "Adds an employee to a specific Project"
|
||||||
|
|
|
@ -72,6 +72,18 @@ public class ApiController implements DefaultApi {
|
||||||
return ResponseEntity.ok(response);
|
return ResponseEntity.ok(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ResponseEntity<GetAllProjectInfoDTO> getProjectInfo(Long id){
|
||||||
|
Optional<Project> optionalProject = projectRepository.findById(id);
|
||||||
|
if (optionalProject.isEmpty()) {
|
||||||
|
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
Project project = optionalProject.get();
|
||||||
|
|
||||||
|
return ResponseEntity.ok(mapper.mapToGet(project));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResponseEntity<Void> updateProject(Long id, UpdateProjectDTO body) {
|
public ResponseEntity<Void> updateProject(Long id, UpdateProjectDTO body) {
|
||||||
Optional<Project> optionalProject = projectRepository.findById(id);
|
Optional<Project> optionalProject = projectRepository.findById(id);
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
package de.hmmh.pmt.util;
|
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.*;
|
||||||
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.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;
|
||||||
|
@ -37,6 +34,19 @@ public class Mapper {
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public GetAllProjectInfoDTO mapToGet(Project project) {
|
||||||
|
GetAllProjectInfoDTO dto = new GetAllProjectInfoDTO();
|
||||||
|
dto.setId(project.getId());
|
||||||
|
dto.setName(project.getName());
|
||||||
|
dto.setGoal(project.getGoal());
|
||||||
|
dto.setCustomerId(project.getCustomerId());
|
||||||
|
dto.setAdministratorId(project.getAdministratorId());
|
||||||
|
dto.setStart(project.getStart());
|
||||||
|
dto.setPlannedEnd(project.getPlannedEnd());
|
||||||
|
dto.setRealEnd(project.getRealEnd());
|
||||||
|
return dto;
|
||||||
|
}
|
||||||
|
|
||||||
public Employee map(EmployeeResponseDTO employeeResponseDTO) {
|
public Employee map(EmployeeResponseDTO employeeResponseDTO) {
|
||||||
Employee dto = new Employee();
|
Employee dto = new Employee();
|
||||||
dto.setId(employeeResponseDTO.getId());
|
dto.setId(employeeResponseDTO.getId());
|
||||||
|
|
37
src/test/java/de/hmmh/pmt/project/GetProjectInfoTest.java
Normal file
37
src/test/java/de/hmmh/pmt/project/GetProjectInfoTest.java
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
package de.hmmh.pmt.project;
|
||||||
|
|
||||||
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import de.hmmh.pmt.IntegrationTest;
|
||||||
|
import de.hmmh.pmt.db.Project;
|
||||||
|
|
||||||
|
public class GetProjectInfoTest extends IntegrationTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void noProject() throws Exception {
|
||||||
|
mvc
|
||||||
|
.perform(get(baseUri + "/project/1"))
|
||||||
|
.andExpect(status().isNotFound());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getProjectInfo() throws Exception {
|
||||||
|
Map<String, Project> allProjects = createTestProjectData();
|
||||||
|
Project spaceStation = allProjects.get("space-station");
|
||||||
|
mvc
|
||||||
|
.perform(get(baseUri + "/project/" +spaceStation.getId()))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(jsonPath("$.id").value(spaceStation.getId()))
|
||||||
|
.andExpect(jsonPath("$.name").value(spaceStation.getName()))
|
||||||
|
.andExpect(jsonPath("$.goal").value(spaceStation.getGoal()))
|
||||||
|
.andExpect(jsonPath("$.customerId").value(spaceStation.getCustomerId()))
|
||||||
|
.andExpect(jsonPath("$.administratorId").value(spaceStation.getAdministratorId()))
|
||||||
|
;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in a new issue