Skip to content

Commit d7ec9f7

Browse files
committed
refactor: file 을 받기 위해서 @RequestPart 적용
1 parent cb8268a commit d7ec9f7

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

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

+11-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@
66
import com.sprint.mission.discodeit.entity.Message;
77
import com.sprint.mission.discodeit.service.MessageService;
88
import java.net.URI;
9+
import java.util.ArrayList;
910
import java.util.List;
11+
import java.util.Objects;
1012
import java.util.UUID;
13+
import org.springframework.http.MediaType;
1114
import org.springframework.http.ResponseEntity;
1215
import org.springframework.web.bind.annotation.PathVariable;
1316
import org.springframework.web.bind.annotation.RequestBody;
1417
import org.springframework.web.bind.annotation.RequestMapping;
1518
import org.springframework.web.bind.annotation.RequestMethod;
19+
import org.springframework.web.bind.annotation.RequestPart;
1620
import org.springframework.web.bind.annotation.RestController;
1721

1822
@RestController
@@ -26,17 +30,20 @@ public MessageController(MessageService messageService) {
2630
}
2731

2832
@RequestMapping(value = "/{channelId}", method = RequestMethod.GET)
29-
public ResponseEntity<List<Message>> findByChannel(
33+
public ResponseEntity<List<Message>> findByAllChannel(
3034
@PathVariable(name = "channelId") UUID channelId
3135
) {
3236
return ResponseEntity.ok(messageService.findAllByChannelId(channelId));
3337
}
3438

35-
@RequestMapping(method = RequestMethod.POST)
39+
@RequestMapping(method = RequestMethod.POST, consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
3640
public ResponseEntity<Void> createMessage(
37-
@RequestBody MessageCreateRequest messageCreateRequest,
38-
@RequestBody(required = false) List<BinaryContentCreateRequest> binaryContentCreateRequest
41+
@RequestPart(name = "messageCreateRequest") MessageCreateRequest messageCreateRequest,
42+
@RequestPart(required = false, name = "binaryContentCreateRequest") List<BinaryContentCreateRequest> binaryContentCreateRequest
3943
) {
44+
if (Objects.isNull(binaryContentCreateRequest)) {
45+
binaryContentCreateRequest = new ArrayList<>();
46+
}
4047
messageService.create(messageCreateRequest, binaryContentCreateRequest);
4148
return ResponseEntity.created(URI.create("/")).build();
4249
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public ResponseEntity<Void> updateUserStatus(
2525
@PathVariable(name = "userId") UUID userId,
2626
@RequestBody UserStatusUpdateRequest userStatusUpdateRequest
2727
) {
28-
userStatusService.update(userId, userStatusUpdateRequest);
28+
userStatusService.updateByUserId(userId, userStatusUpdateRequest);
2929
return ResponseEntity.noContent().build();
3030
}
3131
}

0 commit comments

Comments
 (0)