diff --git a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java index 1c8def0..3b9f230 100644 --- a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java @@ -23,7 +23,7 @@ public final class ContactConstant { public static final int OUTSOURCE_USER_ROLE = 4000; public static final int FIELDWORK_USER_ROLE = 9000; public static final StreamingReadOptions UPPER_CASE_HEADER_OPTIONS = - new StreamingReadOptions(null, 0, 1, header -> header == null ? null : header.toUpperCase( + new StreamingReadOptions(null, 0, 1, header -> header == null ? null : header.trim().toUpperCase( Locale.ROOT)); public static final String LIST_HEADER_ACCEPT_REGEX = "^[가-힣a-zA-Z0-9()_\\-\\[\\] ]+$"; diff --git a/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java index cf1443a..2819c2e 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java @@ -60,6 +60,14 @@ public class ListHeaderDto { @Schema(description = "면접원 수정가능 여부") private Boolean useIntrvwerEdit = false; + public String getListHderNm() { + return listHderNm == null ? null : listHderNm.trim(); + } + + public void setListHderNm(String listHderNm) { + this.listHderNm = listHderNm == null ? null : listHderNm.trim(); + } + public static ListHeaderDto fromEntity(TListHeaderEntity entity) { return ListHeaderDto.builder() .prjctIdx(entity.getPrjctIdx()) @@ -96,7 +104,7 @@ public class ListHeaderDto { .listHderId(headerId) .listHderOrder((short) headerId) .listHderGrad(ListHeaderGrade.COMMON) - .listHderNm(headerName) + .listHderNm(headerName == null ? null : headerName.trim()) .listHderTy(type) .useFilter(true) .useColView(true) @@ -109,13 +117,13 @@ public class ListHeaderDto { return Objects.equals(listHderId, dto.listHderId) && Objects.equals(listHderOrder, dto.listHderOrder) && Objects.equals(listHderGrad, dto.listHderGrad) && - Objects.equals(listHderNm, dto.listHderNm) && + Objects.equals(getListHderNm(), dto.getListHderNm()) && Objects.equals(listHderTy, dto.listHderTy); } public boolean isEqualSimple(ListHeaderDto dto) { return Objects.equals(listHderId, dto.listHderId) && Objects.equals(listHderGrad, dto.listHderGrad) && - Objects.equals(listHderNm, dto.listHderNm); + Objects.equals(getListHderNm(), dto.getListHderNm()); } } diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java index d0aa18d..d46e3fd 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java @@ -101,7 +101,7 @@ public class TListHeaderEntity { .id(TListHeaderEntityId.create(prjctIdx, src.getListHderId())) .listHderOrder(src.getListHderOrder()) .listHderGrad(src.getListHderGrad()) - .listHderNm(src.getListHderNm()) + .listHderNm(src.getListHderNm() == null ? null : src.getListHderNm().trim()) .listHderTy(src.getListHderTy()) .useFilter(src.getUseFilter()) .useColView(src.getUseColView()) 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 27a812c..e769583 100644 --- a/src/main/java/com/kri/contact/server/service/ListHeaderService.java +++ b/src/main/java/com/kri/contact/server/service/ListHeaderService.java @@ -116,6 +116,10 @@ public class ListHeaderService { return List.of(); } + excelHeaders = excelHeaders.stream() + .map(name -> name == null ? null : name.trim()) + .toList(); + List defaultHeaders = listHeaderRepository.findDefaultHeader().stream() .map(ListHeaderDto::fromEntity) .sorted(Comparator.comparing(ListHeaderDto::getListHderId)) @@ -340,7 +344,7 @@ public class ListHeaderService { Map headerIdByName = createHeaderIdByNameMap(getHeader(prjctIdx)); if (!ignoreUnknownHeaders) { Set missingHeaderNames = contentsByHeaderName.keySet().stream() - .filter(name -> !headerIdByName.containsKey(name)) + .filter(name -> !headerIdByName.containsKey(name == null ? null : name.trim())) .collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll); if (!missingHeaderNames.isEmpty()) { @@ -351,7 +355,7 @@ public class ListHeaderService { Map contentsByHeaderId = new LinkedHashMap<>(); contentsByHeaderName.forEach((name, value) -> { - Integer headerId = headerIdByName.get(name); + Integer headerId = headerIdByName.get(name == null ? null : name.trim()); if (headerId != null) { contentsByHeaderId.put(headerId, value); }