260713_01_ENH: 발송 결과에 result code에 대한 label 매칭해서 반환하도록 수정, bulksend에 대한 결과 조회도 통일

This commit is contained in:
2026-07-13 09:44:57 +09:00
parent 8be53a1cae
commit fd43fce572
3 changed files with 40 additions and 6 deletions

View File

@@ -1,11 +1,14 @@
package com.kri.notihub.server.dto.report;
import com.kri.notihub.server.persistence.entity.TSendEntity;
import com.kri.notihub.server.persistence.entity.TSendResultCodeEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@@ -41,6 +44,14 @@ public class SendResultInfoDto {
@Schema(description = "결과 코드")
private Short resultCode;
@Size(max = 128)
@Schema(description = "결과 라벨")
private String resultLabel;
@Size(max = 128)
@Schema(description = "결과 표시 라벨")
private String resultViewLabel;
@Schema(description = "템플릿 인덱스")
private Long tmplatIdx;
@@ -91,16 +102,25 @@ public class SendResultInfoDto {
private LocalDateTime regDt;
public static SendResultInfoDto from(TSendEntity entity) {
return from(entity, null);
}
public static SendResultInfoDto from(TSendEntity entity,
List<TSendResultCodeEntity> resultCodeEntity) {
if (entity == null) {
return null;
}
TSendResultCodeEntity resultCode = findResultCode(entity, resultCodeEntity);
return SendResultInfoDto.builder()
.cmid(entity.getCmid())
.bulkSendKey(entity.getBulkSendKey())
.sendTy(entity.getSendTy())
.resve(entity.isResve())
.resultCode(entity.getResultCode())
.resultLabel(resultCode != null ? resultCode.getResultLabel() : null)
.resultViewLabel(resultCode != null ? resultCode.getResultViewLabel() : null)
.tmplatIdx(entity.getTmplatIdx())
.kkoTmplatCd(entity.getKkoTmplatCd())
.sendEml(entity.getSendEml())
@@ -115,4 +135,18 @@ public class SendResultInfoDto {
.regDt(entity.getRegDt())
.build();
}
private static TSendResultCodeEntity findResultCode(TSendEntity entity,
List<TSendResultCodeEntity> resultCodeEntity) {
if (resultCodeEntity == null) {
return null;
}
return resultCodeEntity.stream()
.filter(e -> e.getId() != null)
.filter(e -> Objects.equals(e.getId().getSendCorp(), entity.getSendCorp()))
.filter(e -> Objects.equals(e.getId().getResultCode(), entity.getResultCode()))
.findFirst()
.orElse(null);
}
}