Skip to content

Commit

Permalink
merge: Polling에서 사용하지 않는 바디 정보 제거 #394
Browse files Browse the repository at this point in the history
  • Loading branch information
@leegwichan
leegwichan authored Nov 12, 2024
2 parents b6d8a9b + db1bc15 commit 13dbd7c
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 92 deletions.
6 changes: 2 additions & 4 deletions backend/src/main/java/ddangkong/facade/room/RoomFacade.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ public void moveToNextRound(Long roomId) {
@Transactional(readOnly = true)
public RoundFinishedResponse getRoundFinished(Long roomId, int round) {
Room room = roomService.getRoom(roomId);
Member master = memberService.getMaster(room);
return new RoundFinishedResponse(room.isRoundFinished(round), room.isAllRoundFinished(), master);
return new RoundFinishedResponse(room.isRoundFinished(round), room.isAllRoundFinished());
}

@Transactional
Expand Down Expand Up @@ -145,7 +144,6 @@ public RoomStatusResponse getRoomStatus(String uuid) {
@Transactional(readOnly = true)
public InitialRoomResponse isInitialRoom(Long roomId) {
Room room = roomService.getRoom(roomId);
Member master = memberService.getMaster(room);
return new InitialRoomResponse(room.isInitialRoom(), master);
return new InitialRoomResponse(room.isInitialRoom());
}
}
3 changes: 1 addition & 2 deletions backend/src/main/java/ddangkong/facade/room/balance/roomvote/RoomBalanceVoteFacade.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ private ContentTotalBalanceVoteResponse getContentTotalBalanceVoteResponse(Balan
@Transactional(readOnly = true)
public VoteFinishedResponse getVoteFinished(Long roomId, Long contentId) {
VoteContext voteContext = getVoteContext(roomId, contentId);
Member master = voteContext.getMaster();
return new VoteFinishedResponse(voteContext.isVoteFinished(), master);
return new VoteFinishedResponse(voteContext.isVoteFinished());
}

private VoteContext getVoteContext(Long roomId, Long contentId) {
Expand Down
4 changes: 0 additions & 4 deletions backend/src/main/java/ddangkong/facade/room/balance/roomvote/context/VoteContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ public VoteContext(RoomMembers roomMembers, BalanceOptions balanceOptions, boole
this.voteFinished = voteFinished;
}

public Member getMaster() {
return roomMembers.getMaster();
}

public Member getMember(Long memberId) {
return roomMembers.getMember(memberId);
}
Expand Down
10 changes: 1 addition & 9 deletions backend/src/main/java/ddangkong/facade/room/balance/roomvote/dto/VoteFinishedResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
package ddangkong.facade.room.balance.roomvote.dto;

import ddangkong.domain.room.member.Member;
import ddangkong.facade.room.member.dto.MasterResponse;

public record VoteFinishedResponse(
boolean isFinished,
MasterResponse master
boolean isFinished
) {

public VoteFinishedResponse(boolean isFinished, Member master) {
this(isFinished, new MasterResponse(master));
}
}
10 changes: 1 addition & 9 deletions backend/src/main/java/ddangkong/facade/room/dto/InitialRoomResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
package ddangkong.facade.room.dto;

import ddangkong.domain.room.member.Member;
import ddangkong.facade.room.member.dto.MasterResponse;

public record InitialRoomResponse(
boolean isInitial,
MasterResponse master
boolean isInitial
) {

public InitialRoomResponse(boolean isInitialRoom, Member master) {
this(isInitialRoom, new MasterResponse(master));
}
}
10 changes: 1 addition & 9 deletions backend/src/main/java/ddangkong/facade/room/dto/RoundFinishedResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
package ddangkong.facade.room.dto;

import ddangkong.domain.room.member.Member;
import ddangkong.facade.room.member.dto.MasterResponse;

public record RoundFinishedResponse(
boolean isRoundFinished,
boolean isGameFinished,
MasterResponse master
boolean isGameFinished
) {

public RoundFinishedResponse(boolean isRoundFinished, boolean isGameFinished, Member master) {
this(isRoundFinished, isGameFinished, new MasterResponse(master));
}
}
10 changes: 2 additions & 8 deletions backend/src/test/java/ddangkong/controller/room/RoomControllerTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package ddangkong.controller.room;

import static ddangkong.support.fixture.MemberFixture.PRIN;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;

Expand All @@ -12,7 +11,6 @@
import ddangkong.domain.room.RoomSetting;
import ddangkong.domain.room.RoomStatus;
import ddangkong.domain.room.balance.roomcontent.RoomContent;
import ddangkong.domain.room.member.Member;
import ddangkong.facade.room.dto.InitialRoomResponse;
import ddangkong.facade.room.dto.RoomInfoResponse;
import ddangkong.facade.room.dto.RoomJoinRequest;
Expand Down Expand Up @@ -269,14 +267,13 @@ class 라운드_종료_여부 {
class 방_초기화 {

private Room room;
private Member master;

@BeforeEach
void setUp() {
BalanceContent content = balanceContentRepository.save(new BalanceContent(Category.IF, "A vs B"));
RoomSetting roomSetting = new RoomSetting(3, 10_000, Category.IF);
room = roomRepository.save(new Room("roomResetSetUpUUID", 3, RoomStatus.FINISH, roomSetting));
master = memberRepository.save(PRIN.master(room));
memberRepository.save(PRIN.master(room));
roomContentRepository.save(new RoomContent(room, content, 1, null));
roomContentRepository.save(new RoomContent(room, content, 2, null));
roomContentRepository.save(new RoomContent(room, content, 3, null));
Expand Down Expand Up @@ -307,10 +304,7 @@ void setUp() {
.as(InitialRoomResponse.class);

// then
assertAll(
() -> assertThat(actual.isInitial()).isTrue(),
() -> assertThat(actual.master().memberId()).isEqualTo(master.getId())
);
assertThat(actual.isInitial()).isTrue();
}
}

Expand Down
16 changes: 4 additions & 12 deletions backend/src/test/java/ddangkong/documentation/room/RoomDocumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,7 @@ class 라운드_종료_여부 {
@Test
void 라운드가_종료되었는지_조회한다() throws Exception {
// given
MasterResponse prin = new MasterResponse(1L, "프콩");
RoundFinishedResponse response = new RoundFinishedResponse(true, false, prin);
RoundFinishedResponse response = new RoundFinishedResponse(true, false);
when(roomFacade.getRoundFinished(anyLong(), anyInt())).thenReturn(response);

// when & then
Expand All @@ -346,10 +345,7 @@ class 라운드_종료_여부 {
),
responseFields(
fieldWithPath("isRoundFinished").description("라운드 종료 여부"),
fieldWithPath("isGameFinished").description("게임 종료 여부"),
fieldWithPath("master").type(OBJECT).description("방장 정보"),
fieldWithPath("master.memberId").type(NUMBER).description("멤버 ID"),
fieldWithPath("master.nickname").type(STRING).description("닉네임")
fieldWithPath("isGameFinished").description("게임 종료 여부")
)
));
}
Expand Down Expand Up @@ -402,8 +398,7 @@ class 방_초기화 {
void 방이_초기화되었는지_확인한다() throws Exception {
// given
String endpoint = "/api/balances/rooms/{roomId}/initial";
MasterResponse prin = new MasterResponse(1L, "프콩");
InitialRoomResponse response = new InitialRoomResponse(true, prin);
InitialRoomResponse response = new InitialRoomResponse(true);
when(roomFacade.isInitialRoom(anyLong())).thenReturn(response);

// when & then
Expand All @@ -414,10 +409,7 @@ class 방_초기화 {
parameterWithName("roomId").description("방 ID")
),
responseFields(
fieldWithPath("isInitial").description("방 초기화 여부"),
fieldWithPath("master").type(OBJECT).description("방장 정보"),
fieldWithPath("master.memberId").type(NUMBER).description("멤버 ID"),
fieldWithPath("master.nickname").type(STRING).description("닉네임")
fieldWithPath("isInitial").description("방 초기화 여부")
)
));

Expand Down
9 changes: 2 additions & 7 deletions .../java/ddangkong/documentation/room/balance/roomvote/RoomBalanceVoteDocumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import ddangkong.facade.room.balance.roomvote.dto.RoomMemberVoteMatchingResponse;
import ddangkong.facade.room.balance.roomvote.dto.RoomMembersVoteMatchingResponse;
import ddangkong.facade.room.balance.roomvote.dto.VoteFinishedResponse;
import ddangkong.facade.room.member.dto.MasterResponse;
import java.util.ArrayList;
import java.util.List;
import org.junit.jupiter.api.Nested;
Expand Down Expand Up @@ -167,8 +166,7 @@ class 투표_종료_여부_조회 {
@Test
void 투표가_종료되었는지_조회한다() throws Exception {
// given
MasterResponse prin = new MasterResponse(1L, "프콩");
VoteFinishedResponse response = new VoteFinishedResponse(true, prin);
VoteFinishedResponse response = new VoteFinishedResponse(true);
when(roomBalanceVoteFacade.getVoteFinished(anyLong(), anyLong())).thenReturn(response);

// when & then
Expand All @@ -180,10 +178,7 @@ class 투표_종료_여부_조회 {
parameterWithName("contentId").description("콘텐츠 ID")
),
responseFields(
fieldWithPath("isFinished").type(BOOLEAN).description("투표 종료 여부"),
fieldWithPath("master").type(OBJECT).description("방장 정보"),
fieldWithPath("master.memberId").type(NUMBER).description("멤버 ID"),
fieldWithPath("master.nickname").type(STRING).description("닉네임")
fieldWithPath("isFinished").type(BOOLEAN).description("투표 종료 여부")
)
)
);
Expand Down
21 changes: 5 additions & 16 deletions backend/src/test/java/ddangkong/facade/room/RoomFacadeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@ class 라운드_종료_여부 {
int currentRound = 2;
RoomSetting roomSetting = new RoomSetting(TOTAL_ROUND, TIME_LIMIT, CATEGORY);
Room room = roomRepository.save(new Room("uuid", currentRound, STATUS, roomSetting));
Member master = memberRepository.save(PRIN.master(room));
int round = 2;

// when
Expand All @@ -391,8 +390,7 @@ class 라운드_종료_여부 {
// then
assertAll(
() -> assertThat(roundFinishedResponse.isRoundFinished()).isFalse(),
() -> assertThat(roundFinishedResponse.isGameFinished()).isFalse(),
() -> assertThat(roundFinishedResponse.master().memberId()).isEqualTo(master.getId())
() -> assertThat(roundFinishedResponse.isGameFinished()).isFalse()
);
}

Expand All @@ -402,7 +400,6 @@ class 라운드_종료_여부 {
int currentRound = 2;
RoomSetting roomSetting = new RoomSetting(TOTAL_ROUND, TIME_LIMIT, CATEGORY);
Room room = roomRepository.save(new Room("uuid", currentRound, STATUS, roomSetting));
Member master = memberRepository.save(PRIN.master(room));
int round = 1;

// when
Expand All @@ -411,8 +408,7 @@ class 라운드_종료_여부 {
// then
assertAll(
() -> assertThat(roundFinishedResponse.isRoundFinished()).isTrue(),
() -> assertThat(roundFinishedResponse.isGameFinished()).isFalse(),
() -> assertThat(roundFinishedResponse.master().memberId()).isEqualTo(master.getId())
() -> assertThat(roundFinishedResponse.isGameFinished()).isFalse()
);
}

Expand All @@ -423,7 +419,6 @@ class 라운드_종료_여부 {
RoomStatus status = RoomStatus.FINISH;
RoomSetting roomSetting = new RoomSetting(TOTAL_ROUND, TIME_LIMIT, CATEGORY);
Room room = roomRepository.save(new Room("uuid", currentRound, status, roomSetting));
Member master = memberRepository.save(PRIN.master(room));
int round = 5;

// when
Expand All @@ -432,8 +427,7 @@ class 라운드_종료_여부 {
// then
assertAll(
() -> assertThat(roundFinishedResponse.isRoundFinished()).isFalse(),
() -> assertThat(roundFinishedResponse.isGameFinished()).isTrue(),
() -> assertThat(roundFinishedResponse.master().memberId()).isEqualTo(master.getId())
() -> assertThat(roundFinishedResponse.isGameFinished()).isTrue()
);
}

Expand All @@ -452,8 +446,7 @@ class 라운드_종료_여부 {
// then
assertAll(
() -> assertThat(roundFinishedResponse.isRoundFinished()).isFalse(),
() -> assertThat(roundFinishedResponse.isGameFinished()).isFalse(),
() -> assertThat(roundFinishedResponse.master().memberId()).isEqualTo(master.getId())
() -> assertThat(roundFinishedResponse.isGameFinished()).isFalse()
);
}
}
Expand Down Expand Up @@ -554,16 +547,12 @@ private void saveRoomContents(Room room) {
void 초기화된_방인지_확인한다() {
// given
Room room = roomRepository.save(new Room("uuid", 5, RoomStatus.READY, ROOM_SETTING));
Member master = memberRepository.save(PRIN.master(room));

// when
InitialRoomResponse actual = roomFacade.isInitialRoom(room.getId());

// then
assertAll(
() -> assertThat(actual.isInitial()).isFalse(),
() -> assertThat(actual.master().memberId()).isEqualTo(master.getId())
);
assertThat(actual.isInitial()).isFalse();
}
}

Expand Down
15 changes: 3 additions & 12 deletions backend/src/test/java/ddangkong/facade/room/balance/roomvote/RoomBalanceVoteFacadeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,7 @@ class 투표_종료_여부_조회 {
VoteFinishedResponse actual = roomBalanceVoteFacade.getVoteFinished(room.getId(), content.getId());

// then
assertAll(
() -> assertThat(actual.isFinished()).isTrue(),
() -> assertThat(actual.master().memberId()).isEqualTo(prin.getId())
);
assertThat(actual.isFinished()).isTrue();
}

@Test
Expand All @@ -218,10 +215,7 @@ class 투표_종료_여부_조회 {
VoteFinishedResponse actual = roomBalanceVoteFacade.getVoteFinished(room.getId(), content.getId());

// then
assertAll(
() -> assertThat(actual.isFinished()).isTrue(),
() -> assertThat(actual.master().memberId()).isEqualTo(prin.getId())
);
assertThat(actual.isFinished()).isTrue();
}

@Test
Expand All @@ -237,10 +231,7 @@ class 투표_종료_여부_조회 {
VoteFinishedResponse actual = roomBalanceVoteFacade.getVoteFinished(room.getId(), content.getId());

// then
assertAll(
() -> assertThat(actual.isFinished()).isFalse(),
() -> assertThat(actual.master().memberId()).isEqualTo(prin.getId())
);
assertThat(actual.isFinished()).isFalse();
}

@Test
Expand Down

0 comments on commit 13dbd7c

Please sign in to comment.