261019_02_BUG: 업로드, 헤더 생성시 origin target 모두 upper로 검사 되도록 버그 수정

This commit is contained in:
2026-10-19 16:23:36 +09:00
parent 3d1489c5d5
commit f649282d2d
2 changed files with 45 additions and 21 deletions

View File

@@ -3,6 +3,7 @@ package com.kri.contact.server.service;
import static com.kri.contact.server.common.consts.ContactConstant.EXACT_MATCH_HEADER_TYPE;
import static com.kri.contact.server.common.consts.ContactConstant.LIST_HEADER_ACCEPT_REGEX;
import static com.kri.contact.server.common.consts.ContactConstant.SYSTEM_USER_NAME;
import static com.kri.contact.server.common.consts.ContactConstant.UPPER_CASE_HEADER_OPTIONS;
import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.feature.web.BusinessException;
@@ -115,7 +116,9 @@ public class ListHeaderService {
Map<String, ListHeaderDto> defaultByName = new LinkedHashMap<>();
for (ListHeaderDto dto : defaultHeaders) {
defaultByName.put(dto.getListHderNm(), dto);
if (defaultByName.putIfAbsent(uploadHeaderKey(dto.getListHderNm()), dto) != null) {
errors.add(ListUploadErrorDto.of(1, dto.getListHderNm(), "기본 헤더명이 대소문자 구분 없이 중복됩니다."));
}
}
List<ListHeaderDto> existingHeaders = listHeaderRepository.findByIdPrjctIdx(prjctIdx).stream()
@@ -124,12 +127,16 @@ public class ListHeaderService {
.toList();
Map<String, ListHeaderDto> existingByName = new LinkedHashMap<>();
for (ListHeaderDto dto : existingHeaders) {
existingByName.put(dto.getListHderNm(), dto);
if (existingByName.putIfAbsent(uploadHeaderKey(dto.getListHderNm()), dto) != null) {
errors.add(ListUploadErrorDto.of(1, dto.getListHderNm(), "기존 헤더명이 대소문자 구분 없이 중복됩니다."));
}
}
for (String defaultName : defaultByName.keySet()) {
if (!excelHeaders.contains(defaultName)) {
errors.add(ListUploadErrorDto.of(1, defaultName, "기본 헤더가 누락되었습니다."));
Set<String> excelHeaderKeys = excelHeaders.stream().map(this::uploadHeaderKey)
.collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll);
for (ListHeaderDto header : defaultHeaders) {
if (!excelHeaderKeys.contains(uploadHeaderKey(header.getListHderNm()))) {
errors.add(ListUploadErrorDto.of(1, header.getListHderNm(), "기본 헤더가 누락되었습니다."));
}
}
@@ -137,7 +144,7 @@ public class ListHeaderService {
for (String h : excelHeaders) {
if (h == null || h.isBlank()) {
errors.add(ListUploadErrorDto.of(1, "헤더", "빈 헤더명이 있습니다."));
} else if (!dupCheck.add(h)) {
} else if (!dupCheck.add(uploadHeaderKey(h))) {
errors.add(ListUploadErrorDto.of(1, h, "헤더명이 중복됩니다."));
} else if (!h.matches(LIST_HEADER_ACCEPT_REGEX)) {
errors.add(ListUploadErrorDto.of(1, h, "허용되지 않는 헤더명 입니다."));
@@ -150,7 +157,7 @@ public class ListHeaderService {
List<ListHeaderDto> result = new ArrayList<>();
for (ListHeaderDto src : defaultHeaders) {
ListHeaderDto existing = existingByName.get(src.getListHderNm());
ListHeaderDto existing = existingByName.get(uploadHeaderKey(src.getListHderNm()));
result.add(ListHeaderDto.fromDto(prjctIdx, existing != null ? existing : src));
}
@@ -161,11 +168,12 @@ public class ListHeaderService {
.orElse(0);
int nextId = Math.max(maxExistingHeaderId + 1, FIRST_COMMON_HEADER_ID);
for (String headerName : excelHeaders) {
if (defaultByName.containsKey(headerName)) {
String headerKey = uploadHeaderKey(headerName);
if (defaultByName.containsKey(headerKey)) {
continue;
}
ListHeaderDto existing = existingByName.get(headerName);
ListHeaderDto existing = existingByName.get(headerKey);
if (existing != null) {
result.add(ListHeaderDto.fromDto(prjctIdx, existing));
continue;
@@ -182,6 +190,10 @@ public class ListHeaderService {
.toList();
}
private String uploadHeaderKey(String name) {
return UPPER_CASE_HEADER_OPTIONS.headerNormalizer().apply(name);
}
@Transactional
public void updateListHeader(Long prjctIdx, List<ListHeaderDto> headerList, String regUser, LocalDateTime regDt){
//upload에서의 header upsert와 분리하기 위한 래핑 메서드

View File

@@ -317,6 +317,7 @@ public class ListUploadService {
private Map<String, TCmpnEntity> createCmpnByUploadText(List<ListHeaderDto> resolvedHeaders,
Path listFilePath, Runnable checkCancelled) {
String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE);
Map<String, String> uploadHeaderKeys = createUploadHeaderKeys(resolvedHeaders);
if (outsourceHeaderName == null) {
return Collections.emptyMap();
}
@@ -324,7 +325,7 @@ public class ListUploadService {
Set<String> uploadTexts = new LinkedHashSet<>();
ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> {
checkCancelled.run();
String raw = normalizeBlank(row.get(outsourceHeaderName));
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(outsourceHeaderName)));
if (raw != null) {
uploadTexts.add(raw);
}
@@ -468,6 +469,7 @@ public class ListUploadService {
String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE);
String memoHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.MEMO);
String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE);
Map<String, String> uploadHeaderKeys = createUploadHeaderKeys(resolvedHeaders);
Map<String, Short> assignRoleByHeaderName = createAssignRoleByHeaderName(resolvedHeaders);
List<ListRowInsert> listRows = new ArrayList<>();
@@ -477,9 +479,9 @@ public class ListUploadService {
ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> {
checkCancelled.run();
String sid = normalizeSid(row.get(sidHeaderName));
short isUse = parseIsUseSafe(row.get(isUseHeaderName));
String memo = normalizeBlank(row.get(memoHeaderName));
String sid = normalizeSid(row.get(uploadHeaderKeys.get(sidHeaderName)));
short isUse = parseIsUseSafe(row.get(uploadHeaderKeys.get(isUseHeaderName)));
String memo = normalizeBlank(row.get(uploadHeaderKeys.get(memoHeaderName)));
listRows.add(new ListRowInsert(
prjctIdx,
@@ -492,7 +494,7 @@ public class ListUploadService {
));
if (outsourceHeaderName != null) {
String rawCmpn = normalizeBlank(row.get(outsourceHeaderName));
String rawCmpn = normalizeBlank(row.get(uploadHeaderKeys.get(outsourceHeaderName)));
TCmpnEntity cmpn = rawCmpn == null ? null : cmpnByUploadText.get(rawCmpn);
if (cmpn != null && !Boolean.TRUE.equals(cmpn.getOwnCmpn())) {
assignCmpnRows.add(new ListAssignCmpnRowInsert(
@@ -507,7 +509,7 @@ public class ListUploadService {
for (Map.Entry<String, Short> assignEntry : assignRoleByHeaderName.entrySet()) {
String assignHeaderName = assignEntry.getKey();
String userId = normalizeBlank(row.get(assignHeaderName));
String userId = normalizeBlank(row.get(uploadHeaderKeys.get(assignHeaderName)));
if (userId == null) {
continue;
}
@@ -527,7 +529,7 @@ public class ListUploadService {
continue;
}
String raw = normalizeBlank(row.get(header.getListHderNm()));
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(header.getListHderNm())));
if (raw == null) {
continue;
}
@@ -701,6 +703,7 @@ public class ListUploadService {
String sidHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.SID);
String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE);
String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE);
Map<String, String> uploadHeaderKeys = createUploadHeaderKeys(resolvedHeaders);
Set<String> prjctAssignUserSet = new LinkedHashSet<>(prjctAssignList);
Set<String> uploadedSids = new LinkedHashSet<>();
@@ -714,7 +717,7 @@ public class ListUploadService {
checkCancelled.run();
totalCount.incrementAndGet();
String rawSid = normalizeBlank(row.get(sidHeaderName));
String rawSid = normalizeBlank(row.get(uploadHeaderKeys.get(sidHeaderName)));
String sid = normalizeSid(rawSid);
String errorSid = sid != null ? sid : rawSid;
if (sid == null) {
@@ -727,7 +730,7 @@ public class ListUploadService {
return;
}
Short isUse = parseIsUseDefaultUsable(row.get(isUseHeaderName));
Short isUse = parseIsUseDefaultUsable(row.get(uploadHeaderKeys.get(isUseHeaderName)));
if (isUse == null) {
errors.add(ListUploadErrorDto.of(
rowNo,
@@ -742,7 +745,7 @@ public class ListUploadService {
}
if (outsourceHeaderName != null) {
String raw = normalizeBlank(row.get(outsourceHeaderName));
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(outsourceHeaderName)));
if (raw != null) {
TCmpnEntity cmpn = cmpnByUploadText.get(raw);
if (cmpn == null) {
@@ -762,7 +765,7 @@ public class ListUploadService {
for (Map.Entry<String, Short> assignEntry : assignRoleByHeaderName.entrySet()) {
String assignHeaderName = assignEntry.getKey();
Short assignRole = assignEntry.getValue();
String raw = normalizeBlank(row.get(assignHeaderName));
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(assignHeaderName)));
if (raw == null) {
continue;
}
@@ -793,7 +796,7 @@ public class ListUploadService {
continue;
}
String raw = normalizeBlank(row.get(header.getListHderNm()));
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(header.getListHderNm())));
if (isNullOrBlank(raw)) {
continue;
}
@@ -875,6 +878,15 @@ public class ListUploadService {
return new ValidationSummary(totalCount.get(), uploadedSids, errors);
}
private Map<String, String> createUploadHeaderKeys(List<ListHeaderDto> headers) {
Map<String, String> keys = new LinkedHashMap<>();
for (ListHeaderDto header : headers) {
String name = header.getListHderNm();
keys.put(name, UPPER_CASE_HEADER_OPTIONS.headerNormalizer().apply(name));
}
return keys;
}
private Map<String, Short> createAssignRoleByHeaderName(List<ListHeaderDto> headers) {
Map<String, Short> result = new LinkedHashMap<>();
for (ListHeaderDto header : headers) {