From fc62f9cb3869cd90a2af41268561fbe2cdac244a Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 23 Oct 2026 15:11:38 +0900 Subject: [PATCH] =?UTF-8?q?261023=5F01=5FENH:=20=EB=B9=84=EB=8F=99?= =?UTF-8?q?=EA=B8=B0=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B0=9C=EC=86=A1=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=84=B1=EA=B3=B5=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EC=88=98=EC=8B=A0=EC=B2=98=20?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EB=8C=80=EC=83=81=20=EA=B1=B4=EB=84=88?= =?UTF-8?q?=EB=9B=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/ListAsyncJobStatus.java | 4 ++-- .../service/async/ListAsyncJobExecutor.java | 3 +++ .../service/async/ListAsyncJobStore.java | 18 +++++++++++++++++- .../service/async/ListAsyncMessageService.java | 15 +++++++++++++-- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/kri/contact/server/common/enums/ListAsyncJobStatus.java b/src/main/java/com/kri/contact/server/common/enums/ListAsyncJobStatus.java index 0d2ab12..93cd576 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListAsyncJobStatus.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListAsyncJobStatus.java @@ -3,11 +3,11 @@ package com.kri.contact.server.common.enums; import java.util.List; public enum ListAsyncJobStatus { - QUEUED, RUNNING, CANCEL_REQUESTED, CANCELLED, SUCCEEDED, FAILED; + QUEUED, RUNNING, CANCEL_REQUESTED, CANCELLED, SUCCEEDED, FAILED, PARTIALLY_SUCCEEDED; public static final List ACTIVE = List.of(QUEUED, RUNNING, CANCEL_REQUESTED); public boolean isTerminal() { - return this == CANCELLED || this == SUCCEEDED || this == FAILED; + return this == CANCELLED || this == SUCCEEDED || this == FAILED || this == PARTIALLY_SUCCEEDED; } } diff --git a/src/main/java/com/kri/contact/server/service/async/ListAsyncJobExecutor.java b/src/main/java/com/kri/contact/server/service/async/ListAsyncJobExecutor.java index 17753cd..ba7c6eb 100644 --- a/src/main/java/com/kri/contact/server/service/async/ListAsyncJobExecutor.java +++ b/src/main/java/com/kri/contact/server/service/async/ListAsyncJobExecutor.java @@ -179,6 +179,9 @@ public class ListAsyncJobExecutor implements ApplicationRunner { public void complete(Runnable changes) { store.complete(task.key, changes, this::checkCancelled); } + public void completePartially(String code, String message, Map detail) { + store.completePartially(task.key, code, message, detail, this::checkCancelled); + } public void reject(String code, String message, Map detail) { checkCancelled(); store.reject(task.key, code, message, detail); diff --git a/src/main/java/com/kri/contact/server/service/async/ListAsyncJobStore.java b/src/main/java/com/kri/contact/server/service/async/ListAsyncJobStore.java index 8617a1f..89085ef 100644 --- a/src/main/java/com/kri/contact/server/service/async/ListAsyncJobStore.java +++ b/src/main/java/com/kri/contact/server/service/async/ListAsyncJobStore.java @@ -100,6 +100,21 @@ public class ListAsyncJobStore { BusinessException.notFound("LIST_JOB_NOT_FOUND", "작업을 찾을 수 없습니다.")); } + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void completePartially(String key, String code, String message, Map detail, + Runnable checkCancelled) { + var job = lock(key); + requireRunning(job); + checkCancelled.run(); + job.setErrorDetailJson(detail); + job.setJobStatus(ListAsyncJobStatus.PARTIALLY_SUCCEEDED); + job.setJobStage("COMPLETED"); + job.setErrorCode(code); + job.setErrorMessage(message); + job.setFinishedDt(DateTimeUtil.nowKstLocalDateTime()); + job.setModDt(job.getFinishedDt()); + } + @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) public List activity( Long projectId, List heldKeys) { @@ -114,7 +129,8 @@ public class ListAsyncJobStore { return jobs.summarizeFinishedMutations(projectId, List.of(ListAsyncJobType.LIST_UPLOAD, ListAsyncJobType.LIST_RESET, ListAsyncJobType.LIST_UPDATE, ListAsyncJobType.LIST_ASSIGN), - List.of(ListAsyncJobStatus.SUCCEEDED, ListAsyncJobStatus.FAILED, ListAsyncJobStatus.CANCELLED), + List.of(ListAsyncJobStatus.SUCCEEDED, ListAsyncJobStatus.PARTIALLY_SUCCEEDED, + ListAsyncJobStatus.FAILED, ListAsyncJobStatus.CANCELLED), heldKeys.isEmpty() ? List.of("") : heldKeys); } diff --git a/src/main/java/com/kri/contact/server/service/async/ListAsyncMessageService.java b/src/main/java/com/kri/contact/server/service/async/ListAsyncMessageService.java index 5d6813a..8c18b51 100644 --- a/src/main/java/com/kri/contact/server/service/async/ListAsyncMessageService.java +++ b/src/main/java/com/kri/contact/server/service/async/ListAsyncMessageService.java @@ -61,6 +61,7 @@ public class ListAsyncMessageService { var failedSids = new HashSet(); var keys = new HashSet(); int duplicates = 0; + int noDestinationSkippedSids = 0; try (var prepared = spool.open(context.jobKey())) { var buffer = new ArrayList(); for (int offset = 0; offset < frozen.size(); offset += 1000) { @@ -90,6 +91,10 @@ public class ListAsyncMessageService { continue; } if (candidates.isEmpty()) { + boolean noDestination = request.destHeaderIds().stream() + .map(row.itemMap()::get) + .allMatch(value -> value == null || value.trim().isEmpty()); + if (noDestination) { noDestinationSkippedSids++; continue; } failures.add(Map.of("code", "NO_DESTINATION", "sids", List.of(row.sid()))); failedSids.add(row.sid()); } @@ -113,6 +118,7 @@ public class ListAsyncMessageService { progress.put("targetSidCnt", frozen.size()); progress.put("preparedRecipientCnt", prepared.targets()); progress.put("preparationFailedSidCnt", failedSids.size()); + progress.put("noDestinationSkippedSidCnt", noDestinationSkippedSids); progress.put("duplicateSkippedRecipientCnt", duplicates); for (String metric : List.of("acceptedRecipientCnt", "failedRecipientCnt", "unknownRecipientCnt", "attemptedRecipientCnt", "processedRecipientCnt", "inFlightRecipientCnt")) progress.put(metric, 0L); @@ -145,6 +151,7 @@ public class ListAsyncMessageService { progress.put("bulkSendKey", bulkKey); context.progress("DISPATCHING", null, progress); long failed = failedSids.size(); + long accepted = 0; for (int number = 1; number <= prepared.batches(); number++) { context.checkCancelled(); access.requireProject(projectId, user); @@ -168,12 +175,16 @@ public class ListAsyncMessageService { } // Persist the observed outcome even if cancellation arrived during the HTTP call. context.messageBatch(number, result); + accepted += ((Number) result.get("acceptedRecipientCnt")).longValue(); failed += ((Number) result.get("failedRecipientCnt")).longValue() + ((Number) result.get("unknownRecipientCnt")).longValue(); } prepared.close(); finishCycle(context); - if (failed > 0) context.reject("MESSAGE_PARTIAL_FAILURE", "전체 대상 처리를 마쳤으며 실패 또는 접수 불명 대상이 있습니다.", context.job().getErrorDetailJson()); - else context.complete(() -> {}); + if (failed == 0) context.complete(() -> {}); + else if (accepted > 0) context.completePartially("MESSAGE_PARTIAL_FAILURE", + "일부 수신처가 접수되었으며 실패 또는 접수 불명 대상이 있습니다.", context.job().getErrorDetailJson()); + else context.reject("MESSAGE_SEND_FAILED", "접수 성공이 확인된 수신처가 없습니다. 실패 또는 접수 불명 내역을 확인해 주세요.", + context.job().getErrorDetailJson()); } catch (IOException failure) { var wrapped = BusinessException.internalError("MESSAGE_PREPARATION_FAILED", "발송 준비 파일 처리에 실패했습니다."); wrapped.addSuppressed(failure);