From aa62139b0f062432166196d96a9629c2dea1ff56 Mon Sep 17 00:00:00 2001 From: arlen02-01 Date: Mon, 26 Jan 2026 12:37:38 +0900 Subject: [PATCH 1/6] =?UTF-8?q?UPLUS-57=20STYLE=20:=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/project/core/controller/CustomerController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/project/core/controller/CustomerController.java b/src/main/java/com/project/core/controller/CustomerController.java index 3f1b4da..143b0d0 100644 --- a/src/main/java/com/project/core/controller/CustomerController.java +++ b/src/main/java/com/project/core/controller/CustomerController.java @@ -48,10 +48,10 @@ public ResponseEntity> getAllCustomers( } /** 고객 조회 (전화번호 기준) */ - @PostMapping("/search") - public ResponseEntity searchByPhone( - @RequestBody PhoneSearchRequest request) { - Customer customer = customerService.loadByPhone(request.phoneRaw()); + @PostMapping("/search") + public ResponseEntity searchByPhone( + @RequestBody PhoneSearchRequest request) { + Customer customer = customerService.loadByPhone(request.phoneRaw()); Long customerId = customer.getCustomerId(); List subscriptions = From 31824638b4187cb59f02c4d389f8c3bb56409a5a Mon Sep 17 00:00:00 2001 From: arlen02-01 Date: Mon, 26 Jan 2026 12:44:25 +0900 Subject: [PATCH 2/6] =?UTF-8?q?UPLUS-57=20fix=20:=20ai=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EB=A6=AC=EB=B7=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infra/repository/TemplateGroupRepository.java | 10 ---------- .../notification/service/TemplateGroupService.java | 8 ++------ .../project/core/service/SubscriptionServiceTest.java | 8 ++++++++ 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/project/notification/infra/repository/TemplateGroupRepository.java b/src/main/java/com/project/notification/infra/repository/TemplateGroupRepository.java index e39b927..d38e0ad 100644 --- a/src/main/java/com/project/notification/infra/repository/TemplateGroupRepository.java +++ b/src/main/java/com/project/notification/infra/repository/TemplateGroupRepository.java @@ -32,14 +32,4 @@ Page search( @Param("keyword") String keyword, Pageable pageable); - @Query( - """ - select g from TemplateGroup g - where (:includeDeleted = true or g.isDeleted = false) - and (:isActive is null or g.isActive = :isActive) - """) - Page searchWithoutKeyword( - @Param("isActive") Boolean isActive, - @Param("includeDeleted") boolean includeDeleted, - Pageable pageable); } diff --git a/src/main/java/com/project/notification/service/TemplateGroupService.java b/src/main/java/com/project/notification/service/TemplateGroupService.java index dd9be81..3b4f12b 100644 --- a/src/main/java/com/project/notification/service/TemplateGroupService.java +++ b/src/main/java/com/project/notification/service/TemplateGroupService.java @@ -56,13 +56,9 @@ public TemplateGroupResponse create(TemplateGroupCreateRequest request) { // 그룹 목록 조회 public Page getGroups( Boolean isActive, boolean includeDeleted, String keyword, Pageable pageable) { - if (keyword == null || keyword.isBlank()) { - return groupRepository - .searchWithoutKeyword(isActive, includeDeleted, pageable) - .map(TemplateGroupResponse::from); - } + String normalizedKeyword = (keyword == null || keyword.isBlank()) ? null : keyword; return groupRepository - .search(isActive, includeDeleted, keyword, pageable) + .search(isActive, includeDeleted, normalizedKeyword, pageable) .map(TemplateGroupResponse::from); } diff --git a/src/test/java/com/project/core/service/SubscriptionServiceTest.java b/src/test/java/com/project/core/service/SubscriptionServiceTest.java index a1dbf5b..a5787ef 100644 --- a/src/test/java/com/project/core/service/SubscriptionServiceTest.java +++ b/src/test/java/com/project/core/service/SubscriptionServiceTest.java @@ -69,6 +69,10 @@ void getAllSubscriptionsSuccess() { // SubscriptionPlan Mock 설정 (Mockito mock 사용) SubscriptionPlan subPlan = org.mockito.Mockito.mock(SubscriptionPlan.class); + com.project.core.infra.entity.plan.Plan plan = + org.mockito.Mockito.mock(com.project.core.infra.entity.plan.Plan.class); + given(plan.getPlanName()).willReturn("BASIC"); + given(subPlan.getPlan()).willReturn(plan); given(subPlan.getSubscription()).willReturn(sub); given(subPlan.getAllotmentPeriod()).willReturn(AllotmentPeriod.MONTH); given(subPlan.getAllotmentAmount()).willReturn(10240L); @@ -111,6 +115,10 @@ void getSubscriptionDetailByPhoneSuccess() { // SubscriptionPlan Mock 설정 (Mockito mock 사용) SubscriptionPlan subPlan = org.mockito.Mockito.mock(SubscriptionPlan.class); + com.project.core.infra.entity.plan.Plan plan = + org.mockito.Mockito.mock(com.project.core.infra.entity.plan.Plan.class); + given(plan.getPlanName()).willReturn("BASIC"); + given(subPlan.getPlan()).willReturn(plan); given(subPlan.getSubscription()).willReturn(sub); given(subPlan.getAllotmentPeriod()).willReturn(AllotmentPeriod.MONTH); given(subPlan.getAllotmentAmount()).willReturn(10240L); From 028d22719b25f60348f616c6b079f212573a4757 Mon Sep 17 00:00:00 2001 From: arlen02-01 Date: Mon, 26 Jan 2026 13:43:14 +0900 Subject: [PATCH 3/6] =?UTF-8?q?UPLUS-57=20feat=20:=20=EA=B7=B8=EB=9D=BC?= =?UTF-8?q?=ED=8C=8C=EB=82=98=20=EB=A7=81=ED=81=AC=20=EB=B6=80=EC=97=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-secret.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-secret.yml b/src/main/resources/application-secret.yml index b567ae5..ac8c176 100644 --- a/src/main/resources/application-secret.yml +++ b/src/main/resources/application-secret.yml @@ -3,5 +3,5 @@ ureca: hash-key: ${URECA_HASH_KEY} billing: grafana: - iframe-url: http://34.22.76.102/d-solo/cfb0vm63z241sc/test?orgId=1&from=1769139882304&to=1769161482304&timezone=browser&panelId=1&__feature.dashboardSceneSolo + iframe-url: https://grafana.4e-um.cloud/public-dashboards/1656cac08ded4a22820d1ec97d3edad6?orgId=1 refresh-interval: 5s From 30c906b5ae782c54821247c54434b1b017e8dba0 Mon Sep 17 00:00:00 2001 From: arlen02-01 Date: Mon, 26 Jan 2026 14:00:13 +0900 Subject: [PATCH 4/6] =?UTF-8?q?[UPLUS-57]=20style=20:=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notification/infra/repository/TemplateGroupRepository.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/project/notification/infra/repository/TemplateGroupRepository.java b/src/main/java/com/project/notification/infra/repository/TemplateGroupRepository.java index d38e0ad..d245262 100644 --- a/src/main/java/com/project/notification/infra/repository/TemplateGroupRepository.java +++ b/src/main/java/com/project/notification/infra/repository/TemplateGroupRepository.java @@ -31,5 +31,4 @@ Page search( @Param("includeDeleted") boolean includeDeleted, @Param("keyword") String keyword, Pageable pageable); - } From 0dcd58a5c728c415de98cc1354f950ebaeedde39 Mon Sep 17 00:00:00 2001 From: arlen02-01 Date: Mon, 26 Jan 2026 14:13:12 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[UPLUS-125]=20fix=20:=20ai=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EB=A6=AC=EB=B7=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infra/repository/plan/SubscriptionPlanRepository.java | 2 +- .../com/project/core/service/SubscriptionServiceTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/project/core/infra/repository/plan/SubscriptionPlanRepository.java b/src/main/java/com/project/core/infra/repository/plan/SubscriptionPlanRepository.java index 14f8d72..1e54683 100644 --- a/src/main/java/com/project/core/infra/repository/plan/SubscriptionPlanRepository.java +++ b/src/main/java/com/project/core/infra/repository/plan/SubscriptionPlanRepository.java @@ -13,7 +13,7 @@ public interface SubscriptionPlanRepository extends JpaRepository CURRENT_TIMESTAMP") Optional findActivePlanBySubId(@Param("subId") Long subId); diff --git a/src/test/java/com/project/core/service/SubscriptionServiceTest.java b/src/test/java/com/project/core/service/SubscriptionServiceTest.java index 4315915..50b0841 100644 --- a/src/test/java/com/project/core/service/SubscriptionServiceTest.java +++ b/src/test/java/com/project/core/service/SubscriptionServiceTest.java @@ -28,6 +28,7 @@ import com.project.core.controller.dto.response.SubscriptionResponse; import com.project.core.infra.entity.customer.Customer; import com.project.core.infra.entity.customer.enums.Grade; +import com.project.core.infra.entity.plan.Plan; import com.project.core.infra.entity.plan.SubscriptionPlan; import com.project.core.infra.entity.plan.enums.AllotmentPeriod; import com.project.core.infra.entity.subscription.Subscription; @@ -150,8 +151,7 @@ private static Subscription newInstanceSubscription(Long subId, Customer custome private static SubscriptionPlan setupMockSubscriptionPlan(Subscription sub) { SubscriptionPlan subPlan = org.mockito.Mockito.mock(SubscriptionPlan.class); - com.project.core.infra.entity.plan.Plan plan = - org.mockito.Mockito.mock(com.project.core.infra.entity.plan.Plan.class); + Plan plan = org.mockito.Mockito.mock(Plan.class); given(plan.getPlanName()).willReturn("BASIC"); given(subPlan.getPlan()).willReturn(plan); given(subPlan.getSubscription()).willReturn(sub); From 0b6b7e314d5916e52911ebdb26a318ee2b9ed1c2 Mon Sep 17 00:00:00 2001 From: arlen02-01 Date: Mon, 26 Jan 2026 14:41:00 +0900 Subject: [PATCH 6/6] =?UTF-8?q?UPLUS-125=20fix:=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95(=ED=83=AC=ED=94=8C=EB=A6=BF=20=EB=84=90=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/notification/service/TemplateGroupService.java | 2 +- src/main/resources/logback-spring.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/project/notification/service/TemplateGroupService.java b/src/main/java/com/project/notification/service/TemplateGroupService.java index 3b4f12b..3c32a7d 100644 --- a/src/main/java/com/project/notification/service/TemplateGroupService.java +++ b/src/main/java/com/project/notification/service/TemplateGroupService.java @@ -56,7 +56,7 @@ public TemplateGroupResponse create(TemplateGroupCreateRequest request) { // 그룹 목록 조회 public Page getGroups( Boolean isActive, boolean includeDeleted, String keyword, Pageable pageable) { - String normalizedKeyword = (keyword == null || keyword.isBlank()) ? null : keyword; + String normalizedKeyword = (keyword == null || keyword.isBlank()) ? "" : keyword; return groupRepository .search(isActive, includeDeleted, normalizedKeyword, pageable) .map(TemplateGroupResponse::from); diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index d510c48..0fc80e3 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -43,4 +43,9 @@ + + + + +