[Step4] 수강신청(요구사항 변경)

README.md

@@ -34,5 +34,13 @@
   - [x] 이미지 타입은 gif, jpg, jpeg, png, svg만 허용한다.
   - [x] 이미지의 width 는 300픽셀, height는 200픽셀 이상이어야 하며, width : height 은 3:2 여야 한다.
 
+## Step4
+
+### 기능 목록
+- [x] 강의는 하나 이상 강의 이미지를 가질 수 있다.
+- [x] 강의가 진행 중인 상태에서도 수강신청이 가능하다.
+  - 강의 진행 상태(준비중, 진행중, 종료)와 모집 상태(비모집중, 모집중)로 상태 분리 필요.
+- [x] 강사는 수강신청한 사람 중, 선발된 인원에 대해서만 수강 승인이 가능해야 한다.
+- [x] 강사는 수강신청한 사람 중, 선발되지 않은 사람은 수강 취소할 수 있다.
 ## 온라인 코드 리뷰 과정
 * [텍스트와 이미지로 살펴보는 온라인 코드 리뷰 과정](https://github.com/next-step/nextstep-docs/tree/master/codereview)

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

@@ -3,15 +3,20 @@
 import nextstep.payments.domain.Payment;
 import nextstep.users.domain.NsUser;
 
+import java.util.List;
 import java.util.Set;
 
 public class FreeSession extends Session {
-    public FreeSession(Long id, SessionImage sessionImage, SessionStatus sessionStatus, SessionDate sessionDate) {
-        super(id, sessionImage, sessionStatus, sessionDate);
+    public FreeSession(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionDate sessionDate) {
+        super(id, sessionImage, recruitStatus, sessionDate);
     }
 
-    public FreeSession(Long id, SessionImage sessionImage, SessionStatus sessionStatus, SessionDate sessionDate, Set<NsUser> students) {
-        super(id, sessionImage, sessionStatus, sessionDate, students);
+    public FreeSession(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionDate sessionDate, Set<NsUser> students) {
+        super(id, sessionImage, recruitStatus, sessionDate, students);
+    }
+
+    public FreeSession(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionProgressStatus sessionProgressStatus, SessionDate sessionDate, Set<NsUser> students, Set<NsUser> approveStudents) {
+        super(id, sessionImage, recruitStatus, sessionProgressStatus, sessionDate, students, approveStudents);
     }
 
 

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

@@ -0,0 +1,11 @@
+package nextstep.courses.domain;
+
+import java.util.Optional;
+
+public interface FreeSessionRepository {
+    Sessions findByCourseId(Long courseId);
+
+    Optional<FreeSession> findBySessionId(Long sessionId);
+
+    void saveSession(FreeSession session, Long courseId);
+}

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

@@ -5,23 +5,32 @@
 import nextstep.payments.domain.Payment;
 import nextstep.users.domain.NsUser;
 
+import java.util.List;
 import java.util.Set;
 
 public class PaySession extends Session {
 
     private final int maximumStudents;
     private final long amount;
 
-    public PaySession(Long id, SessionImage sessionImage, SessionStatus sessionStatus, SessionDate sessionDate, int maximumStudents, long amount) {
-        super(id, sessionImage, sessionStatus, sessionDate);
+    public PaySession(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionDate sessionDate, int maximumStudents, long amount) {
+        super(id, sessionImage, recruitStatus, sessionDate);
         assertValidMaximumStudents(maximumStudents);
         assertValidAmount(amount);
         this.amount = amount;
         this.maximumStudents = maximumStudents;
     }
 
-    public PaySession(Long id, SessionImage sessionImage, SessionStatus sessionStatus, SessionDate sessionDate, Set<NsUser> students, int maximumStudents, long amount) {
-        super(id, sessionImage, sessionStatus, sessionDate, students);
+    public PaySession(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionDate sessionDate, Set<NsUser> students, int maximumStudents, long amount) {
+        super(id, sessionImage, recruitStatus, sessionDate, students);
+        assertValidMaximumStudents(maximumStudents);
+        assertValidAmount(amount);
+        this.amount = amount;
+        this.maximumStudents = maximumStudents;
+    }
+
+    public PaySession(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionProgressStatus sessionProgressStatus, SessionDate sessionDate, Set<NsUser> students, Set<NsUser> approveStudents, int maximumStudents, long amount) {
+        super(id, sessionImage, recruitStatus, sessionProgressStatus, sessionDate, students, approveStudents);
         assertValidMaximumStudents(maximumStudents);
         assertValidAmount(amount);
         this.amount = amount;

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

@@ -0,0 +1,11 @@
+package nextstep.courses.domain;
+
+import java.util.Optional;
+
+public interface PaySessionRepository {
+    Sessions findByCourseId(Long courseId);
+
+    Optional<PaySession> findBySessionId(Long sessionId);
+
+    void saveSession(PaySession session, Long courseId);
+}

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

@@ -0,0 +1,17 @@
+package nextstep.courses.domain;
+
+public enum RecruitStatus {
+
+    RECRUIT,
+    NOT_RECRUIT;
+
+    public static RecruitStatus findByName(String name) {
+        return RecruitStatus.valueOf(name.toUpperCase());
+    }
+
+    public boolean isRecruit() {
+        return this.equals(RECRUIT);
+    }
+
+
+}

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

@@ -4,29 +4,40 @@
 import nextstep.payments.domain.Payment;
 import nextstep.users.domain.NsUser;
 
-import java.time.LocalDate;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 public abstract class Session {
 
     private final Long id;
-    private final SessionImage sessionImage;
-    private SessionStatus sessionStatus;
+    private final List<SessionImage> sessionImage;
+    private RecruitStatus recruitStatus;
+    private SessionProgressStatus sessionProgressStatus;
     private final Set<NsUser> students;
+    private final Set<NsUser> approveStudents;
     private final SessionDate sessionDate;
 
-    public Session(Long id, SessionImage sessionImage, SessionStatus sessionStatus, SessionDate sessionDate) {
-        this(id, sessionImage,sessionStatus, sessionDate, new HashSet<>());
+
+    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<>(), new HashSet<>());
+    }
+
+    public Session(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionDate sessionDate, Set<NsUser> students) {
+        this(id, sessionImage, recruitStatus, SessionProgressStatus.PREPARE, sessionDate, students, new HashSet<>());
     }
 
-    public Session(Long id, SessionImage sessionImage, SessionStatus sessionStatus, SessionDate sessionDate, Set<NsUser> students) {
+    public Session(Long id, List<SessionImage> sessionImage, RecruitStatus recruitStatus, SessionProgressStatus sessionProgressStatus, SessionDate sessionDate, Set<NsUser> students, Set<NsUser> approveStudents) {
         this.id = id;
         this.sessionImage = sessionImage;
-        this.sessionStatus = sessionStatus;
+        this.recruitStatus = recruitStatus;
+        this.sessionProgressStatus = sessionProgressStatus;
         this.sessionDate = sessionDate;
         this.students = students;
+        this.approveStudents = approveStudents;
+
     }
 
     public final void enrollmentUser(NsUser user, Payment payment) {
@@ -37,14 +48,22 @@ public final void enrollmentUser(NsUser user, Payment payment) {
         students.add(user);
     }
 
+    public final void removeNotApproveUser() {
+        students.removeIf(student -> !approveStudents.contains(student));
+    }
+
+    public final void addApproveStudent(NsUser nsUser) {
+        approveStudents.add(nsUser);
+    }
+
     private void assertNotDuplicateStudents(NsUser user) {
         if (students.contains(user)) {
             throw new NotRecruitException();
         }
     }
 
     private void assertRecruit() {
-        if (!sessionStatus.isRecruit()) {
+        if (!recruitStatus.isRecruit()) {
             throw new NotRecruitException();
         }
     }
@@ -53,22 +72,34 @@ public Set<NsUser> getStudents() {
         return new HashSet<>(students);
     }
 
+    public Set<NsUser> getApproveStudents() {
+        return new HashSet<>(approveStudents);
+    }
+
     public Long getId() {
         return id;
     }
 
-    public SessionImage getSessionImage() {
+    public List<SessionImage> getSessionImage() {
         return sessionImage;
     }
 
-    public SessionStatus getSessionStatus() {
-        return sessionStatus;
+    public RecruitStatus getRecruitStatus() {
+        return recruitStatus;
+    }
+
+    public SessionProgressStatus getSessionProgressStatus() {
+        return sessionProgressStatus;
     }
 
     public SessionDate getSessionDate() {
         return sessionDate;
     }
 
+    public void changeProgressStatus(SessionProgressStatus sessionProgressStatus) {
+        this.sessionProgressStatus = sessionProgressStatus;
+    }
+
 
     abstract protected void assertSatisfiedCondition(NsUser user, Payment payment);
 

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());
+    }
+}

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

@@ -15,6 +15,13 @@ public Sessions() {
         this.sessions = new HashSet<>();
     }
 
+    public static Sessions concatSessions(Sessions sessions1, Sessions sessions2) {
+        Set<Session> concatResult = new HashSet<>(sessions1.sessions);
+        concatResult.addAll(new HashSet<>(sessions2.sessions));
+
+        return new Sessions(concatResult);
+    }
+
     public void addSession(Session session) {
         String errorMessage = "이미 등록된 강의입니다.";
 

src/main/java/nextstep/courses/infrastructure/JdbcCourseRepository.java

@@ -16,11 +16,13 @@
 public class JdbcCourseRepository implements CourseRepository {
     private JdbcOperations jdbcTemplate;
 
-    private final SessionRepository sessionRepository;
+    private final FreeSessionRepository freeSessionRepository;
+    private final PaySessionRepository paySessionRepository;
 
-    public JdbcCourseRepository(JdbcOperations jdbcTemplate, SessionRepository sessionRepository) {
+    public JdbcCourseRepository(JdbcOperations jdbcTemplate, FreeSessionRepository freeSessionRepository, PaySessionRepository paySessionRepository) {
         this.jdbcTemplate = jdbcTemplate;
-        this.sessionRepository = sessionRepository;
+        this.freeSessionRepository = freeSessionRepository;
+        this.paySessionRepository = paySessionRepository;
     }
 
     @Override
@@ -38,8 +40,15 @@ public int save(Course course) {
             return ps;
         }, keyHolder);
 
-        course.getSessions().getSessions().forEach(session ->
-                sessionRepository.saveSession(session, (long) keyHolder.getKey())
+        course.getSessions().getSessions().forEach(session -> {
+                    if (session instanceof PaySession) {
+                        paySessionRepository.saveSession((PaySession) session, (long) keyHolder.getKey());
+                    }
+
+                    if (session instanceof FreeSession) {
+                        freeSessionRepository.saveSession((FreeSession) session, (long) keyHolder.getKey());
+                    }
+                }
         );
 
         return result;
@@ -48,7 +57,7 @@ public int save(Course course) {
     @Override
     public Course findById(Long id) {
         String sql = "select id, title, creator_id, created_at, updated_at from course where id = ?";
-        Sessions sessions = sessionRepository.findByCourseId(id);
+        Sessions sessions = Sessions.concatSessions(freeSessionRepository.findByCourseId(id), paySessionRepository.findByCourseId(id));
 
         RowMapper<Course> rowMapper = (rs, rowNum) -> new Course(
                 rs.getLong(1),