🧪 [Test] && 🐛 [Bug] 방 시작하기 및 참여하기에서 시작되는 부분 테스트 코드 작성 && 마감된 방 && Finish방 Intra조회

gg-pingpong-api/src/main/java/gg/party/api/admin/room/service/RoomStatusService.java

@@ -25,11 +25,11 @@ public class RoomStatusService {
 	@Transactional
 	public void finishStartedRooms() {
 		LocalDateTime twoHoursAgo = LocalDateTime.now().minusHours(2);
-		List<Room> startedRooms = roomRepository.findByStatus(RoomType.START, null);
+		List<Room> startedRooms = roomRepository.findByStatusAndStartDate(RoomType.START, twoHoursAgo);
 		for (Room room : startedRooms) {
 			room.updateRoomStatus(RoomType.FINISH);
 			roomRepository.save(room);
-			log.info("Room {} status updated to FINISH", room.getId());
+			log.info("{}번 방이 종료되었습니다.", room.getId());
 		}
 	}
 
@@ -45,7 +45,7 @@ public void failOpenedRooms() {
 			if (room.getDueDate().isBefore(now)) {
 				room.updateRoomStatus(RoomType.FAIL);
 				roomRepository.save(room);
-				log.info("Room {} status updated to FAIL", room.getId());
+				log.info("{}번 방이 시간이 지나 Fail되었습니다.", room.getId());
 			}
 		}
 	}

gg-pingpong-api/src/main/java/gg/party/api/user/room/service/RoomFindService.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.transaction.Transactional;
 
@@ -44,9 +45,15 @@ public RoomListResDto findRoomList() {
 
 		List<Room> notStartedRooms = roomRepository.findByStatus(RoomType.OPEN, sortForNotStarted);
 		List<Room> startedRooms = roomRepository.findByStatus(RoomType.START, sortForStarted);
+		List<Room> finishRooms = roomRepository.findByStatus(RoomType.FINISH, sortForStarted);
 
-		notStartedRooms.addAll(startedRooms);
-		List<RoomResDto> roomListResDto = notStartedRooms.stream()
+		List<Room> limitedFinishRooms = finishRooms.stream().limit(10).collect(Collectors.toList());
+
+		List<Room> combinedRooms = Stream.of(notStartedRooms, startedRooms, limitedFinishRooms)
+			.flatMap(List::stream)
+			.collect(Collectors.toList());
+
+		List<RoomResDto> roomListResDto = combinedRooms.stream()
 			.map(RoomResDto::new)
 			.collect(Collectors.toList());
 
@@ -126,7 +133,8 @@ public RoomDetailResDto findRoomDetail(Long userId, Long roomId) {
 			room.getHost().getId(), roomId);
 		String hostNickname = hostUserRoomOptional.get().getNickname();
 
-		if (room.getStatus() == RoomType.START && userRoomOptional.isPresent()) {
+		if ((room.getStatus() == RoomType.START || room.getStatus() == RoomType.FINISH)
+			&& userRoomOptional.isPresent()) {
 			List<CommentResDto> comments = commentRepository.findByRoomId(roomId).stream()
 				.map(comment -> new CommentResDto(comment, comment.getUser().getIntraId()))
 				.collect(Collectors.toList());
@@ -137,7 +145,7 @@ public RoomDetailResDto findRoomDetail(Long userId, Long roomId) {
 					userRoom.getUser().getImageUri()))
 				.collect(Collectors.toList());
 			return new RoomDetailResDto(room, myNickname, hostNickname, roomUsers, comments);
-		} else { // if 참여자 && 시작했을경우 intraID || else intraId == null
+		} else { // if 참여자 && Start or Finish 상태인 경우 intraID || else intraId == null
 			List<CommentResDto> comments = commentRepository.findByRoomId(roomId).stream()
 				.map(CommentResDto::new)
 				.collect(Collectors.toList());

gg-pingpong-api/src/main/java/gg/party/api/user/room/service/RoomManagementService.java

@@ -116,7 +116,11 @@ public LeaveRoomResDto modifyLeaveRoom(Long roomId, UserDto user) {
 		// 방장 이권
 		if (user.getId().equals(targetRoom.getHost().getId())) {
 			List<User> existUser = userRoomRepository.findByIsExist(roomId);
-			targetRoom.updateHost(existUser.get(0));
+			if (existUser != null && !existUser.isEmpty()) {
+				targetRoom.updateHost(existUser.get(0));
+			} else {
+				targetRoom.updateHost(null);
+			}
 		}
 		userRoomRepository.save(targetUserRoom);
 		roomRepository.save(targetRoom);
@@ -127,14 +131,13 @@ public LeaveRoomResDto modifyLeaveRoom(Long roomId, UserDto user) {
 	/**
 	 * 방을 시작 상태로 바꾼다
 	 * 방의 상태를 시작 상태로 변경.
-	 *
 	 * @param roomId, user
 	 * @return 방 id
-	 * @throws RoomNotFoundException 방 없음
-	 * @throws RoomNotOpenException 방이 열리지 않은 상태
-	 * @throws RoomNotEnoughPeopleException 방에 충분한 인원이 없음
-	 * @throws RoomNotParticipantException 방에 참가하지 않은 유저
-	 * @throws UserNotHostException 방장이 아닌 경우
+	 * @throws RoomNotFoundException 방 없음 - 404
+	 * @throws RoomNotOpenException 방이 열리지 않은 상태 - 400
+	 * @throws RoomNotEnoughPeopleException 방에 충분한 인원이 없음 - 400
+	 * @throws RoomNotParticipantException 방에 참가하지 않은 유저 - 400
+	 * @throws UserNotHostException 방장이 아닌 경우 - 403
 	 */
 	@Transactional
 	public RoomStartResDto modifyStartRoom(Long roomId, UserDto user) {