feat: 번개 조회에 채팅방 아이디 추가

Coen90 · Coen90 · commit 771fdade9932 · 2025-03-11T07:37:41.000+09:00
diff --git a/src/main/java/com/codeit/side/chat/adapter/out/persistence/ChatRoomRepositoryImpl.java b/src/main/java/com/codeit/side/chat/adapter/out/persistence/ChatRoomRepositoryImpl.java
@@ -39,4 +39,19 @@ public ChatRoom getBy(Long id) {
                 .orElseThrow(ChatRoomNotFoundException::new)
                 .toDomain();
     }
+
+    @Override
+    public ChatRoom getByLighteningId(Long lighteningId) {
+        return chatRoomJpaRepository.findByLighteningId(lighteningId)
+                .orElseThrow(ChatRoomNotFoundException::new)
+                .toDomain();
+    }
+
+    @Override
+    public List<ChatRoom> findAllByLighteningIds(List<Long> lighteningIds) {
+        return chatRoomJpaRepository.findAllByLighteningIdIn(lighteningIds)
+                .stream()
+                .map(ChatRoomEntity::toDomain)
+                .toList();
+    }
 }
diff --git a/src/main/java/com/codeit/side/chat/adapter/out/persistence/entity/ChatRoomEntity.java b/src/main/java/com/codeit/side/chat/adapter/out/persistence/entity/ChatRoomEntity.java
@@ -18,6 +18,7 @@ public class ChatRoomEntity extends BaseEntity {
 
     private String name;
 
+    @Column(unique = true)
     private Long lighteningId;
 
     private Long hostId;
diff --git a/src/main/java/com/codeit/side/chat/adapter/out/persistence/jpa/ChatRoomJpaRepository.java b/src/main/java/com/codeit/side/chat/adapter/out/persistence/jpa/ChatRoomJpaRepository.java
@@ -4,7 +4,10 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface ChatRoomJpaRepository extends JpaRepository<ChatRoomEntity, Long> {
-    List<ChatRoomEntity> findByHostIdOrderByCreatedAtDesc(Long hostId);
+    Optional<ChatRoomEntity> findByLighteningId(Long lighteningId);
+
+    List<ChatRoomEntity> findAllByLighteningIdIn(List<Long> lighteningIds);
 }
diff --git a/src/main/java/com/codeit/side/chat/application/port/in/ChatMessageUseCase.java b/src/main/java/com/codeit/side/chat/application/port/in/ChatMessageUseCase.java
@@ -2,6 +2,7 @@
 
 import com.codeit.side.chat.domain.ChatMessage;
 import com.codeit.side.chat.domain.ChatMessages;
+import com.codeit.side.chat.domain.ChatRoom;
 import com.codeit.side.chat.domain.ChatRoomInfo;
 
 import java.util.List;
@@ -18,4 +19,8 @@ public interface ChatMessageUseCase {
     ChatMessages findAllMessagesByRoomId(Long roomId, String email, Long offset, Integer size);
 
     void joinChatRoom(Long id, String email);
+
+    ChatRoom getChatRoomByLighteningId(Long lighteningId);
+
+    List<ChatRoom> findAllChatRoomsByLighteningIds(List<Long> lighteningIds);
 }
diff --git a/src/main/java/com/codeit/side/chat/application/port/out/ChatRoomRepository.java b/src/main/java/com/codeit/side/chat/application/port/out/ChatRoomRepository.java
@@ -11,4 +11,8 @@ public interface ChatRoomRepository {
     List<ChatRoom> findAllByUserId(Long id);
 
     ChatRoom getBy(Long id);
+
+    ChatRoom getByLighteningId(Long lighteningId);
+
+    List<ChatRoom> findAllByLighteningIds(List<Long> lighteningIds);
 }
diff --git a/src/main/java/com/codeit/side/chat/application/service/ChatMessageService.java b/src/main/java/com/codeit/side/chat/application/service/ChatMessageService.java
@@ -92,6 +92,16 @@ public void joinChatRoom(Long id, String email) {
         chatMemberRepository.join(id, user.getId());
     }
 
+    @Override
+    public ChatRoom getChatRoomByLighteningId(Long lighteningId) {
+        return chatRoomRepository.getByLighteningId(lighteningId);
+    }
+
+    @Override
+    public List<ChatRoom> findAllChatRoomsByLighteningIds(List<Long> lighteningIds) {
+        return chatRoomRepository.findAllByLighteningIds(lighteningIds);
+    }
+
     private List<ChatRoomInfo> createChatRoomInfos(List<ChatRoom> chatRooms, Map<Long, ChatMessage> allLastMessageByIds, Map<Long, Integer> idToMemberSize) {
         return chatRooms.stream()
                 .map(chatRoom -> createChatRoomInfo(chatRoom, allLastMessageByIds.get(chatRoom.getId()), idToMemberSize.get(chatRoom.getId())))
diff --git a/src/main/java/com/codeit/side/lightening/adapter/in/web/ReviewController.java b/src/main/java/com/codeit/side/lightening/adapter/in/web/ReviewController.java
@@ -39,7 +39,7 @@ public ResponseEntity<ReviewResponses> getReviews(@PathVariable Long id, @Reques
 
     @GetMapping("/reviews/all")
     public ResponseEntity<ReviewInfoResponses> getReviews(
-            @RequestParam String category,
+            @RequestParam(required = false) String category,
             @RequestParam(required = false) String city,
             @RequestParam(required = false) String town,
             @RequestParam(required = false)LocalDateTime targetAt,
diff --git a/src/main/java/com/codeit/side/lightening/adapter/in/web/response/LighteningResponse.java b/src/main/java/com/codeit/side/lightening/adapter/in/web/response/LighteningResponse.java
@@ -29,6 +29,7 @@ public record LighteningResponse(
         int participantCount,
         boolean isConfirmed,
         boolean isCompleted,
+        Long chatRoomId,
         List<LighteningMemberResponse> participants
 ) {
     public static LighteningResponse from(String email, LighteningInfo lighteningInfo) {
@@ -60,6 +61,7 @@ public static LighteningResponse from(String email, LighteningInfo lighteningInf
                 lighteningInfo.getLighteningMembers().size(),
                 lighteningMemberResponse.size() >= lightening.getMinCapacity(),
                 lighteningMemberResponse.size() >= lightening.getCapacity(),
+                lighteningInfo.getChatRoom().getId(),
                 lighteningMemberResponse
         );
     }
diff --git a/src/main/java/com/codeit/side/lightening/application/service/LighteningService.java b/src/main/java/com/codeit/side/lightening/application/service/LighteningService.java
@@ -1,6 +1,7 @@
 package com.codeit.side.lightening.application.service;
 
 import com.codeit.side.chat.application.port.in.ChatMessageUseCase;
+import com.codeit.side.chat.domain.ChatRoom;
 import com.codeit.side.common.adapter.exception.IllegalRequestException;
 import com.codeit.side.common.adapter.exception.LighteningAlreadyFullException;
 import com.codeit.side.common.adapter.exception.UserAlreadyJoinedException;
@@ -70,7 +71,8 @@ public LighteningInfo getById(String email, Long id) {
         Lightening lightening = lighteningReadRepository.getById(id);
         List<LighteningMember> lighteningMember = lighteningReadRepository.findAllMembersBy(lightening.getId());
         boolean isLighteningLike = lighteningReadRepository.findLighteningLikeBy(email, lightening.getId());
-        return createLighteningInfo(lightening, lighteningMember, isLighteningLike);
+        ChatRoom chatRoom = chatMessageUseCase.getChatRoomByLighteningId(lightening.getId());
+        return createLighteningInfo(lightening, lighteningMember, chatRoom, isLighteningLike);
     }
 
     @Override
@@ -81,7 +83,8 @@ public List<LighteningInfo> findAllBy(String email, LighteningCondition lighteni
                 .toList();
         List<LighteningMember> lighteningMembers = lighteningReadRepository.findAllMembersBy(lighteningIds);
         List<LighteningLike> lighteningLikes = lighteningReadRepository.findLighteningLikesBy(email, lighteningIds);
-        return createLighteningInfos(lightenings, lighteningMembers, lighteningLikes);
+        List<ChatRoom> chatRoomIds = chatMessageUseCase.findAllChatRoomsByLighteningIds(lighteningIds);
+        return createLighteningInfos(lightenings, lighteningMembers, chatRoomIds, lighteningLikes);
     }
 
     @Override
@@ -104,19 +107,21 @@ public void delete(String email, Long id) {
         lighteningCommandRepository.delete(id);
     }
 
-    private List<LighteningInfo> createLighteningInfos(List<Lightening> lightenings, List<LighteningMember> lighteningMembers, List<LighteningLike> lighteningLikes) {
+    private List<LighteningInfo> createLighteningInfos(List<Lightening> lightenings, List<LighteningMember> lighteningMembers, List<ChatRoom> chatRooms, List<LighteningLike> lighteningLikes) {
         Map<Long, List<LighteningMember>> idToLighteningMembers = lighteningMembers.stream()
                 .collect(Collectors.groupingBy(LighteningMember::getLighteningId));
-        Map<Long, LighteningLike> idToLighteningLikes = lighteningLikes.stream()
+        Map<Long, LighteningLike> idToLighteningLike = lighteningLikes.stream()
                 .collect(Collectors.toMap(LighteningLike::getLighteningId, Function.identity()));
+        Map<Long, ChatRoom> idToChatRoom = chatRooms.stream()
+                .collect(Collectors.toMap(ChatRoom::getLighteningId, Function.identity()));
 
         return lightenings.stream()
-                .map(lightening -> createLighteningInfo(lightening, idToLighteningMembers.getOrDefault(lightening.getId(), List.of()), idToLighteningLikes.containsKey(lightening.getId())))
+                .map(lightening -> createLighteningInfo(lightening, idToLighteningMembers.getOrDefault(lightening.getId(), List.of()), idToChatRoom.get(lightening.getId()), idToLighteningLike.containsKey(lightening.getId())))
                 .toList();
     }
 
-    private LighteningInfo createLighteningInfo(Lightening lightening, List<LighteningMember> lighteningMember, boolean isLighteningLike) {
-        return LighteningInfo.of(lightening, lighteningMember, isLighteningLike);
+    private LighteningInfo createLighteningInfo(Lightening lightening, List<LighteningMember> lighteningMember, ChatRoom chatRoom, boolean isLighteningLike) {
+        return LighteningInfo.of(lightening, lighteningMember, chatRoom, isLighteningLike);
     }
 
     private void validateLightening(String email, Lightening lightening) {
diff --git a/src/main/java/com/codeit/side/lightening/domain/LighteningInfo.java b/src/main/java/com/codeit/side/lightening/domain/LighteningInfo.java
@@ -1,5 +1,6 @@
 package com.codeit.side.lightening.domain;
 
+import com.codeit.side.chat.domain.ChatRoom;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -11,13 +12,15 @@
 public class LighteningInfo {
     private final Lightening lightening;
     private final List<LighteningMember> lighteningMembers;
+    private final ChatRoom chatRoom;
     private final boolean isLiked;
 
     public static LighteningInfo of(
             Lightening lightening,
             List<LighteningMember> lighteningMembers,
+            ChatRoom chatRoom,
             boolean isLiked
     ){
-        return new LighteningInfo(lightening, lighteningMembers, isLiked);
+        return new LighteningInfo(lightening, lighteningMembers, chatRoom, isLiked);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,8 @@ public interface ChatRoomRepository {`
`11`	`11`	`List<ChatRoom> findAllByUserId(Long id);`
`12`	`12`
`13`	`13`	`ChatRoom getBy(Long id);`
	`14`	`+`
	`15`	`+ ChatRoom getByLighteningId(Long lighteningId);`
	`16`	`+`
	`17`	`+ List<ChatRoom> findAllByLighteningIds(List<Long> lighteningIds);`
`14`	`18`	`}`