Merge pull request #173 from prgrms-web-devcourse-final-project/feature/EA3-167-study-detail

[EA3-167] feature: 스터디 종료 기능 추가

Author: hyeunS-P

src/main/java/grep/neogul_coder/domain/admin/controller/dto/response/AdminStudyResponse.java

@@ -22,7 +22,7 @@ public class AdminStudyResponse {
     private Category category;
 
     @Schema(description = "스터디 종료 여부", example = "false")
-    private boolean isFinished;
+    private boolean finished;
 
     @Schema(description = "활성화 여부", example = "true")
     private boolean activated;
@@ -33,7 +33,7 @@ private AdminStudyResponse(Long id, String name, Category category, boolean isFi
         this.id = id;
         this.name = name;
         this.category = category;
-        this.isFinished = isFinished;
+        this.finished = isFinished;
         this.activated = activated;
     }
 
@@ -42,7 +42,7 @@ public static AdminStudyResponse from(Study study) {
             .id(study.getId())
             .name(study.getName())
             .category(study.getCategory())
-            .isFinished(study.getEndDate().toLocalDate().isBefore(LocalDate.now()))
+            .isFinished(study.isFinished())
             .activated(study.getActivated())
             .build();
     }

src/main/java/grep/neogul_coder/domain/study/Study.java

@@ -43,6 +43,8 @@ public class Study extends BaseEntity {
 
     private boolean extended;
 
+    private boolean finished;
+
     protected Study() {}
 
     @Builder
@@ -60,6 +62,7 @@ private Study(Long originStudyId, String name, Category category, int capacity,
         this.introduction = introduction;
         this.imageUrl = imageUrl;
         this.extended = false;
+        this.finished = false;
     }
 
     public void update(String name, Category category, int capacity, StudyType studyType,
@@ -101,4 +104,8 @@ public boolean alreadyExtended() {
     public void extend() {
         this.extended = true;
     }
+
+    public void finish() {
+        this.finished = true;
+    }
 }

src/main/java/grep/neogul_coder/domain/study/controller/dto/response/StudyItemResponse.java

@@ -1,14 +1,11 @@
 package grep.neogul_coder.domain.study.controller.dto.response;
 
 import com.querydsl.core.annotations.QueryProjection;
-import grep.neogul_coder.domain.study.Study;
 import grep.neogul_coder.domain.study.enums.Category;
 import grep.neogul_coder.domain.study.enums.StudyType;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Builder;
 import lombok.Getter;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Getter
@@ -48,13 +45,11 @@ public class StudyItemResponse {
     private StudyType studyType;
 
     @Schema(description = "종료 여부", example = "false")
-    public boolean isFinished() {
-        return endDate.toLocalDate().isBefore(LocalDate.now());
-    }
+    private boolean finished;
 
     @QueryProjection
     public StudyItemResponse(Long studyId, String name, String leaderNickname, int capacity, int currentCount, LocalDateTime startDate,
-                             LocalDateTime endDate, String imageUrl, String introduction, Category category, StudyType studyType) {
+                             LocalDateTime endDate, String imageUrl, String introduction, Category category, StudyType studyType, boolean finished) {
         this.studyId = studyId;
         this.name = name;
         this.leaderNickname = leaderNickname;
@@ -66,5 +61,6 @@ public StudyItemResponse(Long studyId, String name, String leaderNickname, int c
         this.introduction = introduction;
         this.category = category;
         this.studyType = studyType;
+        this.finished = finished;
     }
 }

src/main/java/grep/neogul_coder/domain/study/repository/StudyQueryRepository.java

@@ -42,7 +42,8 @@ public Page<StudyItemResponse> findMyStudiesPaging(Pageable pageable, Long userI
                 study.imageUrl,
                 study.introduction,
                 study.category,
-                study.studyType
+                study.studyType,
+                study.finished
             ))
             .from(studyMember)
             .join(user).on(user.id.eq(studyMember.userId))
@@ -78,7 +79,8 @@ public List<StudyItemResponse> findMyStudies(Long userId) {
                 study.imageUrl,
                 study.introduction,
                 study.category,
-                study.studyType
+                study.studyType,
+                study.finished
             ))
             .from(studyMember)
             .join(user).on(user.id.eq(studyMember.userId))

src/main/java/grep/neogul_coder/domain/study/repository/StudyRepository.java

@@ -6,8 +6,9 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import java.util.Optional;
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 public interface StudyRepository extends JpaRepository<Study, Long> {
     List<Study> findByIdIn(List<Long> studyIds);
@@ -19,4 +20,10 @@ public interface StudyRepository extends JpaRepository<Study, Long> {
     @Modifying(clearAutomatically = true)
     @Query("update Study s set s.activated = false where s.id = :studyId")
     void deactivateByStudyId(@Param("studyId") Long studyId);
+
+    @Query("select s from Study s where s.endDate >= :endDateStart and s.endDate < :endDateEnd and s.finished = false and s.activated = true")
+    List<Study> findStudiesEndingIn7Days(@Param("endDateStart") LocalDateTime endDateStart, @Param("endDateEnd") LocalDateTime endDateEnd);
+
+    @Query("select s from Study s where s.endDate < :now and s.finished = false and s.activated = true")
+    List<Study> findStudiesToBeFinished(@Param("now") LocalDateTime now);
 }

src/main/java/grep/neogul_coder/domain/study/scheduler/StudyScheduler.java

@@ -0,0 +1,23 @@
+package grep.neogul_coder.domain.study.scheduler;
+
+import grep.neogul_coder.domain.study.Study;
+import grep.neogul_coder.domain.study.service.StudySchedulerService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class StudyScheduler {
+
+    private final StudySchedulerService studySchedulerService;
+
+    @Scheduled(cron = "0 0 0 * * *")
+    public void processEndingStudies() {
+        List<Study> studiesEndingIn7Days = studySchedulerService.findStudiesEndingIn7Days();
+
+        studySchedulerService.finalizeStudies();
+    }
+}

src/main/java/grep/neogul_coder/domain/study/service/StudyManagementService.java

@@ -19,7 +19,8 @@
 import java.util.List;
 import java.util.Random;
 
-import static grep.neogul_coder.domain.study.enums.StudyMemberRole.*;
+import static grep.neogul_coder.domain.study.enums.StudyMemberRole.LEADER;
+import static grep.neogul_coder.domain.study.enums.StudyMemberRole.MEMBER;
 import static grep.neogul_coder.domain.study.exception.code.StudyErrorCode.*;
 
 @Transactional(readOnly = true)

src/main/java/grep/neogul_coder/domain/study/service/StudySchedulerService.java

@@ -0,0 +1,37 @@
+package grep.neogul_coder.domain.study.service;
+
+import grep.neogul_coder.domain.study.Study;
+import grep.neogul_coder.domain.study.repository.StudyRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+@Service
+public class StudySchedulerService {
+
+    private final StudyRepository studyRepository;
+
+    public List<Study> findStudiesEndingIn7Days() {
+        LocalDate targetEndDate = LocalDate.now().plusDays(7);
+        LocalDateTime endDateStart = targetEndDate.atStartOfDay();
+        LocalDateTime endDateEnd = targetEndDate.plusDays(1).atStartOfDay();
+
+        return studyRepository.findStudiesEndingIn7Days(endDateStart, endDateEnd);
+    }
+
+    @Transactional
+    public void finalizeStudies() {
+        LocalDateTime now = LocalDateTime.now();
+        List<Study> studiesToBeFinished = studyRepository.findStudiesToBeFinished(now);
+
+        for (Study study : studiesToBeFinished) {
+            study.finish();
+        }
+    }
+}

src/main/resources/data.sql

@@ -4,11 +4,11 @@ INSERT INTO member (email, password, nickname, profile_image_url, role, oauth_id
 INSERT INTO member (email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES ('[email protected]',  '$2a$10$WZzvlwlN6FVtQvGUXw2CIeNQvT5fPfA4qN99NisD2GOyCeuC4W0t2','NPy2EpXd$6', 'https://placekitten.com/842/456', 'ROLE_USER', NULL, NULL);
 INSERT INTO member (email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES ('[email protected]',  '$2a$10$WZzvlwlN6FVtQvGUXw2CIeNQvT5fPfA4qN99NisD2GOyCeuC4W0t2', '$c3VDMSkF)','https://placekitten.com/812/623', 'ROLE_ADMIN', NULL, NULL);
 
-INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated) VALUES (NULL, '자바 스터디', 'IT', 10, 1, 'ONLINE', NULL, '2025-08-01', '2025-12-31', '자바 스터디에 오신 것을 환영합니다.', 'https://example.com/image.jpg', FALSE, TRUE);
-INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated) VALUES (NULL, '파이썬 스터디', 'IT', 8, 1, 'OFFLINE', '대구', '2025-09-01', '2026-01-31', '파이썬 기초부터 심화까지 학습합니다.', 'https://example.com/python.jpg', FALSE, TRUE);
-INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated) VALUES (NULL, '디자인 스터디', 'DESIGN', 6, 1, 'HYBRID', '서울', '2025-07-15', '2025-10-15', 'UI/UX 디자인 실습 중심 스터디입니다.', 'https://example.com/design.jpg', FALSE, TRUE);
-INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated) VALUES (NULL, '7급 공무원 스터디', 'EXAM', 12, 1, 'ONLINE', NULL, '2025-08-10', '2025-12-20', '7급 공무원 대비 스터디입니다.', 'https://example.com/exam.jpg', FALSE, TRUE);
-INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated) VALUES (NULL, '토익 스터디', 'LANGUAGE', 9, 1, 'OFFLINE', '광주', '2025-09-05', '2026-02-28', '토익 스터디입니다.', 'https://example.com/datascience.jpg', FALSE, TRUE);
+INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated, finished) VALUES (NULL, '자바 스터디', 'IT', 10, 1, 'ONLINE', NULL, '2025-08-01', '2025-12-31', '자바 스터디에 오신 것을 환영합니다.', 'https://example.com/image.jpg', FALSE, TRUE, FALSE);
+INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated, finished) VALUES (NULL, '파이썬 스터디', 'IT', 8, 1, 'OFFLINE', '대구', '2025-09-01', '2026-01-31', '파이썬 기초부터 심화까지 학습합니다.', 'https://example.com/python.jpg', FALSE, TRUE, FALSE);
+INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated, finished) VALUES (NULL, '디자인 스터디', 'DESIGN', 6, 1, 'HYBRID', '서울', '2025-07-15', '2025-10-15', 'UI/UX 디자인 실습 중심 스터디입니다.', 'https://example.com/design.jpg', FALSE, TRUE, FALSE);
+INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated, finished) VALUES (NULL, '7급 공무원 스터디', 'EXAM', 12, 1, 'ONLINE', NULL, '2025-08-10', '2025-12-20', '7급 공무원 대비 스터디입니다.', 'https://example.com/exam.jpg', FALSE, TRUE, FALSE);
+INSERT INTO study (origin_study_id, name, category, capacity, current_count, study_type, location, start_date, end_date, introduction, image_url, extended, activated, finished) VALUES (NULL, '토익 스터디', 'LANGUAGE', 9, 1, 'OFFLINE', '광주', '2025-09-05', '2026-02-28', '토익 스터디입니다.', 'https://example.com/datascience.jpg', FALSE, TRUE, FALSE);
 
 INSERT INTO study_post (study_id, user_id, title, category, content) VALUES (5, 3, '자바 스터디 1주차 공지.', 'NOTICE', '1주차 스터디 내용은 가위바위보 게임 만들기 입니다. 모두 각자 만드시고 설명 하는 시간을 가지겠습니다.');
 INSERT INTO study_post (study_id, user_id, title, category, content) VALUES (4, 4, '익명 클래스 자료 공유', 'FREE', '동물 이라는 인터페이스가 있을때 구현체는 강아지, 고양이 등이 있습니다. 구현을 하면 여러 구현 클래스가 필요합니다 이를 줄이기 위해 익명클래스를 사용할 수 있습니다.');