Feat #54 이미지 추가해서 반환

src/main/java/com/gachtaxi/domain/chat/controller/ChattingController.java

@@ -2,6 +2,7 @@
 
 import com.gachtaxi.domain.chat.dto.request.ChatMessageRequest;
 import com.gachtaxi.domain.chat.dto.response.ChatResponse;
+import com.gachtaxi.domain.chat.dto.response.ChattingRoomCountResponse;
 import com.gachtaxi.domain.chat.dto.response.ChattingRoomResponse;
 import com.gachtaxi.domain.chat.service.ChattingRoomService;
 import com.gachtaxi.domain.chat.service.ChattingService;
@@ -48,6 +49,15 @@ public ApiResponse<ChatResponse> getChattingMessages(@PathVariable Long roomId,
         return ApiResponse.response(OK, GET_CHATTING_MESSAGE_SUCCESS.getMessage(), response);
     }
 
+    @GetMapping("/api/chat/count/{roomId}")
+    @Operation(summary = "채팅방의 총 참여자 수를 조회하기 위한 API입니다.")
+    public ApiResponse<ChattingRoomCountResponse> getChattingMessageCount(@CurrentMemberId Long memberId,
+                                                                          @PathVariable Long roomId) {
+        ChattingRoomCountResponse response = chattingRoomService.getCount(memberId, roomId);
+
+        return ApiResponse.response(OK, GET_CHATTING_PARTICIPANT_COUNT_SUCCESS.getMessage(), response);
+    }
+
     @DeleteMapping("/api/chat/{roomId}")
     @Operation(summary = "채팅방을 퇴장하는 API입니다. 퇴장시 STOMP UNSUBSCRIBE를 꼭 해주세요")
     public ApiResponse<Void> exitChattingRoom(@PathVariable Long roomId,

src/main/java/com/gachtaxi/domain/chat/controller/ResponseMessage.java

@@ -9,7 +9,8 @@ public enum ResponseMessage {
 
     CREATE_CHATTING_ROOM_SUCCESS("채팅방 생성에 성공했습니다."),
     GET_CHATTING_MESSAGE_SUCCESS("이전 메시지 조회에 성공 했습니다."),
-    EXIT_CHATTING_ROOM_SUCCESS("채팅방 퇴장에 성공했습니다.");
+    EXIT_CHATTING_ROOM_SUCCESS("채팅방 퇴장에 성공했습니다."),
+    GET_CHATTING_PARTICIPANT_COUNT_SUCCESS("채팅방 전체 참여자 조회에 성공했습니다.");
 
     private final String message;
 }

src/main/java/com/gachtaxi/domain/chat/dto/request/ChatMessage.java

@@ -16,6 +16,7 @@ public record ChatMessage(
         Long senderId,
         String senderName,
         String message,
+        String profilePicture,
         ReadMessageRange range,
         Long unreadCount,
         LocalDateTime timeStamp,
@@ -28,6 +29,7 @@ public static ChatMessage from(ChattingMessage chattingMessage) {
                 .senderId(chattingMessage.getSenderId())
                 .senderName(chattingMessage.getSenderName())
                 .message(chattingMessage.getMessage())
+                .profilePicture(chattingMessage.getProfilePicture())
                 .unreadCount(chattingMessage.getUnreadCount())
                 .timeStamp(chattingMessage.getTimeStamp())
                 .messageType(chattingMessage.getMessageType())

src/main/java/com/gachtaxi/domain/chat/dto/response/ChatResponse.java

@@ -16,7 +16,7 @@ public record ChatResponse(
     public static ChatResponse of(ChattingParticipant chattingParticipant, List<ChattingMessageResponse> chattingMessages, ChatPageableResponse chatPageableResponse) {
         return ChatResponse.builder()
                 .memberId(chattingParticipant.getMembers().getId())
-                .disconnectedAt(chattingParticipant.getLastReadAt())
+                .disconnectedAt(chattingParticipant.getDisconnectedAt())
                 .chattingMessage(chattingMessages)
                 .pageable(chatPageableResponse)
                 .build();

src/main/java/com/gachtaxi/domain/chat/dto/response/ChattingMessageResponse.java

@@ -12,6 +12,7 @@ public record ChattingMessageResponse(
         Long senderId,
         String senderName,
         String message,
+        String profilePicture,
         Long unreadCount,
         LocalDateTime timeStamp,
         MessageType messageType
@@ -22,6 +23,7 @@ public static ChattingMessageResponse from(ChattingMessage chattingMessage) {
                 .senderId(chattingMessage.getSenderId())
                 .senderName(chattingMessage.getSenderName())
                 .message(chattingMessage.getMessage())
+                .profilePicture(chattingMessage.getProfilePicture())
                 .unreadCount(chattingMessage.getUnreadCount())
                 .timeStamp(chattingMessage.getTimeStamp())
                 .messageType(chattingMessage.getMessageType())

src/main/java/com/gachtaxi/domain/chat/dto/response/ChattingRoomCountResponse.java

@@ -0,0 +1,10 @@
+package com.gachtaxi.domain.chat.dto.response;
+
+public record ChattingRoomCountResponse(
+        Long roomId,
+        Long totalParticipantCount
+) {
+    public static ChattingRoomCountResponse of(Long roomId, Long totalParticipantCount) {
+        return new ChattingRoomCountResponse(roomId, totalParticipantCount);
+    }
+}

src/main/java/com/gachtaxi/domain/chat/entity/ChattingMessage.java

@@ -25,6 +25,8 @@ public class ChattingMessage {
 
     private String senderName;
 
+    private String profilePicture;
+
     private Long roomId;
 
     private String message;
@@ -38,12 +40,13 @@ public class ChattingMessage {
     @LastModifiedDate
     private LocalDateTime updatedAt;
 
-    public static ChattingMessage of(ChatMessageRequest request, long roomId, long senderId, String senderName, long unreadCount) {
+    public static ChattingMessage of(ChatMessageRequest request, long roomId, long senderId, String senderName, long unreadCount, String profilePicture) {
         return ChattingMessage.builder()
                 .senderId(senderId)
                 .senderName(senderName)
                 .roomId(roomId)
                 .message(request.message())
+                .profilePicture(profilePicture)
                 .unreadCount(unreadCount)
                 .messageType(MessageType.MESSAGE)
                 .timeStamp(LocalDateTime.now())

src/main/java/com/gachtaxi/domain/chat/entity/ChattingParticipant.java

@@ -35,6 +35,8 @@ public class ChattingParticipant extends BaseEntity {
     @CreatedDate
     private LocalDateTime lastReadAt;
 
+    private LocalDateTime disconnectedAt;
+
     public static ChattingParticipant of(ChattingRoom chattingRoom, Members members) {
         return ChattingParticipant.builder()
                 .chattingRoom(chattingRoom)
@@ -48,9 +50,11 @@ public void reSubscribe() {
 
     public void unsubscribe() {
         this.lastReadAt = LocalDateTime.now();
+        this.disconnectedAt = LocalDateTime.now();
     }
 
     public void disconnect() {
         this.lastReadAt = LocalDateTime.now();
+        this.disconnectedAt = LocalDateTime.now();
     }
 }

src/main/java/com/gachtaxi/domain/chat/service/ChattingRedisService.java

@@ -1,34 +1,35 @@
 package com.gachtaxi.domain.chat.service;
 
-import com.gachtaxi.domain.chat.exception.ChattingRoomNotFoundException;
 import com.gachtaxi.domain.chat.exception.UnSubscriptionException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 @Service
 @RequiredArgsConstructor
 public class ChattingRedisService {
     public static final String REDIS_CHAT_KEY_PREFIX = "ROOM:";
 
     private final RedisTemplate<String, Object> chatRoomRedisTemplate;
 
-    public void saveSubscribeMember(long roomId, long senderId) {
+    public void saveSubscribeMember(long roomId, long senderId, String profilePicture) {
         String key = getKey(roomId);
 
-        chatRoomRedisTemplate.opsForSet().add(key, senderId);
+        chatRoomRedisTemplate.opsForHash().put(key, String.valueOf(senderId), profilePicture);
     }
 
     public boolean isActive(long roomId, long senderId) {
         String key = getKey(roomId);
 
-        return Boolean.TRUE.equals(chatRoomRedisTemplate.opsForSet().isMember(key, senderId));
+        return Boolean.TRUE.equals(chatRoomRedisTemplate.opsForHash().hasKey(key, String.valueOf(senderId)));
     }
 
     public void removeSubscribeMember(long roomId, long senderId) {
         String key = getKey(roomId);
 
-        chatRoomRedisTemplate.opsForSet().remove(key, senderId);
+        chatRoomRedisTemplate.opsForHash().delete(key, String.valueOf(senderId));
     }
 
     public void checkSubscriptionStatus(long roomId, long senderId) {
@@ -40,13 +41,15 @@ public void checkSubscriptionStatus(long roomId, long senderId) {
     public long getSubscriberCount(long roomId) {
         String key = getKey(roomId);
 
-        Long size = chatRoomRedisTemplate.opsForSet().size(key);
+        return chatRoomRedisTemplate.opsForHash().size(key);
+    }
 
-        if (size == null) {
-            throw new ChattingRoomNotFoundException();
-        }
+    public String getProfilePicture(long roomId, long senderId) {
+        String key = getKey(roomId);
 
-        return size;
+        return Optional.ofNullable(chatRoomRedisTemplate.opsForHash().get(key, String.valueOf(senderId)))
+                .map(Object::toString)
+                .orElse(null);
     }
 
     private String getKey(long roomId) {

src/main/java/com/gachtaxi/domain/chat/service/ChattingRoomService.java

@@ -1,6 +1,7 @@
 package com.gachtaxi.domain.chat.service;
 
 import com.gachtaxi.domain.chat.dto.request.ChatMessage;
+import com.gachtaxi.domain.chat.dto.response.ChattingRoomCountResponse;
 import com.gachtaxi.domain.chat.dto.response.ChattingRoomResponse;
 import com.gachtaxi.domain.chat.entity.ChattingMessage;
 import com.gachtaxi.domain.chat.entity.ChattingParticipant;
@@ -56,6 +57,13 @@ public void delete(long chattingRoomId) {
         chattingRoom.delete();
     }
 
+    public ChattingRoomCountResponse getCount(Long memberId, Long roomId) {
+        chattingParticipantService.find(roomId, memberId);
+        Long count = chattingParticipantService.getParticipantCount(roomId);
+
+        return ChattingRoomCountResponse.of(roomId, count);
+    }
+
     @Transactional
     public void subscribeChatRoom(long roomId, SimpMessageHeaderAccessor accessor) {
         Long senderId = (Long) accessor.getSessionAttributes().get(CHAT_USER_ID);
@@ -67,12 +75,12 @@ public void subscribeChatRoom(long roomId, SimpMessageHeaderAccessor accessor) {
         accessor.getSessionAttributes().put(CHAT_USER_NAME, members.getNickname());
 
         if (chattingParticipantService.checkSubscription(chattingRoom, members)) {
-            chattingRedisService.saveSubscribeMember(chattingRoom.getId(), members.getId());
+            chattingRedisService.saveSubscribeMember(chattingRoom.getId(), members.getId(), members.getProfilePicture());
 
             return;
         }
 
-        chattingRedisService.saveSubscribeMember(chattingRoom.getId(), members.getId());
+        chattingRedisService.saveSubscribeMember(chattingRoom.getId(), members.getId(), members.getProfilePicture());
 
         ChattingParticipant newParticipant = ChattingParticipant.of(chattingRoom, members);
         chattingParticipantService.save(newParticipant);

src/main/java/com/gachtaxi/domain/chat/service/ChattingService.java

@@ -53,8 +53,9 @@ public void chat(ChatMessageRequest request, SimpMessageHeaderAccessor accessor)
         String senderName = getSessionAttribute(accessor, CHAT_USER_NAME, String.class);
 
         long unreadCount = getUnreadCount(roomId);
+        String profilePicture = chattingRedisService.getProfilePicture(roomId, userId);
 
-        ChattingMessage chattingMessage = ChattingMessage.of(request, roomId, userId, senderName, unreadCount);
+        ChattingMessage chattingMessage = ChattingMessage.of(request, roomId, userId, senderName, unreadCount, profilePicture);
 
         chattingMessageRepository.save(chattingMessage);
 
@@ -99,7 +100,7 @@ private Slice<ChattingMessage> loadMessage(long roomId, ChattingParticipant chat
     }
 
     private Slice<ChattingMessage> loadInitialMessage(long roomId, ChattingParticipant chattingParticipant, int pageSize) {
-        int chattingCount = chattingMessageRepository.countAllByRoomIdAndTimeStampAfterOrderByTimeStampDesc(roomId, chattingParticipant.getLastReadAt());
+        int chattingCount = chattingMessageRepository.countAllByRoomIdAndTimeStampAfterOrderByTimeStampDesc(roomId, chattingParticipant.getDisconnectedAt());
 
         int effectivePageSize = Math.max(chattingCount, pageSize);
         Pageable pageable = PageRequest.of(0, effectivePageSize, Sort.by(Sort.Direction.DESC, "timeStamp"));