feat: 강의가 진행 중인 상태에서도 수강신청 가능하도록 하는 기능 구현

Danden1 · Danden1 · commit 44ed16ab7752 · 2024-04-17T23:21:43.000+09:00
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@
 
 ### 기능 목록
 - [x] 강의는 하나 이상 강의 이미지를 가질 수 있다.
-- [ ] 강의가 진행 중인 상태에서도 수강신청이 가능하다.
+- [x] 강의가 진행 중인 상태에서도 수강신청이 가능하다.
   - 강의 진행 상태(준비중, 진행중, 종료)와 모집 상태(비모집중, 모집중)로 상태 분리 필요.
 - [ ] 강사는 수강신청한 사람 중, 선발된 인원에 대해서만 수강 승인이 가능해야 한다.
 - [ ] 강사는 수강신청한 사람 중, 선발되지 않은 사람은 수강 취소할 수 있다.
diff --git a/src/main/java/nextstep/courses/domain/FreeSession.java b/src/main/java/nextstep/courses/domain/FreeSession.java
@@ -15,6 +15,10 @@ public FreeSession(Long id, List<SessionImage> sessionImage, RecruitStatus recru
         super(id, sessionImage, recruitStatus, sessionDate, students);
     }
 
+    public FreeSession(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus,  SessionProgressStatus sessionProgressStatus, SessionDate sessionDate, Set<NsUser> students) {
+        super(id, sessionImage, recruitStatus, sessionProgressStatus, sessionDate, students);
+    }
+
 
     @Override
     protected void assertSatisfiedCondition(NsUser user, Payment payment) {
diff --git a/src/main/java/nextstep/courses/domain/PaySession.java b/src/main/java/nextstep/courses/domain/PaySession.java
@@ -29,6 +29,14 @@ public PaySession(Long id, List<SessionImage> sessionImage, RecruitStatus recrui
         this.maximumStudents = maximumStudents;
     }
 
+    public PaySession(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionProgressStatus sessionProgressStatus, SessionDate sessionDate, Set<NsUser> students, int maximumStudents, long amount) {
+        super(id, sessionImage, recruitStatus, sessionProgressStatus, sessionDate, students);
+        assertValidMaximumStudents(maximumStudents);
+        assertValidAmount(amount);
+        this.amount = amount;
+        this.maximumStudents = maximumStudents;
+    }
+
     private void assertValidMaximumStudents(int maximumStudents) {
         String errorMessage = "최대 수강생은 1명 이상으로 등록해야 합니다.";
 
diff --git a/src/main/java/nextstep/courses/domain/Session.java b/src/main/java/nextstep/courses/domain/Session.java
@@ -14,17 +14,28 @@ public abstract class Session {
     private final Long id;
     private final List<SessionImage> sessionImage;
     private RecruitStatus recruitStatus;
+    private SessionProgressStatus sessionProgressStatus;
     private final Set<NsUser> students;
     private final SessionDate sessionDate;
 
+
     public Session(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionDate sessionDate) {
         this(id, sessionImage, recruitStatus, sessionDate, new HashSet<>());
     }
 
+    public Session(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionProgressStatus sessionProgressStatus, SessionDate sessionDate) {
+        this(id, sessionImage, recruitStatus, sessionProgressStatus, sessionDate, new HashSet<>());
+    }
+
     public Session(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionDate sessionDate, Set<NsUser> students) {
+        this(id, sessionImage, recruitStatus, SessionProgressStatus.PREPARE, sessionDate, students);
+    }
+
+    public Session(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionProgressStatus sessionProgressStatus, SessionDate sessionDate, Set<NsUser> students) {
         this.id = id;
         this.sessionImage = sessionImage;
         this.recruitStatus = recruitStatus;
+        this.sessionProgressStatus = sessionProgressStatus;
         this.sessionDate = sessionDate;
         this.students = students;
     }
@@ -61,14 +72,26 @@ public List<SessionImage> getSessionImage() {
         return sessionImage;
     }
 
-    public RecruitStatus getSessionStatus() {
+    public RecruitStatus getRecruitStatus() {
         return recruitStatus;
     }
 
+    public SessionProgressStatus getSessionProgressStatus() {
+        return sessionProgressStatus;
+    }
+
     public SessionDate getSessionDate() {
         return sessionDate;
     }
 
+    public void changeProgressStatus(SessionProgressStatus sessionProgressStatus) {
+        this.sessionProgressStatus = sessionProgressStatus;
+    }
+
+    public void changeRecruitStatus(RecruitStatus recruitStatus) {
+        this.recruitStatus = recruitStatus;
+    }
+
 
     abstract protected void assertSatisfiedCondition(NsUser user, Payment payment);
 
diff --git a/src/main/java/nextstep/courses/domain/SessionProgressStatus.java b/src/main/java/nextstep/courses/domain/SessionProgressStatus.java
@@ -0,0 +1,11 @@
+package nextstep.courses.domain;
+
+public enum SessionProgressStatus {
+    PREPARE,
+    RUN,
+    END;
+
+    public static SessionProgressStatus findByName(String name) {
+        return SessionProgressStatus.valueOf(name.toUpperCase());
+    }
+}
diff --git a/src/main/java/nextstep/courses/infrastructure/JdbcSessionRepository.java b/src/main/java/nextstep/courses/infrastructure/JdbcSessionRepository.java
@@ -56,7 +56,7 @@ public <T> Optional<Session> findBySessionId(Long sessionId, Class<T> type) {
     }
 
     private Optional<Session> findFreeSessionById(Long sessionId) {
-        String paySessionSql = "select id, session_status, start_date, end_date from free_session where id = ?";
+        String paySessionSql = "select id, recruit_status, progress_status, start_date, end_date from free_session where id = ?";
         String sessionImageTableName = "free_session_image";
         String studentsTableName = "free_session_students";
 
@@ -67,15 +67,16 @@ private Optional<Session> findFreeSessionById(Long sessionId) {
                 new FreeSession(rs.getLong(1),
                         sessionImage,
                         RecruitStatus.findByName(rs.getString(2)),
-                        new SessionDate(toLocalDate(rs.getTimestamp(3)), toLocalDate(rs.getTimestamp(4))),
+                        SessionProgressStatus.findByName(rs.getString(3)),
+                        new SessionDate(toLocalDate(rs.getTimestamp(4)), toLocalDate(rs.getTimestamp(5))),
                         students
                 );
 
         return Optional.ofNullable(jdbcTemplate.queryForObject(paySessionSql, sessionMapper, sessionId));
     }
 
     private Optional<Session> findPaySessionById(Long sessionId) {
-        String paySessionSql = "select id, session_status, amount, maximum_students, start_date, end_date from pay_session where id = ?";
+        String paySessionSql = "select id, recruit_status, progress_status, amount, maximum_students, start_date, end_date from pay_session where id = ?";
         String sessionImageTableName = "pay_session_image";
         String studentsTableName = "pay_session_students";
 
@@ -86,10 +87,11 @@ private Optional<Session> findPaySessionById(Long sessionId) {
                 new PaySession(rs.getLong(1),
                         sessionImage,
                         RecruitStatus.findByName(rs.getString(2)),
-                        new SessionDate(toLocalDate(rs.getTimestamp(5)), toLocalDate(rs.getTimestamp(6))),
+                        SessionProgressStatus.findByName(rs.getString(3)),
+                        new SessionDate(toLocalDate(rs.getTimestamp(6)), toLocalDate(rs.getTimestamp(7))),
                         students,
-                        rs.getInt(4),
-                        rs.getInt(3)
+                        rs.getInt(5),
+                        rs.getInt(4)
                 );
 
         return Optional.ofNullable(jdbcTemplate.queryForObject(paySessionSql, sessionMapper, sessionId));
@@ -111,13 +113,14 @@ public void saveSession(Session session, Long courseId) {
     }
 
     private void savePaySession(PaySession paySession, Long courseId) {
-        String sql = "insert into pay_session (id, session_status, amount, maximum_students, start_date, end_date, course_id) values (?, ?, ?, ?, ?, ?, ?)";
+        String sql = "insert into pay_session (id, progress_status, recruit_status, amount, maximum_students, start_date, end_date, course_id) values (?, ?, ?, ?, ?, ?, ?, ?)";
         String studentsTableName = "pay_session_students";
         String sessionImageTableName = "pay_session_image";
 
         jdbcTemplate.update(sql,
                 paySession.getId(),
-                paySession.getSessionStatus().name(),
+                paySession.getSessionProgressStatus().name(),
+                paySession.getRecruitStatus().name(),
                 paySession.getAmount(),
                 paySession.getMaximumStudents(),
                 paySession.getSessionDate().getStartDate(),
@@ -129,13 +132,14 @@ private void savePaySession(PaySession paySession, Long courseId) {
     }
 
     private void saveFreeSession(FreeSession freeSession, Long courseId) {
-        String sql = "insert into free_session (id, session_status, start_date, end_date, course_id) values (?, ?, ?, ?, ?)";
+        String sql = "insert into free_session (id, progress_status, recruit_status, start_date, end_date, course_id) values (?, ?, ?, ?, ?, ?)";
         String studentsTableName = "free_session_students";
         String sessionImageTableName = "free_session_image";
 
         jdbcTemplate.update(sql,
                 freeSession.getId(),
-                freeSession.getSessionStatus().name(),
+                freeSession.getSessionProgressStatus().name(),
+                freeSession.getRecruitStatus().name(),
                 freeSession.getSessionDate().getStartDate(),
                 freeSession.getSessionDate().getEndDate(),
                 courseId);
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
@@ -108,3 +108,10 @@ create table delete_history (
     deleted_by_id bigint,
     primary key (id)
 );
+
+
+alter table pay_session rename column session_status to recruit_status;
+alter table free_session rename column session_status to recruit_status;
+
+alter table pay_session add column progress_status varchar(20) default 'PREPARE';
+alter table free_session add column progress_status varchar(20) default 'PREPARE';
diff --git a/src/test/java/nextstep/courses/domain/SessionTest.java b/src/test/java/nextstep/courses/domain/SessionTest.java
@@ -48,4 +48,14 @@ void testManyImage() {
         assertThat(testSession.getSessionImage()).hasSize(2)
                 .containsExactlyInAnyOrderElementsOf(sessionImages);
     }
+
+    @Test
+    @DisplayName("진행 중인 강의 수강신청")
+    void testEnrollmentWhenSessionRun() {
+        Session testSession = TestSessionFactory.recruitStatusSession(sessionId);
+        testSession.changeProgressStatus(SessionProgressStatus.RUN);
+        testSession.enrollmentUser(student, new Payment());
+
+        assertThat(testSession.getStudents()).hasSize(1);
+    }
 }
diff --git a/src/test/java/nextstep/courses/infrastructure/SessionRepositoryTest.java b/src/test/java/nextstep/courses/infrastructure/SessionRepositoryTest.java
@@ -53,7 +53,7 @@ void testFreeSession() {
         assertThat(findSession.getId()).isEqualTo(1L);
 
         assertThat(findSession.getSessionImage().get(0).getId()).isEqualTo(sessionImages.get(0).getId());
-
+        assertThat(findSession.getSessionProgressStatus()).isEqualTo(SessionProgressStatus.PREPARE);
         assertThat(findSession.getStudents()).hasSize(2)
                 .extracting(NsUser::getUserId)
                 .containsAll(students.stream().map(NsUser::getUserId).collect(Collectors.toUnmodifiableList()));
@@ -63,7 +63,7 @@ void testFreeSession() {
     @DisplayName("유료 강의 db에 넣고 조회 테스트")
     void testPaySession() {
         int amount = 1000;
-        PaySession paySession = new PaySession(1L, sessionImages, RecruitStatus.RECRUIT, SessionDateTest.of(), students, 2, amount);
+        PaySession paySession = new PaySession(1L, sessionImages,RecruitStatus.RECRUIT, SessionDateTest.of(), students, 2, amount);
 
         sessionRepository.saveSession(paySession, courseId);
 
@@ -72,7 +72,7 @@ void testPaySession() {
         assertThat(findSession.getId()).isEqualTo(1L);
 
         assertThat(findSession.getSessionImage().get(0).getId()).isEqualTo(sessionImages.get(0).getId());
-
+        assertThat(findSession.getSessionProgressStatus()).isEqualTo(SessionProgressStatus.PREPARE);
         assertThat(findSession.getStudents()).hasSize(2)
                 .extracting(NsUser::getUserId)
                 .containsAll(students.stream().map(NsUser::getUserId).collect(Collectors.toUnmodifiableList()));

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ public FreeSession(Long id, List<SessionImage> sessionImage, RecruitStatus recru`
`15`	`15`	`super(id, sessionImage, recruitStatus, sessionDate, students);`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ public FreeSession(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionProgressStatus sessionProgressStatus, SessionDate sessionDate, Set<NsUser> students) {`
	`19`	`+ super(id, sessionImage, recruitStatus, sessionProgressStatus, sessionDate, students);`
	`20`	`+ }`
	`21`	`+`
`18`	`22`
`19`	`23`	`@Override`
`20`	`24`	`protected void assertSatisfiedCondition(NsUser user, Payment payment) {`