Fix update and create logic, update tests

Author: IlyaLisov

src/main/java/com/example/tasklist/service/impl/TaskServiceImpl.java

@@ -53,9 +53,15 @@ public List<Task> getAllSoonTasks(final Duration duration) {
     @Transactional
     @CachePut(value = "TaskService::getById", key = "#task.id")
     public Task update(final Task task) {
+        Task existing = getById(task.getId());
         if (task.getStatus() == null) {
-            task.setStatus(Status.TODO);
+            existing.setStatus(Status.TODO);
+        } else {
+            existing.setStatus(task.getStatus());
         }
+        existing.setTitle(task.getTitle());
+        existing.setDescription(task.getDescription());
+        existing.setExpirationDate(task.getExpirationDate());
         taskRepository.save(task);
         return task;
     }
@@ -66,7 +72,9 @@ public Task update(final Task task) {
             condition = "#task.id!=null",
             key = "#task.id")
     public Task create(final Task task, final Long userId) {
-        task.setStatus(Status.TODO);
+        if (task.getStatus() != null) {
+            task.setStatus(Status.TODO);
+        }
         taskRepository.save(task);
         taskRepository.assignTask(userId, task.getId());
         return task;

src/main/java/com/example/tasklist/service/impl/UserServiceImpl.java

@@ -54,6 +54,9 @@ public User getByUsername(final String username) {
                     key = "#user.username")
     })
     public User update(final User user) {
+        User existing = getById(user.getId());
+        existing.setName(user.getName());
+        user.setUsername(user.getUsername());
         user.setPassword(passwordEncoder.encode(user.getPassword()));
         userRepository.save(user);
         return user;

src/test/java/com/example/tasklist/config/TestConfig.java

@@ -28,10 +28,6 @@
 @RequiredArgsConstructor
 public class TestConfig {
 
-    private final UserRepository userRepository;
-    private final TaskRepository taskRepository;
-    private final AuthenticationManager authenticationManager;
-
     @Bean
     @Primary
     public BCryptPasswordEncoder testPasswordEncoder() {
@@ -48,8 +44,10 @@ public JwtProperties jwtProperties() {
     }
 
     @Bean
-    public UserDetailsService userDetailsService() {
-        return new JwtUserDetailsService(userService());
+    public UserDetailsService userDetailsService(
+            final UserRepository userRepository
+    ) {
+        return new JwtUserDetailsService(userService(userRepository));
     }
 
     @Bean
@@ -87,15 +85,19 @@ public ImageService imageService() {
     }
 
     @Bean
-    public JwtTokenProvider tokenProvider() {
+    public JwtTokenProvider tokenProvider(
+            final UserRepository userRepository
+    ) {
         return new JwtTokenProvider(jwtProperties(),
-                userDetailsService(),
-                userService());
+                userDetailsService(userRepository),
+                userService(userRepository));
     }
 
     @Bean
     @Primary
-    public UserServiceImpl userService() {
+    public UserServiceImpl userService(
+            final UserRepository userRepository
+    ) {
         return new UserServiceImpl(
                 userRepository,
                 testPasswordEncoder(),
@@ -105,16 +107,38 @@ public UserServiceImpl userService() {
 
     @Bean
     @Primary
-    public TaskServiceImpl taskService() {
+    public TaskServiceImpl taskService(
+            final TaskRepository taskRepository
+    ) {
         return new TaskServiceImpl(taskRepository, imageService());
     }
 
     @Bean
     @Primary
-    public AuthServiceImpl authService() {
-        return new AuthServiceImpl(authenticationManager,
-                userService(),
-                tokenProvider());
+    public AuthServiceImpl authService(
+            final UserRepository userRepository,
+            final AuthenticationManager authenticationManager
+    ) {
+        return new AuthServiceImpl(
+                authenticationManager,
+                userService(userRepository),
+                tokenProvider(userRepository)
+        );
+    }
+
+    @Bean
+    public UserRepository userRepository() {
+        return Mockito.mock(UserRepository.class);
+    }
+
+    @Bean
+    public TaskRepository taskRepository() {
+        return Mockito.mock(TaskRepository.class);
+    }
+
+    @Bean
+    public AuthenticationManager authenticationManager() {
+        return Mockito.mock(AuthenticationManager.class);
     }
 
 }

src/test/java/com/example/tasklist/service/impl/TaskServiceImplTest.java

@@ -6,7 +6,6 @@
 import com.example.tasklist.domain.task.Task;
 import com.example.tasklist.domain.task.TaskImage;
 import com.example.tasklist.repository.TaskRepository;
-import com.example.tasklist.repository.UserRepository;
 import com.example.tasklist.service.ImageService;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -16,7 +15,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
-import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
@@ -37,12 +35,6 @@ public class TaskServiceImplTest {
     @MockBean
     private ImageService imageService;
 
-    @MockBean
-    private UserRepository userRepository;
-
-    @MockBean
-    private AuthenticationManager authenticationManager;
-
     @Autowired
     private TaskServiceImpl taskService;
 
@@ -99,18 +91,37 @@ void getSoonTasks() {
 
     @Test
     void update() {
+        Long id = 1L;
         Task task = new Task();
+        task.setId(id);
         task.setStatus(Status.DONE);
+        Mockito.when(taskRepository.findById(task.getId()))
+                .thenReturn(Optional.of(task));
         Task testTask = taskService.update(task);
         Mockito.verify(taskRepository).save(task);
         Assertions.assertEquals(task, testTask);
+        Assertions.assertEquals(task.getTitle(), testTask.getTitle());
+        Assertions.assertEquals(
+                task.getDescription(),
+                testTask.getDescription()
+        );
+        Assertions.assertEquals(task.getStatus(), testTask.getStatus());
     }
 
     @Test
     void updateWithEmptyStatus() {
+        Long id = 1L;
         Task task = new Task();
+        task.setId(id);
+        Mockito.when(taskRepository.findById(task.getId()))
+                .thenReturn(Optional.of(task));
         Task testTask = taskService.update(task);
         Mockito.verify(taskRepository).save(task);
+        Assertions.assertEquals(task.getTitle(), testTask.getTitle());
+        Assertions.assertEquals(
+                task.getDescription(),
+                testTask.getDescription()
+        );
         Assertions.assertEquals(testTask.getStatus(), Status.TODO);
     }
 

src/test/java/com/example/tasklist/service/impl/UserServiceImplTest.java

@@ -5,7 +5,6 @@
 import com.example.tasklist.domain.exception.ResourceNotFoundException;
 import com.example.tasklist.domain.user.Role;
 import com.example.tasklist.domain.user.User;
-import com.example.tasklist.repository.TaskRepository;
 import com.example.tasklist.repository.UserRepository;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -15,7 +14,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
-import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -33,12 +31,6 @@ public class UserServiceImplTest {
     @MockBean
     private UserRepository userRepository;
 
-    @MockBean
-    private TaskRepository taskRepository;
-
-    @MockBean
-    private AuthenticationManager authenticationManager;
-
     @MockBean
     private BCryptPasswordEncoder passwordEncoder;
 
@@ -94,14 +86,20 @@ void getByNotExistingUsername() {
 
     @Test
     void update() {
+        Long id = 1L;
         String password = "password";
         User user = new User();
+        user.setId(id);
         user.setPassword(password);
         Mockito.when(passwordEncoder.encode(password))
                 .thenReturn("encodedPassword");
-        userService.update(user);
+        Mockito.when(userRepository.findById(user.getId()))
+                .thenReturn(Optional.of(user));
+        User updated = userService.update(user);
         Mockito.verify(passwordEncoder).encode(password);
         Mockito.verify(userRepository).save(user);
+        Assertions.assertEquals(user.getUsername(), updated.getUsername());
+        Assertions.assertEquals(user.getName(), updated.getName());
     }
 
     @Test
@@ -199,9 +197,8 @@ void getNotExistingTaskAuthor() {
         Long taskId = 1L;
         Mockito.when(userRepository.findTaskAuthor(taskId))
                 .thenReturn(Optional.empty());
-        Assertions.assertThrows(ResourceNotFoundException.class, () -> {
-            userService.getTaskAuthor(taskId);
-        });
+        Assertions.assertThrows(ResourceNotFoundException.class, () ->
+                userService.getTaskAuthor(taskId));
         Mockito.verify(userRepository).findTaskAuthor(taskId);
     }