diff --git a/build.gradle b/build.gradle index 7265d52..f2bbc12 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } //버전 변경은 여기서 -def commonVer = "beta.1.0.54" +def commonVer = "beta.1.0.60" group = 'com.kri.common' version = commonVer diff --git a/src/main/java/com/kri/common/datetime/DateTimeUtil.java b/src/main/java/com/kri/common/datetime/DateTimeUtil.java index b0baaf7..2fc663a 100644 --- a/src/main/java/com/kri/common/datetime/DateTimeUtil.java +++ b/src/main/java/com/kri/common/datetime/DateTimeUtil.java @@ -164,6 +164,14 @@ public final class DateTimeUtil { return t.isEmpty() ? null : t; } + public static LocalDate parseLocalDate(String text) { + return tryParseLocalDate(text, DATE_FMT); + } + + public static LocalDateTime parseLocalDateTime(String text) { + return tryParseLocalDateTime(text, DATETIME_FMT); + } + private static LocalDate tryParseLocalDate(String text, DateTimeFormatter fmt) { if (text == null || text.isBlank()) return null; try { return LocalDate.parse(text.trim(), fmt); } diff --git a/src/main/java/com/kri/common/util/CommonUtil.java b/src/main/java/com/kri/common/util/CommonUtil.java new file mode 100644 index 0000000..a29f19b --- /dev/null +++ b/src/main/java/com/kri/common/util/CommonUtil.java @@ -0,0 +1,43 @@ +package com.kri.common.util; + +import java.util.UUID; + +public final class CommonUtil { + + public static String uuid32() { + return UUID.randomUUID().toString().replace("-", ""); + } + + public static boolean isNumeric(String s) { + if (s == null || s.isBlank()) return false; + for (int i = 0; i < s.length(); i++) { + char c = s.charAt(i); + if (c < '0' || c > '9') return false; + } + return true; + } + + public static short safeParseShort(String s, short def) { + try { + return Short.parseShort(s); + } catch (Exception e) { + return def; + } + } + + public static int safeParseInt(String s, short def) { + try { + return Integer.parseInt(s); + } catch (Exception e) { + return def; + } + } + + public static long safeParseLong(String s, short def) { + try { + return Long.parseLong(s); + } catch (Exception e) { + return def; + } + } +} diff --git a/src/main/java/com/kri/common/webmvc/CodeEnumConverter.java b/src/main/java/com/kri/common/webmvc/CodeEnumConverter.java new file mode 100644 index 0000000..a46acc6 --- /dev/null +++ b/src/main/java/com/kri/common/webmvc/CodeEnumConverter.java @@ -0,0 +1,36 @@ +package com.kri.common.webmvc; + +import com.kri.common.enums.CodeEnum; +import org.springframework.core.convert.converter.Converter; +import org.springframework.core.convert.converter.ConverterFactory; + +public class CodeEnumConverter implements ConverterFactory { + + @Override + public Converter getConverter(Class targetType) { + return source -> convert(source, targetType); + } + + private T convert(String source, Class targetType) { + if (source == null || source.isBlank()) return null; + + // 1) enum name으로 먼저 시도 (EMAIL, SMS 등) + if (targetType.isEnum()) { + for (T e : targetType.getEnumConstants()) { + if (((Enum) e).name().equalsIgnoreCase(source)) { + return e; + } + } + } + + // 2) code로 시도 ("11" 등) + for (T e : targetType.getEnumConstants()) { + Object code = e.getCode(); + if (code != null && source.equals(String.valueOf(code))) { + return e; + } + } + + throw new IllegalArgumentException("Unknown enum value: " + source + " for " + targetType.getName()); + } +} diff --git a/src/main/java/com/kri/common/webmvc/KriWebMvcAutoConfiguration.java b/src/main/java/com/kri/common/webmvc/KriWebMvcAutoConfiguration.java index 96e5f05..92038ae 100644 --- a/src/main/java/com/kri/common/webmvc/KriWebMvcAutoConfiguration.java +++ b/src/main/java/com/kri/common/webmvc/KriWebMvcAutoConfiguration.java @@ -78,6 +78,11 @@ public class KriWebMvcAutoConfiguration { public void addArgumentResolvers(java.util.List resolvers) { requestUserContextArgumentResolverProvider.ifAvailable(resolvers::add); } + + @Override + public void addFormatters(org.springframework.format.FormatterRegistry registry) { + registry.addConverterFactory(new com.kri.common.webmvc.CodeEnumConverter()); + } }; } } \ No newline at end of file diff --git a/src/main/java/com/kri/common/webmvc/page/PageRequestDto.java b/src/main/java/com/kri/common/webmvc/page/PageRequestDto.java new file mode 100644 index 0000000..5c0eaca --- /dev/null +++ b/src/main/java/com/kri/common/webmvc/page/PageRequestDto.java @@ -0,0 +1,20 @@ +package com.kri.common.webmvc.page; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "페이지 검색 조건") +public class PageRequestDto { + @Schema(description = "페이지 번호") + private int pageIndex = 0; // 0-base + @Schema(description = "페이지 크기") + private int pageSize = 10; + + @Schema(description = "정렬 기준") + private String sortBy = "prjctIdx"; // 가변 + @Schema(description = "오름차순/내림차순") + private String sortDir = "desc"; // asc/desc +} \ No newline at end of file diff --git a/src/main/java/com/kri/common/webmvc/page/PageResponseDto.java b/src/main/java/com/kri/common/webmvc/page/PageResponseDto.java new file mode 100644 index 0000000..dc714c4 --- /dev/null +++ b/src/main/java/com/kri/common/webmvc/page/PageResponseDto.java @@ -0,0 +1,35 @@ +package com.kri.common.webmvc.page; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.data.domain.Page; + +import java.util.List; + +@Getter +@Builder +public class PageResponseDto { + private List content; + private long totalElements; + private int totalPages; + private int pageIndex; + private int pageSize; + private int numberOfElements; + private boolean first; + private boolean last; + private boolean empty; + + public static PageResponseDto from(Page page) { + return PageResponseDto.builder() + .content(page.getContent()) + .totalElements(page.getTotalElements()) + .totalPages(page.getTotalPages()) + .pageIndex(page.getNumber()) // ✅ 현재 페이지 index(0-base) + .pageSize(page.getSize()) + .numberOfElements(page.getNumberOfElements()) + .first(page.isFirst()) + .last(page.isLast()) + .empty(page.isEmpty()) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/common/webmvc/page/Pageables.java b/src/main/java/com/kri/common/webmvc/page/Pageables.java new file mode 100644 index 0000000..7901fb6 --- /dev/null +++ b/src/main/java/com/kri/common/webmvc/page/Pageables.java @@ -0,0 +1,67 @@ +package com.kri.common.webmvc.page; + + +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; + +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.util.*; +import java.util.stream.Collectors; + +public final class Pageables { + private Pageables() {} + + public static Pageable of(PageRequestDto req, Class sortType) { + int page = Math.max(req.getPageIndex(), 0); + int size = Math.max(req.getPageSize(), 1); + + Sort sort = buildSort(req, sortType); + return (sort == null) ? PageRequest.of(page, size) : PageRequest.of(page, size, sort); + } + + private static Sort buildSort(PageRequestDto req, Class sortType) { + String sortBy = req.getSortBy(); + if (sortBy == null || sortBy.isBlank()) return null; + + Sort.Direction dir = "asc".equalsIgnoreCase(req.getSortDir()) + ? Sort.Direction.ASC + : Sort.Direction.DESC; + + Set allowed = allowedProperties(sortType); + + List props = Arrays.stream(sortBy.split(",")) + .map(String::trim) + .filter(s -> !s.isBlank()) + .collect(Collectors.toList()); + + // 허용되지 않은 필드가 섞이면 예외(또는 무시 정책으로 바꿔도 됨) + List invalid = props.stream() + .filter(p -> !allowed.contains(p)) + .toList(); + + if (!invalid.isEmpty()) { + throw new IllegalArgumentException("Invalid sortBy: " + invalid + ", allowed=" + allowed); + } + + return Sort.by(dir, props.toArray(String[]::new)); + } + + private static Set allowedProperties(Class sortType) { + try { + // getter 기반 프로퍼티 추출 (필드보다 JPA/롬복 환경에서 안정적) + PropertyDescriptor[] pds = Introspector.getBeanInfo(sortType).getPropertyDescriptors(); + Set props = new HashSet<>(); + for (PropertyDescriptor pd : pds) { + String name = pd.getName(); + if ("class".equals(name)) continue; + if (pd.getReadMethod() == null) continue; + props.add(name); + } + return props; + } catch (Exception e) { + throw new IllegalStateException("Failed to introspect sortType=" + sortType.getName(), e); + } + } +} \ No newline at end of file