From 11c80579e52b09f2651e5b4738914f8eff9ff955 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 10 Sep 2026 12:31:00 +0900 Subject: [PATCH] =?UTF-8?q?260910=5F01=5FENH:=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EC=8B=A4=ED=8C=A8=20=EC=97=91=EC=85=80=EC=97=90=20?= =?UTF-8?q?SID=20=EB=B0=8F=20=EC=82=AC=EC=9A=A9=EC=9E=90=20ID=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/dto/excel/ExcelErrorDto.java | 13 ++--- .../server/dto/excel/ListUploadErrorDto.java | 17 ++++++- .../server/dto/excel/UserUploadErrorDto.java | 16 +++++- .../jdbc/ListUploadJdbcSupport.java | 7 ++- .../server/service/ListUploadService.java | 49 +++++++++++++++---- .../contact/server/service/UserService.java | 2 + 6 files changed, 80 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java b/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java index eeb0cc1..7ea3e10 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java @@ -11,25 +11,18 @@ import lombok.experimental.SuperBuilder; @Getter @Setter @Schema(description = "ExcelErrorDto") -public class ExcelErrorDto { +public abstract class ExcelErrorDto { @ExcelColumn(header = "행 번호", order = 0) @Schema(description = "rowNumber") private int rowNumber; - @ExcelColumn(header = "필드명", order = 1) + @ExcelColumn(header = "필드명", order = 2) @Schema(description = "fieldName") private String fieldName; - @ExcelColumn(header = "에러 메시지", order = 2) + @ExcelColumn(header = "에러 메시지", order = 3) @Schema(description = "errorMessage") private String errorMessage; - public static ExcelErrorDto of(int rowNumber, String fieldName, String errorMessage) { - return ExcelErrorDto.builder() - .rowNumber(rowNumber) - .fieldName(fieldName) - .errorMessage(errorMessage) - .build(); - } } diff --git a/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java b/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java index a7e3da2..1a66b1d 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java @@ -1,7 +1,7 @@ package com.kri.contact.server.dto.excel; +import com.kri.common.feature.excel.ExcelColumn; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; @@ -11,9 +11,24 @@ import lombok.experimental.SuperBuilder; @Setter @Schema(description = "ListUploadErrorDto") public class ListUploadErrorDto extends ExcelErrorDto { + + @ExcelColumn(header = "SID", order = 1) + @Schema(description = "sid") + private String sid; + public static ListUploadErrorDto of(int rowNumber, String fieldName, String errorMessage) { + return of(rowNumber, null, fieldName, errorMessage); + } + + public static ListUploadErrorDto of( + int rowNumber, + String sid, + String fieldName, + String errorMessage + ) { return ListUploadErrorDto.builder() .rowNumber(rowNumber) + .sid(sid) .fieldName(fieldName) .errorMessage(errorMessage) .build(); diff --git a/src/main/java/com/kri/contact/server/dto/excel/UserUploadErrorDto.java b/src/main/java/com/kri/contact/server/dto/excel/UserUploadErrorDto.java index 0758c1e..016263d 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/UserUploadErrorDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/UserUploadErrorDto.java @@ -1,7 +1,7 @@ package com.kri.contact.server.dto.excel; +import com.kri.common.feature.excel.ExcelColumn; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; @@ -12,9 +12,23 @@ import lombok.experimental.SuperBuilder; @Schema(description = "UserUploadErrorDto") public class UserUploadErrorDto extends ExcelErrorDto { + @ExcelColumn(header = "사용자 ID", order = 1) + @Schema(description = "userId") + private String userId; + public static UserUploadErrorDto of(int rowNumber, String fieldName, String errorMessage) { + return of(rowNumber, null, fieldName, errorMessage); + } + + public static UserUploadErrorDto of( + int rowNumber, + String userId, + String fieldName, + String errorMessage + ) { return UserUploadErrorDto.builder() .rowNumber(rowNumber) + .userId(userId) .fieldName(fieldName) .errorMessage(errorMessage) .build(); diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java index e861e82..10be576 100644 --- a/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java @@ -71,7 +71,7 @@ public class ListUploadJdbcSupport { public List findFileDuplicateRows(String listUploadLogId) { String sql = """ - select t.row_no, t.list_hder_id, t.raw_val + select t.row_no, t.sid, t.list_hder_id, t.raw_val from t_list_item_upload_tmp t join ( select list_upload_log_id, specific_type, normalized_val @@ -92,6 +92,7 @@ public class ListUploadJdbcSupport { sql, (rs, rowNum) -> new DuplicateHit( rs.getInt("row_no"), + rs.getString("sid"), rs.getInt("list_hder_id"), rs.getString("raw_val") ), @@ -105,7 +106,7 @@ public class ListUploadJdbcSupport { boolean excludeSameSid ) { String sql = """ - select distinct t.row_no, t.list_hder_id, t.raw_val + select distinct t.row_no, t.sid, t.list_hder_id, t.raw_val from t_list_item_upload_tmp t join t_list_item i on i.prjct_idx = t.prjct_idx @@ -123,6 +124,7 @@ public class ListUploadJdbcSupport { sql, (rs, rowNum) -> new DuplicateHit( rs.getInt("row_no"), + rs.getString("sid"), rs.getInt("list_hder_id"), rs.getString("raw_val") ), @@ -308,6 +310,7 @@ public class ListUploadJdbcSupport { public record DuplicateHit( int rowNo, + String sid, int listHderId, String rawVal ) {} diff --git a/src/main/java/com/kri/contact/server/service/ListUploadService.java b/src/main/java/com/kri/contact/server/service/ListUploadService.java index 9484038..27228a0 100644 --- a/src/main/java/com/kri/contact/server/service/ListUploadService.java +++ b/src/main/java/com/kri/contact/server/service/ListUploadService.java @@ -591,19 +591,31 @@ public class ListUploadService { ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> { totalCount.incrementAndGet(); - String sid = parseNumericSid(row.get(sidHeaderName)); + String rawSid = normalizeBlank(row.get(sidHeaderName)); + String sid = parseNumericSid(rawSid); + String errorSid = sid != null ? sid : rawSid; if (sid == null) { - errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "SID는 필수이며 정수여야 합니다.")); + errors.add(ListUploadErrorDto.of( + rowNo, + errorSid, + sidHeaderName, + "SID는 필수이며 정수여야 합니다." + )); return; } Short isUse = parseIsUseDefaultUsable(row.get(isUseHeaderName)); if (isUse == null) { - errors.add(ListUploadErrorDto.of(rowNo, isUseHeaderName, "사용 여부는 O, X, TEST만 허용됩니다.")); + errors.add(ListUploadErrorDto.of( + rowNo, + errorSid, + isUseHeaderName, + "사용 여부는 O, X, TEST만 허용됩니다." + )); } if (!uploadedSids.add(sid)) { - errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "업로드 파일 내 SID가 중복됩니다.")); + errors.add(ListUploadErrorDto.of(rowNo, errorSid, sidHeaderName, "업로드 파일 내 SID가 중복됩니다.")); } if (outsourceHeaderName != null) { @@ -611,10 +623,15 @@ public class ListUploadService { if (raw != null) { TCmpnEntity cmpn = cmpnByUploadText.get(raw); if (cmpn == null) { - errors.add(ListUploadErrorDto.of(rowNo, outsourceHeaderName, "존재하지 않는 회사입니다.")); + errors.add(ListUploadErrorDto.of(rowNo, errorSid, outsourceHeaderName, "존재하지 않는 회사입니다.")); } else if (!Boolean.TRUE.equals(cmpn.getOwnCmpn()) && !prjctAssignCmpnList.contains(cmpn.getCmpnId())) { - errors.add(ListUploadErrorDto.of(rowNo, outsourceHeaderName, "프로젝트에 배정되지 않은 회사입니다.")); + errors.add(ListUploadErrorDto.of( + rowNo, + errorSid, + outsourceHeaderName, + "프로젝트에 배정되지 않은 회사입니다." + )); } } } @@ -629,6 +646,7 @@ public class ListUploadService { if (!prjctAssignUserSet.contains(raw)) { errors.add(ListUploadErrorDto.of( rowNo, + errorSid, assignHeaderName, "프로젝트에 배정되지 않은 사용자입니다." )); @@ -640,6 +658,7 @@ public class ListUploadService { if (userRole == null || !allowedUserRoles.contains(String.valueOf(userRole))) { errors.add(ListUploadErrorDto.of( rowNo, + errorSid, assignHeaderName, "배정 구분과 사용자 권한이 일치하지 않습니다." )); @@ -664,7 +683,12 @@ public class ListUploadService { String normalized = normalizeEmail(raw); if (normalized == null) { - errors.add(ListUploadErrorDto.of(rowNo, header.getListHderNm(), "이메일 형식이 올바르지 않습니다.")); + errors.add(ListUploadErrorDto.of( + rowNo, + errorSid, + header.getListHderNm(), + "이메일 형식이 올바르지 않습니다." + )); continue; } @@ -679,7 +703,12 @@ public class ListUploadService { String normalized = normalizeOnlyNumber(raw); if (normalized == null) { - errors.add(ListUploadErrorDto.of(rowNo, header.getListHderNm(), "전화번호 형식이 올바르지 않습니다.")); + errors.add(ListUploadErrorDto.of( + rowNo, + errorSid, + header.getListHderNm(), + "전화번호 형식이 올바르지 않습니다." + )); continue; } @@ -706,7 +735,7 @@ public class ListUploadService { for (ListUploadJdbcSupport.DuplicateHit hit : listUploadJdbcSupport.findFileDuplicateRows(listUploadLogId)) { String fieldName = headerById.get(hit.listHderId()).getListHderNm(); - errors.add(ListUploadErrorDto.of(hit.rowNo(), fieldName, "업로드 파일 내 중복값입니다.")); + errors.add(ListUploadErrorDto.of(hit.rowNo(), hit.sid(), fieldName, "업로드 파일 내 중복값입니다.")); } if (request.isCheckDuplicateEmail() || request.isCheckDuplicatePhone()) { @@ -716,7 +745,7 @@ public class ListUploadService { listUploadLogId, prjctIdx, excludeSameSid )) { String fieldName = headerById.get(hit.listHderId()).getListHderNm(); - errors.add(ListUploadErrorDto.of(hit.rowNo(), fieldName, "DB 내 중복값입니다.")); + errors.add(ListUploadErrorDto.of(hit.rowNo(), hit.sid(), fieldName, "DB 내 중복값입니다.")); } } diff --git a/src/main/java/com/kri/contact/server/service/UserService.java b/src/main/java/com/kri/contact/server/service/UserService.java index 35ecec1..f9f6478 100644 --- a/src/main/java/com/kri/contact/server/service/UserService.java +++ b/src/main/java/com/kri/contact/server/service/UserService.java @@ -118,6 +118,7 @@ public class UserService { errorList.add( UserUploadErrorDto.of( rowNumber, + dto.getUserId(), SYSTEM_USER_NAME, ex.getMessage() ) @@ -387,6 +388,7 @@ public class UserService { if (!validateResult.isSuccess()) { errors.add(UserUploadErrorDto.of( rowNumber, + dto.getUserId(), validateResult.getFieldName(), validateResult.getErrMessage() ));