diff --git a/service-api/src/main/java/greencity/dto/employee/GetEmployeeDto.java b/service-api/src/main/java/greencity/dto/employee/GetEmployeeDto.java index 367d65b19..f684bec3a 100644 --- 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 employeePositions; private List tariffs; } diff --git a/service/src/main/java/greencity/mapping/employeefilterview/EmployeeFilterViewToGetEmployeeDtoMapper.java b/service/src/main/java/greencity/mapping/employeefilterview/EmployeeFilterViewToGetEmployeeDtoMapper.java index 40d569ff3..bacdb8fa5 100644 --- a/service/src/main/java/greencity/mapping/employeefilterview/EmployeeFilterViewToGetEmployeeDtoMapper.java +++ b/service/src/main/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 index 3196cae40..3f1c2fe6b 100644 --- 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("employee@gmail.com") + .employeeStatus("ACTIVE") .image("Image") .regionId(15L) .regionNameEn("Kyiv region") @@ -287,6 +288,7 @@ public static GetEmployeeDto getEmployeeDto() { .lastName("Last Name") .phoneNumber("Phone Number") .email("employee@gmail.com") + .employeeStatus("ACTIVE") .image("Image") .build(); }