diff --git a/src/main/java/kr/re/etri/autoflow/entity/WorkflowStepEntity.java b/src/main/java/kr/re/etri/autoflow/entity/WorkflowStepEntity.java index 1192d2f..82c1da4 100644 --- a/src/main/java/kr/re/etri/autoflow/entity/WorkflowStepEntity.java +++ b/src/main/java/kr/re/etri/autoflow/entity/WorkflowStepEntity.java @@ -66,4 +66,8 @@ public class WorkflowStepEntity { @Schema(description = "프로젝트 아이디", example = "1", defaultValue = "0") @Column(nullable = false) private Long projectId; + + @Schema(description = "워크플로우 스텝 아이디", example = "1", defaultValue = "0") + @Column(nullable = false) + private Long workflowStepId; } diff --git a/src/main/java/kr/re/etri/autoflow/payload/request/WorkFlowStepRequest.java b/src/main/java/kr/re/etri/autoflow/payload/request/WorkFlowStepRequest.java index 21d7f89..10fa5e9 100644 --- a/src/main/java/kr/re/etri/autoflow/payload/request/WorkFlowStepRequest.java +++ b/src/main/java/kr/re/etri/autoflow/payload/request/WorkFlowStepRequest.java @@ -9,5 +9,8 @@ import lombok.Setter; public class WorkFlowStepRequest extends BaseSearchRequest { @Schema(description = "프로젝트 ID", example = "1") private Long projectId; + + @Schema(description = "프로젝트 ID", example = "1") + private Long workflowId; } diff --git a/src/main/java/kr/re/etri/autoflow/service/WorkFlowStepService.java b/src/main/java/kr/re/etri/autoflow/service/WorkFlowStepService.java index 4669906..5d26058 100644 --- a/src/main/java/kr/re/etri/autoflow/service/WorkFlowStepService.java +++ b/src/main/java/kr/re/etri/autoflow/service/WorkFlowStepService.java @@ -76,6 +76,13 @@ public class WorkFlowStepService { ); } + // workflowId 있으면 조건 추가 (권장) + if (request.getWorkflowId() != null) { + spec = spec.and((root, query, cb) -> + cb.equal(root.get("workflowId"), request.getWorkflowId()) + ); + } + return workflowstepRepository.findAll(spec, pageable); } }