refactor(club-meeting): 도메인 책임을 객체로 이동

src/main/java/checkmo/clubMeeting/internal/converter/ClubMeetingConverter.java

@@ -80,7 +80,7 @@ public static BookShelfResponseDTO.TopicDetail toTopicDetailDTO(
                 .topicId(topic.getId())
                 .content(topic.getDescription())
                 .authorInfo(authorInfo)
-                .author(topic.isOwnedBy(memberId))
+                .author(topic.isAuthoredBy(memberId))
                 .build();
     }
 
@@ -244,4 +244,4 @@ public static DetailInfo toMeetingInfoExternalDTO(
                 .bookInfo(bookInfo)
                 .build();
     }
-}
+}

src/main/java/checkmo/clubMeeting/internal/entity/BookReview.java

@@ -43,7 +43,7 @@ public class BookReview extends BaseEntity {
     @JoinColumn(name = "meeting_id")
     private Meeting meeting;
 
-    public void updateBookReview(String description, double rate) {
+    void updateBookReview(String description, double rate) {
         this.description = description;
         this.rate = rate;
     }
@@ -52,7 +52,7 @@ public boolean isOwnedBy(Long clubMemberId) {
         return this.clubMemberId.equals(clubMemberId);
     }
 
-    public void setMeeting(Meeting meeting) {
+    void setMeeting(Meeting meeting) {
         if (this.meeting == meeting) {
             return;
         }
@@ -68,7 +68,7 @@ public void setMeeting(Meeting meeting) {
         }
     }
 
-    public void removeMeeting() {
+    void removeMeeting() {
         if (this.meeting != null) {
             this.meeting.getBookReviews().remove(this);
             this.meeting = null;

src/main/java/checkmo/clubMeeting/internal/entity/ClubMeetingActor.java

@@ -0,0 +1,4 @@
+package checkmo.clubMeeting.internal.entity;
+
+public record ClubMeetingActor(Long clubMemberId, boolean staff) {
+}

src/main/java/checkmo/clubMeeting/internal/entity/Meeting.java

@@ -1,12 +1,27 @@
 package checkmo.clubMeeting.internal.entity;
 
+import checkmo.clubMeeting.internal.exception.ClubMeetingErrorStatus;
+import checkmo.clubMeeting.internal.exception.ClubMeetingException;
 import checkmo.common.BaseEntity;
-import jakarta.persistence.*;
-import lombok.*;
-
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Version;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 
 @Getter
@@ -44,14 +59,17 @@ public class Meeting extends BaseEntity {
     @Column(name = "book_id", nullable = false)
     private String bookId;
 
+    @Getter(AccessLevel.PACKAGE)
     @Builder.Default
     @OneToMany(mappedBy = "meeting", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Team> teams = new ArrayList<>();
 
+    @Getter(AccessLevel.PACKAGE)
     @Builder.Default
     @OneToMany(mappedBy = "meeting", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private List<Topic> topics = new ArrayList<>();
 
+    @Getter(AccessLevel.PACKAGE)
     @Builder.Default
     @OneToMany(mappedBy = "meeting", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private List<BookReview> bookReviews = new ArrayList<>();
@@ -71,11 +89,52 @@ public void updateMeeting(
         this.tag = tag;
     }
 
-    public void addSumRate(double rate) {
+    public void addBookReview(BookReview review) {
+        review.setMeeting(this);
+        addSumRate(review.getRate());
+    }
+
+    public void reviseBookReviewBy(
+            ClubMeetingActor actor,
+            BookReview review,
+            String description,
+            double newRate
+    ) {
+        validateBookReviewAuthorOrStaff(actor, review);
+        reviseBookReview(review, description, newRate);
+    }
+
+    public void removeBookReviewBy(ClubMeetingActor actor, BookReview review) {
+        validateBookReviewAuthorOrStaff(actor, review);
+        removeBookReview(review);
+    }
+
+    private void validateBookReviewAuthorOrStaff(ClubMeetingActor actor, BookReview review) {
+        if (!review.isOwnedBy(actor.clubMemberId()) && !actor.staff()) {
+            throw new ClubMeetingException(ClubMeetingErrorStatus.BOOK_REVIEW_FORBIDDEN);
+        }
+    }
+
+    private void reviseBookReview(BookReview review, String description, double newRate) {
+        double oldRate = review.getRate();
+        review.updateBookReview(description, newRate);
+
+        if (oldRate != newRate) {
+            subtractSumRate(oldRate);
+            addSumRate(newRate);
+        }
+    }
+
+    private void removeBookReview(BookReview review) {
+        subtractSumRate(review.getRate());
+        review.removeMeeting();
+    }
+
+    private void addSumRate(double rate) {
         this.sumRate += rate;
     }
 
-    public void subtractSumRate(double rate) {
+    private void subtractSumRate(double rate) {
         if (this.sumRate < rate) {
             this.sumRate = this.bookReviews.stream()
                     .mapToDouble(BookReview::getRate)
@@ -92,8 +151,30 @@ public LocalDateTime getChatDeadline() {
         return this.getMeetingTime().plusDays(CHAT_AVAILABLE_DAYS_AFTER_MEETING);
     }
 
+    public void organizeTeams(Map<Integer, List<Long>> requestedMembersByTeamNumber) {
+        Map<Integer, Team> existingTeamsByTeamNumber = this.teams.stream()
+                .collect(Collectors.toMap(Team::getTeamNumber, Function.identity()));
+
+        for (Map.Entry<Integer, List<Long>> entry : requestedMembersByTeamNumber.entrySet()) {
+            Team team = existingTeamsByTeamNumber.get(entry.getKey());
+            if (team == null) {
+                team = Team.builder()
+                        .teamNumber(entry.getKey())
+                        .build();
+                addTeam(team);
+            }
+            team.replaceMembers(entry.getValue());
+        }
+
+        for (Team team : new ArrayList<>(this.teams)) {
+            if (!requestedMembersByTeamNumber.containsKey(team.getTeamNumber())) {
+                removeTeam(team);
+            }
+        }
+    }
+
     // ========= 연관관계 메서드 =========
-    public void addTeam(Team team) {
+    private void addTeam(Team team) {
         if (team == null) {
             return;
         }
@@ -106,11 +187,10 @@ public void removeAllTeams() {
         }
     }
 
-    public void removeTeam(Team team) {
+    private void removeTeam(Team team) {
         if (team == null) {
             return;
         }
         team.removeMeeting();
     }
-
 }

src/main/java/checkmo/clubMeeting/internal/entity/Team.java

@@ -22,6 +22,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
 
 @Getter
 @Builder
@@ -44,10 +45,12 @@ public class Team extends BaseEntity {
     @JoinColumn(name = "meeting_id", nullable = false)
     private Meeting meeting;
 
+    @BatchSize(size = 12)
     @OneToMany(mappedBy = "team", cascade = CascadeType.ALL, orphanRemoval = true)
     @Builder.Default
     private List<TeamTopic> teamTopics = new ArrayList<>();
 
+    @BatchSize(size = 12)
     @OneToMany(mappedBy = "team", cascade = CascadeType.ALL, orphanRemoval = true)
     @Builder.Default
     private List<ClubMemberTeam> clubMemberTeams = new ArrayList<>();
@@ -76,23 +79,35 @@ public void removeMeeting() {
         }
     }
 
-    public void addClubMemberTeam(ClubMemberTeam clubMemberTeam) {
-        if (clubMemberTeam == null) {
+    public void replaceMembers(List<Long> clubMemberIds) {
+        if (hasSameMembers(clubMemberIds)) {
             return;
         }
-        clubMemberTeam.setTeam(this);
+        this.clubMemberTeams.clear();
+        for (Long clubMemberId : clubMemberIds) {
+            addClubMemberTeam(ClubMemberTeam.builder()
+                    .clubMemberId(clubMemberId)
+                    .build());
+        }
     }
 
-    public void removeAllClubMemberTeams() {
-        for (ClubMemberTeam cmt : new ArrayList<>(this.clubMemberTeams)) {
-            removeClubMemberTeam(cmt);
+    private boolean hasSameMembers(List<Long> clubMemberIds) {
+        if (clubMemberTeams.size() != clubMemberIds.size()) {
+            return false;
         }
+        List<Long> unmatchedClubMemberIds = new ArrayList<>(clubMemberIds);
+        for (ClubMemberTeam clubMemberTeam : clubMemberTeams) {
+            if (!unmatchedClubMemberIds.remove(clubMemberTeam.getClubMemberId())) {
+                return false;
+            }
+        }
+        return unmatchedClubMemberIds.isEmpty();
     }
 
-    private void removeClubMemberTeam(ClubMemberTeam clubMemberTeam) {
-        if (clubMemberTeam == null || !clubMemberTeams.contains(clubMemberTeam)) {
+    private void addClubMemberTeam(ClubMemberTeam clubMemberTeam) {
+        if (clubMemberTeam == null) {
             return;
         }
-        this.clubMemberTeams.remove(clubMemberTeam);
+        clubMemberTeam.setTeam(this);
     }
 }

src/main/java/checkmo/clubMeeting/internal/entity/Topic.java

@@ -51,18 +51,33 @@ public class Topic extends BaseEntity {
     @OneToMany(mappedBy = "topic", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private List<TeamTopic> teamTopics = new ArrayList<>();
 
-    public boolean isOwnedBy(String anotherMemberId) {
+    public boolean isAuthoredBy(Long anotherMemberId) {
         return this.memberId.equals(anotherMemberId);
     }
 
     public boolean isOwnedBy(Long anotherClubMemberId) {
         return this.clubMemberId.equals(anotherClubMemberId);
     }
 
-    public void updateTopic(String description) {
+    public void updateBy(ClubMeetingActor actor, String description) {
+        validateAuthorOrStaff(actor);
         this.description = description;
     }
 
+    public void removeBy(ClubMeetingActor actor) {
+        validateAuthorOrStaff(actor);
+        if (this.meeting != null) {
+            this.meeting.getTopics().remove(this);
+            this.meeting = null;
+        }
+    }
+
+    private void validateAuthorOrStaff(ClubMeetingActor actor) {
+        if (!isOwnedBy(actor.clubMemberId()) && !actor.staff()) {
+            throw new ClubMeetingException(ClubMeetingErrorStatus.TOPIC_FORBIDDEN);
+        }
+    }
+
     // == 연관관계 메서드 == //
     public void setMeeting(Meeting meeting) {
         if (meeting == null) {
@@ -79,11 +94,4 @@ public void setMeeting(Meeting meeting) {
             meeting.getTopics().add(this);
         }
     }
-
-    public void removeMeeting() {
-        if (this.meeting != null) {
-            this.meeting.getTopics().remove(this);
-            this.meeting = null;
-        }
-    }
 }

src/main/java/checkmo/clubMeeting/internal/service/command/ClubBookReviewCommandService.java

@@ -4,6 +4,7 @@
 import checkmo.clubManagement.ClubManagementExternalDTO;
 import checkmo.clubMeeting.internal.converter.ClubMeetingConverter;
 import checkmo.clubMeeting.internal.entity.BookReview;
+import checkmo.clubMeeting.internal.entity.ClubMeetingActor;
 import checkmo.clubMeeting.internal.entity.Meeting;
 import checkmo.clubMeeting.internal.exception.ClubMeetingErrorStatus;
 import checkmo.clubMeeting.internal.exception.ClubMeetingException;
@@ -43,9 +44,7 @@ public void createBookReview(Long clubId, Long meetingId, Long memberId, BookRev
         Meeting meeting = clubMeetingQueryService.validateMeeting(clubId, meetingId);
 
         BookReview bookReview = ClubMeetingConverter.toBookReview(request, clubMemberId, memberId);
-        bookReview.setMeeting(meeting);
-
-        meeting.addSumRate(bookReview.getRate());
+        meeting.addBookReview(bookReview);
 
         bookReviewRepository.save(bookReview);
     }
@@ -61,26 +60,19 @@ public void updateBookReview(Long clubId, Long meetingId, Long reviewId, Long me
         if (!clubMembership.isActive()) {
             throw new ClubMeetingException(ClubMeetingErrorStatus.CLUB_MEMBER_INACTIVE);
         }
+        ClubMeetingActor actor = new ClubMeetingActor(
+                clubMembership.getClubMemberId(),
+                clubMembership.isStaff()
+        );
         Meeting meeting = clubMeetingQueryService.validateMeeting(clubId, meetingId);
 
         BookReview bookReview = clubBookReviewQueryService.validateBookReview(reviewId, meeting.getId());
-        if (!bookReview.isOwnedBy(clubMembership.getClubMemberId()) && !clubMembership.isStaff()) {
-            throw new ClubMeetingException(ClubMeetingErrorStatus.BOOK_REVIEW_FORBIDDEN);
-        }
-
-        double oldRate = bookReview.getRate();
-        double newRate = request.getRate();
-
-        bookReview.updateBookReview(
+        meeting.reviseBookReviewBy(
+                actor,
+                bookReview,
                 request.getDescription(),
                 request.getRate()
         );
-
-        // 별점이 변경된 경우에만 미팅의 별점 합산
-        if (oldRate != newRate) {
-            meeting.subtractSumRate(oldRate);
-            meeting.addSumRate(newRate);
-        }
     }
 
     @Retryable(
@@ -94,16 +86,14 @@ public void deleteBookReview(Long clubId, Long meetingId, Long reviewId, Long me
         if (!clubMembership.isActive()) {
             throw new ClubMeetingException(ClubMeetingErrorStatus.CLUB_MEMBER_INACTIVE);
         }
+        ClubMeetingActor actor = new ClubMeetingActor(
+                clubMembership.getClubMemberId(),
+                clubMembership.isStaff()
+        );
         Meeting meeting = clubMeetingQueryService.validateMeeting(clubId, meetingId);
 
         BookReview bookReview = clubBookReviewQueryService.validateBookReview(reviewId, meeting.getId());
-        if (!bookReview.isOwnedBy(clubMembership.getClubMemberId()) && !clubMembership.isStaff()) {
-            throw new ClubMeetingException(ClubMeetingErrorStatus.BOOK_REVIEW_FORBIDDEN);
-        }
-
-        meeting.subtractSumRate(bookReview.getRate());
-
-        bookReview.removeMeeting();
+        meeting.removeBookReviewBy(actor, bookReview);
     }
 
 }