............

src/main/java/africa/semicolon/employeemanagement/data/dto/response/DepartmentResponse.java

@@ -1,7 +1,6 @@
 package africa.semicolon.employeemanagement.data.dto.response;
 
 import africa.semicolon.employeemanagement.data.model.Level;
-import africa.semicolon.employeemanagement.data.model.Role;
 
 import java.time.LocalDateTime;
 
@@ -10,6 +9,5 @@ public class DepartmentResponse {
     private String fieldName;
     private String description;
     private Level employeeJobLevel;
-    private Role jobRole;
     private LocalDateTime creationDate;
 }

src/main/java/africa/semicolon/employeemanagement/data/dto/response/EmployeeResponse.java

@@ -1,7 +1,6 @@
 package africa.semicolon.employeemanagement.data.dto.response;
 
 import africa.semicolon.employeemanagement.data.model.Level;
-import africa.semicolon.employeemanagement.data.model.Role;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -21,7 +20,6 @@ public class EmployeeResponse {
     private String departmentName;
     private Integer employeeSalary;
     private Level employeeJobLevel;
-    private Role jobRole;
     private Boolean isSuspended;
     private LocalDateTime creationDate;
 }

src/main/java/africa/semicolon/employeemanagement/data/model/Employee.java

@@ -34,9 +34,6 @@ public class Employee {
     @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
     private Level employeeJobLevel;
 
-    @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
-    private Role jobRole;
-
     @OneToMany
     private List<Qualification> employeeQualifications;
     private Boolean isSuspended = false;

src/main/java/africa/semicolon/employeemanagement/service/EmployeeService.java

@@ -22,7 +22,6 @@ public interface EmployeeService {
     EmployeeResponse updateEmployeeSalaryByJobLevel(Long employeeId) throws EmployeeDoesNotExistsException;
     Employee activateSuspendEmployeeByEmployeeId(Long employeeId) throws EmployeeDoesNotExistsException;
     Employee deactivateSuspendEmployeeByEmployeeId(Long employeeId) throws EmployeeDoesNotExistsException;
-    Employee setEmployeeRoleByEmployeeId(Long employeeId, RoleRequest request) throws EmployeeDoesNotExistsException;
     Employee setEmployeeQualificationByEmployeeId(Long employeeId, QualificationRequest request) throws EmployeeDoesNotExistsException;
     Employee updateEmployee(String email, JsonPatch jsonpatch) throws EmployeeDoesNotExistsException, JsonPatchException, JsonProcessingException, EmployeeRequestException;
     String deleteAllEmployees();

src/main/java/africa/semicolon/employeemanagement/service/EmployeeServiceImpl.java

@@ -101,17 +101,6 @@ public Employee deactivateSuspendEmployeeByEmployeeId(Long employeeId) throws Em
         return employee;
     }
 
-    @Override
-    public Employee setEmployeeRoleByEmployeeId(Long employeeId, RoleRequest request) throws EmployeeDoesNotExistsException {
-        Employee employee = employeeRepository.findById(employeeId).orElse(null);
-        if (employee == null) throw new EmployeeDoesNotExistsException("Employee with this "+ employeeId+" employee id does not exist");
-
-        Role role = mapper.map(request, Role.class);
-        return employee = Employee.builder()
-                .jobRole(role)
-                .build();
-    }
-
     @Override
     public Employee setEmployeeQualificationByEmployeeId(Long employeeId, QualificationRequest request) throws EmployeeDoesNotExistsException {
         Employee employee = employeeRepository.findById(employeeId).orElse(null);

src/main/java/africa/semicolon/employeemanagement/web/controller/EmployeeController.java

@@ -132,16 +132,6 @@ public ResponseEntity<?> deactivateSuspendEmployeeByEmployeeId(@PathVariable Lon
         }
     }
 
-    @PostMapping(value = "/employee_role/{employeeId}")
-    public ResponseEntity<?> setEmployeeRoleByEmployeeId(@PathVariable Long employeeId, @RequestBody RoleRequest request){
-        try{
-            Employee employee = employeeService.setEmployeeRoleByEmployeeId(employeeId, request);
-            return ResponseEntity.ok().body(employee);
-        }catch (EmployeeDoesNotExistsException e){
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage());
-        }
-    }
-
     @PostMapping(value = "/employee_qualification/{employeeId}")
     public ResponseEntity<?> setEmployeeQualificationByEmployeeId(@PathVariable Long employeeId, @RequestBody QualificationRequest request){
         try{