Step4

README.md

@@ -68,4 +68,9 @@
     - boolean validateFileSize()
     - boolean validateFileType()
     - boolean validateRatio()
-
+
+
+## 🚀 4단계 - 수강신청(요구사항 변경)
+- [x] SessionStatus 진행상태와 모집상태로 분리
+- [x] coverImage 여러개 가능하도록 기능 추가
+- [x] 수강 승인 및 수강 취소 기능 추가

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

@@ -0,0 +1,43 @@
+package nextstep.courses.domain;
+
+public class Enrollment {
+    private Member student;
+    private Session session;
+    private EnrollmentStatus status; // PENDING, APPROVED, REJECTED
+
+    public Enrollment(Member student, Session session) {
+        this.student = student;
+        this.session = session;
+        this.status = EnrollmentStatus.PENDING;
+    }
+
+    public void approve() {
+        if (this.status == EnrollmentStatus.APPROVED) {
+            throw new IllegalStateException("이미 승인된 수강 신청입니다.");
+        }
+
+        this.status = EnrollmentStatus.APPROVED;
+        session.accept();
+    }
+
+    public void reject() {
+        this.status = EnrollmentStatus.REJECTED;
+    }
+
+    public boolean isApproved() {
+        return status == EnrollmentStatus.APPROVED;
+    }
+
+    public Member getStudent() {
+        return student;
+    }
+
+    public EnrollmentStatus getStatus() {
+        return status;
+    }
+
+    public Session getSession() {
+        return session;
+    }
+}
+

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

@@ -0,0 +1,5 @@
+package nextstep.courses.domain;
+
+public enum EnrollmentStatus {
+    PENDING, APPROVED, REJECTED;
+}

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

@@ -0,0 +1,29 @@
+package nextstep.courses.domain;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Enrollments {
+    private final List<Enrollment> values = new ArrayList<>();
+
+    public void addEnrollment(Enrollment enrollment) {
+        values.add(enrollment);
+    }
+
+    public boolean isEnrolledBy(Member student) {
+        return values.stream()
+                .anyMatch(e -> e.getStudent().equals(student));
+    }
+
+    public Enrollment findByMember(Member student) {
+        return values.stream()
+                .filter(e -> e.getStudent().equals(student))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("해당 회원의 수강 신청이 존재하지 않습니다."));
+    }
+
+    public List<Enrollment> getValues() {
+        return Collections.unmodifiableList(values);
+    }
+}

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

@@ -6,11 +6,18 @@
 
 public class Image {
     private static final Set<String> ALLOWED_FILE_FORMAT = new HashSet<>(List.of("gif", "jpg", "jpeg", "png", "svg"));
+    private Long id;
     private final File file;
     private String imageUrl;
     private int width;
     private int height;
 
+    // DB용 생성자 (id 포함, 검증 생략 가능)
+    public Image(Long id, float fileSize, String fileType, String imageUrl, int width, int height) {
+        this(fileSize, fileType, imageUrl, width, height);
+        this.id = id;
+    }
+
     public Image(float fileSize, String fileType, String imageUrl, int width, int height) {
         this.file = new File(ALLOWED_FILE_FORMAT, fileSize, fileType);
         this.imageUrl = imageUrl;
@@ -19,6 +26,7 @@ public Image(float fileSize, String fileType, String imageUrl, int width, int he
         validate();
     }
 
+
     private void validate() {
         validateFileSize();
         validateFileType();

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

@@ -0,0 +1,16 @@
+package nextstep.courses.domain;
+
+import java.util.Collections;
+import java.util.List;
+
+public class Images {
+    private List<Image> images;
+
+    public Images(List<Image> images) {
+        this.images = List.copyOf(images);
+    }
+
+    public List<Image> getImages() {
+        return Collections.unmodifiableList(images);
+    }
+}

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

@@ -0,0 +1,41 @@
+package nextstep.courses.domain;
+
+import java.util.Objects;
+
+public class Member {
+    private final Long id;
+    private final String name;
+    private final String email;
+
+    public Member(Long id, String name, String email) {
+        this.id = id;
+        this.name = name;
+        this.email = email;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    // Member 식별 비교 (예: Set 사용 시 필요)
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Member)) return false;
+        Member member = (Member) o;
+        return Objects.equals(id, member.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+}

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

@@ -0,0 +1,6 @@
+package nextstep.courses.domain;
+
+public enum RecruitmentStatus {
+    NOT_RECRUITING,
+    RECRUITING
+}

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

@@ -3,31 +3,33 @@
 import nextstep.payments.domain.Payment;
 
 import java.time.LocalDateTime;
-import java.util.regex.Pattern;
 
 public class Session {
     private CapacityInfo capacityInfo;
     private SessionPeriod sessionPeriod;
     private String title;
     private int id;
     private Long tuition;
-    private Image coverImage;
+    private Images coverImages;
+    private RecruitmentStatus recruitmentStatus;
     private SessionStatus sessionStatus;
     private JoinStrategy joinStrategy;
+    private final Enrollments enrollments = new Enrollments();
 
 
-    public Session(String title, int id, LocalDateTime startDate, LocalDateTime endDate, Long tuition, int currentCount, int capacity, Image coverImage, SessionStatus sessionStatus) {
-        this(title, id, startDate, endDate, tuition, currentCount, capacity, coverImage, sessionStatus, tuition == 0 ? new FreeJoinStrategy() : new PaidJoinStrategy());
+    public Session(String title, int id, LocalDateTime startDate, LocalDateTime endDate, Long tuition, int currentCount, int capacity, Images coverImages, SessionStatus sessionStatus, RecruitmentStatus recruitmentStatus) {
+        this(title, id, startDate, endDate, tuition, currentCount, capacity, coverImages, sessionStatus, recruitmentStatus, tuition == 0 ? new FreeJoinStrategy() : new PaidJoinStrategy());
     }
 
-    public Session(String title, int id, LocalDateTime startDate, LocalDateTime endDate, Long tuition, int currentCount, int capacity, Image coverImage, SessionStatus sessionStatus, JoinStrategy joinStrategy) {
+    public Session(String title, int id, LocalDateTime startDate, LocalDateTime endDate, Long tuition, int currentCount, int capacity, Images coverImages, SessionStatus sessionStatus, RecruitmentStatus recruitmentStatus, JoinStrategy joinStrategy) {
         this.title = title;
         this.id = id;
         this.sessionPeriod = new SessionPeriod(startDate, endDate);
         this.tuition = tuition;
         this.capacityInfo = new CapacityInfo(currentCount, capacity);
-        this.coverImage = coverImage;
+        this.coverImages = coverImages;
         this.sessionStatus = sessionStatus;
+        this.recruitmentStatus = recruitmentStatus;
         this.joinStrategy = joinStrategy;
     }
 
@@ -36,7 +38,7 @@ boolean joinable(Payment pay) {
     }
 
     public boolean recruiting() {
-        return sessionStatus == SessionStatus.RECRUITING;
+        return sessionStatus == SessionStatus.ONGOING && recruitmentStatus == RecruitmentStatus.RECRUITING;
     }
 
     public boolean underCapacity() {
@@ -51,14 +53,32 @@ public boolean hasId(long id) {
         return this.id == id;
     }
 
-    public void enroll(Payment pay) {
+    public void enroll(Payment pay, Member member) {
         if (!joinable(pay)) {
             throw new IllegalStateException("수강 신청 조건을 만족하지 않습니다.");
         }
 
+        if (enrollments.isEnrolledBy(member)) {
+            throw new IllegalStateException("이미 수강 신청한 회원입니다.");
+        }
+
+        enrollments.addEnrollment(new Enrollment(member, this));
+    }
+
+    public void approveEnrollment(Member member) {
+        Enrollment enrollment = enrollments.findByMember(member);
+        enrollment.approve();
+    }
+
+    public void accept(){
         this.capacityInfo.increaseCurrentCount();
     }
 
+    public void rejectEnrollment(Member member) {
+        Enrollment enrollment = enrollments.findByMember(member);
+        enrollment.reject();
+    }
+
     public String getTitle() {
         return title;
     }
@@ -87,11 +107,23 @@ public int getCapacity() {
         return capacityInfo.getCapacity();
     }
 
-    public Image getCoverImage() {
-        return coverImage;
+    public Images getCoverImages() {
+        return coverImages;
+    }
+
+    public Image getMainCoverImage() {
+        return coverImages.getImages().get(0);
     }
 
-    public SessionStatus getStatus() {
+    public SessionStatus getSessionStatus() {
         return sessionStatus;
     }
+
+    public RecruitmentStatus getRecruitmentStatus() {
+        return recruitmentStatus;
+    }
+
+    public Enrollments getEnrollments() {
+        return enrollments;
+    }
 }

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

@@ -2,6 +2,6 @@
 
 public interface SessionRepository {
     int save(Session session, Long courseId);
-
+    void saveImage(int sessionId, Image image);
     Session findById(Long id);
 }

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

@@ -2,6 +2,6 @@
 
 public enum SessionStatus {
     PREPARING,
-    RECRUITING,
+    ONGOING,
     CLOSED
 }

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

@@ -0,0 +1,60 @@
+package nextstep.courses.infrastructure;
+
+import nextstep.courses.domain.Enrollment;
+import nextstep.courses.domain.EnrollmentStatus;
+import nextstep.courses.domain.Member;
+import nextstep.courses.domain.Session;
+import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class JdbcEnrollmentRepository {
+
+    private final JdbcOperations jdbc;
+    private final JdbcSessionRepository jdbcSessionRepository;
+
+    public JdbcEnrollmentRepository(JdbcOperations jdbc, JdbcSessionRepository jdbcSessionRepository) {
+        this.jdbc = jdbc;
+        this.jdbcSessionRepository = jdbcSessionRepository;
+    }
+
+    public void save(Long sessionId, Long memberId, EnrollmentStatus status) {
+        String sql = "INSERT INTO enrollment (session_id, member_id, status) VALUES (?, ?, ?)";
+        jdbc.update(sql, sessionId, memberId, status.name());
+    }
+
+    public void updateStatus(Long sessionId, Long memberId, EnrollmentStatus status) {
+        String sql = "UPDATE enrollment SET status = ? WHERE session_id = ? AND member_id = ?";
+        jdbc.update(sql, status.name(), sessionId, memberId);
+    }
+
+    public List<Enrollment> findBySessionId(Long sessionId) {
+        String sql =
+                "SELECT e.*, m.id as member_id, m.name, m.email " +
+                        "FROM enrollment e " +
+                        "JOIN member m ON e.member_id = m.id " +
+                        "WHERE e.session_id = ?";
+
+
+        return jdbc.query(sql, (rs, rowNum) -> {
+            Member member = new Member(
+                    rs.getLong("member_id"),
+                    rs.getString("name"),
+                    rs.getString("email")
+            );
+
+            Session session = jdbcSessionRepository.findById(sessionId);
+            Enrollment enrollment = new Enrollment(member, session);
+            EnrollmentStatus status = EnrollmentStatus.valueOf(rs.getString("status"));
+            if (status == EnrollmentStatus.APPROVED) {
+                enrollment.approve();
+            } else if (status == EnrollmentStatus.REJECTED) {
+                enrollment.reject();
+            }
+
+            return enrollment;
+        }, sessionId);
+    }
+}