refactor: game - address 연관관계 제거로 인한 toDTO, fromDTO 시그니처 변경

Java-and-Script · Feb 7, 2024 · fdb4ea7 · fdb4ea7
1 parent e6ebdb1
commit fdb4ea7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/kr/pickple/back/game/dto/response/GameResponse.java b/src/main/java/kr/pickple/back/game/dto/response/GameResponse.java
@@ -4,6 +4,7 @@
 import java.time.LocalTime;
 import java.util.List;
 
+import kr.pickple.back.address.dto.response.MainAddress;
 import kr.pickple.back.game.domain.Game;
 import kr.pickple.back.game.domain.GameStatus;
 import kr.pickple.back.member.dto.response.MemberResponse;
@@ -40,7 +41,7 @@ public class GameResponse {
     private List<MemberResponse> members;
 
     public static GameResponse of(final Game game, final List<MemberResponse> memberResponses,
-            List<Position> positions) {
+            final List<Position> positions, final MainAddress mainAddress) {
         return GameResponse.builder()
                 .id(game.getId())
                 .content(game.getContent())
@@ -58,8 +59,8 @@ public static GameResponse of(final Game game, final List<MemberResponse> member
                 .memberCount(game.getMemberCount())
                 .maxMemberCount(game.getMaxMemberCount())
                 .host(getHostResponse(memberResponses, game.getHost().getId()))
-                .addressDepth1(game.getAddressDepth1().getName())
-                .addressDepth2(game.getAddressDepth2().getName())
+                .addressDepth1(mainAddress.getAddressDepth1().getName())
+                .addressDepth2(mainAddress.getAddressDepth2().getName())
                 .positions(positions)
                 .members(memberResponses)
                 .build();

diff --git a/src/main/java/kr/pickple/back/game/service/GameMemberService.java b/src/main/java/kr/pickple/back/game/service/GameMemberService.java
@@ -92,7 +92,7 @@ public GameResponse findAllGameMembers(
             throw new GameException(GAME_MEMBER_IS_NOT_HOST, loggedInMemberId);
         }
 
-        return GameResponse.of(game, getMemberResponsesByStatus(game, status), getPositionsByGame(game));
+        return GameResponse.of(game, getMemberResponsesByStatus(game, status), getPositionsByGame(game), addressReader.readMainAddressByGame(game));
     }
 
     private List<MemberResponse> getMemberResponsesByStatus(final Game game, final RegistrationStatus status) {
@@ -102,7 +102,7 @@ private List<MemberResponse> getMemberResponsesByStatus(final Game game, final R
                 .map(member -> MemberResponse.of(
                                 member,
                                 getPositionsByMember(member),
-                                addressReader.readMainAddress(member)
+                                addressReader.readMainAddressByMember(member)
                         )
                 )
                 .toList();

diff --git a/src/main/java/kr/pickple/back/member/service/MemberCrewService.java b/src/main/java/kr/pickple/back/member/service/MemberCrewService.java
@@ -96,7 +96,7 @@ private List<MemberResponse> getMemberResponsesByCrew(final Crew crew, final Reg
         return crewMemberRepository.findAllByCrewIdAndStatus(crew.getId(), memberStatus)
                 .stream()
                 .map(CrewMember::getMember)
-                .map(member -> MemberResponse.of(member, getPositions(member), addressReader.readMainAddress(member)))
+                .map(member -> MemberResponse.of(member, getPositions(member), addressReader.readMainAddressByMember(member)))
                 .toList();
     }
 

diff --git a/src/main/java/kr/pickple/back/member/service/MemberGameService.java b/src/main/java/kr/pickple/back/member/service/MemberGameService.java
@@ -99,7 +99,8 @@ private List<MemberGameResponse> convertToMemberGameResponses(
                         MemberGameResponse.of(
                                 memberGame,
                                 getMemberResponsesByGame(memberGame.getGame(), memberStatus),
-                                getPositionsByMember(memberGame.getMember())
+                                getPositionsByMember(memberGame.getMember()),
+                                addressReader.readMainAddressByGame(memberGame.getGame())
                         )
                 )
                 .toList();
@@ -112,7 +113,7 @@ private List<MemberResponse> getMemberResponsesByGame(final Game game, final Reg
                 .map(member -> MemberResponse.of(
                                 member,
                                 getPositionsByMember(member),
-                                addressReader.readMainAddress(member)
+                                addressReader.readMainAddressByMember(member)
                         )
                 )
                 .toList();