diff --git a/core/src/main/java/greencity/controller/ManagementEmployeeController.java b/core/src/main/java/greencity/controller/ManagementEmployeeController.java index 830a28746..d64e8b604 100644 --- a/core/src/main/java/greencity/controller/ManagementEmployeeController.java +++ b/core/src/main/java/greencity/controller/ManagementEmployeeController.java @@ -10,7 +10,6 @@ import greencity.dto.pageble.PageableAdvancedDto; import greencity.dto.position.PositionAuthoritiesDto; import greencity.dto.position.PositionDto; -import greencity.dto.position.PositionWithTranslateDto; import greencity.dto.tariff.GetTariffInfoForEmployeeDto; import greencity.filters.EmployeeFilterCriteria; import greencity.filters.EmployeePage; @@ -153,7 +152,7 @@ public ResponseEntity deleteEmployee(@PathVariable Long id) { }) @PreAuthorize("@preAuthorizer.hasAuthority('SEE_EMPLOYEES_PAGE', authentication)") @GetMapping("/get-all-positions") - public ResponseEntity> getAllPositions() { + public ResponseEntity> getAllPositions() { return ResponseEntity.status(HttpStatus.OK).body(employeeService.getAllPositions()); } diff --git a/service-api/src/main/java/greencity/service/ubs/UBSManagementEmployeeService.java b/service-api/src/main/java/greencity/service/ubs/UBSManagementEmployeeService.java index 5e4d47a9e..f2c792c80 100644 --- a/service-api/src/main/java/greencity/service/ubs/UBSManagementEmployeeService.java +++ b/service-api/src/main/java/greencity/service/ubs/UBSManagementEmployeeService.java @@ -5,7 +5,6 @@ import greencity.dto.employee.EmployeeWithTariffsIdDto; import greencity.dto.position.AddingPositionDto; import greencity.dto.position.PositionDto; -import greencity.dto.position.PositionWithTranslateDto; import greencity.dto.tariff.GetTariffInfoForEmployeeDto; import greencity.filters.EmployeeFilterCriteria; import greencity.filters.EmployeePage; @@ -74,7 +73,7 @@ public interface UBSManagementEmployeeService { * @return {@link PositionDto} * @author Mykola Danylko */ - List getAllPositions(); + List getAllPositions(); /** * Method deletes position by id. diff --git a/service-api/src/test/java/greencity/ModelUtils.java b/service-api/src/test/java/greencity/ModelUtils.java index 4bd11ed28..dd8fbafc1 100644 --- a/service-api/src/test/java/greencity/ModelUtils.java +++ b/service-api/src/test/java/greencity/ModelUtils.java @@ -129,6 +129,7 @@ public static PositionDto getEmployeePosition() { return PositionDto.builder() .id(1L) .name("Менеджер послуги") + .name("Service Manager") .build(); } } diff --git a/service-api/src/test/java/greencity/client/config/UserRemoteClientFallbackFactoryTest.java b/service-api/src/test/java/greencity/client/config/UserRemoteClientFallbackFactoryTest.java index fd9223f71..b059fab3f 100644 --- a/service-api/src/test/java/greencity/client/config/UserRemoteClientFallbackFactoryTest.java +++ b/service-api/src/test/java/greencity/client/config/UserRemoteClientFallbackFactoryTest.java @@ -98,6 +98,12 @@ void signUpEmployee() { assertThrows(RemoteServerUnavailableException.class, () -> client.signUpEmployee(dto)); } + @Test + void signUpEmployeeError() { + EmployeeSignUpDto dto = EmployeeSignUpDto.builder().build(); + assertThrows(RemoteServerUnavailableException.class, () -> client.signUpEmployee(dto)); + } + @Test void updateEmployeeEmailTest() { String newEmail = "new@mail.com"; diff --git a/service/src/main/java/greencity/service/ubs/UBSManagementEmployeeServiceImpl.java b/service/src/main/java/greencity/service/ubs/UBSManagementEmployeeServiceImpl.java index 6b6a6738b..2e87aad93 100644 --- a/service/src/main/java/greencity/service/ubs/UBSManagementEmployeeServiceImpl.java +++ b/service/src/main/java/greencity/service/ubs/UBSManagementEmployeeServiceImpl.java @@ -13,7 +13,6 @@ import greencity.dto.employee.EmployeePositionsDto; import greencity.dto.position.AddingPositionDto; import greencity.dto.position.PositionDto; -import greencity.dto.position.PositionWithTranslateDto; import greencity.dto.tariff.GetTariffInfoForEmployeeDto; import greencity.entity.order.TariffsInfo; import greencity.entity.user.employee.Employee; @@ -104,7 +103,8 @@ private void signUpEmployee(Employee employee) { try { userRemoteClient.signUpEmployee(signUpDto); } catch (HystrixRuntimeException e) { - throw new BadRequestException("User with this email already exists: " + signUpDto.getEmail()); + throw new BadRequestException( + "Error to create user(): User with this email already exists or not valid data "); } } @@ -329,9 +329,9 @@ private Position buildPosition(AddingPositionDto dto) { * {@inheritDoc} */ @Override - public List getAllPositions() { + public List getAllPositions() { return positionRepository.findAll().stream() - .map(p -> modelMapper.map(p, PositionWithTranslateDto.class)) + .map(p -> modelMapper.map(p, PositionDto.class)) .collect(Collectors.toList()); } diff --git a/service/src/test/java/greencity/ModelUtils.java b/service/src/test/java/greencity/ModelUtils.java index 1ba67765a..3196cae40 100644 --- a/service/src/test/java/greencity/ModelUtils.java +++ b/service/src/test/java/greencity/ModelUtils.java @@ -1212,6 +1212,7 @@ public static List getEmployeeList() { .employeePosition(Set.of(Position.builder() .id(6L) .name("Супер адмін") + .nameEn("Super admin") .build())) .tariffInfos(new HashSet<>()) .imagePath("path") diff --git a/service/src/test/java/greencity/service/ubs/UBSManagementEmployeeServiceImplTest.java b/service/src/test/java/greencity/service/ubs/UBSManagementEmployeeServiceImplTest.java index f70fa22fa..aee8d334c 100644 --- a/service/src/test/java/greencity/service/ubs/UBSManagementEmployeeServiceImplTest.java +++ b/service/src/test/java/greencity/service/ubs/UBSManagementEmployeeServiceImplTest.java @@ -353,9 +353,9 @@ void updatePositionTest() { @Test void getAllPositionTest() { when(positionRepository.findAll()).thenReturn(List.of(getPosition())); - when(modelMapper.map(any(), any())).thenReturn(getPositionWithTranslateDto(1L)); + when(modelMapper.map(any(), any())).thenReturn(getPositionDto(1L)); - List positionWithTranslateDtos = employeeService.getAllPositions(); + List positionWithTranslateDtos = employeeService.getAllPositions(); assertEquals(1, positionWithTranslateDtos.size()); verify(positionRepository, times(1)).findAll();