261022_01_ENH: Class에서 record로 변경가능한 Dto들 record로 변경
This commit is contained in:
@@ -106,10 +106,10 @@ public class MessageSendService {
|
||||
RequestUserContext ctx,
|
||||
ChannelType channelType
|
||||
) {
|
||||
validateDestinationHeaders(request.getDestHeaderIds());
|
||||
String sid = requireSid(request.getSid());
|
||||
validateDestinationHeaders(request.destHeaderIds());
|
||||
String sid = requireSid(request.sid());
|
||||
|
||||
MessageContext messageContext = createMessageContext(prjctIdx, request.getTmplatIdx(), request.getDestHeaderIds());
|
||||
MessageContext messageContext = createMessageContext(prjctIdx, request.tmplatIdx(), request.destHeaderIds());
|
||||
ListSearchService.DownloadListRow row = listSearchService
|
||||
.findDownloadListRows(prjctIdx, ListFilterDtoFactory.onlySid(sid), null)
|
||||
.stream()
|
||||
@@ -119,8 +119,8 @@ public class MessageSendService {
|
||||
|
||||
List<NotiHubDestInfoDto> destInfos = createDestInfos(
|
||||
List.of(row),
|
||||
request.getDestHeaderIds(),
|
||||
request.getDestNameHeaderId(),
|
||||
request.destHeaderIds(),
|
||||
request.destNameHeaderId(),
|
||||
messageContext,
|
||||
channelType,
|
||||
new LinkedHashSet<>(),
|
||||
@@ -134,11 +134,11 @@ public class MessageSendService {
|
||||
for (NotiHubDestInfoDto destInfo : destInfos) {
|
||||
NotiHubSendRequestSingleDto notiRequest = NotiHubSendRequestSingleDto.builder()
|
||||
.destInfo(destInfo)
|
||||
.tmplatIdx(request.getTmplatIdx())
|
||||
.tmplatIdx(request.tmplatIdx())
|
||||
.reqstSvc(REQUEST_SERVICE)
|
||||
.prjctCd(messageContext.project().getPrjctCd())
|
||||
.resve(request.getResve())
|
||||
.sendDt(request.getSendDt())
|
||||
.resve(request.resve())
|
||||
.sendDt(request.sendDt())
|
||||
.build();
|
||||
|
||||
if (channelType == ChannelType.EMAIL) {
|
||||
@@ -158,18 +158,18 @@ public class MessageSendService {
|
||||
RequestUserContext ctx,
|
||||
ChannelType channelType
|
||||
) {
|
||||
validateDestinationHeaders(request.getDestHeaderIds());
|
||||
validateDestinationHeaders(request.destHeaderIds());
|
||||
requireValidFilterConditions(
|
||||
request.getListFilter() == null ? null : request.getListFilter().getSidSet()
|
||||
request.listFilter() == null ? null : request.listFilter().getSidSet()
|
||||
);
|
||||
|
||||
MessageContext messageContext = createMessageContext(prjctIdx, request.getTmplatIdx(), request.getDestHeaderIds());
|
||||
MessageContext messageContext = createMessageContext(prjctIdx, request.tmplatIdx(), request.destHeaderIds());
|
||||
List<NotiHubDestInfoDto> destInfos = createAllDestInfos(
|
||||
prjctIdx,
|
||||
request,
|
||||
messageContext,
|
||||
channelType,
|
||||
Boolean.TRUE.equals(request.getDedupe())
|
||||
request.dedupe()
|
||||
);
|
||||
if (destInfos.isEmpty()) {
|
||||
throw BusinessException.badRequest("NO_DESTINATION", "발송 대상 이메일 또는 전화번호가 없습니다.");
|
||||
@@ -186,9 +186,9 @@ public class MessageSendService {
|
||||
List<NotiHubDestInfoDto> chunk = destInfos.subList(start, end);
|
||||
try {
|
||||
NotiHubBulkSendResponseDto response = sendBulkChunk(bulkSendKey, chunk, channelType);
|
||||
requestCount += defaultInt(response.getRequestCount());
|
||||
acceptCount += defaultInt(response.getAcceptCount());
|
||||
failCount += defaultInt(response.getFailCount());
|
||||
requestCount += defaultInt(response.requestCount());
|
||||
acceptCount += defaultInt(response.acceptCount());
|
||||
failCount += defaultInt(response.failCount());
|
||||
} catch (RuntimeException e) {
|
||||
requestCount += chunk.size();
|
||||
failCount += chunk.size();
|
||||
@@ -226,7 +226,7 @@ public class MessageSendService {
|
||||
while (true) {
|
||||
List<ListSearchService.DownloadListRow> rows = listSearchService.findDownloadListRows(
|
||||
prjctIdx,
|
||||
request.getListFilter(),
|
||||
request.listFilter(),
|
||||
lastSid
|
||||
);
|
||||
if (rows.isEmpty()) {
|
||||
@@ -235,8 +235,8 @@ public class MessageSendService {
|
||||
|
||||
destInfos.addAll(createDestInfos(
|
||||
rows,
|
||||
request.getDestHeaderIds(),
|
||||
request.getDestNameHeaderId(),
|
||||
request.destHeaderIds(),
|
||||
request.destNameHeaderId(),
|
||||
messageContext,
|
||||
channelType,
|
||||
dedupeKeys,
|
||||
@@ -291,8 +291,8 @@ public class MessageSendService {
|
||||
}
|
||||
|
||||
NotiHubTemplateDto template = notiHubApiClient.getTemplate(tmplatIdx);
|
||||
Set<String> titleParams = extractTemplateParams(template.getTmplatTitle());
|
||||
Set<String> bodyParams = extractTemplateParams(template.getTmplatBody());
|
||||
Set<String> titleParams = extractTemplateParams(template.tmplatTitle());
|
||||
Set<String> bodyParams = extractTemplateParams(template.tmplatBody());
|
||||
Set<String> templateParams = SetUtils.union(titleParams, bodyParams);
|
||||
|
||||
Map<Integer, ListHeaderDto> headerById = listHeaderService.getHeader(prjctIdx).stream()
|
||||
@@ -357,9 +357,9 @@ public class MessageSendService {
|
||||
.reqstUser(ctx == null ? null : ctx.getUserId())
|
||||
.reqstSvc(REQUEST_SERVICE)
|
||||
.prjctCd(messageContext.project().getPrjctCd())
|
||||
.tmplatIdx(request.getTmplatIdx())
|
||||
.resve(request.getResve())
|
||||
.sendDt(request.getSendDt())
|
||||
.tmplatIdx(request.tmplatIdx())
|
||||
.resve(request.resve())
|
||||
.sendDt(request.sendDt())
|
||||
.trgtCnt(targetCount)
|
||||
.build();
|
||||
|
||||
@@ -531,19 +531,19 @@ public class MessageSendService {
|
||||
) {}
|
||||
|
||||
public MessageContext prepareAsync(Long projectId, MessageSendBulkRequestDto request) {
|
||||
validateDestinationHeaders(request.getDestHeaderIds());
|
||||
return createMessageContext(projectId, request.getTmplatIdx(), request.getDestHeaderIds());
|
||||
validateDestinationHeaders(request.destHeaderIds());
|
||||
return createMessageContext(projectId, request.tmplatIdx(), request.destHeaderIds());
|
||||
}
|
||||
|
||||
public List<NotiHubDestInfoDto> prepareAsyncRow(ListSearchService.DownloadListRow row,
|
||||
MessageSendBulkRequestDto request, MessageContext context, ChannelType channel) {
|
||||
return createDestInfos(List.of(row), request.getDestHeaderIds(), request.getDestNameHeaderId(),
|
||||
return createDestInfos(List.of(row), request.destHeaderIds(), request.destNameHeaderId(),
|
||||
context, channel, new HashSet<>(), false);
|
||||
}
|
||||
|
||||
public boolean retainAsyncDestination(NotiHubDestInfoDto destination, ChannelType channel,
|
||||
Set<String> keys, boolean dedupe) {
|
||||
String value = channel == ChannelType.EMAIL ? destination.getDestEml() : destination.getDestTel();
|
||||
String value = channel == ChannelType.EMAIL ? destination.destEml() : destination.destTel();
|
||||
return !isDuplicateDestination(value, channel, keys, dedupe);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user