From 1ade453257a023f566ecc7cb9b347ead1b10f16f Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 16 Jul 2026 15:58:25 +0900 Subject: [PATCH] =?UTF-8?q?260716=5F04=5FENH:=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/ListHeaderService.java | 24 ++++++- .../server/service/ListUpdateService.java | 68 ++++++++++++------- 2 files changed, 64 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/kri/contact/server/service/ListHeaderService.java b/src/main/java/com/kri/contact/server/service/ListHeaderService.java index 4d677eb..cacd623 100644 --- a/src/main/java/com/kri/contact/server/service/ListHeaderService.java +++ b/src/main/java/com/kri/contact/server/service/ListHeaderService.java @@ -99,6 +99,15 @@ public class ListHeaderService { defaultByName.put(dto.getListHderNm(), dto); } + List existingHeaders = listHeaderRepository.findByIdPrjctIdx(prjctIdx).stream() + .map(ListHeaderDto::fromEntity) + .sorted(Comparator.comparing(ListHeaderDto::getListHderId)) + .toList(); + Map existingByName = new LinkedHashMap<>(); + for (ListHeaderDto dto : existingHeaders) { + existingByName.put(dto.getListHderNm(), dto); + } + for (String defaultName : defaultByName.keySet()) { if (!excelHeaders.contains(defaultName)) { errors.add(ListUploadErrorDto.of(1, defaultName, "기본 헤더가 누락되었습니다.")); @@ -122,15 +131,26 @@ public class ListHeaderService { List result = new ArrayList<>(); 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) { if (defaultByName.containsKey(headerName)) { continue; } + ListHeaderDto existing = existingByName.get(headerName); + if (existing != null) { + result.add(ListHeaderDto.fromDto(prjctIdx, existing)); + continue; + } + int headerId = nextId++; ListHeaderType type = resolveType(headerId, request.getSpecificHeader()); diff --git a/src/main/java/com/kri/contact/server/service/ListUpdateService.java b/src/main/java/com/kri/contact/server/service/ListUpdateService.java index 87f37d2..dbb7405 100644 --- a/src/main/java/com/kri/contact/server/service/ListUpdateService.java +++ b/src/main/java/com/kri/contact/server/service/ListUpdateService.java @@ -87,36 +87,39 @@ public class ListUpdateService { int totalUpdatedCount = 0; if (!isEmpty(updateContents)) { Map headerMap = validateHeaders(prjctIdx, updateContents.keySet(), userRole); - List itemHeaderIds = updateContents.keySet().stream().toList(); + updateContents = filterAllowedUpdateContents(updateContents, headerMap); + if (!updateContents.isEmpty()) { + List itemHeaderIds = updateContents.keySet().stream().toList(); - List sidList = new ArrayList<>(sids); - for (int i = 0; i < sidList.size(); i += chunkSize) { - List sidChunk = sidList.subList(i, Math.min(sidList.size(), i + chunkSize)); - List targetRows = listSearchService.findUpdateTargetRows( - prjctIdx, - sidChunk, - itemHeaderIds - ); + List sidList = new ArrayList<>(sids); + for (int i = 0; i < sidList.size(); i += chunkSize) { + List sidChunk = sidList.subList(i, Math.min(sidList.size(), i + chunkSize)); + List targetRows = listSearchService.findUpdateTargetRows( + prjctIdx, + sidChunk, + itemHeaderIds + ); - if (targetRows.size() != sidChunk.size()) { - throw BusinessException.badRequest("LIST_NOT_FOUND", "수정 대상 리스트를 찾을 수 없습니다."); + if (targetRows.size() != sidChunk.size()) { + throw BusinessException.badRequest("LIST_NOT_FOUND", "수정 대상 리스트를 찾을 수 없습니다."); + } + + totalUpdatedCount += updateChunk( + prjctIdx, + targetRows, + updateContents, + headerMap, + regUser, + regDt + ); } - totalUpdatedCount += updateChunk( - prjctIdx, - targetRows, - updateContents, - headerMap, - regUser, - regDt - ); + List updatedHeaders = headerMap.values().stream() + .map(ListHeaderDto::fromEntity) + .toList(); + + listContentItemService.refreshListContentItem(prjctIdx, updatedHeaders); } - - List updatedHeaders = headerMap.values().stream() - .map(ListHeaderDto::fromEntity) - .toList(); - - listContentItemService.refreshListContentItem(prjctIdx, updatedHeaders); } if (!isEmpty(updateResultCodes)) { @@ -443,13 +446,26 @@ public class ListUpdateService { if (userRole != null && userRole >= ContactConstant.FIELDWORK_USER_ROLE && !Boolean.TRUE.equals(header.getUseIntrvwerEdit())) { - throw BusinessException.badRequest("INTERVIEWER_EDIT_NOT_ALLOWED", "면접원 수정 권한이 없는 헤더가 포함되어 있습니다."); + headerMap.remove(headerId); } } return headerMap; } + private Map filterAllowedUpdateContents( + Map updateContents, + Map 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) { if (header.getListHderTy().equals(ListHeaderType.IS_USE.getCode())) { return String.valueOf(parseIsUseCode(value));