Transactional로 인한 비정상적이던 task 실행 수정 및 retry 적용

apps/user-service/build.gradle

@@ -47,6 +47,9 @@ dependencies {
 	// Scheduler
 	implementation 'org.springframework.boot:spring-boot-starter-quartz'
 
+	// Retry
+	implementation 'org.springframework.retry:spring-retry'
+
 	implementation 'org.springframework.boot:spring-boot-starter-log4j2'
 	implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
 	implementation 'org.apache.logging.log4j:log4j-layout-template-json'

apps/user-service/src/main/java/site/icebang/UserServiceApplication.java

@@ -3,7 +3,9 @@
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.retry.annotation.EnableRetry;
 
+@EnableRetry
 @SpringBootApplication
 @MapperScan("site.icebang.**.mapper")
 public class UserServiceApplication {

apps/user-service/src/main/java/site/icebang/domain/schedule/service/QuartzScheduleService.java

@@ -11,14 +11,10 @@
 @Service
 @RequiredArgsConstructor
 public class QuartzScheduleService {
-
     private final Scheduler scheduler;
 
     public void addOrUpdateSchedule(Schedule schedule) {
         try {
-            // 기존 스케줄 삭제 (있다면)
-            deleteSchedule(schedule.getWorkflowId());
-
             JobKey jobKey = JobKey.jobKey("workflow-" + schedule.getWorkflowId());
             JobDetail jobDetail = JobBuilder.newJob(WorkflowTriggerJob.class)
                     .withIdentity(jobKey)
@@ -34,23 +30,25 @@ public void addOrUpdateSchedule(Schedule schedule) {
                     .withSchedule(CronScheduleBuilder.cronSchedule(schedule.getCronExpression()))
                     .build();
 
+            if (scheduler.checkExists(jobKey)) {
+                scheduler.deleteJob(jobKey); // 기존 Job 삭제 후 재생성 (업데이트)
+            }
             scheduler.scheduleJob(jobDetail, trigger);
             log.info("Quartz 스케줄 등록/업데이트 완료: Workflow ID {}", schedule.getWorkflowId());
         } catch (SchedulerException e) {
-            log.error("Quartz 스케줄 등록 실패", e);
+            log.error("Quartz 스케줄 등록 실패: Workflow ID " + schedule.getWorkflowId(), e);
         }
     }
 
     public void deleteSchedule(Long workflowId) {
         try {
-            JobKey jobkey = JobKey.jobKey("workflow-" + workflowId);
-            TriggerKey triggerKey = TriggerKey.triggerKey("trigger-for-workflow-" + workflowId);
-
-            scheduler.unscheduleJob(triggerKey);
-            scheduler.deleteJob(jobkey);
-            log.info("Quartz 스케줄 삭제 완료: Workflow ID {}", workflowId);
+            JobKey jobKey = JobKey.jobKey("workflow-" + workflowId);
+            if (scheduler.checkExists(jobKey)) {
+                scheduler.deleteJob(jobKey);
+                log.info("Quartz 스케줄 삭제 완료: Workflow ID {}", workflowId);
+            }
         } catch (SchedulerException e) {
-            log.error("Quartz 스케줄 삭제 실패: Workflow ID {}", workflowId, e);
+            log.error("Quartz 스케줄 삭제 실패: Workflow ID " + workflowId, e);
         }
     }
 }

apps/user-service/src/main/java/site/icebang/domain/workflow/dto/JobDto.java

@@ -0,0 +1,19 @@
+package site.icebang.domain.workflow.dto;
+
+import java.time.LocalDateTime;
+
+import lombok.Data;
+
+@Data
+public class JobDto {
+  private Long id;
+  private String name;
+  private String description;
+  private Boolean isEnabled;
+  private LocalDateTime createdAt;
+  private Long createdBy;
+  private LocalDateTime updatedAt;
+  private Long updatedBy;
+
+  private Integer executionOrder;
+}

apps/user-service/src/main/java/site/icebang/domain/workflow/dto/TaskDto.java

@@ -11,8 +11,9 @@ public class TaskDto {
   private Long id;
   private String name;
   private String type;
-  private Integer executionOrder;
   private JsonNode parameters;
   private LocalDateTime createdAt;
   private LocalDateTime updatedAt;
+
+  private Integer executionOrder;
 }

apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/JobMapper.java

@@ -4,12 +4,12 @@
 
 import org.apache.ibatis.annotations.Mapper;
 
+import site.icebang.domain.workflow.dto.JobDto;
 import site.icebang.domain.workflow.dto.TaskDto;
-import site.icebang.domain.workflow.model.Job;
 
 @Mapper
 public interface JobMapper {
-  List<Job> findJobsByWorkflowId(Long workflowId);
+  List<JobDto> findJobsByWorkflowId(Long workflowId);
 
   List<TaskDto> findTasksByJobId(Long jobId);
 }

apps/user-service/src/main/java/site/icebang/domain/execution/mapper/JobRunMapper.java → apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/JobRunMapper.java

@@ -1,8 +1,8 @@
-package site.icebang.domain.execution.mapper;
+package site.icebang.domain.workflow.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import site.icebang.domain.execution.model.JobRun;
+import site.icebang.domain.workflow.model.JobRun;
 
 @Mapper
 public interface JobRunMapper {

apps/user-service/src/main/java/site/icebang/domain/execution/mapper/TaskRunMapper.java → apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/TaskRunMapper.java

@@ -1,8 +1,8 @@
-package site.icebang.domain.execution.mapper;
+package site.icebang.domain.workflow.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import site.icebang.domain.execution.model.TaskRun;
+import site.icebang.domain.workflow.model.TaskRun;
 
 @Mapper
 public interface TaskRunMapper {

apps/user-service/src/main/java/site/icebang/domain/execution/mapper/WorkflowRunMapper.java → apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/WorkflowRunMapper.java

@@ -1,8 +1,8 @@
-package site.icebang.domain.execution.mapper;
+package site.icebang.domain.workflow.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import site.icebang.domain.execution.model.WorkflowRun;
+import site.icebang.domain.workflow.model.WorkflowRun;
 
 @Mapper
 public interface WorkflowRunMapper {

apps/user-service/src/main/java/site/icebang/domain/workflow/model/Job.java

@@ -7,6 +7,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import site.icebang.domain.workflow.dto.JobDto;
+
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
@@ -19,4 +21,13 @@ public class Job {
   private Long createdBy;
   private LocalDateTime updatedAt;
   private Long updatedBy;
+
+  public Job(JobDto dto) {
+    this.id = dto.getId();
+    this.name = dto.getName();
+    this.description = dto.getDescription();
+    this.isEnabled = dto.getIsEnabled();
+    this.createdAt = dto.getCreatedAt();
+    this.updatedAt = dto.getUpdatedAt();
+  }
 }

apps/user-service/src/main/java/site/icebang/domain/execution/model/JobRun.java → apps/user-service/src/main/java/site/icebang/domain/workflow/model/JobRun.java

@@ -1,4 +1,4 @@
-package site.icebang.domain.execution.model;
+package site.icebang.domain.workflow.model;
 
 import java.time.LocalDateTime;
 

apps/user-service/src/main/java/site/icebang/domain/workflow/model/Task.java

@@ -1,14 +1,18 @@
 package site.icebang.domain.workflow.model;
 
+import java.time.LocalDateTime;
+
 import com.fasterxml.jackson.databind.JsonNode;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import site.icebang.domain.workflow.dto.TaskDto;
 
 @Getter
 @NoArgsConstructor // MyBatis가 객체를 생성하기 위해 필요
+@AllArgsConstructor
 public class Task {
 
   private Long id;
@@ -20,6 +24,10 @@ public class Task {
   /** Task 실행에 필요한 파라미터 (JSON) 예: {"url": "http://...", "method": "POST", "body": {...}} */
   private JsonNode parameters;
 
+  private LocalDateTime createdAt;
+
+  private LocalDateTime updatedAt;
+
   public Task(TaskDto taskDto) {
     this.id = taskDto.getId();
     this.name = taskDto.getName();

apps/user-service/src/main/java/site/icebang/domain/execution/model/TaskRun.java → apps/user-service/src/main/java/site/icebang/domain/workflow/model/TaskRun.java

@@ -1,4 +1,4 @@
-package site.icebang.domain.execution.model;
+package site.icebang.domain.workflow.model;
 
 import java.time.LocalDateTime;
 

apps/user-service/src/main/java/site/icebang/domain/workflow/model/Workflow.java

@@ -4,12 +4,10 @@
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
-@Builder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 public class Workflow {

apps/user-service/src/main/java/site/icebang/domain/execution/model/WorkflowRun.java → apps/user-service/src/main/java/site/icebang/domain/workflow/model/WorkflowRun.java

@@ -1,4 +1,4 @@
-package site.icebang.domain.execution.model;
+package site.icebang.domain.workflow.model;
 
 import java.time.LocalDateTime;
 import java.util.UUID;

apps/user-service/src/main/java/site/icebang/domain/workflow/runner/TaskRunner.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import site.icebang.domain.execution.model.TaskRun;
 import site.icebang.domain.workflow.model.Task;
+import site.icebang.domain.workflow.model.TaskRun;
 
 /** 워크플로우의 개별 Task를 실행하는 모든 Runner가 구현해야 할 인터페이스 */
 public interface TaskRunner {

apps/user-service/src/main/java/site/icebang/domain/workflow/runner/fastapi/FastApiTaskRunner.java

@@ -8,8 +8,8 @@
 
 import lombok.RequiredArgsConstructor;
 
-import site.icebang.domain.execution.model.TaskRun;
 import site.icebang.domain.workflow.model.Task;
+import site.icebang.domain.workflow.model.TaskRun;
 import site.icebang.domain.workflow.runner.TaskRunner;
 import site.icebang.external.fastapi.adapter.FastApiAdapter;
 

apps/user-service/src/main/java/site/icebang/domain/workflow/service/TaskExecutionService.java

@@ -0,0 +1,55 @@
+package site.icebang.domain.workflow.service;
+
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Recover;
+import org.springframework.retry.annotation.Retryable;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientException;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import site.icebang.domain.workflow.model.Task;
+import site.icebang.domain.workflow.model.TaskRun;
+import site.icebang.domain.workflow.runner.TaskRunner;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class TaskExecutionService { // 📌 클래스 이름 변경
+  private static final Logger workflowLogger = LoggerFactory.getLogger("WORKFLOW_HISTORY");
+  private final Map<String, TaskRunner> taskRunners;
+
+  /** RestClientException 발생 시, 5초 간격으로 최대 3번 재시도합니다. */
+  @Retryable(
+      value = {RestClientException.class},
+      maxAttempts = 3,
+      backoff = @Backoff(delay = 5000))
+  public TaskRunner.TaskExecutionResult executeWithRetry(
+      Task task, TaskRun taskRun, ObjectNode requestBody) {
+    workflowLogger.info("Task 실행 시도: TaskId={}, TaskRunId={}", task.getId(), taskRun.getId());
+
+    String runnerBeanName = task.getType().toLowerCase() + "TaskRunner";
+    TaskRunner runner = taskRunners.get(runnerBeanName);
+
+    if (runner == null) {
+      throw new IllegalArgumentException("지원하지 않는 Task 타입: " + task.getType());
+    }
+
+    return runner.execute(task, taskRun, requestBody);
+  }
+
+  /** 모든 재시도가 실패했을 때 마지막으로 호출될 복구 메소드입니다. */
+  @Recover
+  public TaskRunner.TaskExecutionResult recover(
+      RestClientException e, Task task, TaskRun taskRun, ObjectNode requestBody) {
+    workflowLogger.error("최종 Task 실행 실패 (모든 재시도 소진): TaskRunId={}", taskRun.getId(), e);
+    return TaskRunner.TaskExecutionResult.failure("최대 재시도 횟수 초과: " + e.getMessage());
+  }
+}