From a85459c44a35870ebda618a5bfe0909bcae1e561 Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Wed, 11 Sep 2024 17:16:30 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=ED=86=A1=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=98=EC=98=81=20-=20=EB=AA=A8?=
 =?UTF-8?q?=EB=B0=94=EC=9D=BC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/KkoTalkMblPageController.java   |  5 -----
 .../modules/kkotalk/service/KkoTalkService.java  | 16 ++++++++--------
 .../modules/iup-kkotalk-mapper.xml               |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/java/cokr/xit/ens/modules/kkotalk/presentation/KkoTalkMblPageController.java b/src/main/java/cokr/xit/ens/modules/kkotalk/presentation/KkoTalkMblPageController.java
index 72a5fb6..0fa1eb2 100644
--- a/src/main/java/cokr/xit/ens/modules/kkotalk/presentation/KkoTalkMblPageController.java
+++ b/src/main/java/cokr/xit/ens/modules/kkotalk/presentation/KkoTalkMblPageController.java
@@ -39,13 +39,10 @@ public class KkoTalkMblPageController extends MblPageControllerSupport {
         final String envelopeId = mParam.get("envelopeId");
         final String externalId = mParam.get("externalId");
 
-
         try {
             if (CmmnUtil.isEmpty(token) && CmmnUtil.isEmpty(envelopeId) && CmmnUtil.isEmpty(externalId))
                 throw new EnsException(EnsErrCd.ERR410, "정상적인 요청이 아닙니다. 재인증 후 시도하시기 바랍니다.");
 
-            // 조직코드값 조회
-
             Map<String, String> param = new HashMap<>();
             param.put("envelopeId", envelopeId);
             param.put("externalId", externalId);
@@ -55,8 +52,6 @@ public class KkoTalkMblPageController extends MblPageControllerSupport {
             SendDetailKkoTalkDTO sendDetailKkoTalkDTO = kkoTalkMapper.findFetchByExternalIdAndEnvelopeId(param)
                 .orElseThrow(() -> new EnsException(EnsErrCd.ERR404, String.format("일치하는 자료가 없습니다. [ envelopeId %s externalId %s ]", envelopeId, externalId)));
 
-
-
             EnsResponseVO<?> responseVO = kkoTalkService.tokenVerify(sendMast.getOrgCd(), envelopeId, token, externalId);
             if (!EnsErrCd.OK.equals(responseVO.getErrCode()))
                 throw new EnsException(responseVO.getErrCode(), responseVO.getErrMsg());
diff --git a/src/main/java/cokr/xit/ens/modules/kkotalk/service/KkoTalkService.java b/src/main/java/cokr/xit/ens/modules/kkotalk/service/KkoTalkService.java
index 997e471..a0c633e 100644
--- a/src/main/java/cokr/xit/ens/modules/kkotalk/service/KkoTalkService.java
+++ b/src/main/java/cokr/xit/ens/modules/kkotalk/service/KkoTalkService.java
@@ -327,7 +327,7 @@ public class KkoTalkService {
             }
 
             // FIXME: 카카오톡 적용 확인
-            String envelopeStatus = (String) mResponse.get("envelopeStatus");
+            String envelopeStatus = (String) mResponse.get("status");
             if (!CmmnUtil.isEmpty(envelopeStatus)) {
                 responseVO = EnsResponseVO.okBuilder()
                         .resultInfo(mResponse)
@@ -361,14 +361,14 @@ public class KkoTalkService {
                         .envelopeId(envelopId)
                         .envelopeId(externalId)
                         .token(token)
-                        .tokenStatus((String) resultInfo.get("token_status"))
-                        .tokenUsedAt((String) resultInfo.get("used_at"))
-                        .sentAt((String) resultInfo.get("sent_at"))
-                        .receivedAt((String) resultInfo.get("received_at"))
-                        .authenticatedAt((String) resultInfo.get("authenticated_at"))
-                        .userNotifiedAt((String) resultInfo.get("user_notified_at"))
+                        .tokenStatus((String) resultInfo.get("status"))
+                        //.tokenUsedAt((String) resultInfo.get("used_at"))
+                        .sentAt((String) resultInfo.get("sentAt"))
+                        .receivedAt((String) resultInfo.get("receivedAt"))
+                        .authenticatedAt((String) resultInfo.get("authenticatedAt"))
+                        .userNotifiedAt((String) resultInfo.get("userNotifiedAt"))
                         .payload((String) resultInfo.get("payload"))
-                        .signedAt((String) resultInfo.get("signed_at"))
+                        //.signedAt((String) resultInfo.get("signed_at"))
                         .build());
             } else {
                 sendDetailKkoTalkTokenHistRepository.save(SendDetailKkoTalkTokenHist.builder()
diff --git a/src/main/resources/mybatis-mapper/modules/iup-kkotalk-mapper.xml b/src/main/resources/mybatis-mapper/modules/iup-kkotalk-mapper.xml
index 7b07731..4695a7f 100644
--- a/src/main/resources/mybatis-mapper/modules/iup-kkotalk-mapper.xml
+++ b/src/main/resources/mybatis-mapper/modules/iup-kkotalk-mapper.xml
@@ -133,7 +133,7 @@
         /** iup-kkotalk-mapper|findFetchByExternalIdAndEnvelopeId-카카오톡 발송 결과 대상?? 조회|julim  */
         <include refid="sqlSelectSendDetailKkoTalk"/>
         FROM ens_snd_dtl_kko_talk
-        WHERE envelope_id = #{envelope_id}
+        WHERE envelope_id = #{envelopeId}
           <if test="externalId != null and externalId != ''">
           AND external_id = #{externalId}
           </if>