Merge branch 'feature-async-list-bulk-work' into develop
This commit is contained in:
@@ -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.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.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.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.datetime.DateTimeUtil;
|
||||||
import com.kri.common.feature.web.BusinessException;
|
import com.kri.common.feature.web.BusinessException;
|
||||||
@@ -115,7 +116,9 @@ public class ListHeaderService {
|
|||||||
|
|
||||||
Map<String, ListHeaderDto> defaultByName = new LinkedHashMap<>();
|
Map<String, ListHeaderDto> defaultByName = new LinkedHashMap<>();
|
||||||
for (ListHeaderDto dto : defaultHeaders) {
|
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()
|
List<ListHeaderDto> existingHeaders = listHeaderRepository.findByIdPrjctIdx(prjctIdx).stream()
|
||||||
@@ -124,12 +127,16 @@ public class ListHeaderService {
|
|||||||
.toList();
|
.toList();
|
||||||
Map<String, ListHeaderDto> existingByName = new LinkedHashMap<>();
|
Map<String, ListHeaderDto> existingByName = new LinkedHashMap<>();
|
||||||
for (ListHeaderDto dto : existingHeaders) {
|
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()) {
|
Set<String> excelHeaderKeys = excelHeaders.stream().map(this::uploadHeaderKey)
|
||||||
if (!excelHeaders.contains(defaultName)) {
|
.collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll);
|
||||||
errors.add(ListUploadErrorDto.of(1, defaultName, "기본 헤더가 누락되었습니다."));
|
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) {
|
for (String h : excelHeaders) {
|
||||||
if (h == null || h.isBlank()) {
|
if (h == null || h.isBlank()) {
|
||||||
errors.add(ListUploadErrorDto.of(1, "헤더", "빈 헤더명이 있습니다."));
|
errors.add(ListUploadErrorDto.of(1, "헤더", "빈 헤더명이 있습니다."));
|
||||||
} else if (!dupCheck.add(h)) {
|
} else if (!dupCheck.add(uploadHeaderKey(h))) {
|
||||||
errors.add(ListUploadErrorDto.of(1, h, "헤더명이 중복됩니다."));
|
errors.add(ListUploadErrorDto.of(1, h, "헤더명이 중복됩니다."));
|
||||||
} else if (!h.matches(LIST_HEADER_ACCEPT_REGEX)) {
|
} else if (!h.matches(LIST_HEADER_ACCEPT_REGEX)) {
|
||||||
errors.add(ListUploadErrorDto.of(1, h, "허용되지 않는 헤더명 입니다."));
|
errors.add(ListUploadErrorDto.of(1, h, "허용되지 않는 헤더명 입니다."));
|
||||||
@@ -150,7 +157,7 @@ public class ListHeaderService {
|
|||||||
|
|
||||||
List<ListHeaderDto> result = new ArrayList<>();
|
List<ListHeaderDto> result = new ArrayList<>();
|
||||||
for (ListHeaderDto src : defaultHeaders) {
|
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));
|
result.add(ListHeaderDto.fromDto(prjctIdx, existing != null ? existing : src));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,11 +168,12 @@ public class ListHeaderService {
|
|||||||
.orElse(0);
|
.orElse(0);
|
||||||
int nextId = Math.max(maxExistingHeaderId + 1, FIRST_COMMON_HEADER_ID);
|
int nextId = Math.max(maxExistingHeaderId + 1, FIRST_COMMON_HEADER_ID);
|
||||||
for (String headerName : excelHeaders) {
|
for (String headerName : excelHeaders) {
|
||||||
if (defaultByName.containsKey(headerName)) {
|
String headerKey = uploadHeaderKey(headerName);
|
||||||
|
if (defaultByName.containsKey(headerKey)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
ListHeaderDto existing = existingByName.get(headerName);
|
ListHeaderDto existing = existingByName.get(headerKey);
|
||||||
if (existing != null) {
|
if (existing != null) {
|
||||||
result.add(ListHeaderDto.fromDto(prjctIdx, existing));
|
result.add(ListHeaderDto.fromDto(prjctIdx, existing));
|
||||||
continue;
|
continue;
|
||||||
@@ -182,6 +190,10 @@ public class ListHeaderService {
|
|||||||
.toList();
|
.toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String uploadHeaderKey(String name) {
|
||||||
|
return UPPER_CASE_HEADER_OPTIONS.headerNormalizer().apply(name);
|
||||||
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void updateListHeader(Long prjctIdx, List<ListHeaderDto> headerList, String regUser, LocalDateTime regDt){
|
public void updateListHeader(Long prjctIdx, List<ListHeaderDto> headerList, String regUser, LocalDateTime regDt){
|
||||||
//upload에서의 header upsert와 분리하기 위한 래핑 메서드
|
//upload에서의 header upsert와 분리하기 위한 래핑 메서드
|
||||||
|
|||||||
@@ -317,6 +317,7 @@ public class ListUploadService {
|
|||||||
private Map<String, TCmpnEntity> createCmpnByUploadText(List<ListHeaderDto> resolvedHeaders,
|
private Map<String, TCmpnEntity> createCmpnByUploadText(List<ListHeaderDto> resolvedHeaders,
|
||||||
Path listFilePath, Runnable checkCancelled) {
|
Path listFilePath, Runnable checkCancelled) {
|
||||||
String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE);
|
String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE);
|
||||||
|
Map<String, String> uploadHeaderKeys = createUploadHeaderKeys(resolvedHeaders);
|
||||||
if (outsourceHeaderName == null) {
|
if (outsourceHeaderName == null) {
|
||||||
return Collections.emptyMap();
|
return Collections.emptyMap();
|
||||||
}
|
}
|
||||||
@@ -324,7 +325,7 @@ public class ListUploadService {
|
|||||||
Set<String> uploadTexts = new LinkedHashSet<>();
|
Set<String> uploadTexts = new LinkedHashSet<>();
|
||||||
ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> {
|
ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> {
|
||||||
checkCancelled.run();
|
checkCancelled.run();
|
||||||
String raw = normalizeBlank(row.get(outsourceHeaderName));
|
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(outsourceHeaderName)));
|
||||||
if (raw != null) {
|
if (raw != null) {
|
||||||
uploadTexts.add(raw);
|
uploadTexts.add(raw);
|
||||||
}
|
}
|
||||||
@@ -468,6 +469,7 @@ public class ListUploadService {
|
|||||||
String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE);
|
String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE);
|
||||||
String memoHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.MEMO);
|
String memoHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.MEMO);
|
||||||
String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE);
|
String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE);
|
||||||
|
Map<String, String> uploadHeaderKeys = createUploadHeaderKeys(resolvedHeaders);
|
||||||
Map<String, Short> assignRoleByHeaderName = createAssignRoleByHeaderName(resolvedHeaders);
|
Map<String, Short> assignRoleByHeaderName = createAssignRoleByHeaderName(resolvedHeaders);
|
||||||
|
|
||||||
List<ListRowInsert> listRows = new ArrayList<>();
|
List<ListRowInsert> listRows = new ArrayList<>();
|
||||||
@@ -477,9 +479,9 @@ public class ListUploadService {
|
|||||||
|
|
||||||
ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> {
|
ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> {
|
||||||
checkCancelled.run();
|
checkCancelled.run();
|
||||||
String sid = normalizeSid(row.get(sidHeaderName));
|
String sid = normalizeSid(row.get(uploadHeaderKeys.get(sidHeaderName)));
|
||||||
short isUse = parseIsUseSafe(row.get(isUseHeaderName));
|
short isUse = parseIsUseSafe(row.get(uploadHeaderKeys.get(isUseHeaderName)));
|
||||||
String memo = normalizeBlank(row.get(memoHeaderName));
|
String memo = normalizeBlank(row.get(uploadHeaderKeys.get(memoHeaderName)));
|
||||||
|
|
||||||
listRows.add(new ListRowInsert(
|
listRows.add(new ListRowInsert(
|
||||||
prjctIdx,
|
prjctIdx,
|
||||||
@@ -492,7 +494,7 @@ public class ListUploadService {
|
|||||||
));
|
));
|
||||||
|
|
||||||
if (outsourceHeaderName != null) {
|
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);
|
TCmpnEntity cmpn = rawCmpn == null ? null : cmpnByUploadText.get(rawCmpn);
|
||||||
if (cmpn != null && !Boolean.TRUE.equals(cmpn.getOwnCmpn())) {
|
if (cmpn != null && !Boolean.TRUE.equals(cmpn.getOwnCmpn())) {
|
||||||
assignCmpnRows.add(new ListAssignCmpnRowInsert(
|
assignCmpnRows.add(new ListAssignCmpnRowInsert(
|
||||||
@@ -507,7 +509,7 @@ public class ListUploadService {
|
|||||||
|
|
||||||
for (Map.Entry<String, Short> assignEntry : assignRoleByHeaderName.entrySet()) {
|
for (Map.Entry<String, Short> assignEntry : assignRoleByHeaderName.entrySet()) {
|
||||||
String assignHeaderName = assignEntry.getKey();
|
String assignHeaderName = assignEntry.getKey();
|
||||||
String userId = normalizeBlank(row.get(assignHeaderName));
|
String userId = normalizeBlank(row.get(uploadHeaderKeys.get(assignHeaderName)));
|
||||||
if (userId == null) {
|
if (userId == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -527,7 +529,7 @@ public class ListUploadService {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
String raw = normalizeBlank(row.get(header.getListHderNm()));
|
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(header.getListHderNm())));
|
||||||
if (raw == null) {
|
if (raw == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -701,6 +703,7 @@ public class ListUploadService {
|
|||||||
String sidHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.SID);
|
String sidHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.SID);
|
||||||
String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE);
|
String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE);
|
||||||
String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE);
|
String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE);
|
||||||
|
Map<String, String> uploadHeaderKeys = createUploadHeaderKeys(resolvedHeaders);
|
||||||
Set<String> prjctAssignUserSet = new LinkedHashSet<>(prjctAssignList);
|
Set<String> prjctAssignUserSet = new LinkedHashSet<>(prjctAssignList);
|
||||||
|
|
||||||
Set<String> uploadedSids = new LinkedHashSet<>();
|
Set<String> uploadedSids = new LinkedHashSet<>();
|
||||||
@@ -714,7 +717,7 @@ public class ListUploadService {
|
|||||||
checkCancelled.run();
|
checkCancelled.run();
|
||||||
totalCount.incrementAndGet();
|
totalCount.incrementAndGet();
|
||||||
|
|
||||||
String rawSid = normalizeBlank(row.get(sidHeaderName));
|
String rawSid = normalizeBlank(row.get(uploadHeaderKeys.get(sidHeaderName)));
|
||||||
String sid = normalizeSid(rawSid);
|
String sid = normalizeSid(rawSid);
|
||||||
String errorSid = sid != null ? sid : rawSid;
|
String errorSid = sid != null ? sid : rawSid;
|
||||||
if (sid == null) {
|
if (sid == null) {
|
||||||
@@ -727,7 +730,7 @@ public class ListUploadService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Short isUse = parseIsUseDefaultUsable(row.get(isUseHeaderName));
|
Short isUse = parseIsUseDefaultUsable(row.get(uploadHeaderKeys.get(isUseHeaderName)));
|
||||||
if (isUse == null) {
|
if (isUse == null) {
|
||||||
errors.add(ListUploadErrorDto.of(
|
errors.add(ListUploadErrorDto.of(
|
||||||
rowNo,
|
rowNo,
|
||||||
@@ -742,7 +745,7 @@ public class ListUploadService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (outsourceHeaderName != null) {
|
if (outsourceHeaderName != null) {
|
||||||
String raw = normalizeBlank(row.get(outsourceHeaderName));
|
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(outsourceHeaderName)));
|
||||||
if (raw != null) {
|
if (raw != null) {
|
||||||
TCmpnEntity cmpn = cmpnByUploadText.get(raw);
|
TCmpnEntity cmpn = cmpnByUploadText.get(raw);
|
||||||
if (cmpn == null) {
|
if (cmpn == null) {
|
||||||
@@ -762,7 +765,7 @@ public class ListUploadService {
|
|||||||
for (Map.Entry<String, Short> assignEntry : assignRoleByHeaderName.entrySet()) {
|
for (Map.Entry<String, Short> assignEntry : assignRoleByHeaderName.entrySet()) {
|
||||||
String assignHeaderName = assignEntry.getKey();
|
String assignHeaderName = assignEntry.getKey();
|
||||||
Short assignRole = assignEntry.getValue();
|
Short assignRole = assignEntry.getValue();
|
||||||
String raw = normalizeBlank(row.get(assignHeaderName));
|
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(assignHeaderName)));
|
||||||
if (raw == null) {
|
if (raw == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -793,7 +796,7 @@ public class ListUploadService {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
String raw = normalizeBlank(row.get(header.getListHderNm()));
|
String raw = normalizeBlank(row.get(uploadHeaderKeys.get(header.getListHderNm())));
|
||||||
if (isNullOrBlank(raw)) {
|
if (isNullOrBlank(raw)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -875,6 +878,15 @@ public class ListUploadService {
|
|||||||
return new ValidationSummary(totalCount.get(), uploadedSids, errors);
|
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) {
|
private Map<String, Short> createAssignRoleByHeaderName(List<ListHeaderDto> headers) {
|
||||||
Map<String, Short> result = new LinkedHashMap<>();
|
Map<String, Short> result = new LinkedHashMap<>();
|
||||||
for (ListHeaderDto header : headers) {
|
for (ListHeaderDto header : headers) {
|
||||||
|
|||||||
Reference in New Issue
Block a user