Merge pull request '260916_01_ENH: SID 대소문자 구분을 위한 임시 테이블 collation 수정' (#22) from develop into master
Reviewed-on: #22
This commit is contained in:
@@ -38,7 +38,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "com.kri.common:starter:beta.1.6.3"
|
||||
implementation "com.kri.common:starter:beta.1.6.6"
|
||||
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-security'
|
||||
|
||||
111
src/main/java/com/kri/contact/server/common/util/SidUtil.java
Normal file
111
src/main/java/com/kri/contact/server/common/util/SidUtil.java
Normal file
@@ -0,0 +1,111 @@
|
||||
package com.kri.contact.server.common.util;
|
||||
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Collection;
|
||||
import java.util.Optional;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public final class SidUtil {
|
||||
|
||||
private static final int MAX_LENGTH = 32;
|
||||
private static final Pattern SID_PATTERN = Pattern.compile(
|
||||
"^[A-Za-z0-9](?:[A-Za-z0-9_-]{0,30}[A-Za-z0-9])?$"
|
||||
);
|
||||
private static final Pattern NUMERIC_PATTERN = Pattern.compile("^[0-9]{1,32}$");
|
||||
|
||||
private SidUtil() {
|
||||
}
|
||||
|
||||
public static String normalizeSid(String value) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
String normalized = value.trim();
|
||||
return SID_PATTERN.matcher(normalized).matches() ? normalized : null;
|
||||
}
|
||||
|
||||
public static String requireSid(String value) {
|
||||
String normalized = normalizeSid(value);
|
||||
if (normalized == null) {
|
||||
throw BusinessException.badRequest(
|
||||
"INVALID_SID",
|
||||
"SID는 영문 대소문자, 숫자, -, _만 사용할 수 있으며 시작과 끝은 영문 또는 숫자여야 합니다."
|
||||
).with("maxLength", MAX_LENGTH);
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
public static Optional<SidFilterCondition> parseFilterCondition(String value) {
|
||||
if (value == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
String normalized = value.trim();
|
||||
if (normalized.isEmpty()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
if (!normalized.contains("~")) {
|
||||
String sid = normalizeSid(normalized);
|
||||
return sid == null
|
||||
? Optional.empty()
|
||||
: Optional.of(SidFilterCondition.exact(sid));
|
||||
}
|
||||
|
||||
String[] tokens = normalized.split("~", -1);
|
||||
if (tokens.length != 2) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
String startToken = tokens[0].trim();
|
||||
String endToken = tokens[1].trim();
|
||||
if (!NUMERIC_PATTERN.matcher(startToken).matches()
|
||||
|| !NUMERIC_PATTERN.matcher(endToken).matches()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
BigDecimal start = new BigDecimal(startToken);
|
||||
BigDecimal end = new BigDecimal(endToken);
|
||||
if (start.compareTo(end) > 0) {
|
||||
BigDecimal temp = start;
|
||||
start = end;
|
||||
end = temp;
|
||||
}
|
||||
return Optional.of(SidFilterCondition.range(start, end));
|
||||
}
|
||||
|
||||
public static void requireValidFilterConditions(Collection<String> conditions) {
|
||||
if (conditions == null || conditions.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (String condition : conditions) {
|
||||
if (parseFilterCondition(condition).isEmpty()) {
|
||||
throw BusinessException.badRequest(
|
||||
"INVALID_SID_FILTER",
|
||||
"SID 필터는 유효한 SID 또는 숫자~숫자 형식이어야 합니다."
|
||||
).with("sidCondition", condition);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public record SidFilterCondition(
|
||||
String exactSid,
|
||||
BigDecimal rangeStart,
|
||||
BigDecimal rangeEnd
|
||||
) {
|
||||
|
||||
private static SidFilterCondition exact(String sid) {
|
||||
return new SidFilterCondition(sid, null, null);
|
||||
}
|
||||
|
||||
private static SidFilterCondition range(BigDecimal start, BigDecimal end) {
|
||||
return new SidFilterCondition(null, start, end);
|
||||
}
|
||||
|
||||
public boolean isExact() {
|
||||
return exactSid != null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -24,7 +24,7 @@ import lombok.Setter;
|
||||
public class ListFilterDto {
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "SID 목록. 숫자 또는 숫자~숫자 형식")
|
||||
@Schema(description = "SID 목록. 영문 대소문자·숫자·-·_로 구성된 SID 또는 숫자~숫자 형식")
|
||||
private Set<String> sidSet;
|
||||
|
||||
@NotNull
|
||||
|
||||
@@ -79,7 +79,9 @@ public class ListResetJdbcSupport {
|
||||
private void prepareTempSids(Collection<String> sids, int chunkSize) {
|
||||
dropTempSids();
|
||||
entityManager.createNativeQuery(
|
||||
"create temporary table " + TEMP_SID_TABLE + " (sid varchar(32) not null primary key) engine=memory"
|
||||
"create temporary table " + TEMP_SID_TABLE
|
||||
+ " (sid varchar(32) character set utf8mb4 collate utf8mb4_0900_bin not null primary key)"
|
||||
+ " engine=memory"
|
||||
).executeUpdate();
|
||||
|
||||
List<String> sidList = new ArrayList<>(sids);
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
package com.kri.contact.server.persistence.repository;
|
||||
|
||||
import static com.kri.common.feature.util.StringUtil.normalizeBlank;
|
||||
import static com.kri.contact.server.common.util.SidUtil.parseFilterCondition;
|
||||
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.page.PageRequestDto;
|
||||
import com.kri.contact.server.common.enums.ListHeaderTypeAssign;
|
||||
import com.kri.contact.server.common.enums.ListHeaderType;
|
||||
import com.kri.contact.server.common.enums.ListIsUse;
|
||||
import com.kri.contact.server.common.enums.ResultCodeType;
|
||||
import com.kri.contact.server.common.util.SidUtil.SidFilterCondition;
|
||||
import com.kri.contact.server.dto.list.ListAssignFilterConditionDto;
|
||||
import com.kri.contact.server.dto.list.ListFilterConditionDto;
|
||||
import com.kri.contact.server.dto.list.ListFilterDto;
|
||||
@@ -218,26 +219,23 @@ public class ListQueryRepositoryImpl implements ListQueryRepository {
|
||||
|
||||
private void appendSidPredicates(BooleanBuilder predicate, QTListEntity list, Set<String> sidSet) {
|
||||
BooleanBuilder sidPredicate = new BooleanBuilder();
|
||||
Set<String> sidNumbers = new LinkedHashSet<>();
|
||||
Set<String> exactSids = new LinkedHashSet<>();
|
||||
|
||||
for (String sidCondition : sidSet) {
|
||||
String normalized = normalizeBlank(sidCondition);
|
||||
if (normalized == null) {
|
||||
SidFilterCondition condition = parseFilterCondition(sidCondition).orElse(null);
|
||||
if (condition == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (normalized.contains("~")) {
|
||||
sidPredicate.or(toSidRangePredicate(list, normalized));
|
||||
if (condition.isExact()) {
|
||||
exactSids.add(condition.exactSid());
|
||||
} else {
|
||||
BigDecimal sidNumber = parseSidNumber(normalized, sidCondition);
|
||||
if (sidNumber != null) {
|
||||
sidNumbers.add(normalized);
|
||||
}
|
||||
sidPredicate.or(toSidRangePredicate(list, condition));
|
||||
}
|
||||
}
|
||||
|
||||
if (!sidNumbers.isEmpty()) {
|
||||
sidPredicate.or(list.id.sid.in(sidNumbers));
|
||||
if (!exactSids.isEmpty()) {
|
||||
sidPredicate.or(list.id.sid.in(exactSids));
|
||||
}
|
||||
|
||||
if (sidPredicate.hasValue()) {
|
||||
@@ -245,50 +243,11 @@ public class ListQueryRepositoryImpl implements ListQueryRepository {
|
||||
}
|
||||
}
|
||||
|
||||
private BooleanBuilder toSidRangePredicate(QTListEntity list, String normalized) {
|
||||
String[] tokens = normalized.split("~", -1);
|
||||
if (tokens.length != 2) {
|
||||
return null;
|
||||
}
|
||||
|
||||
BigDecimal start = parseSidNumber(tokens[0].trim(), normalized);
|
||||
BigDecimal end = parseSidNumber(tokens[1].trim(), normalized);
|
||||
|
||||
if(start == null || end == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (start.compareTo(end) > 0) {
|
||||
BigDecimal temp = start;
|
||||
start = end;
|
||||
end = temp;
|
||||
}
|
||||
|
||||
private BooleanBuilder toSidRangePredicate(QTListEntity list, SidFilterCondition condition) {
|
||||
return new BooleanBuilder()
|
||||
.and(list.sidSortNumber.isNotNull())
|
||||
.and(list.sidSortNumber.goe(start))
|
||||
.and(list.sidSortNumber.loe(end));
|
||||
}
|
||||
|
||||
private BigDecimal parseSidNumber(String value, String originalCondition) {
|
||||
if (value == null || !value.matches("\\d+")) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
BigDecimal parsed = new BigDecimal(value);
|
||||
if (parsed.precision() > 32) {
|
||||
throw invalidSidCondition(originalCondition);
|
||||
}
|
||||
return parsed;
|
||||
} catch (NumberFormatException e) {
|
||||
throw invalidSidCondition(originalCondition);
|
||||
}
|
||||
}
|
||||
|
||||
private BusinessException invalidSidCondition(String sidCondition) {
|
||||
return BusinessException.badRequest("INVALID_SID_FILTER", "SID 필터는 숫자 또는 숫자~숫자 형식이어야 합니다.")
|
||||
.with("sidCondition", sidCondition);
|
||||
.and(list.sidSortType.eq(0))
|
||||
.and(list.sidSortNumber.goe(condition.rangeStart()))
|
||||
.and(list.sidSortNumber.loe(condition.rangeEnd()));
|
||||
}
|
||||
|
||||
private void appendListUseConditionPredicates(
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.service;
|
||||
|
||||
import static com.kri.contact.server.common.util.SidUtil.requireValidFilterConditions;
|
||||
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.contact.server.common.consts.ContactConstant;
|
||||
import com.kri.contact.server.common.enums.ListAssignType;
|
||||
@@ -538,6 +540,7 @@ public class AssignService {
|
||||
}
|
||||
|
||||
private Set<String> resolveTargetSids(Long prjctIdx, ListFilterDto listFilter) {
|
||||
requireValidFilterConditions(listFilter == null ? null : listFilter.getSidSet());
|
||||
List<Integer> exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx);
|
||||
return new LinkedHashSet<>(listRepository.findAllSids(prjctIdx, exactMatchHeaderIds, listFilter));
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.service;
|
||||
|
||||
import static com.kri.contact.server.common.util.SidUtil.requireValidFilterConditions;
|
||||
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.contact.server.common.consts.ContactConstant;
|
||||
import com.kri.contact.server.common.enums.ListResetMode;
|
||||
@@ -33,6 +35,7 @@ public class ListResetService {
|
||||
String regUser,
|
||||
LocalDateTime regDt
|
||||
) {
|
||||
requireValidFilterConditions(filter == null ? null : filter.getSidSet());
|
||||
Set<String> sids = listSearchService.findTargetSids(prjctIdx, filter);
|
||||
return resetBySids(prjctIdx, sids, mode, regUser, regDt);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.service;
|
||||
|
||||
import static com.kri.contact.server.common.util.SidUtil.requireSid;
|
||||
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.page.PageRequestDto;
|
||||
import com.kri.common.feature.web.page.PageResponseDto;
|
||||
@@ -73,7 +75,8 @@ public class ListSearchService {
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public ListSearchWithFullResultDto searchListWithSid(Long prjctIdx, String sid) {
|
||||
ListFilterDto filterDto = ListFilterDto.onlyOneSid(sid);
|
||||
String normalizedSid = requireSid(sid);
|
||||
ListFilterDto filterDto = ListFilterDto.onlyOneSid(normalizedSid);
|
||||
List<ListSearchWithFullResultDto> result = createListSearchWithFullResult(
|
||||
prjctIdx,
|
||||
findAllListEntities(prjctIdx, filterDto)
|
||||
@@ -81,7 +84,7 @@ public class ListSearchService {
|
||||
|
||||
if (result.isEmpty()) {
|
||||
throw BusinessException.notFound("LIST_NOT_FOUND", "해당하는 리스트가 없습니다.")
|
||||
.with("sid", sid);
|
||||
.with("sid", normalizedSid);
|
||||
}
|
||||
|
||||
return result.get(0);
|
||||
@@ -89,7 +92,8 @@ public class ListSearchService {
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public ListSearchExternalDto searchListWithSidFromExternal(Long prjctIdx, String prjctCd, String sid) {
|
||||
ListFilterDto filterDto = ListFilterDto.onlyOneSid(sid);
|
||||
String normalizedSid = requireSid(sid);
|
||||
ListFilterDto filterDto = ListFilterDto.onlyOneSid(normalizedSid);
|
||||
List<ListSearchBaseDto> result = createListSearchBase(
|
||||
prjctIdx,
|
||||
findAllListEntities(prjctIdx, filterDto)
|
||||
@@ -97,7 +101,7 @@ public class ListSearchService {
|
||||
|
||||
if (result.isEmpty()) {
|
||||
throw BusinessException.notFound("LIST_NOT_FOUND", "해당하는 리스트가 없습니다.")
|
||||
.with("sid", sid);
|
||||
.with("sid", normalizedSid);
|
||||
}
|
||||
|
||||
ListSearchBaseDto list = result.get(0);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.kri.contact.server.service;
|
||||
|
||||
import static com.kri.common.feature.util.StringUtil.normalizeBlank;
|
||||
import static com.kri.contact.server.common.util.SidUtil.requireValidFilterConditions;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
@@ -540,6 +541,7 @@ public class ListUpdateService {
|
||||
}
|
||||
|
||||
private Set<String> resolveTargetSids(Long prjctIdx, ListFilterDto listFilter) {
|
||||
requireValidFilterConditions(listFilter == null ? null : listFilter.getSidSet());
|
||||
return new LinkedHashSet<>(listSearchService.findTargetSids(prjctIdx, listFilter));
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.kri.contact.server.service;
|
||||
|
||||
import static com.kri.common.feature.util.NumericUtil.parseOnlyInteger;
|
||||
import static com.kri.common.feature.util.StringUtil.escapeUnsafeText;
|
||||
import static com.kri.common.feature.util.StringUtil.isNullOrBlank;
|
||||
import static com.kri.common.feature.util.StringUtil.normalizeBlank;
|
||||
@@ -8,6 +7,8 @@ import static com.kri.common.feature.util.StringUtil.normalizeEmail;
|
||||
import static com.kri.common.feature.util.StringUtil.normalizeOnlyNumber;
|
||||
import static com.kri.contact.server.common.consts.ContactConstant.DEFAULT_AND_FILE_TYPE;
|
||||
import static com.kri.contact.server.common.consts.ContactConstant.UPPER_CASE_HEADER_OPTIONS;
|
||||
import static com.kri.contact.server.common.util.SidUtil.normalizeSid;
|
||||
import static com.kri.contact.server.common.util.SidUtil.requireSid;
|
||||
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
@@ -117,6 +118,7 @@ public class ListUploadService {
|
||||
String regUser,
|
||||
LocalDateTime regDt
|
||||
) {
|
||||
sid = requireSid(sid);
|
||||
if (files == null || files.isEmpty()) {
|
||||
throw BusinessException.badRequest("EMPTY_FILE", "업로드할 파일이 없습니다.");
|
||||
}
|
||||
@@ -451,7 +453,7 @@ public class ListUploadService {
|
||||
List<ListAssignCmpnRowInsert> assignCmpnRows = new ArrayList<>();
|
||||
|
||||
ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> {
|
||||
String sid = parseNumericSid(row.get(sidHeaderName));
|
||||
String sid = normalizeSid(row.get(sidHeaderName));
|
||||
short isUse = parseIsUseSafe(row.get(isUseHeaderName));
|
||||
String memo = normalizeBlank(row.get(memoHeaderName));
|
||||
|
||||
@@ -592,14 +594,14 @@ public class ListUploadService {
|
||||
totalCount.incrementAndGet();
|
||||
|
||||
String rawSid = normalizeBlank(row.get(sidHeaderName));
|
||||
String sid = parseNumericSid(rawSid);
|
||||
String sid = normalizeSid(rawSid);
|
||||
String errorSid = sid != null ? sid : rawSid;
|
||||
if (sid == null) {
|
||||
errors.add(ListUploadErrorDto.of(
|
||||
rowNo,
|
||||
errorSid,
|
||||
sidHeaderName,
|
||||
"SID는 필수이며 정수여야 합니다."
|
||||
"SID는 영문 대소문자, 숫자, -, _만 사용할 수 있으며 시작과 끝은 영문 또는 숫자여야 합니다."
|
||||
));
|
||||
return;
|
||||
}
|
||||
@@ -829,11 +831,6 @@ public class ListUploadService {
|
||||
return parseIsUse(s);
|
||||
}
|
||||
|
||||
private String parseNumericSid(String raw) {
|
||||
Integer parsed = parseOnlyInteger(raw);
|
||||
return parsed == null ? null : String.valueOf(parsed);
|
||||
}
|
||||
|
||||
private record ValidationSummary(
|
||||
int totalCount,
|
||||
Set<String> uploadedSids,
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package com.kri.contact.server.service;
|
||||
|
||||
import static com.kri.contact.server.common.consts.ContactConstant.REQUEST_SERVICE;
|
||||
import static com.kri.contact.server.common.util.SidUtil.requireSid;
|
||||
import static com.kri.contact.server.common.util.SidUtil.requireValidFilterConditions;
|
||||
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
@@ -88,14 +90,15 @@ public class MessageService {
|
||||
ChannelType channelType
|
||||
) {
|
||||
validateDestinationHeaders(request.getDestHeaderIds());
|
||||
String sid = requireSid(request.getSid());
|
||||
|
||||
MessageContext messageContext = createMessageContext(prjctIdx, request.getTmplatIdx(), request.getDestHeaderIds());
|
||||
ListSearchService.DownloadListRow row = listSearchService
|
||||
.findDownloadListRows(prjctIdx, ListFilterDtoFactory.onlySid(request.getSid()), null)
|
||||
.findDownloadListRows(prjctIdx, ListFilterDtoFactory.onlySid(sid), null)
|
||||
.stream()
|
||||
.findFirst()
|
||||
.orElseThrow(() -> BusinessException.notFound("LIST_NOT_FOUND", "발송 대상 리스트를 찾을 수 없습니다.")
|
||||
.with("sid", request.getSid()));
|
||||
.with("sid", sid));
|
||||
|
||||
List<NotiHubDestInfoDto> destInfos = createDestInfos(
|
||||
List.of(row),
|
||||
@@ -137,6 +140,9 @@ public class MessageService {
|
||||
ChannelType channelType
|
||||
) {
|
||||
validateDestinationHeaders(request.getDestHeaderIds());
|
||||
requireValidFilterConditions(
|
||||
request.getListFilter() == null ? null : request.getListFilter().getSidSet()
|
||||
);
|
||||
|
||||
MessageContext messageContext = createMessageContext(prjctIdx, request.getTmplatIdx(), request.getDestHeaderIds());
|
||||
List<NotiHubDestInfoDto> destInfos = createAllDestInfos(
|
||||
|
||||
Reference in New Issue
Block a user