Skip to content

Commit 7ac3e1b

Browse files
committed
Feat: s3์—ฐ๊ฒฐ
1 parent 67ee3e9 commit 7ac3e1b

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

โ€Žsrc/main/java/cmf/commitField/domain/chat/chatRoom/controller/ChatRoomController.javaโ€Ž

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package cmf.commitField.domain.chat.chatRoom.controller;
22

3-
import cmf.commitField.domain.File.service.FileService;
43
import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
54
import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomUpdateRequest;
65
import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
76
import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomUserDto;
87
import cmf.commitField.domain.chat.chatRoom.service.ChatRoomService;
98
import cmf.commitField.domain.user.entity.CustomOAuth2User;
9+
import cmf.commitField.global.aws.s3.S3Service;
1010
import cmf.commitField.global.error.ErrorCode;
1111
import cmf.commitField.global.globalDto.GlobalResponse;
1212
import cmf.commitField.global.security.LoginCheck;
@@ -28,25 +28,24 @@
2828
@RequestMapping("/chat")
2929
public class ChatRoomController {
3030
private final ChatRoomService chatRoomService;
31-
private final FileService fileService;
31+
private final S3Service s3Service; // S3 ํŒŒ์ผ ์ €์žฅ์„ ์œ„ํ•œ ์„œ๋น„์Šค
3232

3333
// ์ฑ„ํŒ…๋ฐฉ ์ƒ์„ฑ (ํŒŒ์ผ ์—…๋กœ๋“œ ํฌํ•จ)
3434
@PostMapping(value = "/room", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
3535
public GlobalResponse<Object> createRoom(
3636
@ModelAttribute @Valid ChatRoomRequest chatRoomRequest) throws IOException {
3737

38-
3938
// ์ธ์ฆ ํ™•์ธ
4039
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
4140

4241
if (authentication instanceof OAuth2AuthenticationToken) {
4342
CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
44-
Long userId = principal.getId(); // getId()๋ฅผ ํ†ตํ•ด userId๋ฅผ ์ถ”์ถœ
43+
Long userId = principal.getId(); // getId()๋ฅผ ํ†ตํ•ด userId ์ถ”์ถœ
4544

4645
// ํŒŒ์ผ ์—…๋กœ๋“œ ์ฒ˜๋ฆฌ
4746
String imageUrl = null;
4847
if (chatRoomRequest.getFile() != null && !chatRoomRequest.getFile().isEmpty()) {
49-
imageUrl = fileService.saveFile(chatRoomRequest.getFile()); // ํŒŒ์ผ ์ €์žฅ
48+
imageUrl = s3Service.uploadFile(chatRoomRequest.getFile(), "chat-room"); // S3์— ์—…๋กœ๋“œ
5049
}
5150

5251
// ์ฑ„ํŒ…๋ฐฉ ์ƒ์„ฑ ์„œ๋น„์Šค ํ˜ธ์ถœ (์ด๋ฏธ์ง€ URL ํฌํ•จ)
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//package cmf.commitField.domain.chat.chatRoom.controller.response;
2-
//
3-
//public class ChatRoomResponse {
4-
//}
1+
package cmf.commitField.domain.chat.chatRoom.controller.response;
2+
3+
public class ChatRoomResponse {
4+
}

0 commit comments

Comments
ย (0)