Merge pull request #142 from CommitField/chat81

Feat: 채팅 img 사진

Author: skyeong42

src/main/java/cmf/commitField/domain/chat/chatMessage/controller/response/ChatMsgResponse.java

@@ -12,8 +12,10 @@
 public class ChatMsgResponse {
     //채팅방 ID
     private Long roomId;
+    private Long id;
     //사용자(user)
     private String from;
     private String message;
     private LocalDateTime sendAt;
+    private String avatarUrl;  // 아바타 URL 필드 추가
 }

src/main/java/cmf/commitField/domain/chat/chatMessage/dto/ChatMsgDto.java

@@ -15,4 +15,5 @@ public class ChatMsgDto {
     private String nickname;
     private String message;
     private LocalDateTime sendAt;
+    private String avatarUrl;  // avatarUrl 필드 추가
 }

src/main/java/cmf/commitField/domain/chat/chatMessage/service/ChatMessageServiceImpl.java

@@ -43,30 +43,29 @@ public ChatMsgResponse sendMessage(ChatMsgRequest message, Long userId, Long roo
 
         ChatRoom chatRoom = chatRoomRepository.findChatRoomById(roomId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_ROOM));
-        // 채팅 메시지 생성
+
         ChatMsg chatMsg = ChatMsg.builder()
                 .message(message.getMessage())
                 .createdAt(LocalDateTime.now())
                 .user(findUser)
                 .chatRoom(chatRoom)
                 .build();
 
-        // Response message
-        // 응답 값으로 변환
-
-        ChatMsgResponse response = ChatMsgResponse.builder()
+        chatMessageRepository.save(chatMsg);
 
+        // Response message
+        // 응답값 변환
+        return ChatMsgResponse.builder()
+                .id(chatMsg.getId())         // chatMsgId 추가
                 .roomId(roomId)
-                .from(findUser.getNickname())
+                .from(findUser.getUsername())
                 .message(message.getMessage())
                 .sendAt(chatMsg.getCreatedAt())
+                .avatarUrl(findUser.getAvatarUrl()) // 아바타 URL 추가
                 .build();
-        chatMessageRepository.save(chatMsg);
-        return response;
 
     }
 
-
     @Transactional(readOnly = true)
     @Override
     public List<ChatMsgDto> getRoomChatMsgList(Long roomId, Long userId, Long lastId) {
@@ -83,10 +82,11 @@ public List<ChatMsgDto> getRoomChatMsgList(Long roomId, Long userId, Long lastId
         for (ChatMsg chatMsg : chatMsgsList) {
             ChatMsgDto build = ChatMsgDto.builder()
                     .chatMsgId(chatMsg.getId())
-                    .nickname(chatMsg.getUser().getNickname())
+                    .nickname(chatMsg.getUser().getUsername()) // nickname 대신 username 사용
                     .sendAt(chatMsg.getCreatedAt())
                     .message(chatMsg.getMessage())
                     .userId(chatMsg.getUser().getId())
+                    .avatarUrl(chatMsg.getUser().getAvatarUrl()) // avatarUrl 추가
                     .build();
             if (build.getSendAt().isAfter(joinDt)) {
                 chatMsgDtos.add(build);

src/main/java/cmf/commitField/domain/chat/chatRoom/controller/response/ChatRoomResponse.java

@@ -1,4 +1,4 @@
-//package cmf.commitField.domain.chat.chatRoom.controller.response;
-//
-//public class ChatRoomResponse {
-//}
+package cmf.commitField.domain.chat.chatRoom.controller.response;
+
+public class ChatRoomResponse {
+}

src/main/java/cmf/commitField/domain/noti/noti/controller/ApiV1NotiController.java

@@ -31,6 +31,10 @@ public class ApiV1NotiController {
     private final NotiService notiService;
     private final UserRepository userRepository;
 
+//    private final NotiWebSocketHandler notiWebSocketHandler;
+    private final ApplicationEventPublisher eventPublisher;
+
+
     @GetMapping("")
     public GlobalResponse<List<NotiDto>> getNoti(@AuthenticationPrincipal OAuth2User oAuth2User) {
         String username = oAuth2User.getName();

src/main/java/cmf/commitField/domain/user/dto/UserChatInfoDto.java

@@ -10,4 +10,5 @@ public class UserChatInfoDto {
     private String username;
     private String nickname;
     private String email;
+    private String avatarUrl;
 }

src/main/java/cmf/commitField/domain/user/service/UserService.java

@@ -49,6 +49,7 @@ public UserChatInfoDto showUserChatInfo(String username) {
                 .email(user.getEmail())
                 .nickname(user.getNickname())
                 .username(user.getUsername())
+                .avatarUrl(user.getAvatarUrl())
                 .build();
     }
 

src/main/java/cmf/commitField/global/websocket/ChatWebSocketHandler.java

@@ -200,8 +200,9 @@ private void handleChatMessage(WebSocketSession session, JsonNode jsonNode) {
                 wsMessage.put("type", "CHAT");
                 wsMessage.put("roomId", roomId);
                 wsMessage.put("userId", userId);
-                wsMessage.put("from", response.getFrom());
-                wsMessage.put("nickname", response.getFrom()); // 클라이언트 호환성을 위해 두 필드 모두 설정
+                wsMessage.put("from", user.getUsername()); // nickname 대신 username 사용
+                wsMessage.put("nickname", user.getUsername()); // nickname 대신 username 사용
+                wsMessage.put("avatarUrl", user.getAvatarUrl()); // 아바타 URL 추가
                 wsMessage.put("message", message);
                 wsMessage.put("sendAt", response.getSendAt().toString());