hotfix : 파티 상세 조회 시, 이미 참여중인 파티라면 groupChatRoomId 추가 반환

Author: yyytir777

src/main/java/ita/tinybite/domain/chat/repository/ChatRoomMemberRepository.java

@@ -3,7 +3,9 @@
 import ita.tinybite.domain.chat.entity.ChatRoom;
 import ita.tinybite.domain.chat.entity.ChatRoomMember;
 import ita.tinybite.domain.chat.enums.ChatRoomType;
+import ita.tinybite.domain.party.entity.Party;
 import ita.tinybite.domain.user.entity.User;
+import org.springframework.data.domain.Limit;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
@@ -16,4 +18,6 @@ public interface ChatRoomMemberRepository extends JpaRepository<ChatRoomMember,
     Optional<ChatRoomMember> findByChatRoomAndUser(ChatRoom chatRoom, User user);
 
     Optional<ChatRoomMember> findByChatRoomAndUserAndChatRoom_Type(ChatRoom chatRoom, User user, ChatRoomType chatRoomType);
+
+    Optional<ChatRoomMember> findByUserAndChatRoom_typeAndChatRoom_Party(User user, ChatRoomType chatRoomType, Party chatRoomParty);
 }

src/main/java/ita/tinybite/domain/party/dto/response/PartyDetailResponse.java

@@ -1,5 +1,6 @@
 package ita.tinybite.domain.party.dto.response;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import ita.tinybite.domain.party.entity.PickupLocation;
 import ita.tinybite.domain.party.enums.PartyCategory;
 import lombok.*;
@@ -10,6 +11,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class PartyDetailResponse {
 
     private Long partyId;
@@ -48,4 +50,7 @@ public class PartyDetailResponse {
     // 상태
     private Boolean isClosed;
     private Boolean isParticipating; // 현재 사용자가 참여 중인지
+
+    // 현재 유저가 해당 파티에 참여중이라면, 그룹 채팅방 아이디 반환
+    private Long groupChatRoomId;
 }

src/main/java/ita/tinybite/domain/party/service/PartyService.java

@@ -3,7 +3,6 @@
 import ita.tinybite.domain.chat.entity.ChatRoom;
 import ita.tinybite.domain.chat.entity.ChatRoomMember;
 import ita.tinybite.domain.chat.enums.ChatRoomType;
-import ita.tinybite.domain.chat.repository.ChatMessageRepository;
 import ita.tinybite.domain.chat.repository.ChatRoomMemberRepository;
 import ita.tinybite.domain.chat.repository.ChatRoomRepository;
 import ita.tinybite.domain.chat.service.ChatService;
@@ -246,7 +245,16 @@ public PartyDetailResponse getPartyDetail(Long partyId, Long userId, Double user
             );
         }
 
-        return convertToDetailResponse(party, distance, isParticipating);
+        // 특정 유저가 특정 파티의 그룹 채팅방에 참여중일 때, 유저-채팅방의 참여 정보 조회
+        ChatRoomMember chatRoomMember = chatRoomMemberRepository.findByUserAndChatRoom_typeAndChatRoom_Party(user, ChatRoomType.GROUP, party)
+                .orElse(null);
+
+        Long groupChatRoomId = null;
+        if(chatRoomMember != null) {
+            groupChatRoomId = chatRoomMember.getChatRoom().getId();
+        }
+
+        return convertToDetailResponse(party, distance, isParticipating, groupChatRoomId);
     }
 
     private boolean validateLocation(Double userLat, Double userLon, Party party) {
@@ -396,7 +404,7 @@ private PartyCardResponse convertToCardResponse(Party party,
 
 
     private PartyDetailResponse convertToDetailResponse(Party party, double distance,
-                                                        boolean isParticipating) {
+                                                        boolean isParticipating, Long groupChatRoomId) {
         int currentCount = party.getCurrentParticipants();
         int pricePerPerson = party.getPrice() / party.getMaxParticipants();
 
@@ -428,6 +436,7 @@ private PartyDetailResponse convertToDetailResponse(Party party, double distance
                 .images(party.getImages())
                 .isClosed(party.getIsClosed())
                 .isParticipating(isParticipating)
+                .groupChatRoomId(groupChatRoomId)
                 .build();
     }