260716_04_ENH: 리스트 수정 및 리스트 업로드 수정
This commit is contained in:
@@ -99,6 +99,15 @@ public class ListHeaderService {
|
|||||||
defaultByName.put(dto.getListHderNm(), dto);
|
defaultByName.put(dto.getListHderNm(), dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<ListHeaderDto> existingHeaders = listHeaderRepository.findByIdPrjctIdx(prjctIdx).stream()
|
||||||
|
.map(ListHeaderDto::fromEntity)
|
||||||
|
.sorted(Comparator.comparing(ListHeaderDto::getListHderId))
|
||||||
|
.toList();
|
||||||
|
Map<String, ListHeaderDto> existingByName = new LinkedHashMap<>();
|
||||||
|
for (ListHeaderDto dto : existingHeaders) {
|
||||||
|
existingByName.put(dto.getListHderNm(), dto);
|
||||||
|
}
|
||||||
|
|
||||||
for (String defaultName : defaultByName.keySet()) {
|
for (String defaultName : defaultByName.keySet()) {
|
||||||
if (!excelHeaders.contains(defaultName)) {
|
if (!excelHeaders.contains(defaultName)) {
|
||||||
errors.add(ListUploadErrorDto.of(1, defaultName, "기본 헤더가 누락되었습니다."));
|
errors.add(ListUploadErrorDto.of(1, defaultName, "기본 헤더가 누락되었습니다."));
|
||||||
@@ -122,15 +131,26 @@ public class ListHeaderService {
|
|||||||
|
|
||||||
List<ListHeaderDto> result = new ArrayList<>();
|
List<ListHeaderDto> result = new ArrayList<>();
|
||||||
for (ListHeaderDto src : defaultHeaders) {
|
for (ListHeaderDto src : defaultHeaders) {
|
||||||
result.add(ListHeaderDto.fromDto(prjctIdx, src));
|
ListHeaderDto existing = existingByName.get(src.getListHderNm());
|
||||||
|
result.add(ListHeaderDto.fromDto(prjctIdx, existing != null ? existing : src));
|
||||||
}
|
}
|
||||||
|
|
||||||
int nextId = defaultHeaders.size() + 1;
|
int nextId = existingHeaders.stream()
|
||||||
|
.map(ListHeaderDto::getListHderId)
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.max(Integer::compareTo)
|
||||||
|
.orElse(defaultHeaders.size()) + 1;
|
||||||
for (String headerName : excelHeaders) {
|
for (String headerName : excelHeaders) {
|
||||||
if (defaultByName.containsKey(headerName)) {
|
if (defaultByName.containsKey(headerName)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ListHeaderDto existing = existingByName.get(headerName);
|
||||||
|
if (existing != null) {
|
||||||
|
result.add(ListHeaderDto.fromDto(prjctIdx, existing));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
int headerId = nextId++;
|
int headerId = nextId++;
|
||||||
ListHeaderType type = resolveType(headerId, request.getSpecificHeader());
|
ListHeaderType type = resolveType(headerId, request.getSpecificHeader());
|
||||||
|
|
||||||
|
|||||||
@@ -87,36 +87,39 @@ public class ListUpdateService {
|
|||||||
int totalUpdatedCount = 0;
|
int totalUpdatedCount = 0;
|
||||||
if (!isEmpty(updateContents)) {
|
if (!isEmpty(updateContents)) {
|
||||||
Map<Integer, TListHeaderEntity> headerMap = validateHeaders(prjctIdx, updateContents.keySet(), userRole);
|
Map<Integer, TListHeaderEntity> headerMap = validateHeaders(prjctIdx, updateContents.keySet(), userRole);
|
||||||
List<Integer> itemHeaderIds = updateContents.keySet().stream().toList();
|
updateContents = filterAllowedUpdateContents(updateContents, headerMap);
|
||||||
|
if (!updateContents.isEmpty()) {
|
||||||
|
List<Integer> itemHeaderIds = updateContents.keySet().stream().toList();
|
||||||
|
|
||||||
List<Integer> sidList = new ArrayList<>(sids);
|
List<Integer> sidList = new ArrayList<>(sids);
|
||||||
for (int i = 0; i < sidList.size(); i += chunkSize) {
|
for (int i = 0; i < sidList.size(); i += chunkSize) {
|
||||||
List<Integer> sidChunk = sidList.subList(i, Math.min(sidList.size(), i + chunkSize));
|
List<Integer> sidChunk = sidList.subList(i, Math.min(sidList.size(), i + chunkSize));
|
||||||
List<ListSearchService.ListUpdateTargetRow> targetRows = listSearchService.findUpdateTargetRows(
|
List<ListSearchService.ListUpdateTargetRow> targetRows = listSearchService.findUpdateTargetRows(
|
||||||
prjctIdx,
|
prjctIdx,
|
||||||
sidChunk,
|
sidChunk,
|
||||||
itemHeaderIds
|
itemHeaderIds
|
||||||
);
|
);
|
||||||
|
|
||||||
if (targetRows.size() != sidChunk.size()) {
|
if (targetRows.size() != sidChunk.size()) {
|
||||||
throw BusinessException.badRequest("LIST_NOT_FOUND", "수정 대상 리스트를 찾을 수 없습니다.");
|
throw BusinessException.badRequest("LIST_NOT_FOUND", "수정 대상 리스트를 찾을 수 없습니다.");
|
||||||
|
}
|
||||||
|
|
||||||
|
totalUpdatedCount += updateChunk(
|
||||||
|
prjctIdx,
|
||||||
|
targetRows,
|
||||||
|
updateContents,
|
||||||
|
headerMap,
|
||||||
|
regUser,
|
||||||
|
regDt
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
totalUpdatedCount += updateChunk(
|
List<ListHeaderDto> updatedHeaders = headerMap.values().stream()
|
||||||
prjctIdx,
|
.map(ListHeaderDto::fromEntity)
|
||||||
targetRows,
|
.toList();
|
||||||
updateContents,
|
|
||||||
headerMap,
|
listContentItemService.refreshListContentItem(prjctIdx, updatedHeaders);
|
||||||
regUser,
|
|
||||||
regDt
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
List<ListHeaderDto> updatedHeaders = headerMap.values().stream()
|
|
||||||
.map(ListHeaderDto::fromEntity)
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
listContentItemService.refreshListContentItem(prjctIdx, updatedHeaders);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isEmpty(updateResultCodes)) {
|
if (!isEmpty(updateResultCodes)) {
|
||||||
@@ -443,13 +446,26 @@ public class ListUpdateService {
|
|||||||
if (userRole != null
|
if (userRole != null
|
||||||
&& userRole >= ContactConstant.FIELDWORK_USER_ROLE
|
&& userRole >= ContactConstant.FIELDWORK_USER_ROLE
|
||||||
&& !Boolean.TRUE.equals(header.getUseIntrvwerEdit())) {
|
&& !Boolean.TRUE.equals(header.getUseIntrvwerEdit())) {
|
||||||
throw BusinessException.badRequest("INTERVIEWER_EDIT_NOT_ALLOWED", "면접원 수정 권한이 없는 헤더가 포함되어 있습니다.");
|
headerMap.remove(headerId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return headerMap;
|
return headerMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Map<Integer, String> filterAllowedUpdateContents(
|
||||||
|
Map<Integer, String> updateContents,
|
||||||
|
Map<Integer, TListHeaderEntity> headerMap
|
||||||
|
) {
|
||||||
|
return updateContents.entrySet().stream()
|
||||||
|
.filter(entry -> headerMap.containsKey(entry.getKey()))
|
||||||
|
.collect(
|
||||||
|
LinkedHashMap::new,
|
||||||
|
(map, entry) -> map.put(entry.getKey(), entry.getValue()),
|
||||||
|
Map::putAll
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
private String normalizeUpdateValue(TListHeaderEntity header, String value) {
|
private String normalizeUpdateValue(TListHeaderEntity header, String value) {
|
||||||
if (header.getListHderTy().equals(ListHeaderType.IS_USE.getCode())) {
|
if (header.getListHderTy().equals(ListHeaderType.IS_USE.getCode())) {
|
||||||
return String.valueOf(parseIsUseCode(value));
|
return String.valueOf(parseIsUseCode(value));
|
||||||
|
|||||||
Reference in New Issue
Block a user