From 9fcd61795b7aa669bf81271836722e4b732a07f9 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Tue, 8 Aug 2023 09:55:00 +0900
Subject: [PATCH] =?UTF-8?q?error=20:=20=EC=B9=98=ED=99=98=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90=20=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20=EC=B9=98=ED=99=98?=
 =?UTF-8?q?=20=ED=9B=84=20=EB=AC=B8=EC=9E=90=EA=B8=B8=EC=9D=B4=EA=B0=80=20?=
 =?UTF-8?q?lms=20/=20sms=20=EC=B2=98=EB=9F=BC=20=EB=8B=A4=EB=A5=BC=20?=
 =?UTF-8?q?=EB=95=8C=20=EA=B7=B8=EB=A3=B9ID=EA=B0=80=20=ED=95=98=EB=82=98?=
 =?UTF-8?q?=EB=A7=8C=20=EC=98=A4=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/itn/mjonApi/cmn/aop/LogAspect.java    |  3 ++-
 .../mapper/domain/SendSucRestResponse.java    | 26 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/itn/mjonApi/cmn/aop/LogAspect.java b/src/main/java/com/itn/mjonApi/cmn/aop/LogAspect.java
index 250f27b..366cdf0 100644
--- a/src/main/java/com/itn/mjonApi/cmn/aop/LogAspect.java
+++ b/src/main/java/com/itn/mjonApi/cmn/aop/LogAspect.java
@@ -155,7 +155,7 @@ public class LogAspect {
             lettnApiSendMsgLogMapper.insert(apiSendMsgLogVO);
 
             // 메세지 그룹 테이블에 발송 구분 업데이트
-            updateMsgGroupTbSendKind(apiSendMsgLogVO);
+            this.updateMsgGroupTbSendKind(apiSendMsgLogVO);
 
         }
 
@@ -204,6 +204,7 @@ public class LogAspect {
             SendSucRestResponse sendSucRestResponse = (SendSucRestResponse) dataObject;
 
             if("sendMsgData".equals(methodNm)){
+                log.info(" + sendSucRestResponse.getMsgGroupId() :: [{}]", sendSucRestResponse.getMsgGroupId());
 
                 msgGroupId = sendSucRestResponse.getMsgGroupId();
             }
diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/SendSucRestResponse.java b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/SendSucRestResponse.java
index 9977c1c..4b393c3 100644
--- a/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/SendSucRestResponse.java
+++ b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/SendSucRestResponse.java
@@ -3,7 +3,10 @@ package com.itn.mjonApi.mjon.api.send.mapper.domain;
 import com.itn.mjonApi.cmn.msg.StatMsg;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,6 +45,7 @@ public class SendSucRestResponse {
      */
     public static SendSucRestResponse convertMjonDataToApiResponse(MjonResponseVO mjonResponseVO) {
 
+        List<String> msgTypeList = getMsgType(mjonResponseVO.getMsgType());
 
         return SendSucRestResponse.builder()
                 .resultCode("0")
@@ -49,11 +53,31 @@ public class SendSucRestResponse {
                 .successCnt(mjonResponseVO.getResultSts()) // 성공 건수
                 .blockCnt(mjonResponseVO.getResultBlockSts()) // 수신거부 건수
                 .failCnt("0")
-                .msgType(StatMsg.valueOf("msgType"+mjonResponseVO.getMsgType()).getMsg())
+                .msgType(String.join(", ", msgTypeList))
                 .build();
 
     }
 
+    /**
+     * msgType이 여러개일때 List로 변환
+     * @param msgType
+     * @return
+     */
+    @NotNull
+    private static List<String> getMsgType(String msgType) {
+        List<String> result = new ArrayList<>();
+
+        if(msgType.indexOf(",") > 0)
+        {
+            result = Arrays.stream(msgType.split(","))
+                    .map(s -> StatMsg.valueOf("msgType"+s).getMsg())
+                    .collect(Collectors.toList());
+        }else{
+            result.add(StatMsg.valueOf("msgType"+ msgType).getMsg());
+        }
+        return result;
+    }
+
     /**
      * @description 1건~100건 까지 수신자별 메세지 보낸 후 성공 결과를 리턴한다.
      * @param mjonResponseVOList