From d5a766f835bc4a04e54d499741f2322386e2233a Mon Sep 17 00:00:00 2001 From: bwnfo3 Date: Tue, 16 Sep 2025 17:53:54 +0900 Subject: [PATCH 1/8] feat: WorkflowCardDto --- .../icebang/domain/workflow/dto/WorkflowCardDto.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java index b54a29c0..6d36224a 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java +++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java @@ -2,5 +2,15 @@ import lombok.Data; +import java.math.BigInteger; +import java.time.LocalDateTime; + @Data -public class WorkflowCardDto {} +public class WorkflowCardDto { + private BigInteger id; + private String name; + private String description; + private boolean isEnabled; + private String createdBy; + private LocalDateTime createdAt; +} \ No newline at end of file From f7bb9225efab394a6246b14ba30d2356af213709 Mon Sep 17 00:00:00 2001 From: bwnfo3 Date: Tue, 16 Sep 2025 17:54:03 +0900 Subject: [PATCH 2/8] feat: WorkflowMapper --- .../domain/workflow/mapper/WorkflowMapper.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/WorkflowMapper.java diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/WorkflowMapper.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/WorkflowMapper.java new file mode 100644 index 00000000..6e5ef1ca --- /dev/null +++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/WorkflowMapper.java @@ -0,0 +1,15 @@ +package site.icebang.domain.workflow.mapper; + +import site.icebang.common.dto.PageParams; +import site.icebang.domain.workflow.dto.WorkflowCardDto; + +import java.math.BigInteger; +import java.util.*; + +public interface WorkflowMapper { + List selectWorkflowList(PageParams pageParams); + + int selectWorkflowCount(PageParams pageParams); + + WorkflowCardDto selectWorkflowById(BigInteger id); +} From 71de16b6d9abd39decc65b81f34bc1b182bf87b9 Mon Sep 17 00:00:00 2001 From: bwnfo3 Date: Tue, 16 Sep 2025 17:54:14 +0900 Subject: [PATCH 3/8] feat: WorkflowMapper.xml --- .../mybatis/mapper/WorkflowMapper.xml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 apps/user-service/src/main/resources/mybatis/mapper/WorkflowMapper.xml diff --git a/apps/user-service/src/main/resources/mybatis/mapper/WorkflowMapper.xml b/apps/user-service/src/main/resources/mybatis/mapper/WorkflowMapper.xml new file mode 100644 index 00000000..dacade96 --- /dev/null +++ b/apps/user-service/src/main/resources/mybatis/mapper/WorkflowMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + \ No newline at end of file From 1ab796050958815373eb3a0e86b6895f45454b83 Mon Sep 17 00:00:00 2001 From: bwnfo3 Date: Tue, 16 Sep 2025 17:54:30 +0900 Subject: [PATCH 4/8] feat: WorkflowService --- .../workflow/service/WorkflowService.java | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java index 1a358924..8edaad2d 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java +++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java @@ -9,19 +9,28 @@ import site.icebang.common.dto.PageResult; import site.icebang.common.service.PageableService; import site.icebang.domain.workflow.dto.WorkflowCardDto; +import site.icebang.domain.workflow.mapper.WorkflowMapper; + +import java.math.BigInteger; @Service @RequiredArgsConstructor public class WorkflowService implements PageableService { - @Override - @Transactional(readOnly = true) - public PageResult getPagedResult(PageParams pageParams) { - throw new RuntimeException("Not implemented"); - // return PageResult.from( - // pageParams, - // () -> workflowMapper.selectWorkflowList(pageParams), - // () -> workflowMapper.selectWorkflowCount(pageParams) - // ); - } -} + private final WorkflowMapper workflowMapper; + + @Override + @Transactional(readOnly = true) + public PageResult getPagedResult(PageParams pageParams) { + return PageResult.from( + pageParams, + () -> workflowMapper.selectWorkflowList(pageParams), + () -> workflowMapper.selectWorkflowCount(pageParams) + ); + } + + @Transactional(readOnly = true) + public WorkflowCardDto getWorkflowById(BigInteger id) { + return workflowMapper.selectWorkflowById(id); + } +} \ No newline at end of file From f4e57034f87c95cbf03b8dfabbc71bb5069558c1 Mon Sep 17 00:00:00 2001 From: bwnfo3 Date: Tue, 16 Sep 2025 17:54:57 +0900 Subject: [PATCH 5/8] =?UTF-8?q?feat:=20Workflow=EA=B4=80=EB=A0=A8=20api=20?= =?UTF-8?q?Security=EC=97=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../site/icebang/global/config/security/SecurityConfig.java | 1 + .../global/config/security/endpoints/SecurityEndpoints.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java b/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java index c915867d..f9e20640 100644 --- a/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java +++ b/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java @@ -64,6 +64,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .permitAll() .requestMatchers("/auth/login", "/auth/logout") .permitAll() + .requestMatchers("/v0/workflows/**").permitAll() .requestMatchers("/v0/auth/check-session") .authenticated() .requestMatchers(SecurityEndpoints.DATA_ADMIN.getMatchers()) diff --git a/apps/user-service/src/main/java/site/icebang/global/config/security/endpoints/SecurityEndpoints.java b/apps/user-service/src/main/java/site/icebang/global/config/security/endpoints/SecurityEndpoints.java index 019337dc..c4c4b72f 100644 --- a/apps/user-service/src/main/java/site/icebang/global/config/security/endpoints/SecurityEndpoints.java +++ b/apps/user-service/src/main/java/site/icebang/global/config/security/endpoints/SecurityEndpoints.java @@ -26,7 +26,7 @@ public enum SecurityEndpoints { OPS("/api/scheduler/**", "/api/monitoring/**"), // 일반 사용자 엔드포인트 - USER("/user/**", "/profile/**", "/v0/auth/check-session"); + USER("/user/**", "/profile/**", "/v0/auth/check-session","/v0/workflows/**"); private final String[] patterns; From a042c80dd998a76993202e83466e03af8b3fd39d Mon Sep 17 00:00:00 2001 From: bwnfo3 Date: Tue, 16 Sep 2025 18:01:18 +0900 Subject: [PATCH 6/8] fix: spotlessApply --- .../domain/workflow/dto/WorkflowCardDto.java | 18 ++++----- .../workflow/mapper/WorkflowMapper.java | 12 +++--- .../workflow/service/WorkflowService.java | 37 +++++++++---------- .../config/security/SecurityConfig.java | 3 +- .../security/endpoints/SecurityEndpoints.java | 2 +- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java index 6d36224a..a39ce0c3 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java +++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/dto/WorkflowCardDto.java @@ -1,16 +1,16 @@ package site.icebang.domain.workflow.dto; -import lombok.Data; - import java.math.BigInteger; import java.time.LocalDateTime; +import lombok.Data; + @Data public class WorkflowCardDto { - private BigInteger id; - private String name; - private String description; - private boolean isEnabled; - private String createdBy; - private LocalDateTime createdAt; -} \ No newline at end of file + private BigInteger id; + private String name; + private String description; + private boolean isEnabled; + private String createdBy; + private LocalDateTime createdAt; +} diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/WorkflowMapper.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/WorkflowMapper.java index 6e5ef1ca..00afbebc 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/WorkflowMapper.java +++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/mapper/WorkflowMapper.java @@ -1,15 +1,15 @@ package site.icebang.domain.workflow.mapper; -import site.icebang.common.dto.PageParams; -import site.icebang.domain.workflow.dto.WorkflowCardDto; - import java.math.BigInteger; import java.util.*; +import site.icebang.common.dto.PageParams; +import site.icebang.domain.workflow.dto.WorkflowCardDto; + public interface WorkflowMapper { - List selectWorkflowList(PageParams pageParams); + List selectWorkflowList(PageParams pageParams); - int selectWorkflowCount(PageParams pageParams); + int selectWorkflowCount(PageParams pageParams); - WorkflowCardDto selectWorkflowById(BigInteger id); + WorkflowCardDto selectWorkflowById(BigInteger id); } diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java index 8edaad2d..052b96fa 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java +++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java @@ -1,5 +1,7 @@ package site.icebang.domain.workflow.service; +import java.math.BigInteger; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -11,26 +13,23 @@ import site.icebang.domain.workflow.dto.WorkflowCardDto; import site.icebang.domain.workflow.mapper.WorkflowMapper; -import java.math.BigInteger; - @Service @RequiredArgsConstructor public class WorkflowService implements PageableService { - private final WorkflowMapper workflowMapper; - - @Override - @Transactional(readOnly = true) - public PageResult getPagedResult(PageParams pageParams) { - return PageResult.from( - pageParams, - () -> workflowMapper.selectWorkflowList(pageParams), - () -> workflowMapper.selectWorkflowCount(pageParams) - ); - } - - @Transactional(readOnly = true) - public WorkflowCardDto getWorkflowById(BigInteger id) { - return workflowMapper.selectWorkflowById(id); - } -} \ No newline at end of file + private final WorkflowMapper workflowMapper; + + @Override + @Transactional(readOnly = true) + public PageResult getPagedResult(PageParams pageParams) { + return PageResult.from( + pageParams, + () -> workflowMapper.selectWorkflowList(pageParams), + () -> workflowMapper.selectWorkflowCount(pageParams)); + } + + @Transactional(readOnly = true) + public WorkflowCardDto getWorkflowById(BigInteger id) { + return workflowMapper.selectWorkflowById(id); + } +} diff --git a/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java b/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java index f9e20640..61d668cc 100644 --- a/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java +++ b/apps/user-service/src/main/java/site/icebang/global/config/security/SecurityConfig.java @@ -64,7 +64,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .permitAll() .requestMatchers("/auth/login", "/auth/logout") .permitAll() - .requestMatchers("/v0/workflows/**").permitAll() + .requestMatchers("/v0/workflows/**") + .permitAll() .requestMatchers("/v0/auth/check-session") .authenticated() .requestMatchers(SecurityEndpoints.DATA_ADMIN.getMatchers()) diff --git a/apps/user-service/src/main/java/site/icebang/global/config/security/endpoints/SecurityEndpoints.java b/apps/user-service/src/main/java/site/icebang/global/config/security/endpoints/SecurityEndpoints.java index c4c4b72f..bdd0eb48 100644 --- a/apps/user-service/src/main/java/site/icebang/global/config/security/endpoints/SecurityEndpoints.java +++ b/apps/user-service/src/main/java/site/icebang/global/config/security/endpoints/SecurityEndpoints.java @@ -26,7 +26,7 @@ public enum SecurityEndpoints { OPS("/api/scheduler/**", "/api/monitoring/**"), // 일반 사용자 엔드포인트 - USER("/user/**", "/profile/**", "/v0/auth/check-session","/v0/workflows/**"); + USER("/user/**", "/profile/**", "/v0/auth/check-session", "/v0/workflows/**"); private final String[] patterns; From 6cbcf64bcc960209a13348724b112baff00aa5d6 Mon Sep 17 00:00:00 2001 From: bwnfo3 Date: Wed, 17 Sep 2025 14:09:00 +0900 Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94?= =?UTF-8?q?=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icebang/domain/workflow/service/WorkflowService.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java index 052b96fa..f66cb61c 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java +++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java @@ -27,9 +27,4 @@ public PageResult getPagedResult(PageParams pageParams) { () -> workflowMapper.selectWorkflowList(pageParams), () -> workflowMapper.selectWorkflowCount(pageParams)); } - - @Transactional(readOnly = true) - public WorkflowCardDto getWorkflowById(BigInteger id) { - return workflowMapper.selectWorkflowById(id); - } } From cd784d173cd9f93754f53b0799831b373f530e51 Mon Sep 17 00:00:00 2001 From: bwnfo3 Date: Wed, 17 Sep 2025 14:12:15 +0900 Subject: [PATCH 8/8] fix: spotlessApply --- .../site/icebang/domain/workflow/service/WorkflowService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java index f66cb61c..71600b4b 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java +++ b/apps/user-service/src/main/java/site/icebang/domain/workflow/service/WorkflowService.java @@ -1,7 +1,5 @@ package site.icebang.domain.workflow.service; -import java.math.BigInteger; - import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional;