From 674e8f20f0ade390c39fee0e36625d320c86cc1f Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 19 Feb 2026 15:18:29 +0900 Subject: [PATCH] =?UTF-8?q?260219=5F01=5FENH:=20=EA=B3=B5=EC=9A=A9?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=EC=97=85,=20=EC=95=8C=EB=A6=BC=ED=86=A1=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20=EA=B5=AC=ED=98=84=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../server/common/consts/NotihubConst.java | 10 +- .../server/common/enums/ChannelType.java | 3 +- .../server/common/enums/SendKkoAtType.java | 28 +++ .../notihub/server/common/enums/SendType.java | 3 +- .../dto/PringoJsonReturnRequestDto.java | 3 +- .../common/util/TemplateContentSanitizer.java | 19 +- .../controller/SendKkoAtController.java | 58 ++++++ .../server/controller/SendSmsController.java | 12 +- .../server/controller/TemplateController.java | 17 +- ...o.java => BizppurioCursorResponseDto.java} | 6 +- .../dto/send/BulkSendCreateRequestDto.java | 7 + .../server/dto/send/SendRequestSingleDto.java | 5 + .../server/dto/template/TemplateBasicDto.java | 31 +++- .../server/dto/template/TemplateDto.java | 4 + .../dto/template/TemplateSummaryDto.java | 4 +- .../persistence/entity/BizMsgEntity.java | 16 +- .../persistence/entity/TSendEntity.java | 40 +++-- .../persistence/entity/TTmplatEntity.java | 58 ++++-- .../repository/SendRepository.java | 4 +- .../scheduler/BizLogResultScheduler.java | 7 +- .../service/AbstractBizppurioSendService.java | 84 +++++++++ .../service/AbstractPringoSendService.java | 168 ++++++++++++++++++ ...ore.java => BizppurioSendCursorStore.java} | 15 +- .../server/service/EmailResultUpdater.java | 4 +- .../server/service/SendEmailService.java | 147 +-------------- .../server/service/SendKkoAtService.java | 49 +++++ .../notihub/server/service/SendService.java | 45 ++--- .../server/service/SendSmsService.java | 79 +++----- .../server/service/TemplateService.java | 65 +++++-- src/main/resources/application-local.yml | 11 +- 31 files changed, 672 insertions(+), 332 deletions(-) create mode 100644 src/main/java/com/kri/notihub/server/common/enums/SendKkoAtType.java create mode 100644 src/main/java/com/kri/notihub/server/controller/SendKkoAtController.java rename src/main/java/com/kri/notihub/server/dto/send/{SmsCursorResponseDto.java => BizppurioCursorResponseDto.java} (73%) create mode 100644 src/main/java/com/kri/notihub/server/service/AbstractBizppurioSendService.java create mode 100644 src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java rename src/main/java/com/kri/notihub/server/service/{SmsSendCursorStore.java => BizppurioSendCursorStore.java} (63%) create mode 100644 src/main/java/com/kri/notihub/server/service/SendKkoAtService.java diff --git a/build.gradle b/build.gradle index a4156ed..09da8ad 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.0.63" + implementation "com.kri.common:starter:beta.1.0.66" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/notihub/server/common/consts/NotihubConst.java b/src/main/java/com/kri/notihub/server/common/consts/NotihubConst.java index 5480f05..119f150 100644 --- a/src/main/java/com/kri/notihub/server/common/consts/NotihubConst.java +++ b/src/main/java/com/kri/notihub/server/common/consts/NotihubConst.java @@ -5,6 +5,7 @@ import java.util.List; public final class NotihubConst { + public static final String NATION_CODE = "82"; public static final int OUTSOURCE_USER_ROLE = 4000; public static final int CHUNK_SIZE = 5_000; public static final int INSERT_CHUNK_SIZE = 1_000; @@ -12,9 +13,8 @@ public final class NotihubConst { public static final short EMAIL_RESULT_SEARCH_DELAY = 500; public static final short EMAIL_DELAY = 500; public static final short DELAY_MAX_MS = (short) 5_000; // 필요시 조정 - public static final List MOBILE_TYPE_LIST = List.of(SendType.SMS, SendType.LMS_MMS); - public static final List MOBILE_TYPE_CODE_LIST = List.of(SendType.SMS.getCode(), - SendType.LMS_MMS.getCode()); + public static final List SMS_TYPE_CODE_LIST = List.of(SendType.SMS.getCode(), SendType.LMS_MMS.getCode()); + public static final List KKO_TYPE_CODE_LIST = List.of(SendType.KKO_AT.getCode()); public static final List EMAIL_TYPE_CODE_LIST = List.of(SendType.EMAIL.getCode()); public static final String EMAIL_RESERVATION_PREFIX = "RESERVATION_"; public static final short EMAIL_STANDBY = 100; @@ -27,6 +27,10 @@ public final class NotihubConst { public static final short SMS_NOT_RESULT = 9999; public static final short LMS_MMS_STANDBY = 6000; public static final short LMS_MMS_SUCCESS = 6600; + public static final short KKO_AT_STANDBY = 7900; + public static final short KKO_AT_SUCCESS = 7000; + public static final short KKO_AT_NOT_RESULT = 7999; + private NotihubConst() { } } diff --git a/src/main/java/com/kri/notihub/server/common/enums/ChannelType.java b/src/main/java/com/kri/notihub/server/common/enums/ChannelType.java index 7dddf56..964afa1 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/ChannelType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/ChannelType.java @@ -11,7 +11,8 @@ import lombok.RequiredArgsConstructor; public enum ChannelType implements CodeEnum { EMAIL((short) 1), - SMS((short) 2); + SMS((short) 2), + KKO_AT((short) 3); private final Short code; diff --git a/src/main/java/com/kri/notihub/server/common/enums/SendKkoAtType.java b/src/main/java/com/kri/notihub/server/common/enums/SendKkoAtType.java new file mode 100644 index 0000000..a6c7e9b --- /dev/null +++ b/src/main/java/com/kri/notihub/server/common/enums/SendKkoAtType.java @@ -0,0 +1,28 @@ +package com.kri.notihub.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum SendKkoAtType implements CodeEnum { + KKO_AT((short) 31); + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static SendKkoAtType fromCode(Short code) { + if (code == null) { + return null; + } + for (SendKkoAtType s : values()) { + if (s.code == code) { + return s; + } + } + throw new IllegalArgumentException("Unknown SendKkoAtType code: " + code); + } +} diff --git a/src/main/java/com/kri/notihub/server/common/enums/SendType.java b/src/main/java/com/kri/notihub/server/common/enums/SendType.java index e9837d9..8911667 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/SendType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/SendType.java @@ -11,7 +11,8 @@ import lombok.RequiredArgsConstructor; public enum SendType implements CodeEnum { EMAIL(SendEmailType.EMAIL), SMS(SendSmsType.SMS), - LMS_MMS(SendSmsType.LMS_MMS); + LMS_MMS(SendSmsType.LMS_MMS), + KKO_AT(SendKkoAtType.KKO_AT); private final Short code; diff --git a/src/main/java/com/kri/notihub/server/common/external/pringo/dto/PringoJsonReturnRequestDto.java b/src/main/java/com/kri/notihub/server/common/external/pringo/dto/PringoJsonReturnRequestDto.java index 9b9b151..9ead600 100644 --- a/src/main/java/com/kri/notihub/server/common/external/pringo/dto/PringoJsonReturnRequestDto.java +++ b/src/main/java/com/kri/notihub/server/common/external/pringo/dto/PringoJsonReturnRequestDto.java @@ -1,6 +1,7 @@ package com.kri.notihub.server.common.external.pringo.dto; import com.fasterxml.jackson.annotation.JsonProperty; +import com.kri.common.util.StringUtil; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -27,7 +28,7 @@ public class PringoJsonReturnRequestDto { if (this.apiKey == null || this.apiKey.isBlank()) { this.apiKey = defaultApiKey; } - if (this.templateId == null || this.templateId.isBlank()) { + if (StringUtil.isNullOrBlank(this.templateId)) { this.templateId = defaultTemplateId; } } diff --git a/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java b/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java index b7a0067..c240102 100644 --- a/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java +++ b/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java @@ -1,5 +1,6 @@ package com.kri.notihub.server.common.util; +import com.kri.common.util.StringUtil; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.template.TemplateBasicDto; import java.nio.charset.StandardCharsets; @@ -23,10 +24,6 @@ public final class TemplateContentSanitizer { return s.getBytes(StandardCharsets.UTF_8).length; } - private static boolean isBlank(String s) { - return s == null || s.isBlank(); - } - /** * title은 최대 128자(코드포인트 기준)로 절단 */ @@ -100,8 +97,8 @@ public final class TemplateContentSanitizer { String text = doc.body() != null ? doc.body().wholeText() : doc.wholeText(); text = normalizeControls(text, true); - text = text.replaceAll("[ \\t\\f\\v]+", " "); - text = text.replaceAll("\\n{3,}", "\n\n"); + text = text.replaceAll("[ \\t\\f]+", " "); + //text = text.replaceAll("\\n{3,}", "\n\n"); return text.trim(); } @@ -126,7 +123,7 @@ public final class TemplateContentSanitizer { outBody = sanitizeEmailHtml(outBody); } - case SMS, LMS_MMS -> { + case SMS, LMS_MMS, KKO_AT -> { // 평문화 outTitle = htmlToPlainTextPreserveNewlines(outTitle); outTitle = truncateTo128CodePoints(outTitle); @@ -135,17 +132,19 @@ public final class TemplateContentSanitizer { } } - // 2) 타입 재결정(요청사항) - if (type == SendType.SMS) { + if (type == SendType.KKO_AT) { + outTitle = null; + } else if (type == SendType.SMS) { // SMS는 제목 저장 안 함 outTitle = null; + // 2) 타입 재결정 // 본문이 SMS 한도 초과면 LMS_MMS로 승격 if (utf8ByteLength(outBody) > SMS_MAX_BYTES_UTF8) { type = SendType.LMS_MMS; } } else if (type == SendType.LMS_MMS) { - boolean hasTitle = !isBlank(outTitle); + boolean hasTitle = StringUtil.hasText(outTitle); // "LMS_MMS인데 본문이 짧으면 SMS로 강등"이 기본인데, // 단, 제목이 있으면 본문이 짧아도 LMS_MMS 유지 diff --git a/src/main/java/com/kri/notihub/server/controller/SendKkoAtController.java b/src/main/java/com/kri/notihub/server/controller/SendKkoAtController.java new file mode 100644 index 0000000..80a1432 --- /dev/null +++ b/src/main/java/com/kri/notihub/server/controller/SendKkoAtController.java @@ -0,0 +1,58 @@ +package com.kri.notihub.server.controller; + +import com.kri.common.webmvc.RequestUserContext; +import com.kri.notihub.server.dto.send.BizppurioCursorResponseDto; +import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto; +import com.kri.notihub.server.dto.send.BulkSendResponseDto; +import com.kri.notihub.server.dto.send.SendRequestBulkDto; +import com.kri.notihub.server.dto.send.SendRequestSingleDto; +import com.kri.notihub.server.service.BizppurioSendCursorStore; +import com.kri.notihub.server.service.SendKkoAtService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/send-kko") +@RequiredArgsConstructor +@Tag(name = "Send Kakao", description = "카카오 알림톡 발송 API") +public class SendKkoAtController { + private final SendKkoAtService sendKKoAtService; + private final BizppurioSendCursorStore cursorStore; + + @Operation(summary = "발송 결과 반영 커서(send_idx) 조회") + @GetMapping("/cursor") + public BizppurioCursorResponseDto getCursor() { + return BizppurioCursorResponseDto.of(cursorStore.get()); + } + + @Operation(summary = "벌크 발송키 생성") + @PutMapping("/create/bulk") + public String createBulkSendKey(@Valid @RequestBody BulkSendCreateRequestDto req) { + return sendKKoAtService.issueBulkKey(req); + } + + @Operation(summary = "알림톡 단건 발송") + @PostMapping("/single") + public void sendSingle( + @Valid @RequestBody SendRequestSingleDto req, + RequestUserContext ctx + ) { + sendKKoAtService.doSendSingle(req, ctx.getUserCmpn(), ctx.getUserId()); + } + + @Operation(summary = "bulkSendKey 기반 알림톡 벌크 발송") + @PostMapping("/bulk") + public BulkSendResponseDto sendBulk( + @Valid @RequestBody SendRequestBulkDto req + ) { + return sendKKoAtService.doSendBulk(req); + } +} diff --git a/src/main/java/com/kri/notihub/server/controller/SendSmsController.java b/src/main/java/com/kri/notihub/server/controller/SendSmsController.java index a392bef..0e91d82 100644 --- a/src/main/java/com/kri/notihub/server/controller/SendSmsController.java +++ b/src/main/java/com/kri/notihub/server/controller/SendSmsController.java @@ -5,9 +5,9 @@ import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto; import com.kri.notihub.server.dto.send.BulkSendResponseDto; import com.kri.notihub.server.dto.send.SendRequestBulkDto; import com.kri.notihub.server.dto.send.SendRequestSingleDto; -import com.kri.notihub.server.dto.send.SmsCursorResponseDto; +import com.kri.notihub.server.dto.send.BizppurioCursorResponseDto; import com.kri.notihub.server.service.SendSmsService; -import com.kri.notihub.server.service.SmsSendCursorStore; +import com.kri.notihub.server.service.BizppurioSendCursorStore; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -26,12 +26,12 @@ import org.springframework.web.bind.annotation.RestController; public class SendSmsController { private final SendSmsService sendSmsService; - private final SmsSendCursorStore cursorStore; + private final BizppurioSendCursorStore cursorStore; - @Operation(summary = "SMS 결과 반영 커서(send_idx) 조회") + @Operation(summary = "발송 결과 반영 커서(send_idx) 조회") @GetMapping("/cursor") - public SmsCursorResponseDto getCursor() { - return SmsCursorResponseDto.of(cursorStore.get()); + public BizppurioCursorResponseDto getCursor() { + return BizppurioCursorResponseDto.of(cursorStore.get()); } @Operation(summary = "벌크 발송키 생성") diff --git a/src/main/java/com/kri/notihub/server/controller/TemplateController.java b/src/main/java/com/kri/notihub/server/controller/TemplateController.java index 191d9ed..ec4f753 100644 --- a/src/main/java/com/kri/notihub/server/controller/TemplateController.java +++ b/src/main/java/com/kri/notihub/server/controller/TemplateController.java @@ -2,6 +2,7 @@ package com.kri.notihub.server.controller; import com.kri.common.webmvc.RequestUserContext; import com.kri.notihub.server.common.enums.ChannelType; +import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.template.TemplateBasicDto; import com.kri.notihub.server.dto.template.TemplateDto; import com.kri.notihub.server.dto.template.TemplateSummaryDto; @@ -56,14 +57,16 @@ public class TemplateController { TemplateDto newTmplat = templateService.createTemplate(template.getItrntPrjctCd(), template, ctx.getUserId()); - String newHtml = fileService.syncOnSave( - newTmplat.getItrntPrjctCd(), - newTmplat.getTmplatIdx(), - newTmplat.getTmplatBody() - ); - newTmplat.setTmplatBody(newHtml); + if (template.getTmplatTy() == SendType.EMAIL) { + String newHtml = fileService.syncOnSave( + newTmplat.getItrntPrjctCd(), + newTmplat.getTmplatIdx(), + newTmplat.getTmplatBody() + ); + newTmplat.setTmplatBody(newHtml); - templateService.updateTemplateBodyWithCreate(newTmplat); + templateService.updateTemplateBodyWithCreate(newTmplat); + } return newTmplat; } diff --git a/src/main/java/com/kri/notihub/server/dto/send/SmsCursorResponseDto.java b/src/main/java/com/kri/notihub/server/dto/send/BizppurioCursorResponseDto.java similarity index 73% rename from src/main/java/com/kri/notihub/server/dto/send/SmsCursorResponseDto.java rename to src/main/java/com/kri/notihub/server/dto/send/BizppurioCursorResponseDto.java index ceef687..a830268 100644 --- a/src/main/java/com/kri/notihub/server/dto/send/SmsCursorResponseDto.java +++ b/src/main/java/com/kri/notihub/server/dto/send/BizppurioCursorResponseDto.java @@ -10,13 +10,13 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class SmsCursorResponseDto { +public class BizppurioCursorResponseDto { @Schema(description = "SMS 결과 반영 스케줄러 커서(send_idx)") private Long cursor; - public static SmsCursorResponseDto of(long cursor) { - return SmsCursorResponseDto.builder() + public static BizppurioCursorResponseDto of(long cursor) { + return BizppurioCursorResponseDto.builder() .cursor(cursor) .build(); } diff --git a/src/main/java/com/kri/notihub/server/dto/send/BulkSendCreateRequestDto.java b/src/main/java/com/kri/notihub/server/dto/send/BulkSendCreateRequestDto.java index a099e57..93ad7c4 100644 --- a/src/main/java/com/kri/notihub/server/dto/send/BulkSendCreateRequestDto.java +++ b/src/main/java/com/kri/notihub/server/dto/send/BulkSendCreateRequestDto.java @@ -23,25 +23,32 @@ public class BulkSendCreateRequestDto { @NotBlank @Schema(description = "발송 요청 회사") String reqstCmpn; + @Size(max = 32) @NotBlank @Schema(description = "발송 요청자") String reqstUser; + @NotBlank @Schema(description = "발송 요청 서비스 (로그용)") private String reqstSvc; + @Schema(description = "발송 요청 서비스의 프로젝트 코드 (로그용)") private String prjctCd; + @NotNull @Schema(description = "템플릿 idx") private Long tmplatIdx; + @NotNull @Builder.Default @Schema(description = "예약 여부") private Boolean resve = false; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "발송일시(미입력 시 현재 시간)") private LocalDateTime sendDt; + @NotNull @Schema(description = "대상자 수") private Integer trgtCnt; diff --git a/src/main/java/com/kri/notihub/server/dto/send/SendRequestSingleDto.java b/src/main/java/com/kri/notihub/server/dto/send/SendRequestSingleDto.java index ca4b728..071a665 100644 --- a/src/main/java/com/kri/notihub/server/dto/send/SendRequestSingleDto.java +++ b/src/main/java/com/kri/notihub/server/dto/send/SendRequestSingleDto.java @@ -17,17 +17,22 @@ public class SendRequestSingleDto extends SendRequestBasicDto { @NotNull @Schema(description = "수신자 정보") DestInfoDto destInfo; + @NotNull @Schema(description = "발송 템플릿") private long tmplatIdx; + @NotBlank @Schema(description = "발송 요청 서비스 (로그용)") private String reqstSvc; + @Schema(description = "발송 요청 서비스의 프로젝트 코드 (로그용)") private String prjctCd; + @NotNull @Schema(description = "예약 여부") private Boolean resve = false; + @Schema(description = "발송 희망 시간 (비어있는 경우 즉시)") @LenientLocalDateTime @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/kri/notihub/server/dto/template/TemplateBasicDto.java b/src/main/java/com/kri/notihub/server/dto/template/TemplateBasicDto.java index 84c9245..cf4ecec 100644 --- a/src/main/java/com/kri/notihub/server/dto/template/TemplateBasicDto.java +++ b/src/main/java/com/kri/notihub/server/dto/template/TemplateBasicDto.java @@ -2,6 +2,7 @@ package com.kri.notihub.server.dto.template; import com.kri.notihub.server.common.enums.SendType; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -22,39 +23,51 @@ public class TemplateBasicDto { @Size(max = 32) @NotBlank @Schema(description = "인트라넷 프로젝트 코드") - public String itrntPrjctCd; + private String itrntPrjctCd; @NotNull @Schema(description = "템플릿 타입") - public SendType tmplatTy; + private SendType tmplatTy; @Size(max = 32) @NotBlank @Schema(description = "템플릿 명") - public String tmplatNm; + private String tmplatNm; @Size(max = 128) @Schema(description = "발송시 제목") - public String tmplatTitle; + private String tmplatTitle; @NotBlank @Schema(description = "발송 내용") - public String tmplatBody; + private String tmplatBody; + + @Schema(description = "비즈뿌리오 알림톡 프로필의 sender key") + private String senderKey; + + @Schema(description = "카카오 알림톡 템플릿 코드") + private String kkoTmplatCd; + + @Schema(description = "국가 코드 (알림톡에서 사용)") + private String nationCd; + + @Schema(description = "첨부 파일 (여러 개일 경우, ‘I’문자로 구분)") + private String atchFl; @Schema(description = "이메일 건당 발송 딜레이(단위 ms, 기본: 500ms)") - public Short delayTime; + private Short delayTime; @Size(max = 16) @Schema(description = "발송 전화번호(문자 발송에서 사용)") - public String sendTel; + private String sendTel; @Size(max = 64) @Email @Schema(description = "발송 이메일(이메일 발송에서 사용)") - public String sendEml; + private String sendEml; @Size(max = 32) @NotBlank @Schema(description = "발송자 이름") - public String sendNm; + private String sendNm; } diff --git a/src/main/java/com/kri/notihub/server/dto/template/TemplateDto.java b/src/main/java/com/kri/notihub/server/dto/template/TemplateDto.java index 43e112a..ab1fe7b 100644 --- a/src/main/java/com/kri/notihub/server/dto/template/TemplateDto.java +++ b/src/main/java/com/kri/notihub/server/dto/template/TemplateDto.java @@ -51,6 +51,10 @@ public class TemplateDto extends TemplateBasicDto { .tmplatNm(entity.getTmplatNm()) .tmplatTitle(entity.getTmplatTitle()) .tmplatBody(entity.getTmplatBody()) + .senderKey(entity.getSenderKey()) + .kkoTmplatCd(entity.getKkoTmplatCd()) + .nationCd(entity.getNationCd()) + .atchFl(entity.getAtchFl()) .delayTime(entity.getDelayTime()) .sendTel(entity.getSendTel()) .sendEml(entity.getSendEml()) diff --git a/src/main/java/com/kri/notihub/server/dto/template/TemplateSummaryDto.java b/src/main/java/com/kri/notihub/server/dto/template/TemplateSummaryDto.java index fa437cf..94b1e91 100644 --- a/src/main/java/com/kri/notihub/server/dto/template/TemplateSummaryDto.java +++ b/src/main/java/com/kri/notihub/server/dto/template/TemplateSummaryDto.java @@ -17,10 +17,10 @@ import lombok.Setter; public class TemplateSummaryDto { @Schema(description = "템플릿 고유 키") - public Long tmplatIdx; + private Long tmplatIdx; @Schema(description = "템플릿 명") - public String tmplatNm; + private String tmplatNm; public static TemplateSummaryDto from(TTmplatEntity entity) { return TemplateSummaryDto.builder() diff --git a/src/main/java/com/kri/notihub/server/persistence/entity/BizMsgEntity.java b/src/main/java/com/kri/notihub/server/persistence/entity/BizMsgEntity.java index 1d399f0..d98b008 100644 --- a/src/main/java/com/kri/notihub/server/persistence/entity/BizMsgEntity.java +++ b/src/main/java/com/kri/notihub/server/persistence/entity/BizMsgEntity.java @@ -89,15 +89,15 @@ public class BizMsgEntity { @Size(max = 5) @Column(name = "`NATION_CODE`", length = 5) - private String nationCode; + private String nationCode; //알림톡에서만 사용 @Size(max = 40) @Column(name = "`SENDER_KEY`", length = 40) - private String senderKey; + private String senderKey; //알림톡에서만 사용(발송 프로필 키) @Size(max = 64) @Column(name = "`TEMPLATE_CODE`", length = 64) - private String templateCode; + private String templateCode; //알림톡에서만 사용 @Size(max = 8) @Column(name = "`RESPONSE_METHOD`", length = 8) @@ -136,7 +136,7 @@ public class BizMsgEntity { @Size(max = 1000) @Column(name = "`ATTACHED_FILE`", length = 1000) - private String attachedFile; + private String attachedFile;//알림톡에서 버튼 구현등을 위해 사용 @Size(max = 64) @Column(name = "`VXML_FILE`", length = 64) @@ -176,9 +176,7 @@ public class BizMsgEntity { private String rcsRefkey; */ - public static BizMsgEntity fromSend(TSendEntity s) { - int msgType = s.getSendTy().equals(SendType.SMS.getCode()) ? 0 : 5; - String subject = s.getSendTy().equals(SendType.SMS.getCode()) ? null : s.getMsgTitle(); + public static BizMsgEntity fromSend(TSendEntity s, int msgType, String subject) { return BizMsgEntity.builder() .cmid(s.getCmid()) @@ -192,7 +190,11 @@ public class BizMsgEntity { .sendName(s.getSendNm()) .subject(subject) .msgBody(s.getMsgBody()) + .attachedFile(s.getAtchFl())//varchar(1000) .cinfo(s.getReqstSvc()) + .nationCode(s.getNationCd())//varchar(5) + .senderKey(s.getSenderKey()) + .templateCode(s.getKkoTmplatCd()) .build(); } diff --git a/src/main/java/com/kri/notihub/server/persistence/entity/TSendEntity.java b/src/main/java/com/kri/notihub/server/persistence/entity/TSendEntity.java index 6fd65e0..246a7d3 100644 --- a/src/main/java/com/kri/notihub/server/persistence/entity/TSendEntity.java +++ b/src/main/java/com/kri/notihub/server/persistence/entity/TSendEntity.java @@ -6,6 +6,7 @@ import com.kri.notihub.server.dto.send.DestInfoDto; import com.kri.notihub.server.dto.send.SendInternalResultDto; import com.kri.notihub.server.dto.send.SendRequestBasicDto; import com.kri.notihub.server.dto.send.SendRequestSingleDto; +import com.kri.notihub.server.dto.template.TemplateDto; import io.hypersistence.utils.hibernate.type.json.JsonType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -87,6 +88,22 @@ public class TSendEntity { @Column(name = "tmplat_idx", columnDefinition = "int UNSIGNED") private Long tmplatIdx; + @Size(max = 40) + @Column(name = "sender_key", length = 40) + private String senderKey; + + @Size(max = 64) + @Column(name = "kko_tmplat_cd", length = 64) + private String kkoTmplatCd; + + @Size(max = 5) + @Column(name = "nation_cd", length = 5) + private String nationCd; + + @Size(max = 1000) + @Column(name = "atch_fl", length = 1000) + private String atchFl; + @Size(max = 64) @Column(name = "send_eml", length = 64) private String sendEml; @@ -154,9 +171,8 @@ public class TSendEntity { public static TSendEntity from( SendRequestSingleDto req, - SendType sendTy, + TemplateDto tmplat, SendInternalResultDto sendResult, - String itrntPrjctCd, String msgTitle, String msgBody, String regCmpn, @@ -171,12 +187,10 @@ public class TSendEntity { return from( req, req.getDestInfo(), - sendTy, + tmplat, sendResult, - itrntPrjctCd, req.getReqstSvc(), req.getPrjctCd(), - req.getTmplatIdx(), msgTitle, msgBody, regCmpn, @@ -191,12 +205,10 @@ public class TSendEntity { public static TSendEntity from( SendRequestBasicDto basic, DestInfoDto dest, - SendType sendTy, + TemplateDto tmplat, SendInternalResultDto sendResult, - String itrntPrjctCd, String reqstSvc, String prjctCd, - Long tmplatIdx, String msgTitle, String msgBody, String regCmpn, @@ -214,21 +226,25 @@ public class TSendEntity { return null; } - Short sendCorp = sendTy == SendType.EMAIL ? SendCorpType.PRINGO.getCode() + Short sendCorp = tmplat.getTmplatTy() == SendType.EMAIL ? SendCorpType.PRINGO.getCode() : SendCorpType.BIZ_PPURIO.getCode(); return TSendEntity.builder() .cmid(sendResult.getCmid()) .bulkSendKey(bulkSendKey) - .sendTy(sendTy.getCode()) + .sendTy(tmplat.getTmplatTy().getCode()) .resve(resve) .sendCorp(sendCorp) .sendStatus(sendResult.getStatus().getCode()) .resultCode(sendResult.getResultCode()) - .itrntPrjctCd(itrntPrjctCd) + .itrntPrjctCd(tmplat.getItrntPrjctCd()) .reqstSvc(reqstSvc) .prjctCd(prjctCd) - .tmplatIdx(tmplatIdx) + .tmplatIdx(tmplat.getTmplatIdx()) + .senderKey(tmplat.getSenderKey()) + .kkoTmplatCd(tmplat.getKkoTmplatCd()) + .nationCd(tmplat.getNationCd()) + .atchFl(tmplat.getAtchFl()) .sendEml(basic.getSendEml()) .sendTel(basic.getSendTel()) .sendNm(basic.getSendNm()) diff --git a/src/main/java/com/kri/notihub/server/persistence/entity/TTmplatEntity.java b/src/main/java/com/kri/notihub/server/persistence/entity/TTmplatEntity.java index 09840a5..bc96966 100644 --- a/src/main/java/com/kri/notihub/server/persistence/entity/TTmplatEntity.java +++ b/src/main/java/com/kri/notihub/server/persistence/entity/TTmplatEntity.java @@ -52,9 +52,25 @@ public class TTmplatEntity { @NotNull @Lob - @Column(name = "tmplat_body", nullable = false) + @Column(name = "tmplat_body", nullable = false, columnDefinition = "TEXT") private String tmplatBody; + @Size(max = 40) + @Column(name = "sender_key", length = 40) + private String senderKey; + + @Size(max = 64) + @Column(name = "kko_tmplat_cd", length = 64) + private String kkoTmplatCd; + + @Size(max = 5) + @Column(name = "nation_cd", length = 5) + private String nationCd; + + @Size(max = 1000) + @Column(name = "atch_fl", length = 1000) + private String atchFl; + @Column(name = "delay_time") private Short delayTime; @@ -103,14 +119,18 @@ public class TTmplatEntity { LocalDateTime regDt) { return TTmplatEntity.builder() .itrntPrjctCd(itrntPrjctCd) - .tmplatTy(template.tmplatTy.getCode()) - .tmplatNm(template.tmplatNm) - .tmplatTitle(template.tmplatTitle) - .tmplatBody(template.tmplatBody) - .delayTime(template.delayTime) - .sendTel(template.sendTel) - .sendEml(template.sendEml) - .sendNm(template.sendNm) + .tmplatTy(template.getTmplatTy().getCode()) + .tmplatNm(template.getTmplatNm()) + .tmplatTitle(template.getTmplatTitle()) + .tmplatBody(template.getTmplatBody()) + .senderKey(template.getSenderKey()) + .kkoTmplatCd(template.getKkoTmplatCd()) + .nationCd(template.getNationCd()) + .atchFl(template.getAtchFl()) + .delayTime(template.getDelayTime()) + .sendTel(template.getSendTel()) + .sendEml(template.getSendEml()) + .sendNm(template.getSendNm()) .regUser(regUser) .regDt(regDt) .del(false) @@ -119,14 +139,18 @@ public class TTmplatEntity { public void updateFrom(TemplateBasicDto template, String modUser, LocalDateTime modDt) { // 기본 정보 갱신 - this.tmplatTy = template.tmplatTy.getCode(); - this.tmplatNm = template.tmplatNm; - this.tmplatTitle = template.tmplatTitle; - this.tmplatBody = template.tmplatBody; - this.delayTime = template.delayTime; - this.sendTel = template.sendTel; - this.sendEml = template.sendEml; - this.sendNm = template.sendNm; + this.tmplatTy = template.getTmplatTy().getCode(); + this.tmplatNm = template.getTmplatNm(); + this.tmplatTitle = template.getTmplatTitle(); + this.tmplatBody = template.getTmplatBody(); + this.senderKey = template.getSenderKey(); + this.kkoTmplatCd = template.getKkoTmplatCd(); + this.nationCd = template.getNationCd(); + this.atchFl = template.getAtchFl(); + this.delayTime = template.getDelayTime(); + this.sendTel = template.getSendTel(); + this.sendEml = template.getSendEml(); + this.sendNm = template.getSendNm(); // 수정 메타 갱신 this.modUser = modUser; diff --git a/src/main/java/com/kri/notihub/server/persistence/repository/SendRepository.java b/src/main/java/com/kri/notihub/server/persistence/repository/SendRepository.java index 1fb47cb..1128631 100644 --- a/src/main/java/com/kri/notihub/server/persistence/repository/SendRepository.java +++ b/src/main/java/com/kri/notihub/server/persistence/repository/SendRepository.java @@ -16,9 +16,9 @@ public interface SendRepository extends JpaRepository { @Query(""" select coalesce(min(s.sendIdx), 0) from TSendEntity s - where s.sendTy = :sendTy and s.sendStatus = 0 + where s.sendTy in :sendTyList and s.sendStatus = 0 """) - long findMinSendIdxBySendTy(short sendTy); + long findMinSendIdxBySendTyList(List sendTyList); @Query(""" diff --git a/src/main/java/com/kri/notihub/server/scheduler/BizLogResultScheduler.java b/src/main/java/com/kri/notihub/server/scheduler/BizLogResultScheduler.java index b866e7c..33d9df2 100644 --- a/src/main/java/com/kri/notihub/server/scheduler/BizLogResultScheduler.java +++ b/src/main/java/com/kri/notihub/server/scheduler/BizLogResultScheduler.java @@ -1,6 +1,7 @@ package com.kri.notihub.server.scheduler; import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.util.StringUtil; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.SendStatusType; import com.kri.notihub.server.common.enums.SendType; @@ -10,7 +11,7 @@ import com.kri.notihub.server.persistence.entity.TSendEntity; import com.kri.notihub.server.persistence.repository.BizLogRepository; import com.kri.notihub.server.persistence.repository.BulkSendRepository; import com.kri.notihub.server.persistence.repository.SendRepository; -import com.kri.notihub.server.service.SmsSendCursorStore; +import com.kri.notihub.server.service.BizppurioSendCursorStore; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; @@ -31,7 +32,7 @@ import org.springframework.transaction.annotation.Transactional; @RequiredArgsConstructor public class BizLogResultScheduler { - private final SmsSendCursorStore cursorStore; + private final BizppurioSendCursorStore cursorStore; private final SendRepository sendRepository; private final BizLogRepository bizLogRepository; private final BulkSendRepository bulkSendRepository; @@ -151,7 +152,7 @@ public class BizLogResultScheduler { Map failDelta ) { String key = s.getBulkSendKey(); - if (key == null || key.isBlank()) { + if (StringUtil.isNullOrBlank(key)) { return; } if (!bulkMap.containsKey(key)) { diff --git a/src/main/java/com/kri/notihub/server/service/AbstractBizppurioSendService.java b/src/main/java/com/kri/notihub/server/service/AbstractBizppurioSendService.java new file mode 100644 index 0000000..a7e7390 --- /dev/null +++ b/src/main/java/com/kri/notihub/server/service/AbstractBizppurioSendService.java @@ -0,0 +1,84 @@ +package com.kri.notihub.server.service; + +import com.kri.common.util.CommonUtil; +import com.kri.notihub.server.common.enums.ChannelType; +import com.kri.notihub.server.common.enums.SendStatusType; +import com.kri.notihub.server.common.enums.SendType; +import com.kri.notihub.server.dto.send.DestInfoDto; +import com.kri.notihub.server.dto.send.SendInternalResultDto; +import com.kri.notihub.server.persistence.entity.BizMsgEntity; +import com.kri.notihub.server.persistence.entity.TSendEntity; +import com.kri.notihub.server.persistence.repository.BizMsgRepository; +import com.kri.notihub.server.persistence.repository.BulkSendRepository; +import com.kri.notihub.server.persistence.repository.SendRepository; +import com.kri.notihub.server.persistence.repository.TemplateRepository; +import java.util.ArrayList; +import java.util.List; + +public abstract class AbstractBizppurioSendService extends SendService { + + private final BizMsgRepository bizMsgRepository; + + protected AbstractBizppurioSendService( + TemplateRepository templateRepository, + BulkSendRepository bulkSendRepository, + BizMsgRepository bizMsgRepository, + SendRepository sendRepository, + TemplateService templateService + ) { + super(templateRepository, bulkSendRepository, sendRepository, templateService); + this.bizMsgRepository = bizMsgRepository; + } + + protected abstract ChannelType defaultChannelType(); + protected abstract short standbyResultCode(SendType sendType); + protected abstract List sendTypeList(); + protected abstract int msgType(TSendEntity sendEntity); + protected abstract String subject(TSendEntity sendEntity); + + @Override + protected final ChannelType getChannelType() { + return defaultChannelType(); + } + + @Override + protected final SendInternalResultDto doSendInternal( + Boolean isResve, + String bulkSendKey, + SendType sendType, + String sendTel, + String sendNm, + String msgTitle, + String msgBody, + DestInfoDto dest + ) { + String cmid = CommonUtil.uuid32(); + SendStatusType sendStatus = SendStatusType.STANDBY; + short resultCode = standbyResultCode(sendType); + + return SendInternalResultDto.of(cmid, sendStatus, resultCode); + } + + @Override + public void afterPersistSendEntities(List persisted) { + if (persisted == null || persisted.isEmpty()) { + return; + } + + List msgList = new ArrayList<>(persisted.size()); + + for (TSendEntity s : persisted) { + if (s == null || !sendTypeList().contains(s.getSendTy())) { + continue; + } + + BizMsgEntity m = BizMsgEntity.fromSend(s, msgType(s), subject(s)); + msgList.add(m); + } + + if (!msgList.isEmpty()) { + bizMsgRepository.saveAll(msgList); + bizMsgRepository.flush(); + } + } +} diff --git a/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java b/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java new file mode 100644 index 0000000..66de7ce --- /dev/null +++ b/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java @@ -0,0 +1,168 @@ +package com.kri.notihub.server.service; + +import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.util.CommonUtil; +import com.kri.common.util.NumericUtil; +import com.kri.notihub.server.common.consts.NotihubConst; +import com.kri.notihub.server.common.enums.ChannelType; +import com.kri.notihub.server.common.enums.SendStatusType; +import com.kri.notihub.server.common.enums.SendType; +import com.kri.notihub.server.common.external.pringo.PringoApiClient; +import com.kri.notihub.server.common.external.pringo.dto.PringoJsonSendRequestDto; +import com.kri.notihub.server.common.external.pringo.dto.PringoJsonSendResponseDto; +import com.kri.notihub.server.dto.send.DestInfoDto; +import com.kri.notihub.server.dto.send.SendInternalResultDto; +import com.kri.notihub.server.persistence.entity.TSendEntity; +import com.kri.notihub.server.persistence.repository.BulkSendRepository; +import com.kri.notihub.server.persistence.repository.SendRepository; +import com.kri.notihub.server.persistence.repository.TemplateRepository; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ThreadLocalRandom; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public abstract class AbstractPringoSendService extends SendService { + + private final PringoApiClient pringoApiClient; + private final EmailResultPoller emailResultPoller; + + protected AbstractPringoSendService( + TemplateRepository templateRepository, + BulkSendRepository bulkSendRepository, + SendRepository sendRepository, + TemplateService templateService, + PringoApiClient pringoApiClient, + EmailResultPoller emailResultPoller + ) { + super(templateRepository, bulkSendRepository, sendRepository, templateService); + this.pringoApiClient = pringoApiClient; + this.emailResultPoller = emailResultPoller; + } + + protected abstract ChannelType defaultChannelType(); + + @Override + protected final ChannelType getChannelType() { + return defaultChannelType(); + } + + @Override + protected SendInternalResultDto doSendInternal( + Boolean isResve, + String bulkSendKey, + SendType sendType, //Sms에서 사용 Email에서는 의미 없음 + String sendEml, + String sendNm, + String msgTitle, + String msgBody, + DestInfoDto dest + ) { + if (Boolean.TRUE.equals(isResve)) { + //예약 용 cmid 생성 추후 실제 발송 후 갱신 + String ts = DateTimeUtil.nowKstLocalDateTime() + .format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")); + + int r = ThreadLocalRandom.current().nextInt(36 * 36 * 36); + String suffix = String.format("%3s", Integer.toString(r, 36)).replace(' ', '0'); + + String cmid = NotihubConst.EMAIL_RESERVATION_PREFIX + ts + suffix; + + return SendInternalResultDto.of(cmid, SendStatusType.STANDBY, NotihubConst.EMAIL_STANDBY); + } else { + PringoJsonSendRequestDto pringoReq = buildPringoSendRequest(sendEml, sendNm, msgTitle, + msgBody, dest); + return sendPringoEmail(pringoReq); + } + } + + public SendInternalResultDto sendPringoEmail(PringoJsonSendRequestDto pringoReq) { + PringoJsonSendResponseDto pringoRes = null; + try { + pringoRes = pringoApiClient.jsonSend(pringoReq); + } catch (Exception e) { + log.warn("Pringo json-send failed (pringoReq={})", pringoReq, e); + } + + String cmid = resolveEmailCmid(pringoRes); + SendStatusType sendStatus; + short resultCode; + + if (pringoRes != null && pringoRes.isSuccess() && pringoRes.getReturnKey() != null) { + //발송 요청에 성공한 것이지 발송이 성공이 아니므로 STANDBY 유지 + sendStatus = SendStatusType.STANDBY; + resultCode = NotihubConst.EMAIL_PENDING; + } else { + sendStatus = SendStatusType.FAIL; + resultCode = NotihubConst.EMAIL_SEND_FAIL; + } + + return SendInternalResultDto.of(cmid, sendStatus, resultCode); + } + + @Override + public void afterPersistSendEntities(List persisted) { + if (persisted == null || persisted.isEmpty()) { + return; + } + + for (TSendEntity e : persisted) { + if (validateSendEntity(e)) { + emailResultPoller.enqueue(e.getCmid()); + } + } + } + + public PringoJsonSendRequestDto buildPringoSendRequest( + String sendEml, + String sendNm, + String msgTitle, + String msgBody, + DestInfoDto dest + ) { + Map vars = new HashMap<>(); + if (dest.getMsgParam() != null) { + vars.putAll(dest.getMsgParam()); + } + + return PringoJsonSendRequestDto.builder() + .sender(sendEml) + .senderName(Optional.ofNullable(sendNm).orElse("")) + .recipient(dest.getDestEml()) + .recipientName(Optional.ofNullable(dest.getDestNm()).orElse("")) + .subject(Optional.ofNullable(msgTitle).orElse("")) + .body(Optional.ofNullable(msgBody).orElse("")) + .vars(vars) + .build(); + } + + private String resolveEmailCmid(PringoJsonSendResponseDto pringoRes) { + if (pringoRes != null && pringoRes.isSuccess() && pringoRes.getReturnKey() != null) { + return String.valueOf(pringoRes.getReturnKey()); + } + // return_key 미수신 케이스는 SendFau + return CommonUtil.uuid32(); + } + + private boolean validateSendEntity(TSendEntity e) { + if (e == null) { + return false; + } + + // Pringo return polling이 필요한 상태만 + if (e.getResultCode() == null || e.getResultCode() != NotihubConst.EMAIL_PENDING) { + return false; + } + + //예약은 갱신용 큐에 넣지 않음 + if (e.getCmid().startsWith(NotihubConst.EMAIL_RESERVATION_PREFIX)) { + return false; + } + + // return_key(숫자)인 경우만 + return NumericUtil.isNumeric(e.getCmid()); + } +} diff --git a/src/main/java/com/kri/notihub/server/service/SmsSendCursorStore.java b/src/main/java/com/kri/notihub/server/service/BizppurioSendCursorStore.java similarity index 63% rename from src/main/java/com/kri/notihub/server/service/SmsSendCursorStore.java rename to src/main/java/com/kri/notihub/server/service/BizppurioSendCursorStore.java index 21f925c..8779374 100644 --- a/src/main/java/com/kri/notihub/server/service/SmsSendCursorStore.java +++ b/src/main/java/com/kri/notihub/server/service/BizppurioSendCursorStore.java @@ -1,14 +1,16 @@ package com.kri.notihub.server.service; -import com.kri.notihub.server.common.enums.SendType; +import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.persistence.repository.SendRepository; import jakarta.annotation.PostConstruct; +import java.util.List; +import java.util.stream.Stream; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor -public class SmsSendCursorStore { +public class BizppurioSendCursorStore { // 프로세스 전역 커서(스레드 세이프) private static final java.util.concurrent.atomic.AtomicLong CURSOR = new java.util.concurrent.atomic.AtomicLong( @@ -18,7 +20,14 @@ public class SmsSendCursorStore { // 서비스 기동 시: t_send에서 sendTy=SMS의 max(send_idx)로 초기화 @PostConstruct public void init() { - long maxSendIdx = sendRepository.findMinSendIdxBySendTy(SendType.SMS.getCode()); + List bizppurioTypeList = Stream.concat( + NotihubConst.SMS_TYPE_CODE_LIST.stream(), + NotihubConst.KKO_TYPE_CODE_LIST.stream() + ) + .distinct() + .toList(); + + long maxSendIdx = sendRepository.findMinSendIdxBySendTyList(bizppurioTypeList); CURSOR.set(maxSendIdx); } diff --git a/src/main/java/com/kri/notihub/server/service/EmailResultUpdater.java b/src/main/java/com/kri/notihub/server/service/EmailResultUpdater.java index 25acc28..d9d9f03 100644 --- a/src/main/java/com/kri/notihub/server/service/EmailResultUpdater.java +++ b/src/main/java/com/kri/notihub/server/service/EmailResultUpdater.java @@ -1,7 +1,7 @@ package com.kri.notihub.server.service; import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.util.CommonUtil; +import com.kri.common.util.NumericUtil; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.SendStatusType; import com.kri.notihub.server.common.external.pringo.PringoApiClient; @@ -56,7 +56,7 @@ class EmailResultUpdater { return true; } - short resultCode = CommonUtil.safeParseShort(item.getStatus(), NotihubConst.EMAIL_NOT_RESULT); + short resultCode = NumericUtil.safeParseShort(item.getStatus(), NotihubConst.EMAIL_NOT_RESULT); //resultCode를 대상으로 Success인지 아닌지 판별 필요 SendStatusType sendStatus = diff --git a/src/main/java/com/kri/notihub/server/service/SendEmailService.java b/src/main/java/com/kri/notihub/server/service/SendEmailService.java index fd1ec31..24e0930 100644 --- a/src/main/java/com/kri/notihub/server/service/SendEmailService.java +++ b/src/main/java/com/kri/notihub/server/service/SendEmailService.java @@ -1,35 +1,19 @@ package com.kri.notihub.server.service; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.util.CommonUtil; import com.kri.notihub.server.common.consts.NotihubConst; -import com.kri.notihub.server.common.enums.SendStatusType; +import com.kri.notihub.server.common.enums.ChannelType; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.common.external.pringo.PringoApiClient; -import com.kri.notihub.server.common.external.pringo.dto.PringoJsonSendRequestDto; -import com.kri.notihub.server.common.external.pringo.dto.PringoJsonSendResponseDto; -import com.kri.notihub.server.dto.send.DestInfoDto; -import com.kri.notihub.server.dto.send.SendInternalResultDto; -import com.kri.notihub.server.persistence.entity.TSendEntity; import com.kri.notihub.server.persistence.repository.BulkSendRepository; import com.kri.notihub.server.persistence.repository.SendRepository; import com.kri.notihub.server.persistence.repository.TemplateRepository; -import java.time.format.DateTimeFormatter; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.ThreadLocalRandom; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j @Service -public class SendEmailService extends SendService { - - private final PringoApiClient pringoApiClient; - private final EmailResultPoller emailResultPoller; - private final EmailResultUpdater emailResultUpdater; +public class SendEmailService extends AbstractPringoSendService { public SendEmailService( TemplateRepository templateRepository, @@ -37,132 +21,13 @@ public class SendEmailService extends SendService { SendRepository sendRepository, TemplateService templateService, PringoApiClient pringoApiClient, - EmailResultPoller emailResultPoller, - EmailResultUpdater emailResultUpdater + EmailResultPoller emailResultPoller ) { - super(templateRepository, bulkSendRepository, sendRepository, templateService); - this.pringoApiClient = pringoApiClient; - this.emailResultPoller = emailResultPoller; - this.emailResultUpdater = emailResultUpdater; + super(templateRepository, bulkSendRepository, sendRepository, templateService, pringoApiClient, emailResultPoller); } @Override - protected SendType getSendType() { - return SendType.EMAIL; - } - - @Override - protected SendInternalResultDto doSendInternal( - Boolean isResve, - String bulkSendKey, - SendType sendType, //Sms에서 사용 Email에서는 의미 없음 - String sendEml, - String sendNm, - String msgTitle, - String msgBody, - DestInfoDto dest - ) { - if (Boolean.TRUE.equals(isResve)) { - //예약 용 cmid 생성 추후 실제 발송 후 갱신 - String ts = DateTimeUtil.nowKstLocalDateTime() - .format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")); - - int r = ThreadLocalRandom.current().nextInt(36 * 36 * 36); - String suffix = String.format("%3s", Integer.toString(r, 36)).replace(' ', '0'); - - String cmid = NotihubConst.EMAIL_RESERVATION_PREFIX + ts + suffix; - - return SendInternalResultDto.of(cmid, SendStatusType.STANDBY, NotihubConst.EMAIL_STANDBY); - } else { - PringoJsonSendRequestDto pringoReq = buildPringoSendRequest(sendEml, sendNm, msgTitle, - msgBody, dest); - return sendPringoEmail(pringoReq); - } - } - - public SendInternalResultDto sendPringoEmail(PringoJsonSendRequestDto pringoReq) { - PringoJsonSendResponseDto pringoRes = null; - try { - pringoRes = pringoApiClient.jsonSend(pringoReq); - } catch (Exception e) { - log.warn("Pringo json-send failed (pringoReq={})", pringoReq, e); - } - - String cmid = resolveEmailCmid(pringoRes); - SendStatusType sendStatus; - short resultCode; - - if (pringoRes != null && pringoRes.isSuccess() && pringoRes.getReturnKey() != null) { - //발송 요청에 성공한 것이지 발송이 성공이 아니므로 STANDBY 유지 - //sendStatus = SendStatusType.SUCCESS; - sendStatus = SendStatusType.STANDBY; - resultCode = NotihubConst.EMAIL_PENDING; - } else { - sendStatus = SendStatusType.FAIL; - resultCode = NotihubConst.EMAIL_SEND_FAIL; - } - - return SendInternalResultDto.of(cmid, sendStatus, resultCode); - } - - @Override - public void afterPersistSendEntities(List persisted) { - if (persisted == null || persisted.isEmpty()) { - return; - } - - for (TSendEntity e : persisted) { - if (e == null) { - continue; - } - - // Pringo return polling이 필요한 상태만 - if (e.getResultCode() == null || e.getResultCode() != NotihubConst.EMAIL_PENDING) { - continue; - } - - //예약은 갱신용 큐에 넣지 않음 - if (e.getCmid().startsWith(NotihubConst.EMAIL_RESERVATION_PREFIX)) { - continue; - } - - // return_key(숫자)인 경우만 - if (!CommonUtil.isNumeric(e.getCmid())) { - continue; - } - - emailResultPoller.enqueue(e.getCmid()); - } - } - - public PringoJsonSendRequestDto buildPringoSendRequest( - String sendEml, - String sendNm, - String msgTitle, - String msgBody, - DestInfoDto dest - ) { - Map vars = new HashMap<>(); - if (dest.getMsgParam() != null) { - vars.putAll(dest.getMsgParam()); - } - - return PringoJsonSendRequestDto.builder() - .sender(sendEml) - .senderName(Optional.ofNullable(sendNm).orElse("")) - .recipient(dest.getDestEml()) - .recipientName(Optional.ofNullable(dest.getDestNm()).orElse("")) - .subject(Optional.ofNullable(msgTitle).orElse("")) - .body(Optional.ofNullable(msgBody).orElse("")) - .vars(vars) - .build(); - } - - private String resolveEmailCmid(PringoJsonSendResponseDto pringoRes) { - if (pringoRes != null && pringoRes.isSuccess() && pringoRes.getReturnKey() != null) { - return String.valueOf(pringoRes.getReturnKey()); - } - // return_key 미수신 케이스는 SendFau - return CommonUtil.uuid32(); + protected ChannelType defaultChannelType() { + return ChannelType.EMAIL; } } diff --git a/src/main/java/com/kri/notihub/server/service/SendKkoAtService.java b/src/main/java/com/kri/notihub/server/service/SendKkoAtService.java new file mode 100644 index 0000000..359edf8 --- /dev/null +++ b/src/main/java/com/kri/notihub/server/service/SendKkoAtService.java @@ -0,0 +1,49 @@ +package com.kri.notihub.server.service; + +import com.kri.notihub.server.common.consts.NotihubConst; +import com.kri.notihub.server.common.enums.ChannelType; +import com.kri.notihub.server.common.enums.SendType; +import com.kri.notihub.server.persistence.entity.TSendEntity; +import com.kri.notihub.server.persistence.repository.BizMsgRepository; +import com.kri.notihub.server.persistence.repository.BulkSendRepository; +import com.kri.notihub.server.persistence.repository.SendRepository; +import com.kri.notihub.server.persistence.repository.TemplateRepository; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class SendKkoAtService extends AbstractBizppurioSendService { + + public SendKkoAtService( + TemplateRepository templateRepository, + BulkSendRepository bulkSendRepository, + BizMsgRepository bizMsgRepository, + SendRepository sendRepository, + TemplateService templateService + ) { + super(templateRepository, bulkSendRepository, bizMsgRepository, sendRepository, + templateService); + } + + @Override + protected ChannelType defaultChannelType() { + return ChannelType.KKO_AT; + } + + @Override + protected short standbyResultCode(SendType sendType) { + return NotihubConst.KKO_AT_STANDBY; + } + + @Override + protected List sendTypeList() { + return NotihubConst.KKO_TYPE_CODE_LIST; + } + + @Override + protected int msgType(TSendEntity sendEntity) { return 6;} + + @Override + protected String subject(TSendEntity sendEntity) { return null; } + +} diff --git a/src/main/java/com/kri/notihub/server/service/SendService.java b/src/main/java/com/kri/notihub/server/service/SendService.java index 61f8a17..1a94e47 100644 --- a/src/main/java/com/kri/notihub/server/service/SendService.java +++ b/src/main/java/com/kri/notihub/server/service/SendService.java @@ -3,8 +3,10 @@ package com.kri.notihub.server.service; import static org.apache.commons.lang3.StringUtils.firstNonBlank; import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.util.StringUtil; import com.kri.common.web.BusinessException; import com.kri.notihub.server.common.consts.NotihubConst; +import com.kri.notihub.server.common.enums.ChannelType; import com.kri.notihub.server.common.enums.SendStatusType; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto; @@ -69,7 +71,7 @@ public abstract class SendService { } TemplateDto tmplat = templateService.getTemplate(req.getTmplatIdx()); - validateTemplateType(tmplat, getSendType()); + validateTemplateType(tmplat); TBulkSendEntity bulk = TBulkSendEntity.from(req, now); TBulkSendEntity saved = bulkSendRepository.save(bulk); @@ -77,13 +79,15 @@ public abstract class SendService { return saved.getBulkSendKey(); } - protected void validateTemplateType(TemplateDto tmplat, SendType requiredType) { + protected void validateTemplateType(TemplateDto tmplat) { + ChannelType requiredType = getChannelType(); + if (tmplat == null || requiredType == null) { return; } int tmplatTy = tmplat.getTmplatTy().getCode() / 10; - int required = requiredType.getCode() / 10; + int required = requiredType.getCode(); if (tmplat.getTmplatTy() == null || tmplatTy != required) { throw BusinessException.badRequest("WRONG_TEMPLATE_TYPE", "템플릿 타입이 잘 못 됐습니다.") @@ -112,16 +116,16 @@ public abstract class SendService { } TemplateDto tmplat = templateService.getTemplate(req.getTmplatIdx()); - validateTemplateType(tmplat, getSendType()); + validateTemplateType(tmplat); LocalDateTime sendDt = req.getSendDt() != null ? req.getSendDt() : now; String sendTel = firstNonBlank(req.getSendTel(), tmplat.getSendTel()); String sendEml = firstNonBlank(req.getSendEml(), tmplat.getSendEml()); - String sendFrom = getSendType() == SendType.EMAIL ? sendEml : sendTel; + String sendFrom = isEmailChannel() ? sendEml : sendTel; String sendNm = firstNonBlank(req.getSendNm(), tmplat.getSendNm()); if (sendFrom == null || sendFrom.isBlank()) { - if (getSendType() == SendType.EMAIL) { + if (isEmailChannel()) { throw BusinessException.badRequest("SEND_EMAIL_REQUIRED", "sendEml은 필수 입니다."); } else { throw BusinessException.badRequest("SEND_TEL_REQUIRED", "sendTel은 필수 입니다."); @@ -129,9 +133,9 @@ public abstract class SendService { } DestInfoDto dest = req.getDestInfo(); - String sendTo = getSendType() == SendType.EMAIL ? dest.getDestEml() : dest.getDestTel(); + String sendTo = isEmailChannel() ? dest.getDestEml() : dest.getDestTel(); if (sendTo == null || sendTo.isBlank()) { - if (getSendType() == SendType.EMAIL) { + if (isEmailChannel()) { throw BusinessException.badRequest("DEST_EMAIL_REQUIRED", "destEml은 필수 입니다."); } else { throw BusinessException.badRequest("DEST_TEL_REQUIRED", "destTel은 필수 입니다."); @@ -159,9 +163,8 @@ public abstract class SendService { List sendInfo = new ArrayList<>(List.of( TSendEntity.from( req, - tmplat.getTmplatTy(), + tmplat, sendResult, - tmplat.getItrntPrjctCd(), msgTitle, msgBody, regCmpn, @@ -203,18 +206,18 @@ public abstract class SendService { } TemplateDto tmplat = templateService.getTemplate(bulk.getTmplatIdx()); - validateTemplateType(tmplat, getSendType()); + validateTemplateType(tmplat); Boolean isResve = bulk.getResve(); LocalDateTime sendDt = bulk.getSendDt() != null ? bulk.getSendDt() : now; String sendTel = firstNonBlank(req.getSendTel(), tmplat.getSendTel()); String sendEml = firstNonBlank(req.getSendEml(), tmplat.getSendEml()); - String sendFrom = getSendType() == SendType.EMAIL ? sendEml : sendTel; + String sendFrom = isEmailChannel() ? sendEml : sendTel; String sendNm = firstNonBlank(req.getSendNm(), tmplat.getSendNm()); if (sendFrom == null || sendFrom.isBlank()) { - if (getSendType() == SendType.EMAIL) { + if (isEmailChannel()) { throw BusinessException.badRequest("SENDER_EMAIL_REQUIRED", "sendEml은 필수 입니다."); } else { throw BusinessException.badRequest("SENDER_TEL_REQUIRED", "sendTel은 필수 입니다."); @@ -237,7 +240,7 @@ public abstract class SendService { List chunk = req.getDestInfoList().subList(offset, end); for (DestInfoDto dest : chunk) { - String sendTo = getSendType() == SendType.EMAIL ? dest.getDestEml() : dest.getDestTel(); + String sendTo = isEmailChannel() ? dest.getDestEml() : dest.getDestTel(); if (dest == null || sendTo.isBlank()) { failCnt++; continue; @@ -267,12 +270,10 @@ public abstract class SendService { TSendEntity.from( req, dest, - tmplat.getTmplatTy(), + tmplat, sendResult, - tmplat.getItrntPrjctCd(), bulk.getReqstSvc(), bulk.getPrjctCd(), - bulk.getTmplatIdx(), msgTitle, msgBody, bulk.getRegCmpn(), @@ -284,7 +285,7 @@ public abstract class SendService { ) ); - if (getSendType() == SendType.EMAIL) { + if (isEmailChannel()) { // 발송 간 딜레이(Pringo rate-limit 대응) long delay = Math.max(tmplat.getDelayTime(), NotihubConst.EMAIL_DELAY); sleepSilently(delay); @@ -311,7 +312,7 @@ public abstract class SendService { return text; } - Pattern pattern = Pattern.compile("\\[\\$([^\\]]+)]"); + Pattern pattern = Pattern.compile("(?:\\[\\$|#\\{)([^\\]}]+)(?:]|})"); // [$A] 또는 #{A} Matcher matcher = pattern.matcher(text); StringBuilder sb = new StringBuilder(); @@ -364,5 +365,9 @@ public abstract class SendService { } } - protected abstract SendType getSendType(); + protected boolean isEmailChannel() { + return getChannelType() == ChannelType.EMAIL; + } + + protected abstract ChannelType getChannelType(); } diff --git a/src/main/java/com/kri/notihub/server/service/SendSmsService.java b/src/main/java/com/kri/notihub/server/service/SendSmsService.java index 4d1bcff..1b0d69b 100644 --- a/src/main/java/com/kri/notihub/server/service/SendSmsService.java +++ b/src/main/java/com/kri/notihub/server/service/SendSmsService.java @@ -1,92 +1,53 @@ package com.kri.notihub.server.service; -import com.kri.common.util.CommonUtil; import com.kri.notihub.server.common.consts.NotihubConst; -import com.kri.notihub.server.common.enums.SendStatusType; +import com.kri.notihub.server.common.enums.ChannelType; import com.kri.notihub.server.common.enums.SendType; -import com.kri.notihub.server.dto.send.DestInfoDto; -import com.kri.notihub.server.dto.send.SendInternalResultDto; -import com.kri.notihub.server.persistence.entity.BizMsgEntity; import com.kri.notihub.server.persistence.entity.TSendEntity; import com.kri.notihub.server.persistence.repository.BizMsgRepository; import com.kri.notihub.server.persistence.repository.BulkSendRepository; import com.kri.notihub.server.persistence.repository.SendRepository; import com.kri.notihub.server.persistence.repository.TemplateRepository; -import java.util.ArrayList; import java.util.List; import org.springframework.stereotype.Service; @Service -public class SendSmsService extends SendService { - - private final BizMsgRepository bizMsgRepository; +public class SendSmsService extends AbstractBizppurioSendService { public SendSmsService( - BizMsgRepository bizMsgRepository, TemplateRepository templateRepository, BulkSendRepository bulkSendRepository, + BizMsgRepository bizMsgRepository, SendRepository sendRepository, TemplateService templateService ) { - super(templateRepository, bulkSendRepository, sendRepository, templateService); - this.bizMsgRepository = bizMsgRepository; + super(templateRepository, bulkSendRepository, bizMsgRepository, sendRepository, templateService); } @Override - protected SendType getSendType() { - //일단 SMS로 내보내고 발송시에 Template의 SendType 또는 MessageBody, 제목여부로 강화 필요 - return SendType.SMS; // 프로젝트 enum 기준 + protected ChannelType defaultChannelType() { + return ChannelType.SMS; } @Override - protected SendInternalResultDto doSendInternal( - Boolean isResve, - String bulkSendKey, - SendType sendType, - String sendTel, - String sendNm, - String msgTitle, - String msgBody, - DestInfoDto dest - ) { - //문자는 비즈 뿌리오가 발송을 해주기 때문에 예약도 따로 처리할 필요 없음 - - String cmid = CommonUtil.uuid32(); - SendStatusType sendStatus = SendStatusType.STANDBY; - short resultCode = - sendType == SendType.LMS_MMS ? NotihubConst.LMS_MMS_STANDBY : NotihubConst.SMS_STANDBY; - - return SendInternalResultDto.of( - cmid, - sendStatus, - resultCode - ); + protected short standbyResultCode(SendType sendType) { + return sendType == SendType.LMS_MMS + ? NotihubConst.LMS_MMS_STANDBY + : NotihubConst.SMS_STANDBY; } @Override - public void afterPersistSendEntities(List persisted) { - if (persisted == null || persisted.isEmpty()) { - return; - } + protected List sendTypeList() { + return NotihubConst.SMS_TYPE_CODE_LIST; + } - List msgList = new ArrayList<>(persisted.size()); + @Override + protected int msgType(TSendEntity sendEntity) { + return sendEntity.getSendTy().equals(SendType.SMS.getCode()) ? 0 : 5; + } - for (TSendEntity s : persisted) { - if (s == null) { - continue; - } - - if (NotihubConst.MOBILE_TYPE_LIST.contains(s.getSendTy())) { - continue; - } - - BizMsgEntity m = BizMsgEntity.fromSend(s); - msgList.add(m); - } - - if (!msgList.isEmpty()) { - bizMsgRepository.saveAll(msgList); - bizMsgRepository.flush(); - } + @Override + protected String subject(TSendEntity sendEntity) { + return sendEntity.getSendTy().equals(SendType.SMS.getCode()) ? null : sendEntity.getMsgTitle(); } } diff --git a/src/main/java/com/kri/notihub/server/service/TemplateService.java b/src/main/java/com/kri/notihub/server/service/TemplateService.java index 1acfea9..d530562 100644 --- a/src/main/java/com/kri/notihub/server/service/TemplateService.java +++ b/src/main/java/com/kri/notihub/server/service/TemplateService.java @@ -1,6 +1,7 @@ package com.kri.notihub.server.service; import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.util.StringUtil; import com.kri.common.web.BusinessException; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.ChannelType; @@ -16,10 +17,13 @@ import com.kri.notihub.server.persistence.repository.TemplateEventLogRepository; import com.kri.notihub.server.persistence.repository.TemplateRepository; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +@Log4j2 @Service @RequiredArgsConstructor public class TemplateService { @@ -28,8 +32,11 @@ public class TemplateService { private final TemplateEventLogRepository templateEventLogRepository; @Transactional - public TemplateDto createTemplate(String itrntPrjctCd, TemplateBasicDto template, - String regUser) { + public TemplateDto createTemplate( + String itrntPrjctCd, + TemplateBasicDto template, + String regUser + ) { final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); validateBySendType(template); @@ -47,12 +54,13 @@ public class TemplateService { } public List getTemplateList(ChannelType chnnlTy, String itrntPrjctCd) { - List tmplatTyList = chnnlTy == ChannelType.SMS - ? NotihubConst.MOBILE_TYPE_CODE_LIST - : NotihubConst.EMAIL_TYPE_CODE_LIST; + List tmplatTyList = getSendTypeCodeList(chnnlTy); - return templateRepository.findAllByTmplatTyInAndItrntPrjctCdAndDelFalse(tmplatTyList, - itrntPrjctCd).stream() + return templateRepository.findAllByTmplatTyInAndItrntPrjctCdAndDelFalse( + tmplatTyList, + itrntPrjctCd + ) + .stream() .map(TemplateSummaryDto::from) .toList(); } @@ -133,21 +141,30 @@ public class TemplateService { templateEventLogRepository.save(log); } + private List getSendTypeCodeList(ChannelType chnnlTy) { + return switch (chnnlTy) { + case EMAIL -> NotihubConst.EMAIL_TYPE_CODE_LIST; + case SMS -> NotihubConst.SMS_TYPE_CODE_LIST; + case KKO_AT -> NotihubConst.KKO_TYPE_CODE_LIST; + default -> List.of(); + }; + } + private void validateBySendType(TemplateBasicDto template) { //공통 검증 if (template.getTmplatTy() == null) { throw BusinessException.badRequest("NULL TYPE", "템플릿 타입은 필수입니다."); } - if (template.getTmplatNm() == null || template.getTmplatNm().isBlank()) { + if (StringUtil.isNullOrBlank(template.getTmplatNm())) { throw BusinessException.badRequest("EMPTY_NAME", "템플릿 명은 필수입니다."); } - if (template.getTmplatBody() == null || template.getTmplatBody().isBlank()) { + if (StringUtil.isNullOrBlank(template.getTmplatBody())) { throw BusinessException.badRequest("EMPTY_BODY", "내용은 필수입니다."); } - if (template.getSendNm() == null || template.getSendNm().isBlank()) { + if (StringUtil.isNullOrBlank(template.getSendNm())) { throw BusinessException.badRequest("EMPTY_SEND_NAME", "발신자 명은 필수입니다."); } @@ -160,22 +177,36 @@ public class TemplateService { } } - SendType ty = template.getTmplatTy(); - if (ty == SendType.EMAIL) { - if (template.getSendEml() == null || template.getSendEml().isBlank()) { + Short ty = template.getTmplatTy().getCode(); + if (NotihubConst.EMAIL_TYPE_CODE_LIST.contains(ty)) { + if (StringUtil.isNullOrBlank(template.getSendEml())) { throw BusinessException.badRequest("EMPTY_EMAIL", "이메일은 필수입니다."); } - if (template.getTmplatTitle() == null || template.getTmplatTitle().isBlank()) { + if (StringUtil.isNullOrBlank(template.getTmplatTitle())) { throw BusinessException.badRequest("EMPTY_TITLE", "제목은 필수입니다."); } template.setSendTel(null); - } else if (NotihubConst.MOBILE_TYPE_LIST.contains(ty)) { - if (template.getSendTel() == null || template.getSendTel().isBlank()) { + } else if (NotihubConst.SMS_TYPE_CODE_LIST.contains(ty) || NotihubConst.KKO_TYPE_CODE_LIST.contains(ty)) { + if (StringUtil.isNullOrBlank(template.getSendTel())) { throw BusinessException.badRequest("EMPTY_TEL", "발송번호는 필수입니다."); } - if (ty == SendType.SMS) { + if(NotihubConst.KKO_TYPE_CODE_LIST.contains(ty)) { + if(StringUtil.isNullOrBlank(template.getNationCd())){ + template.setNationCd(NotihubConst.NATION_CODE); + } + + if(StringUtil.isNullOrBlank(template.getSenderKey())){ + throw BusinessException.badRequest("EMPTY_SENDER_KEY", "Sender Key는 필수입니다."); + } + + if(StringUtil.isNullOrBlank(template.getKkoTmplatCd())){ + throw BusinessException.badRequest("EMPTY_KKO_TMPLAT_CD", "Kakao Talk Template Code는 필수입니다."); + } + } + + if (Objects.equals(ty, SendType.SMS.getCode()) || NotihubConst.KKO_TYPE_CODE_LIST.contains(ty)) { template.setTmplatTitle(null); } template.setSendEml(null); diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index b2856fd..791c46f 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -20,10 +20,11 @@ spring: hibernate: dialect: org.hibernate.dialect.MySQL8Dialect format_sql: true - show_sql: true + show_sql: false open-in-view: false - logging: - level: - org.hibernate.SQL: debug - org.hibernate.type.descriptor.sql.BasicBinder: trace \ No newline at end of file +logging: + level: + org.hibernate.SQL: DEBUG + org.hibernate.orm.jdbc.bind: TRACE + org.hibernate.orm.jdbc.extract: TRACE \ No newline at end of file