Merge remote-tracking branch 'refs/remotes/origin/dev' into release

mujik-tigers · Jun 11, 2024 · 38c3f1b · 38c3f1b
2 parents 32f81d9 + 7305795
commit 38c3f1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/site/youtogether/room/dto/RoomDetail.java b/src/main/java/site/youtogether/room/dto/RoomDetail.java
@@ -20,6 +20,7 @@ public class RoomDetail {
 	private final int currentParticipant;
 	private final boolean passwordExist;
 	private String currentVideoId;
+	private Long currentVideoNumber;
 	private String currentVideoTitle;
 	private String currentChannelTitle;
 	private double currentVideoTime;
@@ -33,6 +34,7 @@ public RoomDetail(Room room, User user, Optional<PlayingVideo> playingVideo) {
 		this.passwordExist = room.getPassword() != null;
 		playingVideo.ifPresent((p) -> {
 			this.currentVideoId = p.getVideoId();
+			this.currentVideoNumber = p.getVideoNumber();
 			this.currentVideoTitle = p.getVideoTitle();
 			this.currentChannelTitle = p.getChannelTitle();
 			this.currentVideoTime = p.getCurrentTime();

diff --git a/src/test/java/site/youtogether/room/presentation/RoomControllerTest.java b/src/test/java/site/youtogether/room/presentation/RoomControllerTest.java
@@ -341,7 +341,7 @@ void enterRoom() throws Exception {
 		int capacity = 10;
 
 		Participant participantInfo = new Participant(10L, "황똥땡", Role.HOST);
-		RoomDetail createdRoomDetail = new RoomDetail(roomCode, roomTitle, participantInfo, capacity, 2, false, "phuiiNCxRMg", "aespa 에스파 'Supernova' MV",
+		RoomDetail createdRoomDetail = new RoomDetail(roomCode, roomTitle, participantInfo, capacity, 2, false, "phuiiNCxRMg", 21L, "aespa 에스파 'Supernova' MV",
 			"SMTOWN", 10.0);
 		Optional<User> user = Optional.of(User.builder()
 			.currentRoomCode(null)
@@ -389,6 +389,7 @@ void enterRoom() throws Exception {
 					fieldWithPath("data.currentParticipant").type(JsonFieldType.NUMBER).description("현재 참가자 수"),
 					fieldWithPath("data.passwordExist").type(JsonFieldType.BOOLEAN).description("비밀번호 존재 여부"),
 					fieldWithPath("data.currentVideoId").type(JsonFieldType.STRING).description("현재 재생중인 영상의 아이디").optional(),
+					fieldWithPath("data.currentVideoNumber").type(JsonFieldType.NUMBER).description("현재 재생중인 영상 식별 번호").optional(),
 					fieldWithPath("data.currentVideoTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 제목").optional(),
 					fieldWithPath("data.currentChannelTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 채널 이름").optional(),
 					fieldWithPath("data.currentVideoTime").type(JsonFieldType.NUMBER).description("현재 재생중인 영상의 재생 시간").optional()
@@ -406,7 +407,7 @@ void enterRoomFail() throws Exception {
 		int capacity = 10;
 
 		Participant participantInfo = new Participant(10L, "황똥땡", Role.HOST);
-		RoomDetail createdRoomDetail = new RoomDetail(roomCode, roomTitle, participantInfo, capacity, 2, false, "phuiiNCxRMg", "aespa 에스파 'Supernova' MV",
+		RoomDetail createdRoomDetail = new RoomDetail(roomCode, roomTitle, participantInfo, capacity, 2, false, "phuiiNCxRMg", 21L, "aespa 에스파 'Supernova' MV",
 			"SMTOWN", 10.0);
 		Optional<User> user = Optional.of(User.builder()
 			.currentRoomCode("1e7050f7d7")
@@ -454,7 +455,7 @@ void enterPasswordRoom() throws Exception {
 		int capacity = 10;
 
 		Participant participantInfo = new Participant(10L, "황똥땡", Role.HOST);
-		RoomDetail createdRoomDetail = new RoomDetail(roomCode, roomTitle, participantInfo, capacity, 2, true, "phuiiNCxRMg", "aespa 에스파 'Supernova' MV",
+		RoomDetail createdRoomDetail = new RoomDetail(roomCode, roomTitle, participantInfo, capacity, 2, true, "phuiiNCxRMg", 21L, "aespa 에스파 'Supernova' MV",
 			"SMTOWN", 10.0);
 		Optional<User> user = Optional.of(User.builder()
 			.currentRoomCode(null)
@@ -507,6 +508,7 @@ void enterPasswordRoom() throws Exception {
 					fieldWithPath("data.currentParticipant").type(JsonFieldType.NUMBER).description("현재 참가자 수"),
 					fieldWithPath("data.passwordExist").type(JsonFieldType.BOOLEAN).description("비밀번호 존재 여부"),
 					fieldWithPath("data.currentVideoId").type(JsonFieldType.STRING).description("현재 재생중인 영상의 아이디").optional(),
+					fieldWithPath("data.currentVideoNumber").type(JsonFieldType.NUMBER).description("현재 재생중인 영상 식별 번호").optional(),
 					fieldWithPath("data.currentVideoTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 제목").optional(),
 					fieldWithPath("data.currentChannelTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 채널 이름").optional(),
 					fieldWithPath("data.currentVideoTime").type(JsonFieldType.NUMBER).description("현재 재생중인 영상의 재생 시간").optional()