From 28b56832270f66dc3da2f546562e3f93463cc1ac Mon Sep 17 00:00:00 2001 From: bjkim Date: Mon, 25 Aug 2025 17:56:33 +0900 Subject: [PATCH] =?UTF-8?q?[ADD]=20WorkFlow=20=EB=B6=80=EB=AA=A8Project=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/re/etri/autoflow/entity/WorkflowEntity.java | 11 ++++++----- .../autoflow/payload/request/WorkFlowRequest.java | 4 +++- .../kr/re/etri/autoflow/service/WorkFlowService.java | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/kr/re/etri/autoflow/entity/WorkflowEntity.java b/src/main/java/kr/re/etri/autoflow/entity/WorkflowEntity.java index 274f064..0c6a465 100644 --- a/src/main/java/kr/re/etri/autoflow/entity/WorkflowEntity.java +++ b/src/main/java/kr/re/etri/autoflow/entity/WorkflowEntity.java @@ -4,6 +4,7 @@ import jakarta.persistence.*; import lombok.*; import java.time.LocalDateTime; import io.swagger.v3.oas.annotations.media.Schema; +import org.hibernate.annotations.Comment; @Entity @Table(name = "tb_workflows") @@ -17,8 +18,9 @@ public class WorkflowEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Schema(description = "워크플로우 ID", example = "null") - private Long Id; + @Schema(description = "워크플로우 ID22", example = "null", defaultValue = "null") + @Comment("ID") + private Long id; @Schema(description = "워크플로우 이름", example = "데이터 전처리 워크플로우") private String workflowName; @@ -52,7 +54,6 @@ public class WorkflowEntity { @Schema(description = "Kubeflow 상태", example = "Running") private String kubeflowStatus; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "project_id", referencedColumnName = "id", nullable = false) - private ProjectEntity project; + @Schema(description = "프로젝트 아이디", example = "1", defaultValue = "0") + private Long projectId; } diff --git a/src/main/java/kr/re/etri/autoflow/payload/request/WorkFlowRequest.java b/src/main/java/kr/re/etri/autoflow/payload/request/WorkFlowRequest.java index 63ce395..c08247a 100644 --- a/src/main/java/kr/re/etri/autoflow/payload/request/WorkFlowRequest.java +++ b/src/main/java/kr/re/etri/autoflow/payload/request/WorkFlowRequest.java @@ -1,11 +1,13 @@ package kr.re.etri.autoflow.payload.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @Getter @Setter public class WorkFlowRequest extends BaseSearchRequest { - private String projectId; + @Schema(description = "프로젝트 ID", example = "1") + private Long projectId; } diff --git a/src/main/java/kr/re/etri/autoflow/service/WorkFlowService.java b/src/main/java/kr/re/etri/autoflow/service/WorkFlowService.java index bc31ccb..0065c49 100644 --- a/src/main/java/kr/re/etri/autoflow/service/WorkFlowService.java +++ b/src/main/java/kr/re/etri/autoflow/service/WorkFlowService.java @@ -61,7 +61,7 @@ public class WorkFlowService { // projectId가 있으면 조건 추가 (권장) if (request.getProjectId() != null) { spec = spec.and((root, query, cb) -> - cb.equal(root.get("project").get("id"), request.getProjectId()) + cb.equal(root.get("projectId"), request.getProjectId()) ); }