From ad6a302867e1b15e2aea0761ed1b7c90c6506cb9 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 16 Nov 2026 12:29:59 +0900 Subject: [PATCH] =?UTF-8?q?261116=5F01=5FENH:=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=ED=97=A4=EB=8D=94=20=EC=97=AC=EB=9F=AC=20=EC=A4=84?= =?UTF-8?q?=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=ED=83=80=EC=9E=85(MULTILINE?= =?UTF-8?q?=5FTEXT)=20=EB=B0=8F=20=ED=97=A4=EB=8D=94=20=EC=83=89=EC=83=81(?= =?UTF-8?q?list=5Fhder=5Fcolor)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/consts/ContactConstant.java | 1 + .../server/common/enums/ListHeaderType.java | 6 ++++++ .../common/enums/ListHeaderTypeSpecific.java | 3 ++- .../server/dto/list/ListHeaderDto.java | 21 +++++++++++++++++++ .../list/ListHeaderWithFilterContentDto.java | 1 + .../persistence/entity/TListHeaderEntity.java | 6 ++++++ .../server/service/ListHeaderService.java | 12 +++++++++++ .../server/service/ListUploadService.java | 4 ++-- 8 files changed, 51 insertions(+), 3 deletions(-) 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 3b9f230..d94afe0 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 @@ -27,6 +27,7 @@ public final class ContactConstant { Locale.ROOT)); public static final String LIST_HEADER_ACCEPT_REGEX = "^[가-힣a-zA-Z0-9()_\\-\\[\\] ]+$"; + public static final String LIST_HEADER_COLOR_REGEX = "^#([0-9A-Fa-f]{6}|[0-9A-Fa-f]{8})$"; public static final List DEFAULT_AND_FILE_TYPE = Stream.concat( Arrays.stream(ListHeaderTypeDefault.values()) diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java index c200185..05cb8c0 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java @@ -22,12 +22,18 @@ public enum ListHeaderType implements CodeEnum { EMAIL(ListHeaderTypeSpecific.EMAIL), //31 : 이메일 FILE(ListHeaderTypeSpecific.FILE), //81 : 파일업로드 CONTENT_ITEM(ListHeaderTypeSpecific.CONTENT_ITEM), //91 : 목록형 + MULTILINE_TEXT(ListHeaderTypeSpecific.MULTILINE_TEXT), //98 : 여러 줄 텍스트 TEXT((short) 99); //99 : 텍스트 private final Short code; ListHeaderType(CodeEnum source) { this.code = source.getCode();} + /** 저장·처리 방식이 일반 텍스트와 동일한 타입 여부 */ + public boolean isText() { + return this == TEXT || this == MULTILINE_TEXT; + } + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ListHeaderType fromCode(Short code) { if (code == null) { diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java index 39dd6ab..cdb80f1 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java @@ -15,7 +15,8 @@ public enum ListHeaderTypeSpecific implements CodeEnum { TEL_NUM((short) 21), //21 : 전화번호 EMAIL((short) 31), //31 : 이메일 FILE((short) 81), //81 : 파일업로드 - CONTENT_ITEM((short) 91); //목록형 + CONTENT_ITEM((short) 91), //목록형 + MULTILINE_TEXT((short) 98); //98 : 여러 줄 텍스트 (텍스트 계열) private final Short code; 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 2819c2e..e38d346 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 @@ -5,6 +5,7 @@ import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.persistence.entity.TListHeaderEntity; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; +import java.util.Locale; import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Getter; @@ -44,6 +45,9 @@ public class ListHeaderDto { @Schema(description = "헤더 타입") private ListHeaderType listHderTy; + @Schema(description = "헤더 색상 hex (#RRGGBB 또는 #RRGGBBAA, null: 기본색)") + private String listHderColor; + @NotNull @Schema(description = "필터 사용 여부") private Boolean useFilter = false; @@ -68,6 +72,21 @@ public class ListHeaderDto { this.listHderNm = listHderNm == null ? null : listHderNm.trim(); } + public String getListHderColor() { + return normalizeColor(listHderColor); + } + + public void setListHderColor(String listHderColor) { + this.listHderColor = normalizeColor(listHderColor); + } + + private static String normalizeColor(String color) { + if (color == null || color.isBlank()) { + return null; + } + return color.trim().toUpperCase(Locale.ROOT); + } + public static ListHeaderDto fromEntity(TListHeaderEntity entity) { return ListHeaderDto.builder() .prjctIdx(entity.getPrjctIdx()) @@ -76,6 +95,7 @@ public class ListHeaderDto { .listHderGrad(ListHeaderGrade.fromCode(entity.getListHderGrad())) .listHderNm(entity.getListHderNm()) .listHderTy(ListHeaderType.fromCode(entity.getListHderTy())) + .listHderColor(entity.getListHderColor()) .useFilter(entity.getUseFilter()) .useColView(entity.getUseColView()) .useIntrvwerView(entity.getUseIntrvwerView()) @@ -91,6 +111,7 @@ public class ListHeaderDto { .listHderGrad(src.getListHderGrad()) .listHderNm(src.getListHderNm()) .listHderTy(src.getListHderTy()) + .listHderColor(src.getListHderColor()) .useFilter(src.getUseFilter()) .useColView(src.getUseColView()) .useIntrvwerView(src.getUseIntrvwerView()) diff --git a/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java b/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java index f869b62..fce7e55 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java @@ -32,6 +32,7 @@ public class ListHeaderWithFilterContentDto extends ListHeaderDto { .listHderGrad(ListHeaderGrade.fromCode(entity.getListHderGrad())) .listHderNm(entity.getListHderNm()) .listHderTy(ListHeaderType.fromCode(entity.getListHderTy())) + .listHderColor(entity.getListHderColor()) .useFilter(entity.getUseFilter()) .useColView(entity.getUseColView()) .useIntrvwerView(entity.getUseIntrvwerView()) 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 d46e3fd..33cfa43 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 @@ -46,6 +46,10 @@ public class TListHeaderEntity { @Column(name = "list_hder_ty", nullable = false) private Short listHderTy; + @Size(max = 16) + @Column(name = "list_hder_color", length = 16) + private String listHderColor; + @NotNull @ColumnDefault("0") @Column(name = "use_filter", nullable = false) @@ -103,6 +107,7 @@ public class TListHeaderEntity { .listHderGrad(src.getListHderGrad()) .listHderNm(src.getListHderNm() == null ? null : src.getListHderNm().trim()) .listHderTy(src.getListHderTy()) + .listHderColor(src.getListHderColor()) .useFilter(src.getUseFilter()) .useColView(src.getUseColView()) .useIntrvwerView(src.getUseIntrvwerView()) @@ -119,6 +124,7 @@ public class TListHeaderEntity { .listHderGrad(dto.getListHderGrad().getCode()) .listHderNm(dto.getListHderNm()) .listHderTy(dto.getListHderTy().getCode()) + .listHderColor(dto.getListHderColor()) .useFilter(dto.getUseFilter()) .useColView(dto.getUseColView()) .useIntrvwerView(dto.getUseIntrvwerView()) 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 e769583..6661796 100644 --- a/src/main/java/com/kri/contact/server/service/ListHeaderService.java +++ b/src/main/java/com/kri/contact/server/service/ListHeaderService.java @@ -2,6 +2,7 @@ package com.kri.contact.server.service; import static com.kri.contact.server.common.consts.ContactConstant.EXACT_MATCH_HEADER_TYPE; import static com.kri.contact.server.common.consts.ContactConstant.LIST_HEADER_ACCEPT_REGEX; +import static com.kri.contact.server.common.consts.ContactConstant.LIST_HEADER_COLOR_REGEX; import static com.kri.contact.server.common.consts.ContactConstant.SYSTEM_USER_NAME; import static com.kri.contact.server.common.consts.ContactConstant.UPPER_CASE_HEADER_OPTIONS; @@ -245,6 +246,16 @@ public class ListHeaderService { .with("invalidHeaderList", invalidHeaderList); } + List invalidColorHeaderList = headerList.stream() + .filter(h -> h.getListHderColor() != null && !h.getListHderColor().matches(LIST_HEADER_COLOR_REGEX)) + .map(ListHeaderDto::getListHderNm) + .toList(); + + if (!invalidColorHeaderList.isEmpty()) { + throw BusinessException.badRequest("WRONG_HEADER_COLOR", "헤더 색상은 #RRGGBB 또는 #RRGGBBAA 형식이어야 합니다.") + .with("invalidHeaderList", invalidColorHeaderList); + } + validateUniqueHeaderNames(headerList); // headerList에 없는 헤더는 삭제 @@ -403,6 +414,7 @@ public class ListHeaderService { case TEL_NUM -> ListHeaderType.TEL_NUM; case FILE -> ListHeaderType.FILE; case CONTENT_ITEM -> ListHeaderType.CONTENT_ITEM; + case MULTILINE_TEXT -> ListHeaderType.MULTILINE_TEXT; }; } 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 3739566..84945f7 100644 --- a/src/main/java/com/kri/contact/server/service/ListUploadService.java +++ b/src/main/java/com/kri/contact/server/service/ListUploadService.java @@ -380,7 +380,7 @@ public class ListUploadService { continue; } - if (header.getListHderTy() == ListHeaderType.TEXT) { + if (header.getListHderTy() != null && header.getListHderTy().isText()) { raw = escapeUnsafeText(raw); } if (header.getListHderTy() == ListHeaderType.EMAIL) { @@ -631,7 +631,7 @@ public class ListUploadService { continue; } - if (header.getListHderTy() == ListHeaderType.TEXT) { + if (header.getListHderTy() != null && header.getListHderTy().isText()) { raw = escapeUnsafeText(raw); }