refactor: update method controller

Author: ThisAster

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

@@ -35,7 +35,6 @@ public class UserController {
     public ResponseEntity<UserDTO> getUserInfo(@PathVariable Long id) {
         User user = userService.getUserById(id);
         UserDTO userDTO = userMapper.toDTO(user);
-        userDTO.setSubscriptions(subscriptionMapper.toDTOSet(user.getSubscriptions()));
         return ResponseEntity.ok(userDTO);
     }
 
@@ -47,16 +46,12 @@ public ResponseEntity<String> deleteUser(@PathVariable Long id) {
 
     @PutMapping("/{id}")
     public ResponseEntity<UserDTO> updateUser(@PathVariable Long id, @RequestBody @Validated UserDTO userDTO) {
-        User newUser = userMapper.toEntity(userDTO);
-        newUser.setRole(roleService.getByRoleName(userDTO.getRole()));
-        newUser.setRoleId(newUser.getRoleId());
-        newUser.setSubscriptions(subscriptionMapper.toEntitySet(userDTO.getSubscriptions()));
+        User user = userMapper.toEntity(userDTO);
+        user.setRole(roleService.getByRoleName(userDTO.getRole()));
 
-        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);
+        User updatedUser = userService.updateUser(id, user);
+        UserDTO updatedDTO = userMapper.toDTO(updatedUser);
+        return ResponseEntity.ok(updatedDTO);
     }
 
     @PostMapping("/{id}/subscriptions")

src/main/java/com/thisaster/testtask/user/mapper/UserMapper.java

@@ -1,21 +1,20 @@
 package com.thisaster.testtask.user.mapper;
 
+import com.thisaster.testtask.subscription.mapper.SubscriptionMapper;
 import com.thisaster.testtask.user.dto.UserDTO;
 import com.thisaster.testtask.user.entity.User;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;
-import org.springframework.stereotype.Component;
 
-@Component
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING,
+        uses = {SubscriptionMapper.class})
 public abstract class UserMapper {
-    @Mapping(target = "role", ignore = true)
-    @Mapping(target = "subscriptions", ignore = true)
+
+    @Mapping(target = "role", source = "role.name")
     public abstract UserDTO toDTO(User user);
 
-    @Mapping(target = "role", ignore = true)
-    @Mapping(target = "roleId", ignore = true)
-    @Mapping(target = "subscriptions", ignore = true)
+    @Mapping(target = "role", ignore = true) // всё равно подставим вручную в контроллере
+    @Mapping(target = "roleId", ignore = true) // подставим вручную
     public abstract User toEntity(UserDTO userDTO);
-}
+}