PMT-40 Mapper

api/pmt.yml

@@ -27,31 +27,6 @@ components:
       type: array
       items:
         $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:
       type: object
       properties:
@@ -270,31 +245,6 @@ paths:
           $ref: "#/components/responses/ServiceUnavailable"
 
   /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:
       operationId: "addEmployee"
       description: "Adds an employee to a specific Project"
@@ -466,8 +416,6 @@ paths:
               schema:
                 $ref: "#/components/schemas/EmployeeProjectsDTO"
           description: 'Get a List of all Projects from a specific Employee'
-        401:
-          $ref: "#/components/responses/Unauthorized"
         404:
           $ref: '#/components/responses/NotFound'
         500:

src/main/java/de/hmmh/pmt/ApiController.java

@@ -73,18 +73,6 @@ public class ApiController implements DefaultApi {
         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
     public ResponseEntity<Void> updateProject(Long id, UpdateProjectDTO body) {
         Optional<Project> optionalProject = projectRepository.findById(id);
@@ -241,13 +229,22 @@ public class ApiController implements DefaultApi {
 
     @Override
     public ResponseEntity<EmployeeProjectsDTO> getAListOfAllProjectsFromASpecificEmployee(Long id) {
+        if (!projectRepository.existsById(id)) {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+
+        EmployeeProjectsDTO dto = new EmployeeProjectsDTO();
         List<Allocation> allocationsByEmployee = allocationRepository.findAllByEmployeeId(id);
+        if (allocationsByEmployee.isEmpty()) {
+            return new ResponseEntity<>(dto, HttpStatus.OK);
+        }
 
         Set<Project> projects = allocationsByEmployee.stream()
                 .map(Allocation::getProject)
                 .collect(Collectors.toSet());
 
         EmployeeProjectsDTO response = new EmployeeProjectsDTO();
+
         for (Project project : projects) {
             response.addProjectsItem(mapper.mapProject(project));
         }

src/main/java/de/hmmh/pmt/util/Mapper.java

@@ -1,10 +1,13 @@
 package de.hmmh.pmt.util;
 
 import de.hmmh.pmt.db.Project;
-import de.hmmh.pmt.dtos.*;
+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 de.hmmh.pmt.dtos.UpdateProjectDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -34,19 +37,6 @@ public class Mapper {
         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)  {
         Employee dto = new Employee();
         dto.setId(employeeResponseDTO.getId());

src/test/java/de/hmmh/pmt/project/GetProjectInfoTest.java

@@ -1,37 +0,0 @@
-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()))
-        ;
-
-    }
-
-}