SZUT/ProjectManagmentTool
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity Actions

story/PMT-27-mitarbeiter-aus-einem-projekt #17

Merged
SZUT-Ole merged 7 commits from story/PMT-27-mitarbeiter-aus-einem-projekt into trunk 2024-10-23 10:48:09 +00:00
Conversation 0 Commits 7 Files changed 5 +27 -4
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 967946bee2 - Show all commits

31
src/main/java/de/hmmh/pmt/ApiController.java
View file

@ -1,12 +1,11 @@
package de.hmmh.pmt; package de.hmmh.pmt;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import de.hmmh.pmt.db.Allocation;
import de.hmmh.pmt.db.AllocationRepository; import de.hmmh.pmt.db.*;
import de.hmmh.pmt.db.Project;
import de.hmmh.pmt.db.ProjectRepository;
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.Mapper; import de.hmmh.pmt.util.Mapper;
@ -143,4 +142,28 @@ public class ApiController implements DefaultApi {
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} }
@Override
public ResponseEntity<Void> removeEmployeeFromProject(Long id, Long employeeId){
if (!projectRepository.existsById(id)) {
return ResponseEntity.notFound().build();
}
EmployeeResponseDTO employee;
try {
employee = apiClientFactory.getEmployeeApi().findById(employeeId);
} 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);
}
Allocation allocation = allocationRepository.findById(id);
if (allocation.getEmployeeId().equals(employeeId)) {
allocationRepository.delete(allocation);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
} }