[BE] refactor: 도메인 의존 관계 분리 draft

backend/src/main/java/com/yigongil/backend/domain/BaseEntity.java → backend/src/main/java/com/yigongil/backend/domain/base/BaseEntity.java

@@ -1,17 +1,11 @@
-package com.yigongil.backend.domain;
+package com.yigongil.backend.domain.base;
 
-import com.yigongil.backend.domain.event.DomainEvent;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collection;
 import javax.persistence.Column;
 import javax.persistence.EntityListeners;
 import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.domain.AfterDomainEventPublication;
-import org.springframework.data.domain.DomainEvents;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 @EntityListeners(AuditingEntityListener.class)
@@ -25,23 +19,6 @@ public abstract class BaseEntity {
     @LastModifiedDate
     protected LocalDateTime updatedAt;
 
-    @Transient
-    private Collection<DomainEvent> domainEvents = new ArrayList<>();
-
-    @DomainEvents
-    public Collection<DomainEvent> events() {
-        return domainEvents;
-    }
-
-    @AfterDomainEventPublication
-    public void clear() {
-        domainEvents.clear();
-    }
-
-    protected void register(DomainEvent event) {
-        domainEvents.add(event);
-    }
-
     public LocalDateTime getCreatedAt() {
         return createdAt;
     }

backend/src/main/java/com/yigongil/backend/domain/base/BaseRootEntity.java

@@ -0,0 +1,30 @@
+package com.yigongil.backend.domain.base;
+
+import java.time.LocalDateTime;
+import javax.persistence.Column;
+import javax.persistence.EntityListeners;
+import javax.persistence.MappedSuperclass;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.domain.AbstractAggregateRoot;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@EntityListeners(AuditingEntityListener.class)
+@MappedSuperclass
+public class BaseRootEntity extends AbstractAggregateRoot<BaseRootEntity> {
+
+    @CreatedDate
+    @Column(nullable = false)
+    protected LocalDateTime createdAt;
+
+    @LastModifiedDate
+    protected LocalDateTime updatedAt;
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public LocalDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+}

backend/src/main/java/com/yigongil/backend/domain/certification/Certification.java

@@ -1,6 +1,6 @@
 package com.yigongil.backend.domain.certification;
 
-import com.yigongil.backend.domain.BaseEntity;
+import com.yigongil.backend.domain.base.BaseEntity;
 import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.domain.round.Round;
 import com.yigongil.backend.domain.study.Study;

backend/src/main/java/com/yigongil/backend/application/CertificationService.java → backend/src/main/java/com/yigongil/backend/domain/certification/CertificationService.java

@@ -1,7 +1,5 @@
-package com.yigongil.backend.application;
+package com.yigongil.backend.domain.certification;
 
-import com.yigongil.backend.domain.certification.Certification;
-import com.yigongil.backend.domain.certification.CertificationRepository;
 import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.domain.study.Study;
 import com.yigongil.backend.exception.NoCertificationException;

backend/src/main/java/com/yigongil/backend/domain/feedpost/FeedPost.java

@@ -1,6 +1,6 @@
 package com.yigongil.backend.domain.feedpost;
 
-import com.yigongil.backend.domain.BaseEntity;
+import com.yigongil.backend.domain.base.BaseEntity;
 import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.domain.study.Study;
 import java.time.LocalDateTime;

backend/src/main/java/com/yigongil/backend/application/FeedService.java → backend/src/main/java/com/yigongil/backend/domain/feedpost/FeedService.java

@@ -1,7 +1,5 @@
-package com.yigongil.backend.application;
+package com.yigongil.backend.domain.feedpost;
 
-import com.yigongil.backend.domain.feedpost.FeedPost;
-import com.yigongil.backend.domain.feedpost.FeedPostRepository;
 import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.domain.study.Study;
 import com.yigongil.backend.request.FeedPostCreateRequest;

backend/src/main/java/com/yigongil/backend/ui/ImageResourceController.java → backend/src/main/java/com/yigongil/backend/domain/image/ImageResourceController.java

@@ -1,6 +1,5 @@
-package com.yigongil.backend.ui;
+package com.yigongil.backend.domain.image;
 
-import com.yigongil.backend.application.ImageResourceService;
 import java.net.URI;
 import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;

backend/src/main/java/com/yigongil/backend/application/ImageResourceService.java → backend/src/main/java/com/yigongil/backend/domain/image/ImageResourceService.java

@@ -1,4 +1,4 @@
-package com.yigongil.backend.application;
+package com.yigongil.backend.domain.image;
 
 import com.yigongil.backend.exception.ImageToBytesException;
 import com.yigongil.backend.exception.InvalidImageExtensionException;

backend/src/main/java/com/yigongil/backend/domain/meetingdayoftheweek/MeetingDayOfTheWeek.java

@@ -1,6 +1,6 @@
 package com.yigongil.backend.domain.meetingdayoftheweek;
 
-import com.yigongil.backend.domain.BaseEntity;
+import com.yigongil.backend.domain.base.BaseEntity;
 import com.yigongil.backend.domain.study.Study;
 import java.time.DayOfWeek;
 import javax.persistence.Entity;

backend/src/main/java/com/yigongil/backend/ui/HomeController.java → backend/src/main/java/com/yigongil/backend/domain/member/HomeController.java

@@ -1,8 +1,7 @@
-package com.yigongil.backend.ui;
+package com.yigongil.backend.domain.member;
 
-import com.yigongil.backend.application.RoundService;
 import com.yigongil.backend.config.auth.Authorization;
-import com.yigongil.backend.domain.member.Member;
+import com.yigongil.backend.domain.round.RoundService;
 import com.yigongil.backend.response.UpcomingStudyResponse;
 import com.yigongil.backend.ui.doc.HomeApi;
 import java.util.List;

backend/src/main/java/com/yigongil/backend/domain/member/Member.java

@@ -1,6 +1,6 @@
 package com.yigongil.backend.domain.member;
 
-import com.yigongil.backend.domain.BaseEntity;
+import com.yigongil.backend.domain.base.BaseRootEntity;
 import com.yigongil.backend.domain.event.MemberDeleteEvent;
 import java.util.Objects;
 import javax.persistence.Column;
@@ -17,11 +17,7 @@
 @Getter
 @SQLDelete(sql = Member.DELETE_QUERY)
 @Entity
-public class Member extends BaseEntity {
-
-    private static final int MASTER_NUMBER = 0;
-    private static final int PARTICIPANT_NUMBER = 1;
-    private static final int MAXIMUM_TIER = 5;
+public class Member extends BaseRootEntity {
 
     protected static final String DELETE_QUERY = """
             update member
@@ -32,7 +28,9 @@ public class Member extends BaseEntity {
             deleted = true
             where id = ?
             """;
-
+    private static final int MASTER_NUMBER = 0;
+    private static final int PARTICIPANT_NUMBER = 1;
+    private static final int MAXIMUM_TIER = 5;
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
     private Long id;
@@ -103,7 +101,7 @@ public String getIntroduction() {
 
     @PreRemove
     public void registerDeleteEvent() {
-        register(new MemberDeleteEvent(id));
+        registerEvent(new MemberDeleteEvent(id));
     }
 
     public void addExperience(int exp) {

backend/src/main/java/com/yigongil/backend/ui/MemberController.java → backend/src/main/java/com/yigongil/backend/domain/member/MemberController.java

@@ -1,8 +1,6 @@
-package com.yigongil.backend.ui;
+package com.yigongil.backend.domain.member;
 
-import com.yigongil.backend.application.MemberService;
 import com.yigongil.backend.config.auth.Authorization;
-import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.request.ProfileUpdateRequest;
 import com.yigongil.backend.response.MyProfileResponse;
 import com.yigongil.backend.response.NicknameValidationResponse;

backend/src/main/java/com/yigongil/backend/application/MemberService.java → backend/src/main/java/com/yigongil/backend/domain/member/MemberService.java

@@ -1,9 +1,7 @@
-package com.yigongil.backend.application;
+package com.yigongil.backend.domain.member;
 
-import com.yigongil.backend.domain.member.Member;
-import com.yigongil.backend.domain.member.MemberRepository;
-import com.yigongil.backend.domain.member.Nickname;
 import com.yigongil.backend.domain.study.Study;
+import com.yigongil.backend.domain.study.StudyService;
 import com.yigongil.backend.domain.studymember.StudyMember;
 import com.yigongil.backend.domain.studymember.StudyMemberRepository;
 import com.yigongil.backend.exception.MemberNotFoundException;

backend/src/main/java/com/yigongil/backend/domain/report/Report.java

@@ -1,6 +1,6 @@
 package com.yigongil.backend.domain.report;
 
-import com.yigongil.backend.domain.BaseEntity;
+import com.yigongil.backend.domain.base.BaseEntity;
 import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.exception.InvalidReportContentLengthException;
 import com.yigongil.backend.exception.InvalidReportTitleLengthException;

backend/src/main/java/com/yigongil/backend/ui/ReportController.java → backend/src/main/java/com/yigongil/backend/domain/report/ReportController.java

@@ -1,6 +1,5 @@
-package com.yigongil.backend.ui;
+package com.yigongil.backend.domain.report;
 
-import com.yigongil.backend.application.ReportService;
 import com.yigongil.backend.config.auth.Authorization;
 import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.request.MemberReportCreateRequest;

backend/src/main/java/com/yigongil/backend/application/ReportService.java → backend/src/main/java/com/yigongil/backend/domain/report/ReportService.java

@@ -1,10 +1,9 @@
-package com.yigongil.backend.application;
+package com.yigongil.backend.domain.report;
 
 import com.yigongil.backend.domain.member.Member;
-import com.yigongil.backend.domain.report.MemberReport;
-import com.yigongil.backend.domain.report.ReportRepository;
-import com.yigongil.backend.domain.report.StudyReport;
+import com.yigongil.backend.domain.member.MemberService;
 import com.yigongil.backend.domain.study.Study;
+import com.yigongil.backend.domain.study.StudyService;
 import com.yigongil.backend.request.MemberReportCreateRequest;
 import com.yigongil.backend.request.StudyReportCreateRequest;
 import org.springframework.stereotype.Service;

backend/src/main/java/com/yigongil/backend/ui/MustDoController.java → backend/src/main/java/com/yigongil/backend/domain/round/MustDoController.java

@@ -1,6 +1,5 @@
-package com.yigongil.backend.ui;
+package com.yigongil.backend.domain.round;
 
-import com.yigongil.backend.application.MustDoService;
 import com.yigongil.backend.config.auth.Authorization;
 import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.request.MustDoUpdateRequest;

backend/src/main/java/com/yigongil/backend/application/MustDoService.java → backend/src/main/java/com/yigongil/backend/domain/round/MustDoService.java

@@ -1,8 +1,6 @@
-package com.yigongil.backend.application;
+package com.yigongil.backend.domain.round;
 
 import com.yigongil.backend.domain.member.Member;
-import com.yigongil.backend.domain.round.Round;
-import com.yigongil.backend.domain.round.RoundRepository;
 import com.yigongil.backend.exception.RoundNotFoundException;
 import com.yigongil.backend.request.MustDoUpdateRequest;
 import org.springframework.stereotype.Service;

backend/src/main/java/com/yigongil/backend/domain/round/Round.java

@@ -1,7 +1,6 @@
 package com.yigongil.backend.domain.round;
 
-import com.yigongil.backend.domain.BaseEntity;
-import com.yigongil.backend.domain.meetingdayoftheweek.MeetingDayOfTheWeek;
+import com.yigongil.backend.domain.base.BaseEntity;
 import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.domain.roundofmember.RoundOfMember;
 import com.yigongil.backend.domain.study.Study;
@@ -60,9 +59,8 @@ public class Round extends BaseEntity {
     @JoinColumn(name = "round_id", nullable = false)
     private List<RoundOfMember> roundOfMembers = new ArrayList<>();
 
-    @Cascade(CascadeType.PERSIST)
-    @ManyToOne(fetch = FetchType.LAZY)
-    private MeetingDayOfTheWeek meetingDayOfTheWeek;
+    @Enumerated(EnumType.ORDINAL)
+    private DayOfWeek dayOfWeek;
 
     @Column(nullable = false)
     private Integer weekNumber;
@@ -80,22 +78,22 @@ public Round(
             String mustDo,
             Member master,
             List<RoundOfMember> roundOfMembers,
-            MeetingDayOfTheWeek meetingDayOfTheWeek,
+            DayOfWeek dayOfWeek,
             Integer weekNumber
     ) {
         this.id = id;
         this.study = study;
         this.mustDo = mustDo;
         this.master = master;
         this.roundOfMembers = roundOfMembers == null ? new ArrayList<>() : roundOfMembers;
-        this.meetingDayOfTheWeek = meetingDayOfTheWeek;
+        this.dayOfWeek = dayOfWeek;
         this.weekNumber = weekNumber;
     }
 
-    public static Round of(MeetingDayOfTheWeek meetingDayOfTheWeek, Study study, Integer weekNumber) {
+    public static Round of(DayOfWeek dayOfWeek, Study study, Integer weekNumber) {
         return Round.builder()
                     .study(study)
-                    .meetingDayOfTheWeek(meetingDayOfTheWeek)
+                    .dayOfWeek(dayOfWeek)
                     .weekNumber(weekNumber)
                     .master(study.getMaster())
                     .roundOfMembers(RoundOfMember.from(study))
@@ -140,7 +138,7 @@ public boolean isMustDoDone(Member member) {
     }
 
     public boolean isEndAt(LocalDate date) {
-        return meetingDayOfTheWeek.isSameDayOfWeek(date.getDayOfWeek());
+        return dayOfWeek == date.getDayOfWeek();
     }
 
     public RoundOfMember findRoundOfMemberBy(Member member) {
@@ -180,30 +178,26 @@ public boolean isSameWeek(Integer weekNumber) {
         return this.weekNumber == weekNumber;
     }
 
-    public boolean isSameDayOfWeek(MeetingDayOfTheWeek meetingDayOfTheWeek) {
-        return this.meetingDayOfTheWeek.equals(meetingDayOfTheWeek);
+    public boolean isSameDayOfWeek(DayOfWeek dayOfWeek) {
+        return this.dayOfWeek.equals(dayOfWeek);
     }
 
     public boolean isNextDayOfWeek(DayOfWeek dayOfWeek) {
-        return this.meetingDayOfTheWeek.comesNext(dayOfWeek);
+        return this.dayOfWeek.getValue() > dayOfWeek.getValue();
     }
 
     public boolean isInProgress() {
         return roundStatus == RoundStatus.IN_PROGRESS;
     }
 
     public int calculateLeftDaysFrom(LocalDate date) {
-        int gap = meetingDayOfTheWeek.getDayOfWeek().getValue() - date.getDayOfWeek().getValue();
+        int gap = dayOfWeek.getValue() - date.getDayOfWeek().getValue();
         if (gap < 0) {
             return gap + DayOfWeek.values().length;
         }
         return gap;
     }
 
-    public DayOfWeek getDayOfWeek() {
-        return meetingDayOfTheWeek.getDayOfWeek();
-    }
-
     public boolean isBeforeOrSame(Integer minimumWeeks) {
         return weekNumber <= minimumWeeks;
     }

backend/src/main/java/com/yigongil/backend/application/RoundService.java → backend/src/main/java/com/yigongil/backend/domain/round/RoundService.java

@@ -1,8 +1,6 @@
-package com.yigongil.backend.application;
+package com.yigongil.backend.domain.round;
 
 import com.yigongil.backend.domain.member.Member;
-import com.yigongil.backend.domain.round.Round;
-import com.yigongil.backend.domain.round.RoundRepository;
 import com.yigongil.backend.domain.study.ProcessingStatus;
 import com.yigongil.backend.domain.study.Study;
 import com.yigongil.backend.domain.study.StudyRepository;

backend/src/main/java/com/yigongil/backend/domain/roundofmember/RoundOfMember.java

@@ -1,6 +1,6 @@
 package com.yigongil.backend.domain.roundofmember;
 
-import com.yigongil.backend.domain.BaseEntity;
+import com.yigongil.backend.domain.base.BaseEntity;
 import com.yigongil.backend.domain.member.Member;
 import com.yigongil.backend.domain.study.Study;
 import java.util.List;

backend/src/main/java/com/yigongil/backend/application/ScheduleService.java → backend/src/main/java/com/yigongil/backend/domain/study/ScheduleService.java

@@ -1,4 +1,4 @@
-package com.yigongil.backend.application;
+package com.yigongil.backend.domain.study;
 
 import java.time.LocalDate;
 import org.springframework.scheduling.annotation.Scheduled;