update GetEmployeeDto (#1171)

ita-social-projects · Jul 5, 2023 · cf1aad8 · cf1aad8
1 parent 02d2305
commit cf1aad8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/service-api/src/main/java/greencity/dto/employee/GetEmployeeDto.java b/service-api/src/main/java/greencity/dto/employee/GetEmployeeDto.java
@@ -20,6 +20,7 @@ public class GetEmployeeDto {
     private String phoneNumber;
     private String email;
     private String image;
+    private String employeeStatus;
     private List<PositionDto> employeePositions;
     private List<GetTariffInfoForEmployeeDto> tariffs;
 }
diff --git a/...n/java/greencity/mapping/employeefilterview/EmployeeFilterViewToGetEmployeeDtoMapper.java b/...n/java/greencity/mapping/employeefilterview/EmployeeFilterViewToGetEmployeeDtoMapper.java
@@ -16,6 +16,7 @@ protected GetEmployeeDto convert(EmployeeFilterView employeeFilterView) {
             .phoneNumber(employeeFilterView.getPhoneNumber())
             .email(employeeFilterView.getEmail())
             .image(employeeFilterView.getImage())
+            .employeeStatus(employeeFilterView.getEmployeeStatus())
             .build();
     }
 }
diff --git a/service/src/test/java/greencity/ModelUtils.java b/service/src/test/java/greencity/ModelUtils.java
@@ -241,6 +241,7 @@ public static EmployeeFilterView getEmployeeFilterViewWithPassedIds(
             .lastName("Last Name")
             .phoneNumber("Phone Number")
             .email("[email protected]")
+            .employeeStatus("ACTIVE")
             .image("Image")
             .regionId(15L)
             .regionNameEn("Kyiv region")
@@ -287,6 +288,7 @@ public static GetEmployeeDto getEmployeeDto() {
             .lastName("Last Name")
             .phoneNumber("Phone Number")
             .email("[email protected]")
+            .employeeStatus("ACTIVE")
             .image("Image")
             .build();
     }