[BE] issue188: 스터디 상태 자동 변경

backend/src/main/java/com/woowacourse/moamoa/study/domain/RecruitPlanner.java

@@ -1,26 +1,29 @@
 package com.woowacourse.moamoa.study.domain;
 
+import static com.woowacourse.moamoa.study.domain.RecruitStatus.RECRUITMENT_END;
+import static com.woowacourse.moamoa.study.domain.RecruitStatus.RECRUITMENT_START;
+import static javax.persistence.EnumType.STRING;
+import static lombok.AccessLevel.PROTECTED;
+
 import java.time.LocalDate;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
-import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import lombok.NoArgsConstructor;
 
 @Embeddable
+@NoArgsConstructor(access = PROTECTED)
 public class RecruitPlanner {
 
     @Column(name = "max_member_count")
     private Integer max;
 
-    @Enumerated(EnumType.STRING)
+    @Enumerated(value = STRING)
     @Column(name = "recruitment_status")
     private RecruitStatus recruitStatus;
 
     private LocalDate enrollmentEndDate;
 
-    protected RecruitPlanner() {
-    }
-
     public RecruitPlanner(final Integer max, final RecruitStatus recruitStatus, final LocalDate enrollmentEndDate) {
         this.max = max;
         this.recruitStatus = recruitStatus;
@@ -38,20 +41,26 @@ boolean isRecruitedBeforeThan(LocalDate date) {
         return enrollmentEndDate.isBefore(date);
     }
 
-    boolean isNeedToCloseRecruiting(final LocalDate now) {
-        return recruitStatus.equals(RecruitStatus.RECRUITMENT_START) && isRecruitedBeforeThan(now);
+    void updateRecruiting(final LocalDate now) {
+        if (isNeedToCloseRecruiting(now)) {
+            closeRecruiting();
+        }
+    }
+
+    private boolean isNeedToCloseRecruiting(final LocalDate now) {
+        return recruitStatus.equals(RECRUITMENT_START) && isRecruitedBeforeThan(now);
     }
 
     void closeRecruiting() {
-        recruitStatus = RecruitStatus.RECRUITMENT_END;
+        recruitStatus = RECRUITMENT_END;
     }
 
     LocalDate getEnrollmentEndDate() {
         return enrollmentEndDate;
     }
 
     boolean isCloseEnrollment() {
-        return recruitStatus.equals(RecruitStatus.RECRUITMENT_END);
+        return recruitStatus.equals(RECRUITMENT_END);
     }
 
     int getCapacity() {

backend/src/main/java/com/woowacourse/moamoa/study/domain/Study.java

@@ -95,19 +95,20 @@ public void participate(final Long memberId) {
         }
     }
 
-    private boolean isFullOfCapacity() {
-        return recruitPlanner.hasCapacity() && recruitPlanner.getCapacity() == participants.getSize();
+    public void changeStatus(final LocalDate now) {
+        recruitPlanner.updateRecruiting(now);
+        studyPlanner.updateStatus(now);
     }
 
-    public boolean isNeedToCloseRecruiting(LocalDate now) {
-        return recruitPlanner.isNeedToCloseRecruiting(now);
+    public boolean isProgressStatus() {
+        return studyPlanner.isProgress();
     }
 
-    public void closeEnrollment() {
-        recruitPlanner.closeRecruiting();
+    public boolean isCloseStudy() {
+        return studyPlanner.isCloseStudy();
     }
 
-    public boolean isCloseEnrollment() {
-        return recruitPlanner.isCloseEnrollment();
+    private boolean isFullOfCapacity() {
+        return recruitPlanner.hasCapacity() && recruitPlanner.getCapacity() == participants.getSize();
     }
 }

backend/src/main/java/com/woowacourse/moamoa/study/domain/StudyPlanner.java

@@ -1,17 +1,21 @@
 package com.woowacourse.moamoa.study.domain;
 
+import static com.woowacourse.moamoa.study.domain.StudyStatus.DONE;
+import static com.woowacourse.moamoa.study.domain.StudyStatus.IN_PROGRESS;
+import static com.woowacourse.moamoa.study.domain.StudyStatus.PREPARE;
 import static javax.persistence.EnumType.STRING;
 import static lombok.AccessLevel.PROTECTED;
 
 import com.woowacourse.moamoa.study.domain.exception.InvalidPeriodException;
 import java.time.LocalDate;
-import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.Enumerated;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Embeddable
+@EqualsAndHashCode
 @NoArgsConstructor(access = PROTECTED)
 public class StudyPlanner {
 
@@ -44,28 +48,32 @@ boolean isEndBeforeThan(LocalDate date) {
         return endDate.isBefore(date);
     }
 
-    boolean isPreparing() {
-        return studyStatus.equals(StudyStatus.PREPARE);
+    void updateStatus(final LocalDate now) {
+        if (isNeedToCloseStudy(now)) {
+            studyStatus = DONE;
+        }
+        if (isNeedToChangeProgress(now)) {
+            studyStatus = IN_PROGRESS;
+        }
     }
 
-    public StudyStatus getStudyStatus() {
-        return studyStatus;
+    private boolean isNeedToCloseStudy(final LocalDate now) {
+        return (endDate != null) && (studyStatus.equals(IN_PROGRESS)) && (endDate.isAfter(now) || endDate.isEqual(now));
     }
 
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        final StudyPlanner studyPlanner = (StudyPlanner) o;
-        return Objects.equals(startDate, studyPlanner.startDate) && Objects.equals(endDate, studyPlanner.endDate);
+    private boolean isNeedToChangeProgress(final LocalDate now) {
+        return (studyStatus.equals(PREPARE)) && (startDate.isAfter(now) || startDate.isEqual(now));
+    }
+
+    boolean isProgress() {
+        return studyStatus.equals(IN_PROGRESS);
+    }
+
+    boolean isPreparing() {
+        return studyStatus.equals(PREPARE);
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(startDate, endDate);
+    boolean isCloseStudy() {
+        return studyStatus.equals(DONE);
     }
 }

backend/src/main/java/com/woowacourse/moamoa/study/schedule/AutoCloseEnrollmentTask.java

@@ -4,7 +4,6 @@
 import com.woowacourse.moamoa.study.service.StudyService;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.config.TriggerTask;
@@ -27,7 +26,7 @@ private static Runnable runnable(final StudyService studyService) {
             @Transactional
             public void run() {
                 LOGGER.debug(LocalDateTime.now() + " : " + "start moamoa scheduled task!");
-                studyService.autoCloseStudies();
+                studyService.autoUpdateStatus();
             }
         };
     }

backend/src/main/java/com/woowacourse/moamoa/study/service/StudyService.java

@@ -1,18 +1,15 @@
 package com.woowacourse.moamoa.study.service;
 
-import static com.woowacourse.moamoa.study.domain.StudyStatus.IN_PROGRESS;
-import static com.woowacourse.moamoa.study.domain.StudyStatus.PREPARE;
-
 import com.woowacourse.moamoa.common.exception.UnauthorizedException;
 import com.woowacourse.moamoa.common.utils.DateTimeSystem;
 import com.woowacourse.moamoa.member.domain.Member;
 import com.woowacourse.moamoa.member.domain.repository.MemberRepository;
 import com.woowacourse.moamoa.study.domain.AttachedTags;
 import com.woowacourse.moamoa.study.domain.Content;
 import com.woowacourse.moamoa.study.domain.Participants;
-import com.woowacourse.moamoa.study.domain.StudyPlanner;
 import com.woowacourse.moamoa.study.domain.RecruitPlanner;
 import com.woowacourse.moamoa.study.domain.Study;
+import com.woowacourse.moamoa.study.domain.StudyPlanner;
 import com.woowacourse.moamoa.study.domain.repository.StudyRepository;
 import com.woowacourse.moamoa.study.service.exception.StudyNotFoundException;
 import com.woowacourse.moamoa.study.service.request.CreatingStudyRequest;
@@ -68,14 +65,12 @@ private Member findMemberBy(final Long githubId) {
                 .orElseThrow(() -> new UnauthorizedException(String.format("%d의 githubId를 가진 사용자는 없습니다.", githubId)));
     }
 
-    public void autoCloseStudies() {
+    public void autoUpdateStatus() {
         final List<Study> studies = studyRepository.findAll();
         final LocalDate now = dateTimeSystem.now().toLocalDate();
 
         for (Study study : studies) {
-            if (study.isNeedToCloseRecruiting(now)) {
-                study.closeEnrollment();
-            }
+            study.changeStatus(now);
         }
     }
 }

backend/src/main/java/com/woowacourse/moamoa/study/service/response/StudyDetailResponse.java

@@ -3,6 +3,7 @@
 import com.woowacourse.moamoa.member.query.data.MemberData;
 import com.woowacourse.moamoa.study.query.data.StudyDetailsData;
 import com.woowacourse.moamoa.tag.query.response.TagData;
+import java.time.LocalDate;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -22,11 +23,11 @@ public class StudyDetailResponse {
     private String recruitmentStatus;
     private String description;
     private Integer currentMemberCount;
-    private String maxMemberCount;
-    private String createdDate;
-    private String enrollmentEndDate;
-    private String startDate;
-    private String endDate;
+    private Integer maxMemberCount;
+    private LocalDate createdDate;
+    private LocalDate enrollmentEndDate;
+    private LocalDate startDate;
+    private LocalDate endDate;
     private MemberData owner;
     private List<MemberData> members;
     private List<TagData> tags;
@@ -41,20 +42,13 @@ public StudyDetailResponse(final StudyDetailsData study,
         this.recruitmentStatus = study.getRecruitmentStatus();
         this.description = study.getDescription();
         this.currentMemberCount = study.getCurrentMemberCount();
-        this.maxMemberCount = getNullableDate(study.getMaxMemberCount());
-        this.createdDate = study.getCreatedDate().toString();
-        this.enrollmentEndDate = getNullableDate(study.getEnrollmentEndDate());
-        this.startDate = study.getStartDate().toString();
-        this.endDate = getNullableDate(study.getEndDate());
+        this.maxMemberCount = study.getMaxMemberCount();
+        this.createdDate = study.getCreatedDate();
+        this.enrollmentEndDate = study.getEnrollmentEndDate();
+        this.startDate = study.getStartDate();
+        this.endDate = study.getEndDate();
         this.owner = study.getOwner();
         this.members = participants;
         this.tags = attachedTags;
     }
-
-    private String getNullableDate(final Object value) {
-        if (value == null) {
-            return "";
-        }
-        return value.toString();
-    }
 }

backend/src/test/java/com/woowacourse/acceptance/study/GettingMyStudiesAcceptanceTest.java

@@ -33,10 +33,10 @@ void initDatabase() {
                 + "VALUES (1, 'Java 스터디', '자바 설명', 'java thumbnail', 'RECRUITMENT_START', 'PREPARE', '그린론의 우당탕탕 자바 스터디입니다.', 3, 10, '" + now + "', '2021-12-08', 2)");
         jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, max_member_count, created_at, enrollment_end_date, start_date, end_date, owner_id) "
                 + "VALUES (2, 'React 스터디', '리액트 설명', 'react thumbnail', 'RECRUITMENT_START', 'PREPARE', '디우의 뤼액트 스터디입니다.', 4, 5, '" + now + "', '2021-11-09', '2021-11-10', '2021-12-08', 3)");
-        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, max_member_count, created_at, owner_id) "
-                + "VALUES (3, 'javaScript 스터디', '자바스크립트 설명', 'javascript thumbnail', 'RECRUITMENT_START', 'PREPARE', '그린론의 자바스크립트 접해보기', 3, 20, '" + now + "', 2)");
-        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, max_member_count, created_at, owner_id) "
-                + "VALUES (4, 'HTTP 스터디', 'HTTP 설명', 'http thumbnail', 'RECRUITMENT_END', 'PREPARE', '디우의 HTTP 정복하기', 5, '" + now + "', 3)");
+        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, max_member_count, created_at, start_date, owner_id) "
+                + "VALUES (3, 'javaScript 스터디', '자바스크립트 설명', 'javascript thumbnail', 'RECRUITMENT_START', 'PREPARE', '그린론의 자바스크립트 접해보기', 3, 20, '" + now + "', '2022-08-03', 2)");
+        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, max_member_count, created_at, start_date, owner_id) "
+                + "VALUES (4, 'HTTP 스터디', 'HTTP 설명', 'http thumbnail', 'RECRUITMENT_END', 'PREPARE', '디우의 HTTP 정복하기', 5, '" + now + "', '2022-08-03', 3)");
         jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, created_at, owner_id, start_date) "
                 + "VALUES (5, '알고리즘 스터디', '알고리즘 설명', 'algorithm thumbnail', 'RECRUITMENT_END', 'PREPARE', '알고리즘을 TDD로 풀자의 베루스입니다.', 1, '" + now + "', 4, '2021-12-06')");
         jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, created_at, owner_id, start_date, enrollment_end_date, end_date) "

backend/src/test/java/com/woowacourse/acceptance/study/GettingStudyDetailsAcceptanceTest.java

@@ -4,6 +4,7 @@
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
 
 import com.woowacourse.acceptance.AcceptanceTest;
 import com.woowacourse.moamoa.auth.service.oauthclient.response.GithubProfileResponse;
@@ -34,10 +35,10 @@ void initDataBase() {
                 + "VALUES (1, 'Java 스터디', '자바 설명', 'java thumbnail', 'RECRUITMENT_START', 'PREPARE', '그린론의 우당탕탕 자바 스터디입니다.', 3, 10, '" + now + "', '2021-12-08', 2)");
         jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, max_member_count, created_at, enrollment_end_date, start_date, end_date, owner_id) "
                 + "VALUES (2, 'React 스터디', '리액트 설명', 'react thumbnail', 'RECRUITMENT_START', 'PREPARE', '디우의 뤼액트 스터디입니다.', 4, 5, '" + now + "', '2021-11-09', '2021-11-10', '2021-12-08', 3)");
-        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, max_member_count, created_at, owner_id) "
-                + "VALUES (3, 'javaScript 스터디', '자바스크립트 설명', 'javascript thumbnail', 'RECRUITMENT_START', 'PREPARE', '그린론의 자바스크립트 접해보기', 3, 20, '" + now + "', 2)");
-        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, max_member_count, created_at, owner_id) "
-                + "VALUES (4, 'HTTP 스터디', 'HTTP 설명', 'http thumbnail', 'RECRUITMENT_END', 'PREPARE', '디우의 HTTP 정복하기', 5, '" + now + "', 3)");
+        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, max_member_count, created_at, start_date, owner_id) "
+                + "VALUES (3, 'javaScript 스터디', '자바스크립트 설명', 'javascript thumbnail', 'RECRUITMENT_START', 'PREPARE', '그린론의 자바스크립트 접해보기', 3, 20, '" + now + "', '2022-08-03', 2)");
+        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, max_member_count, created_at, start_date, owner_id) "
+                + "VALUES (4, 'HTTP 스터디', 'HTTP 설명', 'http thumbnail', 'RECRUITMENT_END', 'PREPARE', '디우의 HTTP 정복하기', 5, '" + now + "', '2022-08-03', 3)");
         jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, created_at, owner_id, start_date) "
                 + "VALUES (5, '알고리즘 스터디', '알고리즘 설명', 'algorithm thumbnail', 'RECRUITMENT_END', 'PREPARE', '알고리즘을 TDD로 풀자의 베루스입니다.', 1, '" + now + "', 4, '2021-12-06')");
         jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, created_at, owner_id, start_date, enrollment_end_date, end_date) "
@@ -93,7 +94,7 @@ public void getStudyDetails() {
                 .body("recruitmentStatus", is("RECRUITMENT_START"))
                 .body("description", is("디우의 뤼액트 스터디입니다."))
                 .body("currentMemberCount", is(4))
-                .body("maxMemberCount", is("5"))
+                .body("maxMemberCount", is(5))
                 .body("enrollmentEndDate", is("2021-11-09"))
                 .body("startDate", is("2021-11-10"))
                 .body("endDate", is("2021-12-08"))
@@ -124,10 +125,10 @@ public void getNotHasOptionalDataStudyDetails() {
                 .body("recruitmentStatus", is("RECRUITMENT_END"))
                 .body("description", is("알고리즘을 TDD로 풀자의 베루스입니다."))
                 .body("currentMemberCount", is(1))
-                .body("maxMemberCount", is(""))
-                .body("enrollmentEndDate", is(""))
+                .body("maxMemberCount", is(nullValue()))
+                .body("enrollmentEndDate", is(nullValue()))
                 .body("startDate", is("2021-12-06"))
-                .body("endDate", is(""))
+                .body("endDate", is(nullValue()))
                 .body("owner.id", is(4))
                 .body("owner.username", is("verus"))
                 .body("owner.imageUrl", is("https://image"))

backend/src/test/java/com/woowacourse/acceptance/study/SearchingStudiesAcceptanceTest.java

@@ -40,10 +40,10 @@ void initDataBase() {
                 + "VALUES (1, 'Java 스터디', '자바 설명', 'java thumbnail', 'RECRUITMENT_START', 'PREPARE', '그린론의 우당탕탕 자바 스터디입니다.', 3, 10, '" + now + "', '2021-12-08', 2)");
         jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, max_member_count, created_at, enrollment_end_date, start_date, end_date, owner_id) "
                 + "VALUES (2, 'React 스터디', '리액트 설명', 'react thumbnail', 'RECRUITMENT_START', 'PREPARE', '디우의 뤼액트 스터디입니다.', 4, 5, '" + now + "', '2021-11-09', '2021-11-10', '2021-12-08', 3)");
-        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, max_member_count, created_at, owner_id) "
-                + "VALUES (3, 'javaScript 스터디', '자바스크립트 설명', 'javascript thumbnail', 'RECRUITMENT_START', 'PREPARE', '그린론의 자바스크립트 접해보기', 3, 20, '" + now + "', 2)");
-        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, max_member_count, created_at, owner_id) "
-                + "VALUES (4, 'HTTP 스터디', 'HTTP 설명', 'http thumbnail', 'RECRUITMENT_END', 'PREPARE', '디우의 HTTP 정복하기', 5, '" + now + "', 3)");
+        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, max_member_count, created_at, start_date, owner_id) "
+                + "VALUES (3, 'javaScript 스터디', '자바스크립트 설명', 'javascript thumbnail', 'RECRUITMENT_START', 'PREPARE', '그린론의 자바스크립트 접해보기', 3, 20, '" + now + "', '2022-08-03', 2)");
+        jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, max_member_count, created_at, start_date, owner_id) "
+                + "VALUES (4, 'HTTP 스터디', 'HTTP 설명', 'http thumbnail', 'RECRUITMENT_END', 'PREPARE', '디우의 HTTP 정복하기', 5, '" + now + "', '2022-08-03', 3)");
         jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, created_at, owner_id, start_date) "
                 + "VALUES (5, '알고리즘 스터디', '알고리즘 설명', 'algorithm thumbnail', 'RECRUITMENT_END', 'PREPARE', '알고리즘을 TDD로 풀자의 베루스입니다.', 1, '" + now + "', 4, '2021-12-06')");
         jdbcTemplate.update("INSERT INTO study(id, title, excerpt, thumbnail, recruitment_status, study_status, description, current_member_count, created_at, owner_id, start_date, enrollment_end_date, end_date) "