modify: 방 입장 응답 데이터에 영상의 재생 시간 추가

mujik-tigers · Jun 4, 2024 · 92882a0 · 92882a0
1 parent 9855d9d
commit 92882a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/site/youtogether/room/dto/RoomDetail.java b/src/main/java/site/youtogether/room/dto/RoomDetail.java
@@ -22,6 +22,7 @@ public class RoomDetail {
 	private String currentVideoId;
 	private String currentVideoTitle;
 	private String currentChannelTitle;
+	private double currentVideoTime;
 
 	public RoomDetail(Room room, User user, Optional<PlayingVideo> playingVideo) {
 		this.roomCode = room.getCode();
@@ -34,6 +35,7 @@ public RoomDetail(Room room, User user, Optional<PlayingVideo> playingVideo) {
 			this.currentVideoId = p.getVideoId();
 			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
@@ -342,7 +342,7 @@ void enterRoom() throws Exception {
 
 		Participant participantInfo = new Participant(10L, "황똥땡", Role.HOST);
 		RoomDetail createdRoomDetail = new RoomDetail(roomCode, roomTitle, participantInfo, capacity, 2, false, "phuiiNCxRMg", "aespa 에스파 'Supernova' MV",
-			"SMTOWN");
+			"SMTOWN", 10.0);
 		Optional<User> user = Optional.of(User.builder()
 			.currentRoomCode(null)
 			.build());
@@ -370,6 +370,7 @@ void enterRoom() throws Exception {
 			.andExpect(jsonPath("$.data.passwordExist").value(false))
 			.andExpect(jsonPath("$.data.currentVideoTitle").value(createdRoomDetail.getCurrentVideoTitle()))
 			.andExpect(jsonPath("$.data.currentChannelTitle").value(createdRoomDetail.getCurrentChannelTitle()))
+			.andExpect(jsonPath("$.data.currentVideoTime").value(createdRoomDetail.getCurrentVideoTime()))
 			.andDo(document("enter-room-success",
 				preprocessRequest(prettyPrint()),
 				preprocessResponse(prettyPrint()),
@@ -389,7 +390,8 @@ void enterRoom() throws Exception {
 					fieldWithPath("data.passwordExist").type(JsonFieldType.BOOLEAN).description("비밀번호 존재 여부"),
 					fieldWithPath("data.currentVideoId").type(JsonFieldType.STRING).description("현재 재생중인 영상의 아이디").optional(),
 					fieldWithPath("data.currentVideoTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 제목").optional(),
-					fieldWithPath("data.currentChannelTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 채널 이름").optional()
+					fieldWithPath("data.currentChannelTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 채널 이름").optional(),
+					fieldWithPath("data.currentVideoTime").type(JsonFieldType.NUMBER).description("현재 재생중인 영상의 재생 시간").optional()
 				)
 			));
 	}
@@ -405,7 +407,7 @@ void enterRoomFail() throws Exception {
 
 		Participant participantInfo = new Participant(10L, "황똥땡", Role.HOST);
 		RoomDetail createdRoomDetail = new RoomDetail(roomCode, roomTitle, participantInfo, capacity, 2, false, "phuiiNCxRMg", "aespa 에스파 'Supernova' MV",
-			"SMTOWN");
+			"SMTOWN", 10.0);
 		Optional<User> user = Optional.of(User.builder()
 			.currentRoomCode("1e7050f7d7")
 			.build());
@@ -453,7 +455,7 @@ void enterPasswordRoom() throws Exception {
 
 		Participant participantInfo = new Participant(10L, "황똥땡", Role.HOST);
 		RoomDetail createdRoomDetail = new RoomDetail(roomCode, roomTitle, participantInfo, capacity, 2, true, "phuiiNCxRMg", "aespa 에스파 'Supernova' MV",
-			"SMTOWN");
+			"SMTOWN", 10.0);
 		Optional<User> user = Optional.of(User.builder()
 			.currentRoomCode(null)
 			.build());
@@ -483,6 +485,7 @@ void enterPasswordRoom() throws Exception {
 			.andExpect(jsonPath("$.data.passwordExist").value(true))
 			.andExpect(jsonPath("$.data.currentVideoTitle").value(createdRoomDetail.getCurrentVideoTitle()))
 			.andExpect(jsonPath("$.data.currentChannelTitle").value(createdRoomDetail.getCurrentChannelTitle()))
+			.andExpect(jsonPath("$.data.currentVideoTime").value(createdRoomDetail.getCurrentVideoTime()))
 			.andDo(document("enter-password-room-success",
 				preprocessRequest(prettyPrint()),
 				preprocessResponse(prettyPrint()),
@@ -505,7 +508,8 @@ void enterPasswordRoom() throws Exception {
 					fieldWithPath("data.passwordExist").type(JsonFieldType.BOOLEAN).description("비밀번호 존재 여부"),
 					fieldWithPath("data.currentVideoId").type(JsonFieldType.STRING).description("현재 재생중인 영상의 아이디").optional(),
 					fieldWithPath("data.currentVideoTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 제목").optional(),
-					fieldWithPath("data.currentChannelTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 채널 이름").optional()
+					fieldWithPath("data.currentChannelTitle").type(JsonFieldType.STRING).description("현재 재생중인 영상의 채널 이름").optional(),
+					fieldWithPath("data.currentVideoTime").type(JsonFieldType.NUMBER).description("현재 재생중인 영상의 재생 시간").optional()
 				)
 			));
 	}