261008_01_ENH: 알림톡 템플릿 관련내용 구현 및 발송 구현
This commit is contained in:
@@ -24,6 +24,7 @@ import com.kri.contact.server.dto.message.MessageSendBulkRequestDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendSingleRequestDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendSingleResponseDto;
|
||||
import com.kri.contact.server.dto.project.ProjectInfoDto;
|
||||
import com.kri.contact.server.dto.project.ProjectSurveyDto;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
@@ -81,6 +82,24 @@ public class MessageSendService {
|
||||
return sendBulk(prjctIdx, request, ctx, ChannelType.SMS);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public MessageSendSingleResponseDto sendKkoSingle(
|
||||
Long prjctIdx,
|
||||
MessageSendSingleRequestDto request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return sendSingle(prjctIdx, request, ctx, ChannelType.KKO_AT);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public MessageSendBulkResponseDto sendKkoBulk(
|
||||
Long prjctIdx,
|
||||
MessageSendBulkRequestDto request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return sendBulk(prjctIdx, request, ctx, ChannelType.KKO_AT);
|
||||
}
|
||||
|
||||
private MessageSendSingleResponseDto sendSingle(
|
||||
Long prjctIdx,
|
||||
MessageSendSingleRequestDto request,
|
||||
@@ -124,6 +143,8 @@ public class MessageSendService {
|
||||
|
||||
if (channelType == ChannelType.EMAIL) {
|
||||
response = notiHubApiClient.sendEmailSingle(notiRequest, ctx);
|
||||
} else if (channelType == ChannelType.KKO_AT) {
|
||||
response = notiHubApiClient.sendKkoSingle(notiRequest, ctx);
|
||||
} else {
|
||||
response = notiHubApiClient.sendSmsSingle(notiRequest, ctx);
|
||||
}
|
||||
@@ -237,7 +258,7 @@ public class MessageSendService {
|
||||
) {
|
||||
List<NotiHubDestInfoDto> result = new ArrayList<>();
|
||||
for (ListSearchService.DownloadListRow row : rows) {
|
||||
Map<String, String> msgParam = createMessageParams(row, messageContext.paramHeaderByName());
|
||||
Map<String, String> msgParam = createMessageParams(row, messageContext);
|
||||
String destNm = resolveHeaderValue(row, messageContext.headerById().get(destNameHeaderId));
|
||||
|
||||
for (Integer destHeaderId : destHeaderIds) {
|
||||
@@ -274,7 +295,7 @@ public class MessageSendService {
|
||||
Set<String> bodyParams = extractTemplateParams(template.getTmplatBody());
|
||||
Set<String> templateParams = SetUtils.union(titleParams, bodyParams);
|
||||
|
||||
Map<Integer, ListHeaderDto> headerById = listHeaderService.getHeader(prjctIdx).stream()
|
||||
Map<Integer, ListHeaderDto> headerById = listHeaderService.getHeader(prjctIdx).stream()
|
||||
.collect(Collectors.toMap(
|
||||
ListHeaderDto::getListHderId,
|
||||
header -> header,
|
||||
@@ -299,7 +320,29 @@ public class MessageSendService {
|
||||
LinkedHashMap::new
|
||||
));
|
||||
|
||||
return new MessageContext(project, template, headerById, paramHeaderByName);
|
||||
Map<String, String> surveyUrlByName = new LinkedHashMap<>();
|
||||
if (project.getSurveys() != null) {
|
||||
for (ProjectSurveyDto survey : project.getSurveys()) {
|
||||
String name = survey.getSurveyName();
|
||||
String url = normalizeBlank(survey.getSurveyUrl());
|
||||
if (!templateParams.contains(name) || paramHeaderByName.containsKey(name) || url == null) {
|
||||
continue;
|
||||
}
|
||||
if (surveyUrlByName.putIfAbsent(name, url) != null) {
|
||||
throw BusinessException.badRequest("DUPLICATE_SURVEY_NAME", "치환할 설문명이 중복됩니다.")
|
||||
.with("surveyName", name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Set<String> requiredHeaderParams = new HashSet<>(templateParams);
|
||||
surveyUrlByName.values().forEach(url -> requiredHeaderParams.addAll(extractTemplateParams(url)));
|
||||
headerById.values().stream()
|
||||
.filter(header -> requiredHeaderParams.contains(header.getListHderNm()))
|
||||
.forEach(header -> paramHeaderByName.putIfAbsent(header.getListHderNm(), header));
|
||||
|
||||
return new MessageContext(project, template, headerById, paramHeaderByName,
|
||||
templateParams, surveyUrlByName);
|
||||
}
|
||||
|
||||
private String createBulkSendKey(
|
||||
@@ -320,9 +363,11 @@ public class MessageSendService {
|
||||
.trgtCnt(targetCount)
|
||||
.build();
|
||||
|
||||
return channelType == ChannelType.EMAIL
|
||||
? notiHubApiClient.createEmailBulk(notiRequest)
|
||||
: notiHubApiClient.createSmsBulk(notiRequest);
|
||||
return switch (channelType) {
|
||||
case EMAIL -> notiHubApiClient.createEmailBulk(notiRequest);
|
||||
case SMS -> notiHubApiClient.createSmsBulk(notiRequest);
|
||||
case KKO_AT -> notiHubApiClient.createKkoBulk(notiRequest);
|
||||
};
|
||||
}
|
||||
|
||||
private NotiHubBulkSendResponseDto sendBulkChunk(
|
||||
@@ -335,25 +380,44 @@ public class MessageSendService {
|
||||
.destInfoList(destInfos)
|
||||
.build();
|
||||
|
||||
return channelType == ChannelType.EMAIL
|
||||
? notiHubApiClient.sendEmailBulk(request)
|
||||
: notiHubApiClient.sendSmsBulk(request);
|
||||
return switch (channelType) {
|
||||
case EMAIL -> notiHubApiClient.sendEmailBulk(request);
|
||||
case SMS -> notiHubApiClient.sendSmsBulk(request);
|
||||
case KKO_AT -> notiHubApiClient.sendKkoBulk(request);
|
||||
};
|
||||
}
|
||||
|
||||
private Map<String, String> createMessageParams(
|
||||
ListSearchService.DownloadListRow row,
|
||||
Map<String, ListHeaderDto> paramHeaderByName
|
||||
MessageContext messageContext
|
||||
) {
|
||||
Map<String, String> headerParams = new LinkedHashMap<>();
|
||||
Map<String, String> msgParam = new LinkedHashMap<>();
|
||||
for (Map.Entry<String, ListHeaderDto> entry : paramHeaderByName.entrySet()) {
|
||||
for (Map.Entry<String, ListHeaderDto> entry : messageContext.paramHeaderByName().entrySet()) {
|
||||
String value = resolveHeaderValue(row, entry.getValue());
|
||||
if (value != null) {
|
||||
msgParam.put(entry.getKey(), value);
|
||||
headerParams.put(entry.getKey(), value);
|
||||
if (messageContext.templateParams().contains(entry.getKey())) {
|
||||
msgParam.put(entry.getKey(), value);
|
||||
}
|
||||
}
|
||||
}
|
||||
messageContext.surveyUrlByName().forEach((name, url) ->
|
||||
msgParam.put(name, resolveSurveyUrlParams(url, headerParams)));
|
||||
return msgParam;
|
||||
}
|
||||
|
||||
private String resolveSurveyUrlParams(String url, Map<String, String> headerParams) {
|
||||
Matcher matcher = TEMPLATE_PARAM_PATTERN.matcher(url);
|
||||
StringBuilder resolved = new StringBuilder();
|
||||
while (matcher.find()) {
|
||||
String value = headerParams.get(normalizeBlank(matcher.group(1)));
|
||||
matcher.appendReplacement(resolved, Matcher.quoteReplacement(value == null ? matcher.group() : value));
|
||||
}
|
||||
matcher.appendTail(resolved);
|
||||
return resolved.toString();
|
||||
}
|
||||
|
||||
private String resolveHeaderValue(ListSearchService.DownloadListRow row, ListHeaderDto header) {
|
||||
if (header == null) {
|
||||
return null;
|
||||
@@ -419,7 +483,7 @@ public class MessageSendService {
|
||||
if (normalized == null) {
|
||||
return null;
|
||||
}
|
||||
if (channelType == ChannelType.SMS) {
|
||||
if (channelType == ChannelType.SMS || channelType == ChannelType.KKO_AT) {
|
||||
String digits = normalized.replaceAll("\\D", "");
|
||||
return digits.isBlank() ? null : digits;
|
||||
}
|
||||
@@ -461,7 +525,9 @@ public class MessageSendService {
|
||||
ProjectInfoDto project,
|
||||
NotiHubTemplateDto template,
|
||||
Map<Integer, ListHeaderDto> headerById,
|
||||
Map<String, ListHeaderDto> paramHeaderByName
|
||||
Map<String, ListHeaderDto> paramHeaderByName,
|
||||
Set<String> templateParams,
|
||||
Map<String, String> surveyUrlByName
|
||||
) {}
|
||||
|
||||
private static class ListFilterDtoFactory {
|
||||
|
||||
Reference in New Issue
Block a user