feat: 카카오 send시 ci 사용 추가 반영

mens-api/src/main/resources/config/application-local.yml

@@ -87,7 +87,7 @@ app:
     response-enabled: true
     # MDC logging trace 활성
     mdc:
-      enabled: false
+      enabled: true
 
   # slack
   slack-webhook:

mens-batch/src/main/java/kr/xit/biz/ens/model/EnsDTO.java

@@ -764,6 +764,11 @@ public class EnsDTO {
          */
         private String try3;
         private int trySeq;
+
+        /**
+         * ci
+         */
+        private String ci;
     }
 
     @Data

mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchService.java

@@ -137,6 +137,8 @@ public class EnsBatchService extends EgovAbstractServiceImpl implements IEnsBatc
         String sndngDt = null;
 
         for (EnsDTO.SndngMssageParam dto : list) {
+            dto.setSignguCode(reqDTO.getSignguCode());
+            dto.setFfnlgCode(reqDTO.getFfnlgCode());
             final List<String> mstIdList = new ArrayList<>();
             String mstId = "";
             if (!Objects.equals(mstId, dto.getUnitySndngMastrId())) {
@@ -147,21 +149,22 @@ public class EnsBatchService extends EgovAbstractServiceImpl implements IEnsBatc
 
             // validation check
             final List<EnsDTO.sndngVali> valiList = mapper.selectAcceptVali(dto);
-            final String err = validatedAccept(valiList);
-            if(StringUtils.isNotEmpty(err)){
+            try {
+                validatedAccept(valiList);
+            } catch (Exception e) {
                 updateAcceptCntcSndngMstFailStatus(mstIdList,
-                    "accept 생성 요청 실패(파라메터 오류) : " + EgovStringUtil.cutString(err, 300));
+                    "accept 생성 요청 실패(파라메터 오류) : " + EgovStringUtil.cutString(e.getMessage(), 300));
                 continue;
             }
 
             // 초기 1회 셋팅 (발송 일시2, 발송 일시3 :  템플릿 관리 try2_minute, try3_minute 값에 따라 처리)
-            if (sndngDt == null) {
+            if (StringUtils.isEmpty(sndngDt)) {
                 sndngDt = StringUtils.defaultString(dto.getSndngDt());
-                if (dto.getTry2() != null && !"".equals(sndngDt)) {
+                if (StringUtils.isNotEmpty(dto.getTry2()) && StringUtils.isNotEmpty(sndngDt)) {
                     dto.setSndngDt2(
                         EgovDateUtil.addMinute(sndngDt, Integer.parseInt(dto.getTry2Minute())));
                 }
-                if (dto.getTry3() != null && !"".equals(sndngDt)) {
+                if (StringUtils.isNotEmpty(dto.getTry3()) && StringUtils.isNotEmpty(sndngDt)) {
                     dto.setSndngDt3(
                         EgovDateUtil.addMinute(sndngDt, Integer.parseInt(dto.getTry3Minute())));
                 }
@@ -462,10 +465,9 @@ public class EnsBatchService extends EgovAbstractServiceImpl implements IEnsBatc
      * accept 파라메터 유효성 체크
      *
      * @param valiList List<EnsDTO.sndngVali>
-     * @return String 에러 내용
      * </pre>
      */
-    private String validatedAccept(List<EnsDTO.sndngVali> valiList) {
+    private void validatedAccept(List<EnsDTO.sndngVali> valiList) {
         List<String> errors = new ArrayList<>();
         int idx = 0;
 
@@ -506,17 +508,22 @@ public class EnsBatchService extends EgovAbstractServiceImpl implements IEnsBatc
 
                 switch (SndngSeCode.compare(tryVal[dto.getTrySeq() - 1])) {
                     case KAKAO:
-                        if (Checks.isEmpty(dto.getIhidnum())) {
-                            errors.add(
-                                String.format("주민등록번호는 필수입니다(dto.getIhidnum[%d] 번째 오류)", idx + 1));
-                        }
-                        if (Checks.isEmpty(dto.getMoblphonNo())) {
-                            errors.add(String.format("핸드폰 번호는 필수입니다(dto.getMoblphonNo[%d] 번째 오류)",
-                                idx + 1));
-                        }
-                        if (Checks.isEmpty(dto.getIhidnum())) {
-                            errors.add(
-                                String.format("받는이 이름은 필수입니다(dto.getIhidnum[%d] 번째 오류)", idx + 1));
+                        if (Checks.isEmpty(dto.getCi())) {
+                            if(Checks.isEmpty(dto.getIhidnum())) {
+                                errors.add(
+                                    String.format("주민등록번호는 필수입니다(dto.getIhidnum[%d] 번째 오류)",
+                                        idx + 1));
+                            }
+                            if(Checks.isEmpty(dto.getMoblphonNo())) {
+                                errors.add(
+                                    String.format("핸드폰 번호는 필수입니다(dto.getMoblphonNo[%d] 번째 오류)",
+                                        idx + 1));
+                            }
+                            if(Checks.isEmpty(dto.getIhidnum())) {
+                                errors.add(
+                                    String.format("받는이 이름은 필수입니다(dto.getIhidnum[%d] 번째 오류)",
+                                        idx + 1));
+                            }
                         }
                         break;
 
@@ -554,8 +561,9 @@ public class EnsBatchService extends EgovAbstractServiceImpl implements IEnsBatc
                 idx++;
             }
         }
-
-        return errors.size() > 0 ? errors.toString() : StringUtils.EMPTY;
+        if (errors.size() > 0) {
+            throw BizRuntimeException.create(errors.toString());
+        }
     }
 
     /**

mens-batch/src/main/java/kr/xit/biz/ens/web/EnsBatchController.java

@@ -100,12 +100,12 @@ public class EnsBatchController {
     @io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, content = {
         @Content(mediaType = "application/json", examples = {
             @ExampleObject(value = """
-                {
-                    "signguCode": "88328",
-                    "ffnlgCode": "11",
-                    sndngProcessSttus": "make-ok"
-                }
-                """
+                        {
+                            "signguCode": "88328",
+                            "ffnlgCode": "11",
+                            "sndngProcessSttus": "make-ok"
+                        }
+                    """
             )
         })
     })

mens-batch/src/main/resources/egovframework/mapper/biz/ens-mysql-mapper.xml

@@ -455,7 +455,7 @@
 		  FROM tb_ens_sndng_mastr tesm
 		  JOIN tb_ens_kakao_my_doc tekmd
 		    ON tesm.sndng_mastr_id = tekmd.sndng_mastr_id
-		  JOIN tb_ens_ci tec
+		  LEFT JOIN tb_ens_ci tec
 		    ON tekmd.unity_sndng_detail_id = tec.unity_sndng_detail_id
 		 WHERE tesm.sndng_mastr_id = #{sndngMastrId}
 		   -- AND tesm.sndng_process_sttus = #{sndngProcessSttus}
@@ -737,9 +737,12 @@
 				 , tetm.try2
 				 , tetm.try3
 				 , 1 AS try_seq
+		     , tec.ci
 		  FROM tb_cntc_sndng_mastr tcsm
 		  JOIN tb_cntc_sndng_detail tcsd
 			  ON tcsm.unity_sndng_mastr_id = tcsd.unity_sndng_mastr_id
+		  LEFT JOIN tb_ens_ci tec
+		    ON tcsd.unity_sndng_detail_id = tec.unity_sndng_detail_id
 		  LEFT OUTER JOIN tb_ens_tmplat_manage tetm
 			  ON tcsm.tmplat_id = tetm.tmplat_id
 		  LEFT OUTER JOIN tb_ens_rlaybsnm_manage term