PMT-26 refactor GetAllEmployeesByProjectTest.java

api/pmt.yml

@@ -250,37 +250,6 @@ paths:
         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"

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

@@ -1,11 +1,12 @@
 package de.hmmh.pmt;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import de.hmmh.pmt.db.*;
+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.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;
@@ -143,17 +144,6 @@ 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)) {

src/test/java/de/hmmh/pmt/IntegrationTest.java

@@ -165,18 +165,12 @@ public abstract class IntegrationTest {
         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;
     }

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

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