From b15035cb3205edf446ac8d50636623f0af903217 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 2 Nov 2026 12:07:55 +0900 Subject: [PATCH 1/2] =?UTF-8?q?261102=5F01=5FENH:=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=ED=86=A1=20=EB=B0=9C=EC=8B=A0=20=ED=94=84=EB=A1=9C=ED=95=84=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20?= =?UTF-8?q?=ED=85=9C=ED=94=8C=EB=A6=BF=20=EC=A1=B0=ED=9A=8C=20=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=EC=97=90=20senderKey=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/external/notihub/NotiHubApiClient.java | 8 ++++++++ .../notihub/dto/NotiHubKkoSenderProfileDto.java | 11 +++++++++++ .../dto/NotiHubKkoTemplateDetailRequestDto.java | 3 +++ .../notihub/dto/NotiHubKkoTemplateListRequestDto.java | 3 +++ .../server/controller/MessageTemplateController.java | 9 +++++++++ .../server/service/MessageTemplateService.java | 8 ++++++++ src/main/resources/application-local.yml | 4 ++-- 7 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoSenderProfileDto.java diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubApiClient.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubApiClient.java index 99e3a14..ff6e57f 100644 --- a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubApiClient.java +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubApiClient.java @@ -13,6 +13,7 @@ import com.kri.common.feature.web.RequestUserContext; import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendCreateRequestDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendInfoDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendResponseDto; +import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoSenderProfileDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoTemplateDetailDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoTemplateDetailRequestDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoTemplateListRequestDto; @@ -132,6 +133,13 @@ public class NotiHubApiClient { return sendBulk("/send-kko/bulk", request); } + public ResponseEntity> getKkoSenderProfiles( + HttpServletRequest request, + RequestUserContext ctx + ) { + return relay(request, null, new ParameterizedTypeReference<>() {}, ctx); + } + public ResponseEntity getKkoTemplateList( NotiHubKkoTemplateListRequestDto body, HttpServletRequest request, diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoSenderProfileDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoSenderProfileDto.java new file mode 100644 index 0000000..6f184b1 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoSenderProfileDto.java @@ -0,0 +1,11 @@ +package com.kri.contact.server.common.external.notihub.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "Kakao sender profile") +public record NotiHubKkoSenderProfileDto( + String senderKey, + String name, + String uuid +) { +} diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoTemplateDetailRequestDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoTemplateDetailRequestDto.java index 5d37b98..e1d65ec 100644 --- a/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoTemplateDetailRequestDto.java +++ b/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoTemplateDetailRequestDto.java @@ -1,11 +1,14 @@ package com.kri.contact.server.common.external.notihub.dto; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; public record NotiHubKkoTemplateDetailRequestDto( + @Schema(description = "Selected sender profile key; validated by NotiHub", requiredMode = Schema.RequiredMode.REQUIRED) + String senderKey, @NotBlank @Size(max = 30) @Pattern(regexp = "[A-Za-z0-9_-]+") diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoTemplateListRequestDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoTemplateListRequestDto.java index 36e7927..40a0fe5 100644 --- a/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoTemplateListRequestDto.java +++ b/src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubKkoTemplateListRequestDto.java @@ -1,9 +1,12 @@ package com.kri.contact.server.common.external.notihub.dto; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; public record NotiHubKkoTemplateListRequestDto( + @Schema(description = "Selected sender profile key; validated by NotiHub", requiredMode = Schema.RequiredMode.REQUIRED) + String senderKey, @Size(min = 2, max = 50) String keyword ) { diff --git a/src/main/java/com/kri/contact/server/controller/MessageTemplateController.java b/src/main/java/com/kri/contact/server/controller/MessageTemplateController.java index 469d05a..e42ab61 100644 --- a/src/main/java/com/kri/contact/server/controller/MessageTemplateController.java +++ b/src/main/java/com/kri/contact/server/controller/MessageTemplateController.java @@ -1,6 +1,7 @@ package com.kri.contact.server.controller; import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoSenderProfileDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoTemplateDetailDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoTemplateDetailRequestDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoTemplateListRequestDto; @@ -37,6 +38,14 @@ public class MessageTemplateController { private final MessageTemplateService messageTemplateService; + @GetMapping("/kko/profiles") + public ResponseEntity> getKkoSenderProfiles( + HttpServletRequest request, + RequestUserContext ctx + ) { + return messageTemplateService.getKkoSenderProfiles(request, ctx); + } + @PostMapping(value = "/kko/list", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getKkoTemplateList( @Valid @RequestBody NotiHubKkoTemplateListRequestDto body, diff --git a/src/main/java/com/kri/contact/server/service/MessageTemplateService.java b/src/main/java/com/kri/contact/server/service/MessageTemplateService.java index 9089825..b5e6549 100644 --- a/src/main/java/com/kri/contact/server/service/MessageTemplateService.java +++ b/src/main/java/com/kri/contact/server/service/MessageTemplateService.java @@ -2,6 +2,7 @@ package com.kri.contact.server.service; import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoSenderProfileDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoTemplateDetailDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoTemplateDetailRequestDto; import com.kri.contact.server.common.external.notihub.dto.NotiHubKkoTemplateListRequestDto; @@ -25,6 +26,13 @@ public class MessageTemplateService { private final NotiHubApiClient notiHubApiClient; private final ProjectMainTemplateRepository projectMainTemplateRepository; + public ResponseEntity> getKkoSenderProfiles( + HttpServletRequest request, + RequestUserContext ctx + ) { + return notiHubApiClient.getKkoSenderProfiles(request, ctx); + } + public ResponseEntity getKkoTemplateList( NotiHubKkoTemplateListRequestDto body, HttpServletRequest request, diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 68dd75b..8d27783 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,8 +2,8 @@ kri: api-url: #intranet-extension: "http://localhost:3031/api/v1" intranet-extension: https://intranet-ext.kric.com/api/v1 - #noti-hub: http://localhost:4011/api/v1 - noti-hub: https://noti-hub.kric.com/api/v1 + noti-hub: http://localhost:4011/api/v1 + #noti-hub: https://noti-hub.kric.com/api/v1 short-url: https://short-url.kric.com/api/v1 #kart: http://localhost:4014/api/kric-internal kart: https://test-kart.kric.com/api/kric-internal -- 2.49.0.windows.1 From c4ef361c3d03b7704077171c55482baac389e42e Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 2 Nov 2026 12:08:53 +0900 Subject: [PATCH 2/2] =?UTF-8?q?261102=5F02=5FDOC:=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=ED=96=88=EB=8D=98=20=EB=A1=9C=EC=BB=AC=20notihub=EC=97=90=20?= =?UTF-8?q?=EB=8C=80=ED=95=9C=20=EA=B2=BD=EB=A1=9C=EB=A5=BC=20=EB=8B=A4?= =?UTF-8?q?=EC=8B=9C=20=EC=8B=A4=EC=84=9C=EB=B9=84=EC=8A=A4=EB=A1=9C=20?= =?UTF-8?q?=EB=8F=8C=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 8d27783..68dd75b 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,8 +2,8 @@ kri: api-url: #intranet-extension: "http://localhost:3031/api/v1" intranet-extension: https://intranet-ext.kric.com/api/v1 - noti-hub: http://localhost:4011/api/v1 - #noti-hub: https://noti-hub.kric.com/api/v1 + #noti-hub: http://localhost:4011/api/v1 + noti-hub: https://noti-hub.kric.com/api/v1 short-url: https://short-url.kric.com/api/v1 #kart: http://localhost:4014/api/kric-internal kart: https://test-kart.kric.com/api/kric-internal -- 2.49.0.windows.1