보드게임 DTO 분리

GApple-T · Jan 2, 2024 · e8e71d8 · e8e71d8
1 parent c5b8a7b
commit e8e71d8
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 27 deletions.
diff --git a/src/main/java/com/gapple/weeingback/domain/boardgame/domain/Boardgame.java b/src/main/java/com/gapple/weeingback/domain/boardgame/domain/Boardgame.java
@@ -31,31 +31,6 @@ public class Boardgame {
     @OneToMany
     private List<Member> members;
 
-    public ToBoardgameDto toDto(Boardgame boardgame){
-        List<NumberNameWithId> players = new ArrayList<>();
-        boardgame.getMembers().forEach(member ->
-            players.add(new NumberNameWithId(
-                    member.getGrade(),
-                    member.getClassroom(),
-                    member.getNumber(),
-                    member.getName(),
-                    member.getId().toString()
-            ))
-        );
-
-        return new ToBoardgameDto(
-                boardgame.getId().toString(),
-                boardgame.getMaxOf(),
-                new NumberNameWithId(
-                        creator.getGrade(),
-                        creator.getClassroom(),
-                        creator.getNumber(),
-                        creator.getName(),
-                        creator.getId().toString()
-                ),
-                players);
-    }
-
     public void addMember(Member member){
         members.add(member);
     }

diff --git a/...va/com/gapple/weeingback/domain/boardgame/service/implmentation/BoardgameServiceImpl.java b/...va/com/gapple/weeingback/domain/boardgame/service/implmentation/BoardgameServiceImpl.java
@@ -6,6 +6,7 @@
 import com.gapple.weeingback.domain.boardgame.repository.BoardgameRepository;
 import com.gapple.weeingback.domain.boardgame.service.BoardgameService;
 import com.gapple.weeingback.domain.member.entity.Member;
+import com.gapple.weeingback.domain.member.entity.NumberNameWithId;
 import com.gapple.weeingback.domain.member.repository.MemberRepository;
 import com.gapple.weeingback.global.exception.BoardgameNotFoundException;
 import com.gapple.weeingback.global.exception.MemberNotFoundException;
@@ -43,9 +44,11 @@ public BoardgameShowResponse showAllBoardgame() {
         List<Boardgame> boardgames = boardgameRepository.findAll();
         List<ToBoardgameDto> boardgameDtos = new ArrayList<>();
         boardgames.forEach(boardgame ->
-            boardgameDtos.add(boardgame.toDto(boardgame))
+            boardgameDtos.add(toDto(boardgame))
         );
 
+
+
         return new BoardgameShowResponse(boardgameDtos);
     }
 
@@ -66,4 +69,44 @@ public void joinBoardgame(UUID boardgameId) {
     public void doneBoardgame(UUID boardgameId) {
         boardgameRepository.deleteById(boardgameId);
     }
+
+    public ToBoardgameDto toDto(Boardgame boardgame){
+        List<NumberNameWithId> players = new ArrayList<>();
+        List<Member> members = boardgame.getMembers();
+        Member creator = boardgame.getCreator();
+
+        members.forEach(m -> {
+            players.add(new NumberNameWithId(
+                    m.getGrade(),
+                    m.getClassroom(),
+                    m.getNumber(),
+                    m.getName(),
+                    m.getId().toString()
+            ));
+        });
+
+        boardgame.getMembers().forEach(member ->
+                players.add(new NumberNameWithId(
+                        member.getGrade(),
+                        member.getClassroom(),
+                        member.getNumber(),
+                        member.getName(),
+                        member.getId().toString()
+                ))
+        );
+
+        return new ToBoardgameDto(
+                boardgame.getId().toString(),
+                boardgame.getMaxOf(),
+                new NumberNameWithId(
+                        creator.getGrade(),
+                        creator.getClassroom(),
+                        creator.getNumber(),
+                        creator.getName(),
+                        creator.getId().toString()
+                ),
+                players);
+    }
 }
+
+
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -50,4 +50,7 @@ jwt:
 redis:
   host: ${REDIS_HOST}
   port: ${REDIS_PORT}
-  auth: ${REDIS_AUTH}
+  auth: ${REDIS_AUTH}
+
+server:
+  port: 9090