From dce0e115aef53483ee23941687fb3ae96d619824 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 20 Oct 2026 08:28:48 +0900 Subject: [PATCH] =?UTF-8?q?261020=5F01=5FENH:=20KKO=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=97=90=20RDY=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EB=8F=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../external/kakao/KkoTemplateApiClient.java | 4 +- .../server/config/KkoTemplateProperties.java | 13 ++++++ .../server/service/KkoTemplateService.java | 40 +++++++++++++------ src/main/resources/application.yml | 3 ++ 5 files changed, 46 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index ad293b5..5d2f21a 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.6.7" + implementation "com.kri.common:starter:beta.1.7.0" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/notihub/server/common/external/kakao/KkoTemplateApiClient.java b/src/main/java/com/kri/notihub/server/common/external/kakao/KkoTemplateApiClient.java index ef718bb..986ea4a 100644 --- a/src/main/java/com/kri/notihub/server/common/external/kakao/KkoTemplateApiClient.java +++ b/src/main/java/com/kri/notihub/server/common/external/kakao/KkoTemplateApiClient.java @@ -33,9 +33,9 @@ public class KkoTemplateApiClient { this.externalApiClient = externalApiClient; } - public JsonNode list(String keyword) { + public JsonNode list(String keyword, String templateStatus) { Map request = credentials(); - request.put("templateStatus", "ACT"); + request.put("templateStatus", templateStatus); if (keyword == null || keyword.isBlank()) { request.put("page", 1); request.put("count", 10); diff --git a/src/main/java/com/kri/notihub/server/config/KkoTemplateProperties.java b/src/main/java/com/kri/notihub/server/config/KkoTemplateProperties.java index cfb7974..3fd3308 100644 --- a/src/main/java/com/kri/notihub/server/config/KkoTemplateProperties.java +++ b/src/main/java/com/kri/notihub/server/config/KkoTemplateProperties.java @@ -1,6 +1,10 @@ package com.kri.notihub.server.config; +import jakarta.validation.constraints.AssertTrue; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import java.util.HashSet; +import java.util.List; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -22,4 +26,13 @@ public class KkoTemplateProperties { private String apiKey; @NotBlank private String senderKey; + + @NotEmpty + private List<@NotBlank String> templateStatuses; + + @AssertTrue(message = "template-statuses must not contain duplicate values") + public boolean isTemplateStatusesUnique() { + return templateStatuses == null + || new HashSet<>(templateStatuses).size() == templateStatuses.size(); + } } diff --git a/src/main/java/com/kri/notihub/server/service/KkoTemplateService.java b/src/main/java/com/kri/notihub/server/service/KkoTemplateService.java index 7c1e2e9..1acd329 100644 --- a/src/main/java/com/kri/notihub/server/service/KkoTemplateService.java +++ b/src/main/java/com/kri/notihub/server/service/KkoTemplateService.java @@ -11,7 +11,8 @@ import com.kri.notihub.server.dto.template.KkoTemplateListResponseDto; import com.kri.notihub.server.dto.template.KkoTemplateSummaryDto; import com.kri.notihub.server.dto.template.TemplateBasicDto; import java.util.ArrayList; -import java.util.List; +import java.util.LinkedHashMap; +import java.util.Map; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -29,21 +30,34 @@ public class KkoTemplateService { throw BusinessException.badRequest("KKO_TEMPLATE_INVALID_KEYWORD", "검색어는 2자 이상 50자 이하여야 합니다."); } - JsonNode root = apiClient.list(normalized); - JsonNode items = root.path("data").path("list"); - if (!items.isArray()) { - throw KkoTemplateApiClient.invalidResponse(); - } - List list = new ArrayList<>(); - for (JsonNode item : items) { - if (!item.isObject() || !item.path("templateCode").isTextual() - || !item.path("templateName").isTextual()) { + Map templates = new LinkedHashMap<>(); + int totalCount = 0; + int totalPage = 0; + int currentPage = 0; + for (String templateStatus : properties.getTemplateStatuses()) { + JsonNode root = apiClient.list(normalized, templateStatus); + JsonNode items = root.path("data").path("list"); + if (!items.isArray()) { throw KkoTemplateApiClient.invalidResponse(); } - list.add(read(item, KkoTemplateSummaryDto.class)); + for (JsonNode item : items) { + if (!item.isObject() || !item.path("templateCode").isTextual() + || !item.path("templateName").isTextual()) { + throw KkoTemplateApiClient.invalidResponse(); + } + KkoTemplateSummaryDto template = read(item, KkoTemplateSummaryDto.class); + templates.putIfAbsent(template.getTemplateCode(), template); + } + int count = nonNegativeInt(root, "totalCount"); + if (count > Integer.MAX_VALUE - totalCount) { + throw KkoTemplateApiClient.invalidResponse(); + } + totalCount += count; + totalPage = Math.max(totalPage, nonNegativeInt(root, "totalPage")); + currentPage = Math.max(currentPage, nonNegativeInt(root, "currentPage")); } - return new KkoTemplateListResponseDto(nonNegativeInt(root, "totalCount"), - nonNegativeInt(root, "totalPage"), nonNegativeInt(root, "currentPage"), list); + return new KkoTemplateListResponseDto(totalCount, totalPage, currentPage, + new ArrayList<>(templates.values())); } public KkoTemplateDetailDto getDetail(String templateCode) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 71adcb7..23545c9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -127,6 +127,9 @@ kri: notihub: kakao: + template-statuses: + - ACT + - RDY base-url: https://kapi.ppurio.com/v3/kakao biz-id: kri_notihub api-key: weMdoq0nCGHA