Bug #4984 fixed-method getAllAuthorities in UBSClientServiceImpl #947

LiliaMokhnatska · 2023-01-18T11:37:32Z

changed method getAllAuthorities in UBSClientServiceImpl and in UserRemoteClientFallbackFactory

All checks have failed

in method updateEmployeesAuthorities due to SonarLint

RomaMocherniuk · 2023-01-19T09:30:15Z

service/src/main/java/greencity/service/ubs/UBSClientServiceImpl.java

    }

    @Override
    public void updateEmployeesAuthorities(UserEmployeeAuthorityDto dto, String email) {
-        Employee employee = employeeRepository.findByEmail(dto.getEmployeeEmail())
-            .orElseThrow(() -> new NotFoundException(EMPLOYEE_DOESNT_EXIST));


Why did you remove this?
Is it possible to update authorities for a non-existent employee?

RomaMocherniuk · 2023-01-19T09:30:38Z

service/src/main/java/greencity/service/ubs/UBSClientServiceImpl.java

@@ -1907,13 +1907,15 @@ public TariffsForLocationDto getTariffForOrder(Long id) {
    public Set<String> getAllAuthorities(String email) {
        Employee employee = employeeRepository.findByEmail(email)
            .orElseThrow(() -> new NotFoundException(EMPLOYEE_DOESNT_EXIST));
-        return userRemoteClient.getAllAuthorities(employee.getEmail());
+        Set<String> authorities = userRemoteClient.getAllAuthorities(employee.getEmail());
+        if (authorities.isEmpty()) {


please add test for this case

Is it not a valid case when an employee does not have any authorities?
Do we set some authorities when we create employees?

And according to your changes, we will have empty authorities list if some error happens when we call /user/get-all-authorities endpoint
In this case, the employee could have some authorities but we could not get them and your message COULD_NOT_RETRIEVE_EMPLOYEE_AUTHORITY will not be valid

RomaMocherniuk · 2023-01-19T09:31:45Z

service-api/src/main/java/greencity/client/config/UserRemoteClientFallbackFactory.java

@@ -58,7 +59,7 @@ public void sendEmailNotification(NotificationDto notification, String email) {
            @Override
            public Set<String> getAllAuthorities(String email) {
                log.error(ErrorMessage.COULD_NOT_RETRIEVE_EMPLOYEE_AUTHORITY, throwable);
-                return Collections.singleton(throwable.getMessage());
+                return Collections.emptySet();


please add test for this case

RomaMocherniuk · 2023-01-19T09:31:58Z

core/src/main/java/greencity/controller/ManagementEmployeeController.java

@@ -259,7 +259,8 @@ public ResponseEntity<HttpStatus> deleteEmployeeImage(@PathVariable Long id) {
        @ApiResponse(code = 200, message = HttpStatuses.OK),
        @ApiResponse(code = 400, message = HttpStatuses.BAD_REQUEST),
        @ApiResponse(code = 401, message = HttpStatuses.UNAUTHORIZED),
-        @ApiResponse(code = 403, message = HttpStatuses.FORBIDDEN)
+        @ApiResponse(code = 403, message = HttpStatuses.FORBIDDEN),
+        @ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND)


please add test

RomaMocherniuk · 2023-01-19T09:32:17Z

service-api/src/main/java/greencity/client/config/UserRemoteClientFallbackFactory.java

@@ -31,6 +31,7 @@ public String findUuidByEmail(String email) {
            @Override
            public Optional<UserVO> findNotDeactivatedByEmail(String email) {
                log.error(ErrorMessage.USER_WITH_THIS_EMAIL_DOES_NOT_EXIST + email, throwable);
+
