Merge pull request #171 from Myaongi/feature/#142-create-chatroom-match

Feature/#142 create chatroom match

Author: leewonhee-3054

src/main/java/Myaong/Gangajikimi/chatroom/repository/ChatRoomRepositoryImpl.java

@@ -111,6 +111,7 @@ public List<ChatRoomListResponse> findChatRoomsWithLastMessageAndUnreadCount(Lon
 				.postImageUrl(postImageUrl)
 				.postRegion(postRegion)
 				.postUserTime(postUserTime)
+				.chatContext(room.getContext())
 				.build();
 		}).toList();
 	}

src/main/java/Myaong/Gangajikimi/chatroom/service/ChatRoomServiceImpl.java

@@ -96,6 +96,7 @@ public ChatRoomResponse createChatRoom(ChatRoomCreateRequest req, Long memberId)
 			Long opponentPostId;
 			PostType opponentType;
 			String title, region, dogType, dogColor;
+			String image; // 이미지
 			String timeAgo = null; // 필요 없으면 제거
 
 			if (iAmLostOwner) {
@@ -106,6 +107,7 @@ public ChatRoomResponse createChatRoom(ChatRoomCreateRequest req, Long memberId)
 				dogType = (found.getDogType() != null) ? found.getDogType().getType() : null;
 				dogColor = found.getDogColor();
 				timeAgo  = TimeUtil.getTimeAgo(found.getFoundTime());
+				image = pickImage(found);
 			} else { // iAmFoundOwner
 				opponentPostId = lost.getId();
 				opponentType   = PostType.LOST;
@@ -114,6 +116,7 @@ public ChatRoomResponse createChatRoom(ChatRoomCreateRequest req, Long memberId)
 				dogType = (lost.getDogType() != null) ? lost.getDogType().getType() : null;
 				dogColor = lost.getDogColor();
 				timeAgo  = TimeUtil.getTimeAgo(lost.getLostTime());
+				image    = pickImage(lost);
 			}
 
 			// 2-3) 응답을 서비스에서 직접 빌드(컨버터 손 안 댐)
@@ -131,6 +134,7 @@ public ChatRoomResponse createChatRoom(ChatRoomCreateRequest req, Long memberId)
 					.opponentDogType(dogType)
 					.opponentDogColor(dogColor)
 					.opponentTimeAgo(timeAgo)
+					.opponentImage(image)
 					.build();
 		}
 
@@ -206,7 +210,9 @@ public ChatRoomResponse getRoomAndMatchCard(Long chatRoomId, Long requesterId) {
 							.opponentRegion(found.getFoundRegion())
 							.opponentDogType(found.getDogType()!=null?found.getDogType().getType():null)
 							.opponentDogColor(found.getDogColor())
-							.opponentTimeAgo(TimeUtil.getTimeAgo(found.getFoundTime()));
+							.opponentTimeAgo(TimeUtil.getTimeAgo(found.getFoundTime()))
+							.opponentImage(pickImage(found))
+							.dogName(lost.getDogName()); // dogName 반환
 				} else {            // 내가 FOUND 주인 → 상대 LOST 카드
 					b.matchingRatio(ratio)
 							.opponentPostId(lost.getId())
@@ -215,14 +221,37 @@ public ChatRoomResponse getRoomAndMatchCard(Long chatRoomId, Long requesterId) {
 							.opponentRegion(lost.getLostRegion())
 							.opponentDogType(lost.getDogType()!=null?lost.getDogType().getType():null)
 							.opponentDogColor(lost.getDogColor())
-							.opponentTimeAgo(TimeUtil.getTimeAgo(lost.getLostTime()));
+							.opponentTimeAgo(TimeUtil.getTimeAgo(lost.getLostTime()))
+							.opponentImage(pickImage(lost));
 				}
 			}
 		}
 
 		return b.build();
 	}
 
+	private String pickImage(PostFound found) {
+		if (found.getAiImage() != null && !found.getAiImage().isBlank()) {
+			return found.getAiImage();
+		}
+		var real = found.getRealImage();
+		if (real != null && !real.isEmpty() && real.get(0) != null && !real.get(0).isBlank()) {
+			return real.get(0);
+		}
+		return null;
+	}
+
+	private String pickImage(PostLost lost) {
+		if (lost.getAiImage() != null && !lost.getAiImage().isBlank()) {
+			return lost.getAiImage();
+		}
+		var real = lost.getRealImage();
+		if (real != null && !real.isEmpty() && real.get(0) != null && !real.get(0).isBlank()) {
+			return real.get(0);
+		}
+		return null;
+	}
+
 
 
 

src/main/java/Myaong/Gangajikimi/chatroom/web/dto/ChatRoomListResponse.java

@@ -2,6 +2,7 @@
 
 import java.time.LocalDateTime;
 
+import Myaong.Gangajikimi.common.enums.ChatContext;
 import Myaong.Gangajikimi.common.enums.PostType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -27,6 +28,7 @@ public class ChatRoomListResponse {
 	private String postImageUrl;
 	private String postRegion;
 	private LocalDateTime postUserTime;
+	private ChatContext chatContext;
 
 
 }

src/main/java/Myaong/Gangajikimi/chatroom/web/dto/ChatRoomResponse.java

@@ -25,4 +25,6 @@ public class ChatRoomResponse {
 	private String     opponentDogType;
 	private String     opponentDogColor;
 	private String     opponentTimeAgo; // "3분 전" 등 (선택)
+	private String 	   opponentImage;
+	private String     dogName;
 }