refactor : (review) period 객체 추출

Author: heewonham

src/main/java/nextstep/courses/domain/FreeSession.java

@@ -2,12 +2,10 @@
 
 import nextstep.payments.domain.Payment;
 
-import java.time.LocalDate;
-
 public class FreeSession extends Session {
 
-    public FreeSession(Long id, String name, LocalDate startDate, LocalDate endDate, Image coverImage, LectureStatus status) {
-        super(id, name, startDate, endDate, coverImage, status);
+    public FreeSession(Long id, String name, Period period, Image coverImage, SessionStatus status) {
+        super(id, name, period, coverImage, status);
     }
 
     @Override

src/main/java/nextstep/courses/domain/PaidSession.java

@@ -2,22 +2,20 @@
 
 import nextstep.payments.domain.Payment;
 
-import java.time.LocalDate;
-
 public class PaidSession extends Session {
     private Capacity maxCapacity;
     private TuitionFee tuitionFee;
 
-    public PaidSession(Long id, String name, LocalDate startDate, LocalDate endDate, Image coverImage,
-                       LectureStatus status, int maxCapacity, Long tuitionFee) {
-        super(id, name, startDate, endDate, coverImage, status);
+    public PaidSession(Long id, String name, Period period, Image coverImage,
+                       SessionStatus status, int maxCapacity, int tuitionFee) {
+        super(id, name, period, coverImage, status);
         this.maxCapacity = new Capacity(maxCapacity);
         this.tuitionFee = new TuitionFee(tuitionFee);
     }
 
     @Override
     protected void validateRegistration(Long studentId, Payment payment) {
-        if (registeredStudents.size() >= maxCapacity) {
+        if (registeredStudents.size() >= maxCapacity.getValue()) {
             throw new IllegalStateException("수강 인원을 초과하였습니다.");
         }
         if (payment == null) {

src/main/java/nextstep/courses/domain/Period.java

@@ -0,0 +1,24 @@
+package nextstep.courses.domain;
+
+import java.time.LocalDate;
+
+public class Period {
+    private final LocalDate startDate;
+    private final LocalDate endDate;
+
+    public Period(LocalDate startDate, LocalDate endDate) {
+        if (endDate.isBefore(startDate) || endDate.isEqual(startDate)) {
+            throw new IllegalArgumentException("종료일은 시작일보다 이후여야 합니다.");
+        }
+        this.startDate = startDate;
+        this.endDate = endDate;
+    }
+
+    public LocalDate getStartDate() {
+        return startDate;
+    }
+
+    public LocalDate getEndDate() {
+        return endDate;
+    }
+}

src/main/java/nextstep/courses/domain/Session.java

@@ -2,28 +2,26 @@
 
 import nextstep.payments.domain.Payment;
 
-import java.time.LocalDate;
 import java.util.HashSet;
 import java.util.Set;
 public abstract class Session {
     protected Long id;
     protected String name;
-    protected LocalDate startDate;
-    protected LocalDate endDate;
+    protected Period period;
     protected Image coverImage;
-    protected LectureStatus status;
+    protected SessionStatus status;
     protected Set<Long> registeredStudents = new HashSet<>();
-    public Session(Long id, String name, LocalDate startDate, LocalDate endDate, Image coverImage, LectureStatus status) {
+
+    public Session(Long id, String name, Period period, Image coverImage, SessionStatus status) {
         this.id = id;
         this.name = name;
-        this.startDate = startDate;
-        this.endDate = endDate;
+        this.period = period;
         this.coverImage = coverImage;
         this.status = status;
     }
 
     public void register(Long studentId, Payment payment) {
-        if (status != LectureStatus.RECRUITING) {
+        if (status != SessionStatus.RECRUITING) {
             throw new IllegalStateException("수강 신청은 모집중일 때만 가능합니다.");
         }
 

src/test/java/nextstep/qna/domain/PeriodTest.java

@@ -0,0 +1,27 @@
+package nextstep.qna.domain;
+
+import nextstep.courses.domain.Period;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDate;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class PeriodTest {
+    @Test
+    @DisplayName("종료일이 시작일보다 이르거나 같으면 예외가 발생한다")
+    void invalidPeriodThrowsException() {
+        LocalDate startDate = LocalDate.of(2025, 4, 10);
+        LocalDate endDateSame = LocalDate.of(2025, 4, 10);
+        LocalDate endDateBefore = LocalDate.of(2025, 4, 9);
+
+        assertThatThrownBy(() -> new Period(startDate, endDateSame))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("종료일은 시작일보다 이후여야 합니다.");
+
+        assertThatThrownBy(() -> new Period(startDate, endDateBefore))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("종료일은 시작일보다 이후여야 합니다.");
+    }
+}

src/test/java/nextstep/qna/domain/SessionTest.java

@@ -1,9 +1,6 @@
 package nextstep.qna.domain;
 
-import nextstep.courses.domain.FreeSession;
-import nextstep.courses.domain.LectureStatus;
-import nextstep.courses.domain.PaidSession;
-import nextstep.courses.domain.Session;
+import nextstep.courses.domain.*;
 import nextstep.payments.domain.Payment;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -20,10 +17,9 @@ void notRegisterSession() {
         Session session = new FreeSession(
                 1L,
                 "자바지기",
-                LocalDate.now(),
-                LocalDate.now(),
+                new Period(LocalDate.now(), LocalDate.now().plusDays(1)),
                 null,
-                LectureStatus.CLOSED
+                SessionStatus.CLOSED
         );
         assertThatThrownBy(() -> {
             session.register(1L, new Payment());
@@ -35,10 +31,9 @@ void registerSession() {
         Session session = new FreeSession(
                 1L,
                 "자바지기",
-                LocalDate.now(),
-                LocalDate.now(),
+                new Period(LocalDate.now(), LocalDate.now().plusDays(1)),
                 null,
-                LectureStatus.RECRUITING
+                SessionStatus.RECRUITING
         );
         session.register(1L, new Payment());
         assertThat(session.isRegistered(1L)).isTrue();
@@ -50,19 +45,24 @@ void paidSession() {
         Session session = new PaidSession(
                 1L,
                 "자바지기",
-                LocalDate.now(),
-                LocalDate.now(),
+                new Period(LocalDate.now(), LocalDate.now().plusDays(1)),
                 null,
-                LectureStatus.RECRUITING,
-                0,
-                10000L
+                SessionStatus.RECRUITING,
+                1,
+                10000
         );
         assertThatThrownBy(() -> {
             session.register(11L, new Payment(
                     "1",
                     1L,
                     11L,
-                    10000L
+                    10000
+            ));
+            session.register(11L, new Payment(
+                    "1",
+                    1L,
+                    11L,
+                    10000
             ));
         }).isInstanceOf(IllegalStateException.class).hasMessage("수강 인원을 초과하였습니다.");
     }
@@ -73,12 +73,11 @@ void paidSessionWithoutPayment() {
         Session session = new PaidSession(
                 1L,
                 "자바지기",
-                LocalDate.now(),
-                LocalDate.now(),
+                new Period(LocalDate.now(), LocalDate.now().plusDays(1)),
                 null,
-                LectureStatus.RECRUITING,
+                SessionStatus.RECRUITING,
                 10,
-                10000L
+                10000
         );
         assertThatThrownBy(() -> {
             session.register(11L, null);
@@ -91,19 +90,18 @@ void paidSessionWithDifferentPayment() {
         Session session = new PaidSession(
                 1L,
                 "자바지기",
-                LocalDate.now(),
-                LocalDate.now(),
+                new Period(LocalDate.now(), LocalDate.now().plusDays(1)),
                 null,
-                LectureStatus.RECRUITING,
+                SessionStatus.RECRUITING,
                 10,
-                10000L
+                10000
         );
         assertThatThrownBy(() -> {
             session.register(11L, new Payment(
                     "1",
                     2L,
                     11L,
-                    10000L
+                    10000
             ));
         }).isInstanceOf(IllegalArgumentException.class).hasMessage("결제한 강의와 일치하지 않습니다.");
     }
@@ -114,19 +112,18 @@ void paidSessionWithDifferentStudent() {
         Session session = new PaidSession(
                 1L,
                 "자바지기",
-                LocalDate.now(),
-                LocalDate.now(),
+                new Period(LocalDate.now(), LocalDate.now().plusDays(1)),
                 null,
-                LectureStatus.RECRUITING,
+                SessionStatus.RECRUITING,
                 10,
-                10000L
+                10000
         );
         assertThatThrownBy(() -> {
             session.register(11L, new Payment(
                     "1",
                     1L,
                     12L,
-                    10000L
+                    10000
             ));
         }).isInstanceOf(IllegalArgumentException.class).hasMessage("결제한 사용자와 일치하지 않습니다.");
     }
@@ -137,20 +134,20 @@ void paidSessionWithDifferentTuitionFee() {
         Session session = new PaidSession(
                 1L,
                 "자바지기",
-                LocalDate.now(),
-                LocalDate.now(),
+                new Period(LocalDate.now(), LocalDate.now().plusDays(1)),
                 null,
-                LectureStatus.RECRUITING,
+                SessionStatus.RECRUITING,
                 10,
-                10000L
+                10000
         );
         assertThatThrownBy(() -> {
             session.register(11L, new Payment(
                     "1",
                     1L,
                     11L,
-                    20000L
+                    20000
             ));
         }).isInstanceOf(IllegalArgumentException.class).hasMessage("결제 금액과 일치하지 않습니다.");
     }
+
 }