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

pom.xml

@@ -31,6 +31,11 @@
             <artifactId>json-patch</artifactId>
             <version>1.13</version>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/africa/semicolon/employeemanagement/data/dto/DepartmentRequest.java → src/main/java/africa/semicolon/employeemanagement/data/dto/request/DepartmentRequest.java

@@ -1,5 +1,7 @@
-package africa.semicolon.employeemanagement.data.dto;
+package africa.semicolon.employeemanagement.data.dto.request;
 
+import africa.semicolon.employeemanagement.data.model.JobDepartment;
+import africa.semicolon.employeemanagement.data.model.Level;
 import lombok.*;
 
 import javax.validation.constraints.NotNull;
@@ -11,7 +13,7 @@
 @NoArgsConstructor
 public class DepartmentRequest {
     @NotNull(message="Field can not be empty")
-    private String fieldName;
+    private JobDepartment fieldName;
     @NotNull(message="Field can not be empty")
-    private String level;
+    private Level level;
 }

src/main/java/africa/semicolon/employeemanagement/data/dto/EmployeeRequest.java → src/main/java/africa/semicolon/employeemanagement/data/dto/request/EmployeeRequest.java

@@ -1,4 +1,4 @@
-package africa.semicolon.employeemanagement.data.dto;
+package africa.semicolon.employeemanagement.data.dto.request;
 
 import lombok.*;
 

src/main/java/africa/semicolon/employeemanagement/data/dto/MobileNumberRequest.java → src/main/java/africa/semicolon/employeemanagement/data/dto/request/MobileNumberRequest.java

@@ -1,4 +1,4 @@
-package africa.semicolon.employeemanagement.data.dto;
+package africa.semicolon.employeemanagement.data.dto.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/africa/semicolon/employeemanagement/data/dto/request/QualificationRequest.java

@@ -0,0 +1,12 @@
+package africa.semicolon.employeemanagement.data.dto.request;
+
+import lombok.*;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Setter
+@Getter
+public class QualificationRequest {
+    private String qualificationName;
+}

src/main/java/africa/semicolon/employeemanagement/data/dto/request/RoleRequest.java

@@ -0,0 +1,13 @@
+package africa.semicolon.employeemanagement.data.dto.request;
+
+import lombok.*;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Setter
+@Getter
+public class RoleRequest {
+    private Long employeeId;
+    private String position;
+}

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

@@ -1,12 +1,15 @@
-package africa.semicolon.employeemanagement.data.dto;
+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;
+
 public class DepartmentResponse {
     private Long id;
     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

@@ -0,0 +1,27 @@
+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;
+
+
+@Setter
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class EmployeeResponse {
+    private Long id;
+    private String firstName;
+    private String lastName;
+    private String email;
+    private int age;
+    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/dto/MobileNumberResponse.java → src/main/java/africa/semicolon/employeemanagement/data/dto/response/MobileNumberResponse.java

@@ -1,4 +1,4 @@
-package africa.semicolon.employeemanagement.data.dto;
+package africa.semicolon.employeemanagement.data.dto.response;
 
 
 import lombok.AllArgsConstructor;

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

@@ -1,8 +1,10 @@
 package africa.semicolon.employeemanagement.data.model;
 
 import lombok.*;
+import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Builder
@@ -14,7 +16,7 @@
 public class Department {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private Integer id;
+    private Long id;
 
     @Column(unique = true)
     private JobDepartment fieldName;
@@ -24,6 +26,6 @@ public class Department {
     @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
     private List<Employee> employees;
 
-    @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
-    private Role jobRole;
+    @CreationTimestamp
+    private LocalDateTime creationDate = LocalDateTime.now();
 }

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

@@ -1,8 +1,10 @@
 package africa.semicolon.employeemanagement.data.model;
 
 import lombok.*;
+import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 
@@ -32,8 +34,13 @@ 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;
 
+    @CreationTimestamp
+    private LocalDateTime creationDate = LocalDateTime.now();
 }

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

@@ -19,7 +19,7 @@ public class Qualification {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long QualificationId;
-    private String qualificationName;
+    private SchoolQualification qualificationName;
     @CreationTimestamp
     private LocalDateTime dateSubmitted;
 }

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

@@ -18,8 +18,8 @@
 public class Role {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private Integer roleId;
-    private Integer employeeId;
+    private Long roleId;
+    private Long employeeId;
     private String position;
     @CreationTimestamp
     private LocalDateTime appointmentDate;

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

@@ -0,0 +1,9 @@
+package africa.semicolon.employeemanagement.data.model;
+
+public enum SchoolQualification {
+    BACHELORS_DEGREE,
+    POSTGRADUATE_DIPLOMA,
+    MASTERS_DEGREE,
+    DOCTORATE_DEGREE;
+
+}

src/main/java/africa/semicolon/employeemanagement/data/repository/DepartmentRepository.java

@@ -3,8 +3,13 @@
 import africa.semicolon.employeemanagement.data.model.Department;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 @Repository
-public interface DepartmentRepository extends JpaRepository<Department, Integer> {
+public interface DepartmentRepository extends JpaRepository<Department, Long> {
 
+    Department findByFieldName(String fieldName);
+
+    @Transactional
+    void deleteByFieldName(String departmentName);
 }

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

@@ -1,7 +1,9 @@
 package africa.semicolon.employeemanagement.service;
 
-import africa.semicolon.employeemanagement.data.dto.EmployeeRequest;
-import africa.semicolon.employeemanagement.data.dto.EmployeeResponse;
+import africa.semicolon.employeemanagement.data.dto.request.EmployeeRequest;
+import africa.semicolon.employeemanagement.data.dto.request.QualificationRequest;
+import africa.semicolon.employeemanagement.data.dto.request.RoleRequest;
+import africa.semicolon.employeemanagement.data.dto.response.EmployeeResponse;
 import africa.semicolon.employeemanagement.data.model.Employee;
 import africa.semicolon.employeemanagement.web.exception.EmployeeAlreadyExistsException;
 import africa.semicolon.employeemanagement.web.exception.EmployeeDoesNotExistsException;
@@ -20,6 +22,8 @@ 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();
     String deleteEmployeeById(Long id);

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

@@ -1,11 +1,10 @@
 package africa.semicolon.employeemanagement.service;
 
-import africa.semicolon.employeemanagement.data.dto.EmployeeRequest;
-import africa.semicolon.employeemanagement.data.dto.EmployeeResponse;
-import africa.semicolon.employeemanagement.data.model.ConstantSalary;
-import africa.semicolon.employeemanagement.data.model.Employee;
-import africa.semicolon.employeemanagement.data.model.JobLevel;
-import africa.semicolon.employeemanagement.data.model.Level;
+import africa.semicolon.employeemanagement.data.dto.request.EmployeeRequest;
+import africa.semicolon.employeemanagement.data.dto.request.QualificationRequest;
+import africa.semicolon.employeemanagement.data.dto.request.RoleRequest;
+import africa.semicolon.employeemanagement.data.dto.response.EmployeeResponse;
+import africa.semicolon.employeemanagement.data.model.*;
 import africa.semicolon.employeemanagement.data.repository.EmployeeRepository;
 import africa.semicolon.employeemanagement.web.exception.EmployeeAlreadyExistsException;
 import africa.semicolon.employeemanagement.web.exception.EmployeeDoesNotExistsException;
@@ -35,7 +34,7 @@ public EmployeeServiceImpl(EmployeeRepository employeeRepository, ModelMapper ma
     }
 
     @Override
-    public EmployeeResponse createEmployee(EmployeeRequest employeeDto) throws EmployeeAlreadyExistsException {
+    public EmployeeResponse createEmployee(EmployeeRequest employeeDto) {
         if(employeeDto == null) throw new IllegalArgumentException("Employee records can not be empty");
 
         Optional<Employee> foundEmployee = employeeRepository.findByEmail(employeeDto.getEmail());
@@ -102,6 +101,30 @@ 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);
+        if (employee == null) throw new EmployeeDoesNotExistsException("Employee with this "+ employeeId+" employee id does not exist");
+
+        Qualification qualify = mapper.map(request, Qualification.class);
+
+        List<Qualification> qualification = List.of(qualify);
+       return employee = Employee.builder()
+                .employeeQualifications(qualification)
+                .build();
+    }
+
     @Override
     public Employee updateEmployee(String email, JsonPatch jsonpatch) throws EmployeeDoesNotExistsException,
             JsonPatchException, JsonProcessingException, EmployeeRequestException {
@@ -164,6 +187,4 @@ public Optional<Employee> findEmployeeById(Long id) throws EmployeeDoesNotExists
 
         return found;
     }
-
-
 }

src/main/java/africa/semicolon/employeemanagement/service/departmentService/DepartmentService.java

@@ -1,18 +1,19 @@
 package africa.semicolon.employeemanagement.service.departmentService;
 
-import africa.semicolon.employeemanagement.data.dto.DepartmentRequest;
-import africa.semicolon.employeemanagement.data.dto.DepartmentResponse;
+import africa.semicolon.employeemanagement.data.dto.request.DepartmentRequest;
+import africa.semicolon.employeemanagement.data.dto.response.DepartmentResponse;
 import africa.semicolon.employeemanagement.data.model.Department;
 
 import java.util.List;
 
 public interface DepartmentService {
     DepartmentResponse createDepartment(DepartmentRequest request);
-    Department updateDepartment(String departmentId);
-    String deleteDepartmentByDepartmentId(String departmentId);
+    Department updateDepartmentByDepartmentId(Long departmentId);
+    String deleteDepartmentByDepartmentId(Long departmentId);
     String deleteDepartmentByDepartmentName(String departmentName);
+    void deleteAllDepartments();
     List<Department> findAllDepartment();
-    Department findDepartmentById(String departmentId);
+    Department findDepartmentById(Long departmentId);
     Department findDepartmentByName(String departmentName);
 
 }