🔨 Refactor/#185 - 게시판에 기간 추가, 기간에 따른 스케줄링 로직 추가 및 Response 변경 (#186)

9oormthon-univ · Dec 1, 2024 · 1905cff · 1905cff
1 parent 458139c
commit 1905cff
Show file tree

Hide file tree

Showing 33 changed files with 408 additions and 57 deletions.
diff --git a/src/main/java/com/daon/onjung/account/domain/Store.java b/src/main/java/com/daon/onjung/account/domain/Store.java
@@ -74,7 +74,7 @@ public class Store {
     /* -------------------------------------------- */
     /* One To One Mapping ------------------------ */
     /* -------------------------------------------- */
-    @OneToOne
+    @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "owner_id")
     private Owner owner;
 

diff --git a/src/main/java/com/daon/onjung/core/listener/AppEventListener.java b/src/main/java/com/daon/onjung/core/listener/AppEventListener.java
@@ -5,6 +5,9 @@
 import com.daon.onjung.core.exception.type.CommonException;
 import com.daon.onjung.event.repository.redis.ScheduledEventJobRepository;
 import com.daon.onjung.event.application.controller.consumer.EventSchedulerConsumerV1Controller;
+import com.daon.onjung.suggestion.application.controller.consumer.BoardSchedulerConsumerV1Controller;
+import com.daon.onjung.suggestion.domain.redis.ScheduledBoardJob;
+import com.daon.onjung.suggestion.repository.redis.ScheduledBoardJobRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
@@ -21,6 +24,7 @@ public class AppEventListener {
     private final Scheduler scheduler;
 
     private final ScheduledEventJobRepository scheduledEventJobRepository;
+    private final ScheduledBoardJobRepository scheduledBoardJobRepository;
 
     @EventListener
     public void handleEventScheduled(ScheduledEventJob scheduledEventJob) {
@@ -45,4 +49,27 @@ public void handleEventScheduled(ScheduledEventJob scheduledEventJob) {
         }
     }
 
+    @EventListener
+    public void handleBoardScheduled(ScheduledBoardJob scheduledBoardJob) {
+        JobDetail jobDetail = JobBuilder.newJob(BoardSchedulerConsumerV1Controller.class)
+                .withIdentity("boardJob-" + scheduledBoardJob.getJobId(), "boardGroup")
+                .usingJobData("boardId", scheduledBoardJob.getBoardId())
+                .build();
+        log.info("Job 등록 완료. boardId: {}", scheduledBoardJob.getBoardId());
+
+        Trigger trigger = TriggerBuilder.newTrigger()
+                .withIdentity("boardTrigger-" + scheduledBoardJob.getJobId(), "boardGroup")
+                .startAt(Timestamp.valueOf(scheduledBoardJob.getScheduledTime()))
+                .build();
+        log.info("boardId {}에 대한 Trigger 등록 완료.", scheduledBoardJob.getBoardId());
+        log.info("Trigger 시작 시간: {}", trigger.getStartTime());
+
+        try {
+            scheduler.scheduleJob(jobDetail, trigger);
+            scheduledBoardJobRepository.save(scheduledBoardJob);
+        } catch (SchedulerException e) {
+            throw new CommonException(ErrorCode.SCHEDULER_ERROR);
+        }
+    }
+
 }
diff --git a/src/main/java/com/daon/onjung/core/listener/SchedulerRecoveryListener.java b/src/main/java/com/daon/onjung/core/listener/SchedulerRecoveryListener.java
@@ -3,6 +3,9 @@
 import com.daon.onjung.event.domain.redis.ScheduledEventJob;
 import com.daon.onjung.event.repository.redis.ScheduledEventJobRepository;
 import com.daon.onjung.event.application.controller.consumer.EventSchedulerConsumerV1Controller;
+import com.daon.onjung.suggestion.application.controller.consumer.BoardSchedulerConsumerV1Controller;
+import com.daon.onjung.suggestion.domain.redis.ScheduledBoardJob;
+import com.daon.onjung.suggestion.repository.redis.ScheduledBoardJobRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
@@ -20,36 +23,59 @@ public class SchedulerRecoveryListener implements CommandLineRunner {
 
     private final ScheduledEventJobRepository scheduledEventJobRepository;
     private final Scheduler scheduler;
+    private final ScheduledBoardJobRepository scheduledBoardJobRepository;
 
     @Override
     public void run(String... args) throws Exception {
         LocalDateTime now = LocalDateTime.now();
-        List<ScheduledEventJob> pendingJobs = scheduledEventJobRepository.findAll();
-        log.info("미처리 Job 조회 완료. 조회된 Job 수: {}", pendingJobs.size());
-        if (pendingJobs.isEmpty()) {
+        List<ScheduledEventJob> pendingEventJobs = scheduledEventJobRepository.findAll();
+        log.info("미처리 Event Job 조회 완료. 조회된 Job 수: {}", pendingEventJobs.size());
+        if (!pendingEventJobs.isEmpty()) {
+            for (ScheduledEventJob job : pendingEventJobs) {
+                if (job == null) {
+                    log.warn("조회된 Job 중 null 객체가 존재합니다.");
+                    continue;
+                }
+                if (job.getScheduledTime() == null) {
+                    log.warn("Job의 scheduledTime 값이 null입니다. eventId: {}", job.getEventId());
+                    continue;
+                }
+                if (job.getScheduledTime().isAfter(now)) {
+                    log.info("미래 작업 스케줄러에 재등록. eventId: {}", job.getEventId());
+                    scheduleEventJob(job);
+                } else {
+                    executeEventJobImmediately(job);
+                }
+            }
+        }
+
+        List<ScheduledBoardJob> pendingBoardJobs = scheduledBoardJobRepository.findAll();
+        log.info("미처리 Board Job 조회 완료. 조회된 Job 수: {}", pendingBoardJobs.size());
+
+        if (pendingBoardJobs.isEmpty()) {
             return;
         }
-        for (ScheduledEventJob job : pendingJobs) {
+        for (ScheduledBoardJob job : pendingBoardJobs) {
             if (job == null) {
                 log.warn("조회된 Job 중 null 객체가 존재합니다.");
                 continue;
             }
             if (job.getScheduledTime() == null) {
-                log.warn("Job의 scheduledTime 값이 null입니다. eventId: {}", job.getEventId());
+                log.warn("Job의 scheduledTime 값이 null입니다. boardId: {}", job.getBoardId());
                 continue;
             }
             if (job.getScheduledTime().isAfter(now)) {
-                log.info("미래 작업 스케줄러에 재등록. eventId: {}", job.getEventId());
-                scheduleJob(job);
+                log.info("미래 작업 스케줄러에 재등록. boardId: {}", job.getBoardId());
+                scheduleBoardJob(job);
             } else {
-                executeJobImmediately(job);
+                executeBoardJobImmediately(job);
             }
         }
     }
 
-    private void scheduleJob(ScheduledEventJob job) throws SchedulerException {
+    private void scheduleEventJob(ScheduledEventJob job) throws SchedulerException {
         JobDetail jobDetail = JobBuilder.newJob(EventSchedulerConsumerV1Controller.class)
-                .withIdentity("eventJob-" + job.getEventId(), "eventGroup")
+                .withIdentity("eventJob-" + job.getJobId(), "eventGroup")
                 .usingJobData("eventId", job.getEventId())
                 .build();
 
@@ -61,7 +87,7 @@ private void scheduleJob(ScheduledEventJob job) throws SchedulerException {
         scheduler.scheduleJob(jobDetail, trigger);
     }
 
-    private void executeJobImmediately(ScheduledEventJob scheduledEventJob) {
+    private void executeEventJobImmediately(ScheduledEventJob scheduledEventJob) {
         try {
             JobDetail jobDetail = JobBuilder.newJob(EventSchedulerConsumerV1Controller.class)
                     .withIdentity("eventJob-" + scheduledEventJob.getJobId(), "eventGroup")
@@ -86,4 +112,44 @@ private void executeJobImmediately(ScheduledEventJob scheduledEventJob) {
             // 실패 시 삭제하지 않음. 필요하면 재시도 큐에 추가하는 로직 고려
         }
     }
+
+    private void scheduleBoardJob(ScheduledBoardJob job) throws SchedulerException {
+        JobDetail jobDetail = JobBuilder.newJob(BoardSchedulerConsumerV1Controller.class)
+                .withIdentity("boardJob-" + job.getJobId(), "boardGroup")
+                .usingJobData("boardId", job.getBoardId())
+                .build();
+
+        Trigger trigger = TriggerBuilder.newTrigger()
+                .withIdentity("trigger-" + job.getJobId(), "boardGroup")
+                .startAt(Timestamp.valueOf(job.getScheduledTime()))
+                .build();
+
+        scheduler.scheduleJob(jobDetail, trigger);
+    }
+
+    private void executeBoardJobImmediately(ScheduledBoardJob scheduledBoardJob) {
+        try {
+            JobDetail jobDetail = JobBuilder.newJob(BoardSchedulerConsumerV1Controller.class)
+                    .withIdentity("boardJob-" + scheduledBoardJob.getJobId(), "boardGroup")
+                    .usingJobData("boardId", scheduledBoardJob.getBoardId())
+                    .build();
+            log.info("Job 등록 완료. boardId: {}", scheduledBoardJob.getBoardId());
+
+            Trigger trigger = TriggerBuilder.newTrigger()
+                    .withIdentity("boardTrigger-" + scheduledBoardJob.getJobId(), "boardGroup")
+                    .startNow()
+                    .build();
+
+            // 작업 스케줄링
+            scheduler.scheduleJob(jobDetail, trigger);
+
+            // 실행 성공 시 작업 삭제
+            scheduledBoardJobRepository.delete(scheduledBoardJob);
+
+            log.info("이전에 등록했지만 실행안된, 기간이 지난 Job을 즉시 실행함. boardId: {}", scheduledBoardJob.getBoardId());
+        } catch (SchedulerException e) {
+            log.error("Job 즉시실행에 실패. boardId: {}", scheduledBoardJob.getBoardId(), e);
+            // 실패 시 삭제하지 않음. 필요하면 재시도 큐에 추가하는 로직 고려
+        }
+    }
 }
diff --git a/...daon/onjung/event/application/controller/consumer/EventSchedulerConsumerV1Controller.java b/...daon/onjung/event/application/controller/consumer/EventSchedulerConsumerV1Controller.java
@@ -1,6 +1,5 @@
 package com.daon.onjung.event.application.controller.consumer;
 
-import com.daon.onjung.event.repository.redis.ScheduledEventJobRepository;
 import com.daon.onjung.event.application.usecase.ProcessCompletedEventUseCase;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,18 +12,12 @@
 public class EventSchedulerConsumerV1Controller implements Job {
 
     private final ProcessCompletedEventUseCase processCompletedEventUseCase;
-    private final ScheduledEventJobRepository scheduledEventJobRepository;
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
         // JobDataMap을 통해 eventId를 가져온다.
         Long eventId = context.getJobDetail().getJobDataMap().getLong("eventId");
 
-        // eventId를 통해 ScheduledEventJob을 삭제
-        scheduledEventJobRepository.findByEventId(eventId)
-                .ifPresent(scheduledEventJobRepository::delete);
-        log.info("ScheduledEventJob 삭제 완료. eventId: {}", eventId);
-
         processCompletedEventUseCase.execute(eventId);
     }
 }
diff --git a/src/main/java/com/daon/onjung/event/application/service/ProcessCompletedEventService.java b/src/main/java/com/daon/onjung/event/application/service/ProcessCompletedEventService.java
@@ -4,7 +4,6 @@
 import com.daon.onjung.account.domain.User;
 import com.daon.onjung.account.domain.type.EBankName;
 import com.daon.onjung.account.repository.mysql.UserRepository;
-import com.daon.onjung.event.domain.service.ScheduledEventJobService;
 import com.daon.onjung.core.dto.CreateVirtualAccountResponseDto;
 import com.daon.onjung.core.exception.error.ErrorCode;
 import com.daon.onjung.core.exception.type.CommonException;
@@ -16,9 +15,11 @@
 import com.daon.onjung.event.domain.mysql.Event;
 import com.daon.onjung.event.domain.mysql.Ticket;
 import com.daon.onjung.event.domain.service.EventService;
+import com.daon.onjung.event.domain.service.ScheduledEventJobService;
 import com.daon.onjung.event.domain.service.TicketService;
 import com.daon.onjung.event.repository.mysql.EventRepository;
 import com.daon.onjung.event.repository.mysql.TicketRepository;
+import com.daon.onjung.event.repository.redis.ScheduledEventJobRepository;
 import com.daon.onjung.onjung.repository.mysql.DonationRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -40,6 +41,7 @@ public class ProcessCompletedEventService implements ProcessCompletedEventUseCas
     private final UserRepository userRepository;
     private final TicketRepository ticketRepository;
     private final DonationRepository donationRepository;
+    private final ScheduledEventJobRepository scheduledEventJobRepository;
 
     private final EventService eventService;
     private final TicketService ticketService;
@@ -55,6 +57,11 @@ public class ProcessCompletedEventService implements ProcessCompletedEventUseCas
     @Transactional
     public void execute(Long eventId) {
 
+        // eventId를 통해 ScheduledEventJob을 삭제
+        scheduledEventJobRepository.findByEventId(eventId)
+                .ifPresent(scheduledEventJobRepository::delete);
+        log.info("ScheduledEventJob 삭제 완료. eventId: {}", eventId);
+
         // 이벤트 조회
         Event currentEvent = eventRepository.findById(eventId)
                 .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_RESOURCE));

diff --git a/...onjung/suggestion/application/controller/consumer/BoardSchedulerConsumerV1Controller.java b/...onjung/suggestion/application/controller/consumer/BoardSchedulerConsumerV1Controller.java
@@ -0,0 +1,24 @@
+package com.daon.onjung.suggestion.application.controller.consumer;
+
+import com.daon.onjung.suggestion.application.usecase.ProcessCompletedBoardUseCase;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+
+@RequiredArgsConstructor
+@Slf4j
+public class BoardSchedulerConsumerV1Controller implements Job {
+
+    private final ProcessCompletedBoardUseCase processCompletedBoardUseCase;
+
+    @Override
+    public void execute(JobExecutionContext context) {
+        // JobDataMap을 통해 boardId를 가져온다.
+        Long boardId = context.getJobDetail().getJobDataMap().getLong("boardId");
+
+        processCompletedBoardUseCase.execute(boardId);
+    }
+
+
+}
diff --git a/...ontroller/consumer/CommentV1Consumer.java → ...consumer/CommentConsumerV1Controller.java b/...ontroller/consumer/CommentV1Consumer.java → ...consumer/CommentConsumerV1Controller.java
@@ -6,8 +6,8 @@
 import com.daon.onjung.core.exception.type.CommonException;
 import com.daon.onjung.suggestion.application.dto.request.CommentMessage;
 import com.daon.onjung.suggestion.application.dto.response.CreateCommentResponseDto;
-import com.daon.onjung.suggestion.domain.Board;
-import com.daon.onjung.suggestion.domain.Comment;
+import com.daon.onjung.suggestion.domain.mysql.Board;
+import com.daon.onjung.suggestion.domain.mysql.Comment;
 import com.daon.onjung.suggestion.domain.service.BoardService;
 import com.daon.onjung.suggestion.domain.service.CommentService;
 import com.daon.onjung.suggestion.repository.mysql.BoardRepository;
@@ -21,7 +21,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class CommentV1Consumer {
+public class CommentConsumerV1Controller {
 
     private final BoardRepository boardRepository;
     private final CommentRepository commentRepository;

diff --git a/...n/controller/consumer/LikeV1Consumer.java → ...er/consumer/LikeConsumerV1Controller.java b/...n/controller/consumer/LikeV1Consumer.java → ...er/consumer/LikeConsumerV1Controller.java
@@ -5,9 +5,8 @@
 import com.daon.onjung.core.exception.error.ErrorCode;
 import com.daon.onjung.core.exception.type.CommonException;
 import com.daon.onjung.suggestion.application.dto.request.LikeMessage;
-import com.daon.onjung.suggestion.application.dto.response.CreateOrDeleteLikeResponseDto;
-import com.daon.onjung.suggestion.domain.Board;
-import com.daon.onjung.suggestion.domain.Like;
+import com.daon.onjung.suggestion.domain.mysql.Board;
+import com.daon.onjung.suggestion.domain.mysql.Like;
 import com.daon.onjung.suggestion.domain.service.BoardService;
 import com.daon.onjung.suggestion.domain.service.LikeService;
 import com.daon.onjung.suggestion.repository.mysql.BoardRepository;
@@ -20,7 +19,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class LikeV1Consumer {
+public class LikeConsumerV1Controller {
 
     private final LikeRepository likeRepository;
     private final BoardRepository boardRepository;

diff --git a/...in/java/com/daon/onjung/suggestion/application/dto/response/CreateCommentResponseDto.java b/...in/java/com/daon/onjung/suggestion/application/dto/response/CreateCommentResponseDto.java
@@ -3,7 +3,7 @@
 import com.daon.onjung.account.domain.User;
 import com.daon.onjung.core.dto.SelfValidating;
 import com.daon.onjung.core.utility.DateTimeUtil;
-import com.daon.onjung.suggestion.domain.Comment;
+import com.daon.onjung.suggestion.domain.mysql.Comment;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 import lombok.Getter;