From c3f77faeba0efce23d933e5504a8a1015da15993 Mon Sep 17 00:00:00 2001
From: Jeonghyun Kang <rilac1@naver.com>
Date: Sat, 14 Oct 2023 18:32:21 +0900
Subject: [PATCH 1/4] =?UTF-8?q?YW2-227=20feat:=20FeignClient=20=EB=AA=85?=
 =?UTF-8?q?=EC=84=B8=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dangle/adapter/http/config/FeignConfig.kt |  4 ++--
 .../adapter/http/config/HttpAdapterConfig.kt  |  8 +++----
 .../http/kakao/KakaoNotificationClient.kt     | 13 ------------
 .../http/ncp/NcpKakaoNotificationClient.kt    | 21 +++++++++++++++++++
 4 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/KakaoNotificationClient.kt
 create mode 100644 dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/NcpKakaoNotificationClient.kt

diff --git a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/FeignConfig.kt b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/FeignConfig.kt
index 39d01ad..bf7352a 100644
--- a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/FeignConfig.kt
+++ b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/FeignConfig.kt
@@ -1,13 +1,13 @@
 package com.dangle.adapter.http.config
 
-import com.dangle.adapter.http.kakao.KakaoNotificationClient
+import com.dangle.adapter.http.ncp.NcpKakaoNotificationClient
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.cloud.openfeign.EnableFeignClients
 import org.springframework.cloud.openfeign.FeignClientProperties
 
 @EnableFeignClients(
     clients = [
-        KakaoNotificationClient::class,
+        NcpKakaoNotificationClient::class,
     ]
 )
 @EnableConfigurationProperties(FeignClientProperties::class)
diff --git a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/HttpAdapterConfig.kt b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/HttpAdapterConfig.kt
index 9fa719f..99bec36 100644
--- a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/HttpAdapterConfig.kt
+++ b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/HttpAdapterConfig.kt
@@ -1,7 +1,7 @@
 package com.dangle.adapter.http.config
 
-import com.dangle.adapter.http.kakao.KakaoNotificationAdapter
-import com.dangle.adapter.http.kakao.KakaoNotificationClient
+import com.dangle.adapter.http.ncp.NcpKakaoNotificationClient
+import com.dangle.adapter.http.ncp.NcpKakaoNotificationAdapter
 import com.dangle.usecase.notification.port.out.KakaoNotificationPort
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -14,8 +14,8 @@ import org.springframework.context.annotation.Import
 class HttpAdapterConfig {
     @Bean
     fun kakaoNotificationPort(
-        kakaoNotificationClient: KakaoNotificationClient,
+        ncpKakaoNotificationClient: NcpKakaoNotificationClient,
     ): KakaoNotificationPort {
-        return KakaoNotificationAdapter(kakaoNotificationClient)
+        return NcpKakaoNotificationAdapter(ncpKakaoNotificationClient)
     }
 }
diff --git a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/KakaoNotificationClient.kt b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/KakaoNotificationClient.kt
deleted file mode 100644
index 7ca0c9a..0000000
--- a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/KakaoNotificationClient.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dangle.adapter.http.kakao
-
-import com.dangle.adapter.http.kakao.dto.KakaoNotificationRequest
-import com.dangle.adapter.http.kakao.dto.KakaoNotificationResponse
-import org.springframework.cloud.openfeign.FeignClient
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-
-@FeignClient(name = "kakaoNotifiactionFeignClient", url = "TBD")
-interface KakaoNotificationClient {
-    @PostMapping(value = ["/TBD"])
-    fun send(@RequestBody request: KakaoNotificationRequest): KakaoNotificationResponse
-}
diff --git a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/NcpKakaoNotificationClient.kt b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/NcpKakaoNotificationClient.kt
new file mode 100644
index 0000000..d8f3b9e
--- /dev/null
+++ b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/NcpKakaoNotificationClient.kt
@@ -0,0 +1,21 @@
+package com.dangle.adapter.http.ncp
+
+import com.dangle.adapter.http.ncp.dto.NcpKakaoNotificationRequest
+import com.dangle.adapter.http.ncp.dto.NcpKakaoNotificationResponse
+import org.springframework.cloud.openfeign.FeignClient
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestHeader
+
+@FeignClient(name = "ncpKakaoNotificationFeignClient", url = "https://sens.apigw.ntruss.com/alimtalk/v2")
+interface NcpKakaoNotificationClient {
+    @PostMapping(value = ["services/{serviceId}/messages"])
+    fun send(
+        @RequestHeader("x-ncp-apigw-timestamp") timestamp: String, // Millisecond
+        @RequestHeader("x-ncp-apigw-x-ncp-iam-access-key") subAccountAccessKey: String,
+        @RequestHeader("x-ncp-apigw-signature-v2") apiGatewaySignature: String, // HmacSHA256
+        @PathVariable("serviceId") serviceId: String,
+        @RequestBody request: NcpKakaoNotificationRequest
+    ): NcpKakaoNotificationResponse
+}

From 956928ad065495cee028c7599b6ecb1a7156243e Mon Sep 17 00:00:00 2001
From: Jeonghyun Kang <rilac1@naver.com>
Date: Sat, 14 Oct 2023 18:32:37 +0900
Subject: [PATCH 2/4] =?UTF-8?q?YW2-227=20feat:=20=EC=9A=94=EC=B2=AD,=20?=
 =?UTF-8?q?=EC=9D=91=EB=8B=B5=EA=B0=92=20=EB=AA=85=EC=84=B8=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../http/kakao/dto/KakaoNotification.kt       |  7 --
 .../http/ncp/dto/NcpKakaoNotification.kt      | 74 +++++++++++++++++++
 2 files changed, 74 insertions(+), 7 deletions(-)
 delete mode 100644 dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/dto/KakaoNotification.kt
 create mode 100644 dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/dto/NcpKakaoNotification.kt

diff --git a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/dto/KakaoNotification.kt b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/dto/KakaoNotification.kt
deleted file mode 100644
index 8c92fe1..0000000
--- a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/dto/KakaoNotification.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.dangle.adapter.http.kakao.dto
-
-class KakaoNotificationRequest
-
-class KakaoNotificationResponse {
-    fun isSuccess(): Boolean = true
-}
diff --git a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/dto/NcpKakaoNotification.kt b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/dto/NcpKakaoNotification.kt
new file mode 100644
index 0000000..f5a91ed
--- /dev/null
+++ b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/dto/NcpKakaoNotification.kt
@@ -0,0 +1,74 @@
+package com.dangle.adapter.http.ncp.dto
+
+data class NcpKakaoNotificationRequest(
+    val plusFriendId: String,
+    val templateCode: String,
+    val messages: List<Message>,
+    val reserveTime: String, // yyyy-MM-dd HH:mm
+    val reserveTimeZone: String,
+) {
+    data class Message(
+        val countryCode: String,
+        val to: String,
+        val title: String,
+        val content: String,
+        val headerContent: String,
+        val itemHighlight: ItemHighlight,
+        val item: List<Item>,
+        val buttons: List<Button>,
+        val useSmsFailover: Boolean,
+        val failoverConfig: FailoverConfig,
+    )
+
+    data class ItemHighlight(
+        val title: String,
+        val description: String,
+    )
+
+    data class Item(
+        val list: List<ItemContents>,
+        val summary: ItemContents,
+    )
+
+    data class ItemContents(
+        val title: String,
+        val description: String,
+    )
+
+    data class Button(
+        val type: String,
+        val name: String,
+        val linkMobile: String,
+        val linkPc: String,
+        val schemeIos: String,
+        val schemeAndroid: String,
+    )
+
+    data class FailoverConfig(
+        val type: String,
+        val from: String,
+        val subject: String,
+        val content: String,
+    )
+}
+
+data class NcpKakaoNotificationResponse(
+    val requestId: String,
+    val requestTime: String,
+    val statusCode: String,
+    val statusName: String,
+    val messages: List<Message>,
+) {
+    fun isSuccess(): Boolean = true
+
+    data class Message(
+        val messageId: String,
+        val countryCode: String,
+        val to: String,
+        val content: String,
+        val requestStatusCode: String,
+        val requestStatusName: String,
+        val requestStatusDesc: String,
+        val useSmsFailover: Boolean,
+    )
+}

From 6c9fef6bd2ca7efb7e7a1cc759fa802aa169b08d Mon Sep 17 00:00:00 2001
From: Jeonghyun Kang <rilac1@naver.com>
Date: Sat, 14 Oct 2023 18:33:11 +0900
Subject: [PATCH 3/4] =?UTF-8?q?YW2-227=20feat:=20=EC=96=B4=EB=8C=91?=
 =?UTF-8?q?=ED=84=B0=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../http/kakao/KakaoNotificationAdapter.kt    | 20 -----------
 .../http/ncp/NcpKakaoNotificationAdapter.kt   | 33 +++++++++++++++++++
 2 files changed, 33 insertions(+), 20 deletions(-)
 delete mode 100644 dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/KakaoNotificationAdapter.kt
 create mode 100644 dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/NcpKakaoNotificationAdapter.kt

diff --git a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/KakaoNotificationAdapter.kt b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/KakaoNotificationAdapter.kt
deleted file mode 100644
index d24ba52..0000000
--- a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/kakao/KakaoNotificationAdapter.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dangle.adapter.http.kakao
-
-import com.dangle.adapter.http.kakao.dto.KakaoNotificationRequest
-import com.dangle.usecase.notification.port.out.KakaoNotificationPort
-
-class KakaoNotificationAdapter(
-    private val kakaoNotificationClient: KakaoNotificationClient,
-) : KakaoNotificationPort {
-    override fun send(
-        targetPhoneNumber: String,
-        templateName: String,
-        variables: Map<String, String>,
-    ) {
-        // TOOD(kang) 연동 필요
-        val response = kakaoNotificationClient.send(KakaoNotificationRequest())
-        if (!response.isSuccess()) {
-            // TODO(kang). 에러로그 남기기
-        }
-    }
-}
diff --git a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/NcpKakaoNotificationAdapter.kt b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/NcpKakaoNotificationAdapter.kt
new file mode 100644
index 0000000..a8a472c
--- /dev/null
+++ b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/ncp/NcpKakaoNotificationAdapter.kt
@@ -0,0 +1,33 @@
+package com.dangle.adapter.http.ncp
+
+import com.dangle.adapter.http.ncp.dto.NcpKakaoNotificationRequest
+import com.dangle.usecase.notification.port.out.KakaoNotificationPort
+
+class NcpKakaoNotificationAdapter(
+    private val ncpKakaoNotificationClient: NcpKakaoNotificationClient,
+) : KakaoNotificationPort {
+    override fun send(
+        targetPhoneNumber: String,
+        templateName: String,
+        variables: Map<String, String>,
+    ) {
+        val request = NcpKakaoNotificationRequest(
+            plusFriendId = "TBD",
+            templateCode = "TBD",
+            messages = listOf(),
+            reserveTime = "TBD",
+            reserveTimeZone = "TBD"
+
+        )
+        val response = ncpKakaoNotificationClient.send(
+            timestamp = "TBD",
+            subAccountAccessKey = "TBD",
+            apiGatewaySignature = "TBD",
+            serviceId = "TBD",
+            request = request,
+        )
+        if (!response.isSuccess()) {
+            // TODO(kang). 에러로그 남기기
+        }
+    }
+}

From c16700fef394527c81c544a57d50dda12ff7dff2 Mon Sep 17 00:00:00 2001
From: Jeonghyun Kang <rilac1@naver.com>
Date: Sat, 14 Oct 2023 18:42:49 +0900
Subject: [PATCH 4/4] =?UTF-8?q?YW2-227=20feat:=20ktlint=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/com/dangle/adapter/http/config/HttpAdapterConfig.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/HttpAdapterConfig.kt b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/HttpAdapterConfig.kt
index 99bec36..70469c2 100644
--- a/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/HttpAdapterConfig.kt
+++ b/dangle-adapter/http/src/main/kotlin/com/dangle/adapter/http/config/HttpAdapterConfig.kt
@@ -1,7 +1,7 @@
 package com.dangle.adapter.http.config
 
-import com.dangle.adapter.http.ncp.NcpKakaoNotificationClient
 import com.dangle.adapter.http.ncp.NcpKakaoNotificationAdapter
+import com.dangle.adapter.http.ncp.NcpKakaoNotificationClient
 import com.dangle.usecase.notification.port.out.KakaoNotificationPort
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration