refactor: file 을 받기 위해서 @RequestPart 적용 - user

Author: jaewoo9797

codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/controller/BinaryContent/BinaryContentController.java

@@ -28,8 +28,8 @@ public ResponseEntity<BinaryContent> findById(@PathVariable UUID binaryContentId
 
     @RequestMapping(method = RequestMethod.POST)
     public ResponseEntity<List<BinaryContent>> findAll(
-            @RequestBody List<UUID> uuids
+            @RequestBody List<UUID> binaryIds
     ) {
-        return ResponseEntity.ok(binaryContentService.findAllByIdIn(uuids));
+        return ResponseEntity.ok(binaryContentService.findAllByIdIn(binaryIds));
     }
 }

codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/controller/message/MessageController.java

@@ -5,10 +5,9 @@
 import com.sprint.mission.discodeit.dto.request.MessageUpdateRequest;
 import com.sprint.mission.discodeit.entity.Message;
 import com.sprint.mission.discodeit.service.MessageService;
+import java.io.IOException;
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -18,6 +17,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequestMapping("/api/message")
@@ -36,15 +36,28 @@ public ResponseEntity<List<Message>> findByAllChannel(
         return ResponseEntity.ok(messageService.findAllByChannelId(channelId));
     }
 
-    @RequestMapping(method = RequestMethod.POST, consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
+    @RequestMapping(
+            method = RequestMethod.POST, consumes = {MediaType.APPLICATION_JSON_VALUE,
+            MediaType.MULTIPART_FORM_DATA_VALUE}
+    )
     public ResponseEntity<Void> createMessage(
             @RequestPart(name = "messageCreateRequest") MessageCreateRequest messageCreateRequest,
-            @RequestPart(required = false, name = "binaryContentCreateRequest") List<BinaryContentCreateRequest> binaryContentCreateRequest
+            @RequestPart(required = false, name = "binaryContentCreateRequest") List<MultipartFile> binaryContentCreateRequest
     ) {
-        if (Objects.isNull(binaryContentCreateRequest)) {
-            binaryContentCreateRequest = new ArrayList<>();
-        }
-        messageService.create(messageCreateRequest, binaryContentCreateRequest);
+        List<BinaryContentCreateRequest> binaryContents = binaryContentCreateRequest.stream()
+                .map(file -> {
+                    try {
+                        return new BinaryContentCreateRequest(
+                                file.getOriginalFilename(),
+                                file.getContentType(),
+                                file.getBytes()
+                        );
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+                .toList();
+        messageService.create(messageCreateRequest, binaryContents);
         return ResponseEntity.created(URI.create("/")).build();
     }
 

codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/controller/user/UserController.java

@@ -5,16 +5,21 @@
 import com.sprint.mission.discodeit.dto.request.UserCreateRequest;
 import com.sprint.mission.discodeit.dto.request.UserUpdateRequest;
 import com.sprint.mission.discodeit.service.UserService;
+import java.io.IOException;
 import java.net.URI;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequestMapping("/api/user")
@@ -26,12 +31,23 @@ public UserController(UserService userService) {
         this.userService = userService;
     }
 
-    @RequestMapping(method = RequestMethod.POST)
+    @RequestMapping(method = RequestMethod.POST, consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
     public ResponseEntity<Void> createUser(
-            @RequestBody UserCreateRequest userCreateRequest,
-            @RequestBody(required = false) BinaryContentCreateRequest binaryContentCreateRequest
+            @RequestPart(name = "user-create-request") UserCreateRequest userCreateRequest,
+            @RequestPart(name = "binary-content-create-request", required = false) MultipartFile binaryContentCreateRequest
     ) {
-        userService.create(userCreateRequest, Optional.ofNullable(binaryContentCreateRequest));
+        BinaryContentCreateRequest binaryContent = null;
+        if (Objects.nonNull(binaryContentCreateRequest)) {
+            try {
+                binaryContent = new BinaryContentCreateRequest(
+                        binaryContentCreateRequest.getOriginalFilename(),
+                        binaryContentCreateRequest.getContentType(),
+                        binaryContentCreateRequest.getBytes());
+            } catch (IOException exception) {
+                throw new IllegalArgumentException(exception);
+            }
+        }
+        userService.create(userCreateRequest, Optional.ofNullable(binaryContent));
         return ResponseEntity.created(URI.create("/")).build();
     }