Revize 8a5593f0

Changed that user with ADMIN rights can not be removed

re #9755

backend/src/main/java/cz/zcu/kiv/backendapi/user/UserServiceImpl.java

@@ -93 +93 @@
     //TODO maybe check if user is not deleting himself - or it might be ok
     @Override
     public void deleteUser(String username) {
-        if (!userRepository.existsById(username)) {
+        UserEntity userEntity = userRepository.findByEmail(username).orElseThrow(() -> {
             log.error(String.format(USER_NOT_FOUND, username));
             throw new UsernameNotFoundException(String.format(USER_NOT_FOUND, username));
+        });
+        if (userEntity.isAdmin()) {
+            log.error("User with ADMIN rights can not be deleted");
+            throw new ApiRequestException("User with ADMIN rights can not be deleted", HttpStatus.BAD_REQUEST);
         }
-        userRepository.deleteById(username);
+        userRepository.delete(userEntity);
     }
 
     @Override

backend/src/test/java/cz/zcu/kiv/backendapi/user/UserServiceImplTest.java

@@ -220 +220 @@
     void testCanDeleteUser() {
         // given
         String email = "[e-mail]";
-        given(userRepository.existsById(email)).willReturn(true);
+        UserEntity userEntity = new UserEntity("John Doe", email, "", (byte) 0, false);
+        given(userRepository.findByEmail(email)).willReturn(Optional.of(userEntity));
+
         // when
         underTest.deleteUser(email);
 
         // then
-        verify(userRepository).deleteById(email);
+        verify(userRepository).delete(userEntity);
     }
 
     @Test
     void testCanNotDeleteUser() {
         // given
         String email = "[e-mail]";
-        given(userRepository.existsById(email)).willReturn(false);
+        given(userRepository.findByEmail(email)).willReturn(Optional.empty());
+
         // when
         assertThatThrownBy(() -> underTest.deleteUser(email))
                 .isInstanceOf(UsernameNotFoundException.class)
                 .hasMessageContaining("User with username " + email + " not found");
 
         // then
-        verify(userRepository, never()).deleteById(email);
+        verify(userRepository, never()).delete(any());
+    }
+
+    @Test
+    void testCanNotDeleteUserAdmin() {
+        // given
+        String email = "[e-mail]";
+        UserEntity userEntity = new UserEntity("John Doe", email, "", (byte) 0, true);
+        given(userRepository.findByEmail(email)).willReturn(Optional.of(userEntity));
+
+        // when
+        assertThatThrownBy(() -> underTest.deleteUser(email))
+                .isInstanceOf(ApiRequestException.class)
+                .hasMessageContaining("User with ADMIN rights can not be deleted");
+
+        // then
+        verify(userRepository, never()).delete(any());
     }
 
     @Test