Merge pull request '260910_01_ENH: 업로드 실패 엑셀에 SID 및 사용자 ID 추가' (#20) from develop into master

Reviewed-on: #20
This commit is contained in:
2026-09-10 12:35:07 +09:00
6 changed files with 80 additions and 24 deletions

View File

@@ -11,25 +11,18 @@ import lombok.experimental.SuperBuilder;
@Getter @Getter
@Setter @Setter
@Schema(description = "ExcelErrorDto") @Schema(description = "ExcelErrorDto")
public class ExcelErrorDto { public abstract class ExcelErrorDto {
@ExcelColumn(header = "행 번호", order = 0) @ExcelColumn(header = "행 번호", order = 0)
@Schema(description = "rowNumber") @Schema(description = "rowNumber")
private int rowNumber; private int rowNumber;
@ExcelColumn(header = "필드명", order = 1) @ExcelColumn(header = "필드명", order = 2)
@Schema(description = "fieldName") @Schema(description = "fieldName")
private String fieldName; private String fieldName;
@ExcelColumn(header = "에러 메시지", order = 2) @ExcelColumn(header = "에러 메시지", order = 3)
@Schema(description = "errorMessage") @Schema(description = "errorMessage")
private String errorMessage; private String errorMessage;
public static ExcelErrorDto of(int rowNumber, String fieldName, String errorMessage) {
return ExcelErrorDto.builder()
.rowNumber(rowNumber)
.fieldName(fieldName)
.errorMessage(errorMessage)
.build();
}
} }

View File

@@ -1,7 +1,7 @@
package com.kri.contact.server.dto.excel; package com.kri.contact.server.dto.excel;
import com.kri.common.feature.excel.ExcelColumn;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@@ -11,9 +11,24 @@ import lombok.experimental.SuperBuilder;
@Setter @Setter
@Schema(description = "ListUploadErrorDto") @Schema(description = "ListUploadErrorDto")
public class ListUploadErrorDto extends ExcelErrorDto { 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) { 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() return ListUploadErrorDto.builder()
.rowNumber(rowNumber) .rowNumber(rowNumber)
.sid(sid)
.fieldName(fieldName) .fieldName(fieldName)
.errorMessage(errorMessage) .errorMessage(errorMessage)
.build(); .build();

View File

@@ -1,7 +1,7 @@
package com.kri.contact.server.dto.excel; package com.kri.contact.server.dto.excel;
import com.kri.common.feature.excel.ExcelColumn;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@@ -12,9 +12,23 @@ import lombok.experimental.SuperBuilder;
@Schema(description = "UserUploadErrorDto") @Schema(description = "UserUploadErrorDto")
public class UserUploadErrorDto extends ExcelErrorDto { 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) { 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() return UserUploadErrorDto.builder()
.rowNumber(rowNumber) .rowNumber(rowNumber)
.userId(userId)
.fieldName(fieldName) .fieldName(fieldName)
.errorMessage(errorMessage) .errorMessage(errorMessage)
.build(); .build();

View File

@@ -71,7 +71,7 @@ public class ListUploadJdbcSupport {
public List<DuplicateHit> findFileDuplicateRows(String listUploadLogId) { public List<DuplicateHit> findFileDuplicateRows(String listUploadLogId) {
String sql = """ 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 from t_list_item_upload_tmp t
join ( join (
select list_upload_log_id, specific_type, normalized_val select list_upload_log_id, specific_type, normalized_val
@@ -92,6 +92,7 @@ public class ListUploadJdbcSupport {
sql, sql,
(rs, rowNum) -> new DuplicateHit( (rs, rowNum) -> new DuplicateHit(
rs.getInt("row_no"), rs.getInt("row_no"),
rs.getString("sid"),
rs.getInt("list_hder_id"), rs.getInt("list_hder_id"),
rs.getString("raw_val") rs.getString("raw_val")
), ),
@@ -105,7 +106,7 @@ public class ListUploadJdbcSupport {
boolean excludeSameSid boolean excludeSameSid
) { ) {
String sql = """ 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 from t_list_item_upload_tmp t
join t_list_item i join t_list_item i
on i.prjct_idx = t.prjct_idx on i.prjct_idx = t.prjct_idx
@@ -123,6 +124,7 @@ public class ListUploadJdbcSupport {
sql, sql,
(rs, rowNum) -> new DuplicateHit( (rs, rowNum) -> new DuplicateHit(
rs.getInt("row_no"), rs.getInt("row_no"),
rs.getString("sid"),
rs.getInt("list_hder_id"), rs.getInt("list_hder_id"),
rs.getString("raw_val") rs.getString("raw_val")
), ),
@@ -308,6 +310,7 @@ public class ListUploadJdbcSupport {
public record DuplicateHit( public record DuplicateHit(
int rowNo, int rowNo,
String sid,
int listHderId, int listHderId,
String rawVal String rawVal
) {} ) {}

View File

@@ -591,19 +591,31 @@ public class ListUploadService {
ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> { ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> {
totalCount.incrementAndGet(); 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) { if (sid == null) {
errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "SID는 필수이며 정수여야 합니다.")); errors.add(ListUploadErrorDto.of(
rowNo,
errorSid,
sidHeaderName,
"SID는 필수이며 정수여야 합니다."
));
return; return;
} }
Short isUse = parseIsUseDefaultUsable(row.get(isUseHeaderName)); Short isUse = parseIsUseDefaultUsable(row.get(isUseHeaderName));
if (isUse == null) { 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)) { if (!uploadedSids.add(sid)) {
errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "업로드 파일 내 SID가 중복됩니다.")); errors.add(ListUploadErrorDto.of(rowNo, errorSid, sidHeaderName, "업로드 파일 내 SID가 중복됩니다."));
} }
if (outsourceHeaderName != null) { if (outsourceHeaderName != null) {
@@ -611,10 +623,15 @@ public class ListUploadService {
if (raw != null) { if (raw != null) {
TCmpnEntity cmpn = cmpnByUploadText.get(raw); TCmpnEntity cmpn = cmpnByUploadText.get(raw);
if (cmpn == null) { if (cmpn == null) {
errors.add(ListUploadErrorDto.of(rowNo, outsourceHeaderName, "존재하지 않는 회사입니다.")); errors.add(ListUploadErrorDto.of(rowNo, errorSid, outsourceHeaderName, "존재하지 않는 회사입니다."));
} else if (!Boolean.TRUE.equals(cmpn.getOwnCmpn()) } else if (!Boolean.TRUE.equals(cmpn.getOwnCmpn())
&& !prjctAssignCmpnList.contains(cmpn.getCmpnId())) { && !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)) { if (!prjctAssignUserSet.contains(raw)) {
errors.add(ListUploadErrorDto.of( errors.add(ListUploadErrorDto.of(
rowNo, rowNo,
errorSid,
assignHeaderName, assignHeaderName,
"프로젝트에 배정되지 않은 사용자입니다." "프로젝트에 배정되지 않은 사용자입니다."
)); ));
@@ -640,6 +658,7 @@ public class ListUploadService {
if (userRole == null || !allowedUserRoles.contains(String.valueOf(userRole))) { if (userRole == null || !allowedUserRoles.contains(String.valueOf(userRole))) {
errors.add(ListUploadErrorDto.of( errors.add(ListUploadErrorDto.of(
rowNo, rowNo,
errorSid,
assignHeaderName, assignHeaderName,
"배정 구분과 사용자 권한이 일치하지 않습니다." "배정 구분과 사용자 권한이 일치하지 않습니다."
)); ));
@@ -664,7 +683,12 @@ public class ListUploadService {
String normalized = normalizeEmail(raw); String normalized = normalizeEmail(raw);
if (normalized == null) { if (normalized == null) {
errors.add(ListUploadErrorDto.of(rowNo, header.getListHderNm(), "이메일 형식이 올바르지 않습니다.")); errors.add(ListUploadErrorDto.of(
rowNo,
errorSid,
header.getListHderNm(),
"이메일 형식이 올바르지 않습니다."
));
continue; continue;
} }
@@ -679,7 +703,12 @@ public class ListUploadService {
String normalized = normalizeOnlyNumber(raw); String normalized = normalizeOnlyNumber(raw);
if (normalized == null) { if (normalized == null) {
errors.add(ListUploadErrorDto.of(rowNo, header.getListHderNm(), "전화번호 형식이 올바르지 않습니다.")); errors.add(ListUploadErrorDto.of(
rowNo,
errorSid,
header.getListHderNm(),
"전화번호 형식이 올바르지 않습니다."
));
continue; continue;
} }
@@ -706,7 +735,7 @@ public class ListUploadService {
for (ListUploadJdbcSupport.DuplicateHit hit : listUploadJdbcSupport.findFileDuplicateRows(listUploadLogId)) { for (ListUploadJdbcSupport.DuplicateHit hit : listUploadJdbcSupport.findFileDuplicateRows(listUploadLogId)) {
String fieldName = headerById.get(hit.listHderId()).getListHderNm(); 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()) { if (request.isCheckDuplicateEmail() || request.isCheckDuplicatePhone()) {
@@ -716,7 +745,7 @@ public class ListUploadService {
listUploadLogId, prjctIdx, excludeSameSid listUploadLogId, prjctIdx, excludeSameSid
)) { )) {
String fieldName = headerById.get(hit.listHderId()).getListHderNm(); 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 내 중복값입니다."));
} }
} }

View File

@@ -118,6 +118,7 @@ public class UserService {
errorList.add( errorList.add(
UserUploadErrorDto.of( UserUploadErrorDto.of(
rowNumber, rowNumber,
dto.getUserId(),
SYSTEM_USER_NAME, SYSTEM_USER_NAME,
ex.getMessage() ex.getMessage()
) )
@@ -387,6 +388,7 @@ public class UserService {
if (!validateResult.isSuccess()) { if (!validateResult.isSuccess()) {
errors.add(UserUploadErrorDto.of( errors.add(UserUploadErrorDto.of(
rowNumber, rowNumber,
dto.getUserId(),
validateResult.getFieldName(), validateResult.getFieldName(),
validateResult.getErrMessage() validateResult.getErrMessage()
)); ));