From 4977a4f9d54d4ce3aecda8ceba73c344f16016a6 Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Tue, 27 Aug 2024 11:11:48 +0900
Subject: [PATCH] feat: ktgbs api fix

---
 .../biz/mbl/service/MobilePageService.java    | 52 ++++++++++---------
 .../kakao/{v1 => pay}/cmm/CmmKakaoUtils.java  |  2 +-
 .../service/AsyncKkopayEltrcDocService.java   |  6 +--
 .../service/IAsyncKkopayEltrcDocService.java  |  4 +-
 .../service/IKkopayEltrcDocService.java       |  4 +-
 .../service/KkopayEltrcDocService.java        |  4 +-
 .../web/AsyncKkopayEltrcDocController.java    |  0
 .../web/KkopayEltrcDocController.java         |  6 +--
 .../service/IKkotalkEltrcDocService.java      |  4 +-
 .../service/KkotalkEltrcDocService.java       |  4 +-
 .../web/KkotalkEltrcDocController.java        |  6 +--
 11 files changed, 47 insertions(+), 45 deletions(-)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v1 => pay}/cmm/CmmKakaoUtils.java (97%)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v1 => pay}/service/AsyncKkopayEltrcDocService.java (99%)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v1 => pay}/service/IAsyncKkopayEltrcDocService.java (98%)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v1 => pay}/service/IKkopayEltrcDocService.java (98%)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v1 => pay}/service/KkopayEltrcDocService.java (99%)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v1 => pay}/web/AsyncKkopayEltrcDocController.java (100%)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v1 => pay}/web/KkopayEltrcDocController.java (98%)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v2 => talk}/service/IKkotalkEltrcDocService.java (97%)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v2 => talk}/service/KkotalkEltrcDocService.java (99%)
 rename mens-api/src/main/java/kr/xit/ens/kakao/{v2 => talk}/web/KkotalkEltrcDocController.java (98%)

diff --git a/mens-api/src/main/java/kr/xit/biz/mbl/service/MobilePageService.java b/mens-api/src/main/java/kr/xit/biz/mbl/service/MobilePageService.java
index ac0bf5f..d6143bf 100644
--- a/mens-api/src/main/java/kr/xit/biz/mbl/service/MobilePageService.java
+++ b/mens-api/src/main/java/kr/xit/biz/mbl/service/MobilePageService.java
@@ -3,6 +3,8 @@ package kr.xit.biz.mbl.service;
 import org.springframework.stereotype.Service;
 
 import kr.xit.biz.ens.model.cntc.CntcDTO;
+import kr.xit.biz.ens.model.kakao.v1.KkopayDocDTO;
+import kr.xit.biz.ens.model.kakao.v2.KkotalkApiDTO;
 import kr.xit.biz.ens.model.kt.KtCommonDTO;
 import kr.xit.biz.ens.model.kt.KtTokenDTO;
 import kr.xit.biz.mbl.mapper.IMobilePageMapper;
@@ -15,8 +17,8 @@ import kr.xit.core.model.IApiResponse;
 import kr.xit.core.service.AbstractService;
 import kr.xit.core.spring.annotation.TraceLogging;
 import kr.xit.core.support.utils.Checks;
-import kr.xit.ens.kakao.v1.service.IKkopayEltrcDocService;
-import kr.xit.ens.kakao.v2.service.IKkotalkEltrcDocService;
+import kr.xit.ens.kakao.pay.service.IKkopayEltrcDocService;
+import kr.xit.ens.kakao.talk.service.IKkotalkEltrcDocService;
 import kr.xit.ens.kt.service.IKtBcService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -71,18 +73,18 @@ public class MobilePageService extends AbstractService implements IMobilePageSer
         if(mobilePageManage == null)    throw BizRuntimeException.create("데이타 오류[카카오페이 내문서함 문서가 없습니다]");
 
         // FIXME: 테스트를 위해 임시로 주석처리
-        // final ApiResponseDTO<KkopayDocDTO.ValidTokenResponse> res = kkopayService.findKkopayReadyAndMblPage(
-        //     KkopayDocDTO.OneTimeToken.builder()
-        //         .document_binder_uuid(reqDTO.getDocumentBinderUuid())
-        //         .external_document_uuid(reqDTO.getExternalDocumentUuid())
-        //         .token(reqDTO.getToken())
-        //         .signguCode(mobilePageManage.getSignguCode())
-        //         .ffnlgCode(mobilePageManage.getFfnlgCode())
-        //         .build()
-        // );
-        // if(!res.isSuccess()){
-        //     throw BizRuntimeException.create(res.getMessage());
-        // }
+        final ApiResponseDTO<KkopayDocDTO.ValidTokenResponse> res = kkopayService.findKkopayReadyAndMblPage(
+            KkopayDocDTO.OneTimeToken.builder()
+                .document_binder_uuid(reqDTO.getDocumentBinderUuid())
+                .external_document_uuid(reqDTO.getExternalDocumentUuid())
+                .token(reqDTO.getToken())
+                .signguCode(mobilePageManage.getSignguCode())
+                .ffnlgCode(mobilePageManage.getFfnlgCode())
+                .build()
+        );
+        if(!res.isSuccess()){
+            throw BizRuntimeException.create(res.getMessage());
+        }
         return mobilePageManage.getMobilePageCn();
     }
 
@@ -112,17 +114,17 @@ public class MobilePageService extends AbstractService implements IMobilePageSer
         if(mobilePageManage == null)    throw BizRuntimeException.create("데이타 오류[카카오톡 내문서함 문서가 없습니다]");
 
         // FIXME: 테스트를 위해 임시로 주석처리
-        // final ApiResponseDTO<KkotalkApiDTO.ValidTokenResponse> res = kkotalkService.findKkotalkReadyAndMblPage(
-        //     KkotalkApiDTO.ValidTokenRequest.builder()
-        //         .envelopeId(reqDTO.getEnvelopeId())
-        //         .token(reqDTO.getToken())
-        //         .signguCode(mobilePageManage.getSignguCode())
-        //         .ffnlgCode(mobilePageManage.getFfnlgCode())
-        //         .build()
-        // );
-        // if(!res.isSuccess()){
-        //     throw BizRuntimeException.create(res.getMessage());
-        // }
+        final ApiResponseDTO<KkotalkApiDTO.ValidTokenResponse> res = kkotalkService.findKkotalkReadyAndMblPage(
+            KkotalkApiDTO.ValidTokenRequest.builder()
+                .envelopeId(reqDTO.getEnvelopeId())
+                .token(reqDTO.getToken())
+                .signguCode(mobilePageManage.getSignguCode())
+                .ffnlgCode(mobilePageManage.getFfnlgCode())
+                .build()
+        );
+        if(!res.isSuccess()){
+            throw BizRuntimeException.create(res.getMessage());
+        }
 
         return mobilePageManage.getMobilePageCn();
     }
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v1/cmm/CmmKakaoUtils.java b/mens-api/src/main/java/kr/xit/ens/kakao/pay/cmm/CmmKakaoUtils.java
similarity index 97%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v1/cmm/CmmKakaoUtils.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/pay/cmm/CmmKakaoUtils.java
index 073e76e..9d66b1a 100644
--- a/mens-api/src/main/java/kr/xit/ens/kakao/v1/cmm/CmmKakaoUtils.java
+++ b/mens-api/src/main/java/kr/xit/ens/kakao/pay/cmm/CmmKakaoUtils.java
@@ -1,4 +1,4 @@
-package kr.xit.ens.kakao.v1.cmm;
+package kr.xit.ens.kakao.pay.cmm;
 
 import org.apache.commons.lang3.ObjectUtils;
 
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v1/service/AsyncKkopayEltrcDocService.java b/mens-api/src/main/java/kr/xit/ens/kakao/pay/service/AsyncKkopayEltrcDocService.java
similarity index 99%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v1/service/AsyncKkopayEltrcDocService.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/pay/service/AsyncKkopayEltrcDocService.java
index a66a7b8..9131bb7 100644
--- a/mens-api/src/main/java/kr/xit/ens/kakao/v1/service/AsyncKkopayEltrcDocService.java
+++ b/mens-api/src/main/java/kr/xit/ens/kakao/pay/service/AsyncKkopayEltrcDocService.java
@@ -1,4 +1,4 @@
-package kr.xit.ens.kakao.v1.service;
+package kr.xit.ens.kakao.pay.service;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,14 +27,14 @@ import kr.xit.core.spring.annotation.TraceLogging;
 import kr.xit.core.spring.util.ApiWebClientUtil;
 import kr.xit.core.support.utils.Checks;
 import kr.xit.core.support.utils.JsonUtils;
-import kr.xit.ens.kakao.v1.cmm.CmmKakaoUtils;
+import kr.xit.ens.kakao.pay.cmm.CmmKakaoUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 /**
  * <pre>
  * description : 카카오 페이 전자 문서 발송 요청 서비스
- * packageName : kr.xit.ens.kakao.v1.service
+ * packageName : kr.xit.ens.kakao.pay.service
  * fileName    : KkopayEltrcDocService
  * author      : julim
  * date        : 2023-04-28
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v1/service/IAsyncKkopayEltrcDocService.java b/mens-api/src/main/java/kr/xit/ens/kakao/pay/service/IAsyncKkopayEltrcDocService.java
similarity index 98%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v1/service/IAsyncKkopayEltrcDocService.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/pay/service/IAsyncKkopayEltrcDocService.java
index a3d6877..eb4ddfc 100644
--- a/mens-api/src/main/java/kr/xit/ens/kakao/v1/service/IAsyncKkopayEltrcDocService.java
+++ b/mens-api/src/main/java/kr/xit/ens/kakao/pay/service/IAsyncKkopayEltrcDocService.java
@@ -1,4 +1,4 @@
-package kr.xit.ens.kakao.v1.service;
+package kr.xit.ens.kakao.pay.service;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -10,7 +10,7 @@ import kr.xit.core.model.ApiResponseDTO;
 /**
  * <pre>
  * description : 카카오 페이 전자 문서 발송 요청 인터 페이스
- * packageName : kr.xit.ens.kakao.v1.service
+ * packageName : kr.xit.ens.kakao.pay.service
  * fileName    : IKkopayEltrcDocService
  * author      : julim
  * date        : 2023-04-28
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v1/service/IKkopayEltrcDocService.java b/mens-api/src/main/java/kr/xit/ens/kakao/pay/service/IKkopayEltrcDocService.java
similarity index 98%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v1/service/IKkopayEltrcDocService.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/pay/service/IKkopayEltrcDocService.java
index b914b9e..1c61f1a 100644
--- a/mens-api/src/main/java/kr/xit/ens/kakao/v1/service/IKkopayEltrcDocService.java
+++ b/mens-api/src/main/java/kr/xit/ens/kakao/pay/service/IKkopayEltrcDocService.java
@@ -1,4 +1,4 @@
-package kr.xit.ens.kakao.v1.service;
+package kr.xit.ens.kakao.pay.service;
 
 import kr.xit.biz.ens.model.kakao.v1.KkopayDocAttrDTO;
 import kr.xit.biz.ens.model.kakao.v1.KkopayDocBulkDTO;
@@ -8,7 +8,7 @@ import kr.xit.core.model.ApiResponseDTO;
 /**
  * <pre>
  * description : 카카오 페이 전자 문서 발송 요청 인터 페이스
- * packageName : kr.xit.ens.kakao.v1.service
+ * packageName : kr.xit.ens.kakao.pay.service
  * fileName    : IKkopayEltrcDocService
  * author      : julim
  * date        : 2023-04-28
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v1/service/KkopayEltrcDocService.java b/mens-api/src/main/java/kr/xit/ens/kakao/pay/service/KkopayEltrcDocService.java
similarity index 99%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v1/service/KkopayEltrcDocService.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/pay/service/KkopayEltrcDocService.java
index 2d980fd..d4fe30f 100644
--- a/mens-api/src/main/java/kr/xit/ens/kakao/v1/service/KkopayEltrcDocService.java
+++ b/mens-api/src/main/java/kr/xit/ens/kakao/pay/service/KkopayEltrcDocService.java
@@ -1,4 +1,4 @@
-package kr.xit.ens.kakao.v1.service;
+package kr.xit.ens.kakao.pay.service;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +35,7 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * <pre>
  * description : 카카오 페이 전자 문서 발송 요청 서비스
- * packageName : kr.xit.ens.kakao.v1.service
+ * packageName : kr.xit.ens.kakao.pay.service
  * fileName    : KkopayEltrcDocService
  * author      : julim
  * date        : 2023-04-28
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v1/web/AsyncKkopayEltrcDocController.java b/mens-api/src/main/java/kr/xit/ens/kakao/pay/web/AsyncKkopayEltrcDocController.java
similarity index 100%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v1/web/AsyncKkopayEltrcDocController.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/pay/web/AsyncKkopayEltrcDocController.java
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v1/web/KkopayEltrcDocController.java b/mens-api/src/main/java/kr/xit/ens/kakao/pay/web/KkopayEltrcDocController.java
similarity index 98%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v1/web/KkopayEltrcDocController.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/pay/web/KkopayEltrcDocController.java
index 7f72e91..2b7f9f9 100644
--- a/mens-api/src/main/java/kr/xit/ens/kakao/v1/web/KkopayEltrcDocController.java
+++ b/mens-api/src/main/java/kr/xit/ens/kakao/pay/web/KkopayEltrcDocController.java
@@ -1,4 +1,4 @@
-package kr.xit.ens.kakao.v1.web;
+package kr.xit.ens.kakao.pay.web;
 
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,14 +15,14 @@ import kr.xit.biz.ens.model.kakao.v1.KkopayDocBulkDTO;
 import kr.xit.biz.ens.model.kakao.v1.KkopayDocDTO;
 import kr.xit.core.model.ApiResponseDTO;
 import kr.xit.core.model.IApiResponse;
-import kr.xit.ens.kakao.v1.service.IKkopayEltrcDocService;
+import kr.xit.ens.kakao.pay.service.IKkopayEltrcDocService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 /**
  * <pre>
  * description : 카카오 페이 전자 문서 발송 controller
- * packageName : kr.xit.ens.kakao.v1.web
+ * packageName : kr.xit.ens.kakao.pay.web
  * fileName    : KkopayEltrcDocController
  * author      : julim
  * date        : 2023-04-28
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v2/service/IKkotalkEltrcDocService.java b/mens-api/src/main/java/kr/xit/ens/kakao/talk/service/IKkotalkEltrcDocService.java
similarity index 97%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v2/service/IKkotalkEltrcDocService.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/talk/service/IKkotalkEltrcDocService.java
index 6dd5f83..62e90d9 100644
--- a/mens-api/src/main/java/kr/xit/ens/kakao/v2/service/IKkotalkEltrcDocService.java
+++ b/mens-api/src/main/java/kr/xit/ens/kakao/talk/service/IKkotalkEltrcDocService.java
@@ -1,4 +1,4 @@
-package kr.xit.ens.kakao.v2.service;
+package kr.xit.ens.kakao.talk.service;
 
 import kr.xit.biz.ens.model.kakao.v2.KkotalkApiDTO;
 import kr.xit.biz.ens.model.kakao.v2.KkotalkDTO;
@@ -7,7 +7,7 @@ import kr.xit.core.model.ApiResponseDTO;
 /**
  * <pre>
  * description : 카카오 페이 전자 문서 발송 요청 인터 페이스
- * packageName : kr.xit.ens.kakao.v1.service
+ * packageName : kr.xit.ens.kakao.talk.service
  * fileName    : IKkopayEltrcDocService
  * author      : julim
  * date        : 2023-04-28
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v2/service/KkotalkEltrcDocService.java b/mens-api/src/main/java/kr/xit/ens/kakao/talk/service/KkotalkEltrcDocService.java
similarity index 99%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v2/service/KkotalkEltrcDocService.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/talk/service/KkotalkEltrcDocService.java
index 49f2b80..7ff95d8 100644
--- a/mens-api/src/main/java/kr/xit/ens/kakao/v2/service/KkotalkEltrcDocService.java
+++ b/mens-api/src/main/java/kr/xit/ens/kakao/talk/service/KkotalkEltrcDocService.java
@@ -1,4 +1,4 @@
-package kr.xit.ens.kakao.v2.service;
+package kr.xit.ens.kakao.talk.service;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +33,7 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * <pre>
  * description : 카카오 페이 전자 문서 발송 요청 서비스
- * packageName : kr.xit.ens.kakao.v1.service
+ * packageName : kr.xit.ens.kakao.talk.service
  * fileName    : KkopayEltrcDocService
  * author      : julim
  * date        : 2023-04-28
diff --git a/mens-api/src/main/java/kr/xit/ens/kakao/v2/web/KkotalkEltrcDocController.java b/mens-api/src/main/java/kr/xit/ens/kakao/talk/web/KkotalkEltrcDocController.java
similarity index 98%
rename from mens-api/src/main/java/kr/xit/ens/kakao/v2/web/KkotalkEltrcDocController.java
rename to mens-api/src/main/java/kr/xit/ens/kakao/talk/web/KkotalkEltrcDocController.java
index 5b23b0e..bda1794 100644
--- a/mens-api/src/main/java/kr/xit/ens/kakao/v2/web/KkotalkEltrcDocController.java
+++ b/mens-api/src/main/java/kr/xit/ens/kakao/talk/web/KkotalkEltrcDocController.java
@@ -1,4 +1,4 @@
-package kr.xit.ens.kakao.v2.web;
+package kr.xit.ens.kakao.talk.web;
 
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,14 +14,14 @@ import kr.xit.biz.ens.model.kakao.v2.KkotalkApiDTO;
 import kr.xit.biz.ens.model.kakao.v2.KkotalkDTO;
 import kr.xit.core.model.ApiResponseDTO;
 import kr.xit.core.model.IApiResponse;
-import kr.xit.ens.kakao.v2.service.IKkotalkEltrcDocService;
+import kr.xit.ens.kakao.talk.service.IKkotalkEltrcDocService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 /**
  * <pre>
  * description : 카카오톡 전자 문서 발송 controller
- * packageName : kr.xit.ens.kakao.v2.web
+ * packageName : kr.xit.ens.kakao.talk.web
  * fileName    : KkotalkEltrcDocController
  * author      : julim
  * date        : 2024-08-12