From 86666474b2d61712dd092486bf2cc25d773e9d90 Mon Sep 17 00:00:00 2001
From: bwnfo3 <bwnfo0702@gmail.com>
Date: Tue, 23 Sep 2025 11:49:25 +0900
Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20execution=5Forder=20=EC=BB=AC?=
 =?UTF-8?q?=EB=9F=BC=20=EC=B6=94=EA=B0=80=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/site/icebang/domain/execution/model/TaskRun.java     | 4 +++-
 .../main/java/site/icebang/domain/workflow/dto/TaskDto.java   | 1 +
 .../src/main/resources/mybatis/mapper/JobMapper.xml           | 3 ++-
 .../src/main/resources/mybatis/mapper/TaskRunMapper.xml       | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/user-service/src/main/java/site/icebang/domain/execution/model/TaskRun.java b/apps/user-service/src/main/java/site/icebang/domain/execution/model/TaskRun.java
index f1ae2239..9eb9028d 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/execution/model/TaskRun.java
+++ b/apps/user-service/src/main/java/site/icebang/domain/execution/model/TaskRun.java
@@ -12,6 +12,7 @@ public class TaskRun {
   private Long id;
   private Long jobRunId;
   private Long taskId;
+  private Integer executionOrder;
   private String status; // PENDING, RUNNING, SUCCESS, FAILED
   private String resultMessage; // 실행 결과 메시지
   private LocalDateTime startedAt;
@@ -27,8 +28,9 @@ private TaskRun(Long jobRunId, Long taskId) {
   }
 
   /** Task 실행 시작을 위한 정적 팩토리 메서드 */
-  public static TaskRun start(Long jobRunId, Long taskId) {
+  public static TaskRun start(Long jobRunId, Long taskId,  Integer executionOrder) {
     TaskRun taskRun = new TaskRun(jobRunId, taskId);
+    taskRun.executionOrder = executionOrder;
     taskRun.status = "RUNNING";
     taskRun.startedAt = LocalDateTime.now();
     return taskRun;
diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/TaskDto.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/TaskDto.java
index 54a0ca08..286e7e8c 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/TaskDto.java
+++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/TaskDto.java
@@ -11,6 +11,7 @@ public class TaskDto {
   private Long id;
   private String name;
   private String type;
+  private Integer executionOrder;
   private JsonNode parameters;
   private LocalDateTime createdAt;
   private LocalDateTime updatedAt;
diff --git a/apps/user-service/src/main/resources/mybatis/mapper/JobMapper.xml b/apps/user-service/src/main/resources/mybatis/mapper/JobMapper.xml
index 4d5b1e60..f27012ff 100644
--- a/apps/user-service/src/main/resources/mybatis/mapper/JobMapper.xml
+++ b/apps/user-service/src/main/resources/mybatis/mapper/JobMapper.xml
@@ -23,6 +23,7 @@
         <id property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="type" column="type"/>
+        <result property="executionOrder" column="execution_order"/>
         <result property="parameters" column="parameters" javaType="com.fasterxml.jackson.databind.JsonNode" jdbcType="VARCHAR" typeHandler="site.icebang.global.config.mybatis.typehandler.JsonNodeTypeHandler"/>
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
@@ -36,7 +37,7 @@
     </select>
 
     <select id="findTasksByJobId" resultMap="TaskDtoResultMap">
-        SELECT t.* FROM task t
+        SELECT t.*, jt.execution_order FROM task t
         JOIN job_task jt ON t.id = jt.task_id
         WHERE jt.job_id = #{jobId}
         ORDER BY jt.execution_order ASC
diff --git a/apps/user-service/src/main/resources/mybatis/mapper/TaskRunMapper.xml b/apps/user-service/src/main/resources/mybatis/mapper/TaskRunMapper.xml
index 7333e065..807144cc 100644
--- a/apps/user-service/src/main/resources/mybatis/mapper/TaskRunMapper.xml
+++ b/apps/user-service/src/main/resources/mybatis/mapper/TaskRunMapper.xml
@@ -3,8 +3,8 @@
 
 <mapper namespace="site.icebang.domain.execution.mapper.TaskRunMapper">
     <insert id="insert" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO task_run (job_run_id, task_id, status, started_at, created_at)
-        VALUES (#{jobRunId}, #{taskId}, #{status}, #{startedAt}, #{createdAt})
+        INSERT INTO task_run (job_run_id, task_id, execution_order, status, started_at, created_at)
+        VALUES (#{jobRunId}, #{taskId}, #{executionOrder}, #{status}, #{startedAt}, #{createdAt})
     </insert>
 
     <update id="update">

From 0cc15166199c77a4aebf1d4a83414c6e0bc17917 Mon Sep 17 00:00:00 2001
From: bwnfo3 <bwnfo0702@gmail.com>
Date: Tue, 23 Sep 2025 11:50:15 +0900
Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20execution=5Forder=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B0=98=20Task=20=EC=8B=A4=ED=96=89=20=EC=88=9C=EC=84=9C=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0=20=EB=B0=8F=20=EC=84=B1=EB=8A=A5=20=EC=B5=9C?=
 =?UTF-8?q?=EC=A0=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/WorkflowExecutionService.java     | 69 ++++++++-----------
 1 file changed, 29 insertions(+), 40 deletions(-)

diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowExecutionService.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowExecutionService.java
index c6be9ac9..91d2fc88 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowExecutionService.java
+++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowExecutionService.java
@@ -1,5 +1,6 @@
 package site.icebang.domain.workflow.service;
 
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -101,58 +102,67 @@ public void executeWorkflow(Long workflowId) {
 
   private boolean executeTasksForJob(JobRun jobRun, Map<String, JsonNode> workflowContext) {
     List<TaskDto> taskDtos = jobMapper.findTasksByJobId(jobRun.getJobId());
-    List<Task> tasks = taskDtos.stream().map(this::convertToTask).collect(Collectors.toList());
 
-    workflowLogger.info("Job (JobRunId={}) 내 총 {}개의 Task를 실행합니다.", jobRun.getId(), tasks.size());
+    // execution_order null 처리 및 중복 처리
+    taskDtos.sort(Comparator
+            .comparing(TaskDto::getExecutionOrder, Comparator.nullsLast(Comparator.naturalOrder()))
+            .thenComparing(TaskDto::getId));
 
-    for (Task task : tasks) {
-      TaskRun taskRun = TaskRun.start(jobRun.getId(), task.getId());
+    workflowLogger.info("Job (JobRunId={}) 내 총 {}개의 Task를 execution_order 순으로 실행합니다.",
+            jobRun.getId(), taskDtos.size());
+
+    for (TaskDto taskDto : taskDtos) {
+      TaskRun taskRun = TaskRun.start(jobRun.getId(), taskDto.getId(), taskDto.getExecutionOrder());
       taskRunMapper.insert(taskRun);
 
       // Task 컨텍스트로 전환
       mdcManager.setTaskContext(taskRun.getId());
-      workflowLogger.info("Task 실행 시작: TaskId={}, TaskRunId={}", task.getId(), taskRun.getId());
+      workflowLogger.info("Task 실행 시작: TaskId={}, ExecutionOrder={}, TaskName={}, TaskRunId={}",
+              taskDto.getId(), taskDto.getExecutionOrder(), taskDto.getName(), taskRun.getId());
 
-      String runnerBeanName = task.getType().toLowerCase() + "TaskRunner";
+      String runnerBeanName = taskDto.getType().toLowerCase() + "TaskRunner";
       TaskRunner runner = taskRunners.get(runnerBeanName);
 
       if (runner == null) {
-        taskRun.finish("FAILED", "지원하지 않는 Task 타입: " + task.getType());
+        taskRun.finish("FAILED", "지원하지 않는 Task 타입: " + taskDto.getType());
         taskRunMapper.update(taskRun);
-        workflowLogger.error("Task 실행 실패 (미지원 타입): Type={}", task.getType());
+        workflowLogger.error("Task 실행 실패 (미지원 타입): Type={}, ExecutionOrder={}",
+                taskDto.getType(), taskDto.getExecutionOrder());
         mdcManager.setJobContext(jobRun.getId()); // Job 컨텍스트로 복원
         return false;
       }
 
-      ObjectNode requestBody =
-          bodyBuilders.stream()
-              .filter(builder -> builder.supports(task.getName()))
+      // TaskDto에서 직접 Task 생성 (불필요한 변환 제거)
+      ObjectNode requestBody = bodyBuilders.stream()
+              .filter(builder -> builder.supports(taskDto.getName()))
               .findFirst()
-              .map(builder -> builder.build(task, workflowContext))
+              .map(builder -> builder.build(createTaskFromDto(taskDto), workflowContext))
               .orElse(objectMapper.createObjectNode());
 
-      TaskRunner.TaskExecutionResult result = runner.execute(task, taskRun, requestBody);
+      TaskRunner.TaskExecutionResult result = runner.execute(createTaskFromDto(taskDto), taskRun, requestBody);
       taskRun.finish(result.status(), result.message());
       taskRunMapper.update(taskRun);
 
       if (result.isFailure()) {
-        workflowLogger.error("Task 실행 실패: Message={}", result.message());
+        workflowLogger.error("Task 실행 실패: ExecutionOrder={}, Message={}",
+                taskDto.getExecutionOrder(), result.message());
         mdcManager.setJobContext(jobRun.getId()); // Job 컨텍스트로 복원
         return false;
       }
 
       try {
         JsonNode resultJson = objectMapper.readTree(result.message());
-        workflowContext.put(task.getName(), resultJson);
+        workflowContext.put(taskDto.getName(), resultJson);
       } catch (JsonProcessingException e) {
-        workflowLogger.error("Task 결과 JSON 파싱 실패");
+        workflowLogger.error("Task 결과 JSON 파싱 실패: ExecutionOrder={}", taskDto.getExecutionOrder());
         taskRun.finish("FAILED", "결과 JSON 파싱 실패");
         taskRunMapper.update(taskRun);
         mdcManager.setJobContext(jobRun.getId()); // Job 컨텍스트로 복원
         return false;
       }
 
-      workflowLogger.info("Task 실행 성공: TaskRunId={}", taskRun.getId());
+      workflowLogger.info("Task 실행 성공: ExecutionOrder={}, TaskRunId={}",
+              taskDto.getExecutionOrder(), taskRun.getId());
 
       // 다시 Job 컨텍스트로 복원
       mdcManager.setJobContext(jobRun.getId());
@@ -161,28 +171,7 @@ private boolean executeTasksForJob(JobRun jobRun, Map<String, JsonNode> workflow
   }
 
   /** TaskDto를 Task 모델로 변환합니다. 📌 주의: Reflection을 사용한 방식은 성능이 느리고 불안정하므로 권장되지 않습니다. */
-  private Task convertToTask(TaskDto taskDto) {
-    Task task = new Task();
-    try {
-      java.lang.reflect.Field idField = Task.class.getDeclaredField("id");
-      idField.setAccessible(true);
-      idField.set(task, taskDto.getId());
-
-      java.lang.reflect.Field nameField = Task.class.getDeclaredField("name");
-      nameField.setAccessible(true);
-      nameField.set(task, taskDto.getName());
-
-      java.lang.reflect.Field typeField = Task.class.getDeclaredField("type");
-      typeField.setAccessible(true);
-      typeField.set(task, taskDto.getType());
-
-      java.lang.reflect.Field parametersField = Task.class.getDeclaredField("parameters");
-      parametersField.setAccessible(true);
-      parametersField.set(task, taskDto.getParameters());
-
-    } catch (Exception e) {
-      throw new RuntimeException("TaskDto to Task 변환 중 오류 발생", e);
-    }
-    return task;
+  private Task createTaskFromDto(TaskDto taskDto) {
+    return new Task(taskDto);  // 생성자 사용
   }
 }

From 0101fb60e9018c6342877404c4145f60c053e301 Mon Sep 17 00:00:00 2001
From: bwnfo3 <bwnfo0702@gmail.com>
Date: Tue, 23 Sep 2025 11:50:47 +0900
Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20Task=20=EB=AA=A8=EB=8D=B8?=
 =?UTF-8?q?=EC=97=90=20TaskDto=20=EC=83=9D=EC=84=B1=EC=9E=90=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/site/icebang/domain/workflow/model/Task.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/model/Task.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/model/Task.java
index 09589cc1..9f3a8d39 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/workflow/model/Task.java
+++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/model/Task.java
@@ -4,6 +4,7 @@
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import site.icebang.domain.workflow.dto.TaskDto;
 
 @Getter
 @NoArgsConstructor // MyBatis가 객체를 생성하기 위해 필요
@@ -17,4 +18,11 @@ public class Task {
 
   /** Task 실행에 필요한 파라미터 (JSON) 예: {"url": "http://...", "method": "POST", "body": {...}} */
   private JsonNode parameters;
+
+  public Task(TaskDto taskDto) {
+    this.id = taskDto.getId();
+    this.name = taskDto.getName();
+    this.type = taskDto.getType();
+    this.parameters = taskDto.getParameters();
+  }
 }

From e9988fb4a4cc03bf6969ecb7d243546c58fd0165 Mon Sep 17 00:00:00 2001
From: bwnfo3 <bwnfo0702@gmail.com>
Date: Tue, 23 Sep 2025 11:51:55 +0900
Subject: [PATCH 4/4] chore: spotlessApply

---
 .../domain/execution/model/TaskRun.java       |  2 +-
 .../icebang/domain/workflow/model/Task.java   |  1 +
 .../service/WorkflowExecutionService.java     | 46 ++++++++++++-------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/apps/user-service/src/main/java/site/icebang/domain/execution/model/TaskRun.java b/apps/user-service/src/main/java/site/icebang/domain/execution/model/TaskRun.java
index 9eb9028d..a58e0c9f 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/execution/model/TaskRun.java
+++ b/apps/user-service/src/main/java/site/icebang/domain/execution/model/TaskRun.java
@@ -28,7 +28,7 @@ private TaskRun(Long jobRunId, Long taskId) {
   }
 
   /** Task 실행 시작을 위한 정적 팩토리 메서드 */
-  public static TaskRun start(Long jobRunId, Long taskId,  Integer executionOrder) {
+  public static TaskRun start(Long jobRunId, Long taskId, Integer executionOrder) {
     TaskRun taskRun = new TaskRun(jobRunId, taskId);
     taskRun.executionOrder = executionOrder;
     taskRun.status = "RUNNING";
diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/model/Task.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/model/Task.java
index 9f3a8d39..5fed64f9 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/workflow/model/Task.java
+++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/model/Task.java
@@ -4,6 +4,7 @@
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+
 import site.icebang.domain.workflow.dto.TaskDto;
 
 @Getter
diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowExecutionService.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowExecutionService.java
index 91d2fc88..c547dd2d 100644
--- a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowExecutionService.java
+++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowExecutionService.java
@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -104,12 +103,15 @@ private boolean executeTasksForJob(JobRun jobRun, Map<String, JsonNode> workflow
     List<TaskDto> taskDtos = jobMapper.findTasksByJobId(jobRun.getJobId());
 
     // execution_order null 처리 및 중복 처리
-    taskDtos.sort(Comparator
-            .comparing(TaskDto::getExecutionOrder, Comparator.nullsLast(Comparator.naturalOrder()))
+    taskDtos.sort(
+        Comparator.comparing(
+                TaskDto::getExecutionOrder, Comparator.nullsLast(Comparator.naturalOrder()))
             .thenComparing(TaskDto::getId));
 
-    workflowLogger.info("Job (JobRunId={}) 내 총 {}개의 Task를 execution_order 순으로 실행합니다.",
-            jobRun.getId(), taskDtos.size());
+    workflowLogger.info(
+        "Job (JobRunId={}) 내 총 {}개의 Task를 execution_order 순으로 실행합니다.",
+        jobRun.getId(),
+        taskDtos.size());
 
     for (TaskDto taskDto : taskDtos) {
       TaskRun taskRun = TaskRun.start(jobRun.getId(), taskDto.getId(), taskDto.getExecutionOrder());
@@ -117,8 +119,12 @@ private boolean executeTasksForJob(JobRun jobRun, Map<String, JsonNode> workflow
 
       // Task 컨텍스트로 전환
       mdcManager.setTaskContext(taskRun.getId());
-      workflowLogger.info("Task 실행 시작: TaskId={}, ExecutionOrder={}, TaskName={}, TaskRunId={}",
-              taskDto.getId(), taskDto.getExecutionOrder(), taskDto.getName(), taskRun.getId());
+      workflowLogger.info(
+          "Task 실행 시작: TaskId={}, ExecutionOrder={}, TaskName={}, TaskRunId={}",
+          taskDto.getId(),
+          taskDto.getExecutionOrder(),
+          taskDto.getName(),
+          taskRun.getId());
 
       String runnerBeanName = taskDto.getType().toLowerCase() + "TaskRunner";
       TaskRunner runner = taskRunners.get(runnerBeanName);
@@ -126,26 +132,32 @@ private boolean executeTasksForJob(JobRun jobRun, Map<String, JsonNode> workflow
       if (runner == null) {
         taskRun.finish("FAILED", "지원하지 않는 Task 타입: " + taskDto.getType());
         taskRunMapper.update(taskRun);
-        workflowLogger.error("Task 실행 실패 (미지원 타입): Type={}, ExecutionOrder={}",
-                taskDto.getType(), taskDto.getExecutionOrder());
+        workflowLogger.error(
+            "Task 실행 실패 (미지원 타입): Type={}, ExecutionOrder={}",
+            taskDto.getType(),
+            taskDto.getExecutionOrder());
         mdcManager.setJobContext(jobRun.getId()); // Job 컨텍스트로 복원
         return false;
       }
 
       // TaskDto에서 직접 Task 생성 (불필요한 변환 제거)
-      ObjectNode requestBody = bodyBuilders.stream()
+      ObjectNode requestBody =
+          bodyBuilders.stream()
               .filter(builder -> builder.supports(taskDto.getName()))
               .findFirst()
               .map(builder -> builder.build(createTaskFromDto(taskDto), workflowContext))
               .orElse(objectMapper.createObjectNode());
 
-      TaskRunner.TaskExecutionResult result = runner.execute(createTaskFromDto(taskDto), taskRun, requestBody);
+      TaskRunner.TaskExecutionResult result =
+          runner.execute(createTaskFromDto(taskDto), taskRun, requestBody);
       taskRun.finish(result.status(), result.message());
       taskRunMapper.update(taskRun);
 
       if (result.isFailure()) {
-        workflowLogger.error("Task 실행 실패: ExecutionOrder={}, Message={}",
-                taskDto.getExecutionOrder(), result.message());
+        workflowLogger.error(
+            "Task 실행 실패: ExecutionOrder={}, Message={}",
+            taskDto.getExecutionOrder(),
+            result.message());
         mdcManager.setJobContext(jobRun.getId()); // Job 컨텍스트로 복원
         return false;
       }
@@ -161,8 +173,10 @@ private boolean executeTasksForJob(JobRun jobRun, Map<String, JsonNode> workflow
         return false;
       }
 
-      workflowLogger.info("Task 실행 성공: ExecutionOrder={}, TaskRunId={}",
-              taskDto.getExecutionOrder(), taskRun.getId());
+      workflowLogger.info(
+          "Task 실행 성공: ExecutionOrder={}, TaskRunId={}",
+          taskDto.getExecutionOrder(),
+          taskRun.getId());
 
       // 다시 Job 컨텍스트로 복원
       mdcManager.setJobContext(jobRun.getId());
@@ -172,6 +186,6 @@ private boolean executeTasksForJob(JobRun jobRun, Map<String, JsonNode> workflow
 
   /** TaskDto를 Task 모델로 변환합니다. 📌 주의: Reflection을 사용한 방식은 성능이 느리고 불안정하므로 권장되지 않습니다. */
   private Task createTaskFromDto(TaskDto taskDto) {
-    return new Task(taskDto);  // 생성자 사용
+    return new Task(taskDto); // 생성자 사용
   }
 }