refactor: update user

Author: ThisAster

src/main/java/com/thisaster/testtask/user/controller/UserController.java

@@ -52,11 +52,11 @@ public ResponseEntity<UserDTO> updateUser(@PathVariable Long id, @RequestBody @V
         newUser.setRoleId(newUser.getRoleId());
         newUser.setSubscriptions(subscriptionMapper.toEntitySet(userDTO.getSubscriptions()));
 
-        userService.updateUser(id, newUser);
-        UserDTO modificationUser = userMapper.toDTO(userService.getUserById(id));
-        modificationUser.setSubscriptions(userDTO.getSubscriptions());
-        modificationUser.setRole(userDTO.getRole());
-        return ResponseEntity.ok(modificationUser);
+        User modificationUser = userService.updateUser(id, newUser);
+        UserDTO modificationUserDTO = userMapper.toDTO(modificationUser);
+        modificationUserDTO.setSubscriptions(subscriptionMapper.toDTOSet(modificationUser.getSubscriptions()));
+        modificationUserDTO.setRole(userDTO.getRole());
+        return ResponseEntity.ok(modificationUserDTO);
     }
 
     @PostMapping("/{id}/subscriptions")

src/main/java/com/thisaster/testtask/user/service/UserService.java

@@ -12,6 +12,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.util.HashSet;
 import java.util.Set;
 
 @Service
@@ -39,37 +40,43 @@ public void createUser(User user) {
     }
 
     @Transactional
-    public void updateUser(Long userId, User user) {
+    public User updateUser(Long userId, User user) {
         User existingUser = userRepository.findById(userId)
                 .orElseThrow(() -> new EntityNotFoundException("User not found with id: " + userId));
 
         existingUser.setUsername(user.getUsername());
-        existingUser.setPassword(passwordEncoder.encode(user.getPassword()));
         existingUser.setEmail(user.getEmail());
 
-        for (Subscription subscription : user.getSubscriptions()) {
-            Subscription existingSubscription = subscriptionRepository.findByName(subscription.getName())
-                    .orElseGet(() -> {
-                        Subscription newSubscription = new Subscription();
-                        newSubscription.setName(subscription.getName());
-                        return subscriptionRepository.save(newSubscription);
-                    });
-
-            if (!existingUser.getSubscriptions().contains(existingSubscription)) {
-                existingUser.getSubscriptions().add(existingSubscription);
-                existingSubscription.getUsers().add(existingUser);
+        if (user.getPassword() != null && !user.getPassword().isBlank()) {
+            existingUser.setPassword(passwordEncoder.encode(user.getPassword()));
+        }
+        existingUser.setRole(roleService.getByRoleId(user.getRoleId()));
+
+        Set<Subscription> updatedSubscriptions = new HashSet<>();
+        if (user.getSubscriptions() != null) {
+            for (Subscription subscription : user.getSubscriptions()) {
+                subscribeUserToSub(userId, subscription);
+                subscriptionRepository.findByName(subscription.getName())
+                        .ifPresent(updatedSubscriptions::add);
             }
         }
 
-        existingUser.setRole(roleService.getByRoleId(user.getRoleId()));
-        userRepository.save(existingUser);
+        Set<Subscription> currentSubscriptions = new HashSet<>(existingUser.getSubscriptions());
+        for (Subscription currentSub : currentSubscriptions) {
+            if (!updatedSubscriptions.contains(currentSub)) {
+                removeSubFromUser(userId, currentSub.getId());
+            }
+        }
+
+        return existingUser;
     }
 
     public User getUserById(Long id) {
         return userRepository.findById(id)
                 .orElseThrow(() -> new EntityNotFoundException("User not found with id: " + id));
     }
 
+    @Transactional
     public void subscribeUserToSub(Long userId, Subscription subscription) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new EntityNotFoundException("User not found with id: " + userId));

src/test/java/com/thisaster/testtask/user/controller/UserControllerTest.java

@@ -3,7 +3,10 @@
 import com.thisaster.testtask.subscription.repository.SubscriptionRepository;
 import com.thisaster.testtask.user.repository.UserRepository;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
@@ -27,6 +30,7 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @AutoConfigureMockMvc
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Sql(value = {
         "/sql/test.sql"
 }, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS)
@@ -46,6 +50,7 @@ public class UserControllerTest {
     UserRepository userRepository;
 
     @Test
+    @Order(1)
     void shouldGetUserById() throws Exception {
         Long userId = 1L;
 
@@ -60,6 +65,7 @@ void shouldGetUserById() throws Exception {
     }
 
     @Test
+    @Order(2)
     void shouldAddSubscriptionToUser(@Value("classpath:user/createSubscription.json") Resource json) throws Exception {
         Long userId = 1L;
         mockMvc.perform(post("/api/users/{id}/subscriptions", userId)
@@ -71,6 +77,7 @@ void shouldAddSubscriptionToUser(@Value("classpath:user/createSubscription.json"
     }
 
     @Test
+    @Order(3)
     void shouldDeleteUserById() throws Exception {
         Long userId = 2L;
         mockMvc.perform(delete("/api/users/{id}", userId)
@@ -80,6 +87,7 @@ void shouldDeleteUserById() throws Exception {
     }
 
     @Test
+    @Order(4)
     void shouldGetUserSubscriptions() throws Exception {
         final Long userId = 3L;
 
@@ -92,6 +100,7 @@ void shouldGetUserSubscriptions() throws Exception {
     }
 
     @Test
+    @Order(5)
     void shouldDeleteUserSubscription() throws Exception {
         final Long userId = 3L;
         final Long subscriptionId = 3L;
@@ -103,6 +112,7 @@ void shouldDeleteUserSubscription() throws Exception {
 
 
     @Test
+    @Order(6)
     void shouldUpdateUser(@Value("classpath:user/updateUser.json") Resource json) throws Exception {
         Long userId = 3L;
         mockMvc.perform(put("/api/users/{userId}", userId)