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 index 50bb4d8..27d2842 100644 --- a/src/main/java/com/gapple/weeingback/domain/boardgame/domain/Boardgame.java +++ b/src/main/java/com/gapple/weeingback/domain/boardgame/domain/Boardgame.java @@ -28,9 +28,6 @@ public class Boardgame { @Column(nullable = false) private Long maxOf; - @Column(nullable = false) - private Long joined; - @OneToMany(fetch = FetchType.EAGER) private List members; @@ -46,7 +43,6 @@ public ToBoardgameDto toDto(Boardgame boardgame){ return new ToBoardgameDto( boardgame.getId().toString(), boardgame.getMaxOf(), - boardgame.getJoined(), new NumberNameWithId( creator.getNumber() + " " + creator.getName(), creator.getId().toString() diff --git a/src/main/java/com/gapple/weeingback/domain/boardgame/domain/ToBoardgameDto.java b/src/main/java/com/gapple/weeingback/domain/boardgame/domain/ToBoardgameDto.java index 525d9d1..e818b5f 100644 --- a/src/main/java/com/gapple/weeingback/domain/boardgame/domain/ToBoardgameDto.java +++ b/src/main/java/com/gapple/weeingback/domain/boardgame/domain/ToBoardgameDto.java @@ -13,7 +13,6 @@ public class ToBoardgameDto { private String id; private Long maxOf; - private Long joined; private NumberNameWithId creator; private List players; } diff --git a/src/main/java/com/gapple/weeingback/domain/boardgame/service/implmentation/BoardgameServiceImpl.java b/src/main/java/com/gapple/weeingback/domain/boardgame/service/implmentation/BoardgameServiceImpl.java index 53649ef..5c6d169 100644 --- a/src/main/java/com/gapple/weeingback/domain/boardgame/service/implmentation/BoardgameServiceImpl.java +++ b/src/main/java/com/gapple/weeingback/domain/boardgame/service/implmentation/BoardgameServiceImpl.java @@ -36,7 +36,6 @@ public void submitBoardgame(Long maxOf) { .joined(0L) .build(); - member.addBoardgame(boardgame); boardgameRepository.save(boardgame); } @@ -52,26 +51,22 @@ public BoardgameShowResponse showAllBoardgame() { } @Override - public void joinBoardgame(UUID id) { + @Transactional + public void joinBoardgame(UUID boardgameId) { String memberId = SecurityContextHolder.getContext().getAuthentication().getName(); Member member = memberRepository.findMemberById(UUID.fromString(memberId)).orElseThrow(MemberNotFoundException::new); - Boardgame boardgame = boardgameRepository.findBoardgameById(id).orElseThrow(BoardgameNotFoundException::new); + Boardgame boardgame = boardgameRepository.findBoardgameById(boardgameId).orElseThrow(BoardgameNotFoundException::new); boardgame.addMember(member); + memberRepository.save(member); boardgameRepository.save(boardgame); } @Override @Transactional public void doneBoardgame(UUID boardgameId) { - UUID memberId = UUID.fromString(SecurityContextHolder.getContext().getAuthentication().getName()); - Member member = memberRepository.findMemberById(memberId).orElseThrow(MemberNotFoundException::new); - - member.removeBoardgame(boardgameRepository.findBoardgameById(boardgameId).get()); - memberRepository.save(member); - boardgameRepository.deleteById(boardgameId); } } diff --git a/src/main/java/com/gapple/weeingback/domain/member/entity/Member.java b/src/main/java/com/gapple/weeingback/domain/member/entity/Member.java index 86220eb..4f35cf1 100644 --- a/src/main/java/com/gapple/weeingback/domain/member/entity/Member.java +++ b/src/main/java/com/gapple/weeingback/domain/member/entity/Member.java @@ -39,15 +39,11 @@ public class Member implements GrantedAuthority { @Column(columnDefinition = "VARCHAR(80)", nullable = false) private String role; - @OneToMany(fetch = FetchType.EAGER) + @OneToMany @JoinColumn(name = "consulting_id") private List consulting; - @ManyToMany(fetch = FetchType.EAGER) - @JoinColumn(name = "boardgame_id") - private List boardgames; - - @OneToMany(fetch = FetchType.EAGER) + @OneToMany @JoinColumn(name = "diary_id") private List diaries; @@ -59,13 +55,6 @@ public void addDiary(Diary diary){ this.diaries.add(diary); } - public void addBoardgame(Boardgame boardgame){ - this.boardgames.add(boardgame); - } - - public void removeBoardgame(Boardgame boardgame){ - this.boardgames.remove(boardgame); - } @Override public String getAuthority() {