From 17c27e43989460fa214fc341eb8d4cb7f32c296e Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 19 Jun 2026 10:16:16 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9D=98=20=EC=83=81=ED=83=9C?= =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95:=20IN=5FPROGRESS=20=E2=86=92=20R?= =?UTF-8?q?ESPONDED=20-=20=EB=AC=B8=EC=9D=98=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EB=B0=8F=20=EA=B4=80=EB=A0=A8=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81/=EB=B7=B0=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20-?= =?UTF-8?q?=20Validation=20=ED=8C=A8=ED=84=B4=20=EB=B0=8F=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EB=B0=98=EC=98=81=20?= =?UTF-8?q?-=20=EB=B7=B0=20=EC=83=81=ED=83=9C=20=EB=B0=B0=EC=A7=80=20?= =?UTF-8?q?=EB=B0=8F=20=EC=9D=91=EB=8B=B5=20=EC=84=B9=EC=85=98=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apim/portal/apps/community/qna/dto/InquiryDTO.java | 2 +- .../djb/community/qna/constant/DjbInquiryStatus.java | 2 +- .../views/apps/community/mainInquiryDetail.html | 6 +++--- .../views/apps/community/mainInquiryList.html | 4 ++-- .../support/InquiryCommentPermissionCheckerTest.java | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/eactive/apim/portal/apps/community/qna/dto/InquiryDTO.java b/src/main/java/com/eactive/apim/portal/apps/community/qna/dto/InquiryDTO.java index 2177501..29cfbc3 100644 --- a/src/main/java/com/eactive/apim/portal/apps/community/qna/dto/InquiryDTO.java +++ b/src/main/java/com/eactive/apim/portal/apps/community/qna/dto/InquiryDTO.java @@ -25,7 +25,7 @@ public class InquiryDTO { @Size(max = 4000, message = "제목은 50자를 초과할 수 없습니다.") private String inquiryDetail; - @Pattern(regexp = "^(PENDING|IN_PROGRESS|CLOSED)$", message = "유효하지 않은 문의 상태입니다.") + @Pattern(regexp = "^(PENDING|RESPONDED|CLOSED)$", message = "유효하지 않은 문의 상태입니다.") private String inquiryStatus; private String inquirerName; diff --git a/src/main/java/com/eactive/apim/portal/djb/community/qna/constant/DjbInquiryStatus.java b/src/main/java/com/eactive/apim/portal/djb/community/qna/constant/DjbInquiryStatus.java index 4463e00..67fc533 100644 --- a/src/main/java/com/eactive/apim/portal/djb/community/qna/constant/DjbInquiryStatus.java +++ b/src/main/java/com/eactive/apim/portal/djb/community/qna/constant/DjbInquiryStatus.java @@ -3,7 +3,7 @@ package com.eactive.apim.portal.djb.community.qna.constant; public final class DjbInquiryStatus { public static final String PENDING = "PENDING"; - public static final String IN_PROGRESS = "IN_PROGRESS"; + public static final String RESPONDED = "RESPONDED"; public static final String CLOSED = "CLOSED"; private DjbInquiryStatus() { diff --git a/src/main/resources/templates/views/apps/community/mainInquiryDetail.html b/src/main/resources/templates/views/apps/community/mainInquiryDetail.html index a304f52..d010a97 100644 --- a/src/main/resources/templates/views/apps/community/mainInquiryDetail.html +++ b/src/main/resources/templates/views/apps/community/mainInquiryDetail.html @@ -17,8 +17,8 @@
+ th:classappend="${inquiry.inquiryStatus == 'RESPONDED' ? 'inquiry-status-badge--completed' : (inquiry.inquiryStatus == 'CLOSED' ? 'inquiry-status-badge--closed' : 'inquiry-status-badge--pending')}" + th:text="${inquiry.inquiryStatus == 'RESPONDED' ? '답변완료' : (inquiry.inquiryStatus == 'CLOSED' ? '종료' : '답변대기')}"> 답변대기
@@ -39,7 +39,7 @@
-
+
관리자 답변 2025.11.02 diff --git a/src/main/resources/templates/views/apps/community/mainInquiryList.html b/src/main/resources/templates/views/apps/community/mainInquiryList.html index 563d2db..c3e9a9d 100644 --- a/src/main/resources/templates/views/apps/community/mainInquiryList.html +++ b/src/main/resources/templates/views/apps/community/mainInquiryList.html @@ -70,8 +70,8 @@
홍**
+ th:classappend="${inquiry.inquiryStatus == 'RESPONDED' ? 'inquiry-status-badge--completed' : (inquiry.inquiryStatus == 'CLOSED' ? 'inquiry-status-badge--closed' : 'inquiry-status-badge--pending')}" + th:text="${inquiry.inquiryStatus == 'RESPONDED' ? '답변완료' : (inquiry.inquiryStatus == 'CLOSED' ? '종료' : '답변대기')}"> 답변대기
diff --git a/src/test/java/com/eactive/apim/portal/djb/community/qna/support/InquiryCommentPermissionCheckerTest.java b/src/test/java/com/eactive/apim/portal/djb/community/qna/support/InquiryCommentPermissionCheckerTest.java index 0dc23e6..6abe0d1 100644 --- a/src/test/java/com/eactive/apim/portal/djb/community/qna/support/InquiryCommentPermissionCheckerTest.java +++ b/src/test/java/com/eactive/apim/portal/djb/community/qna/support/InquiryCommentPermissionCheckerTest.java @@ -54,7 +54,7 @@ class InquiryCommentPermissionCheckerTest { @Test void canWrite_inProgressTrue() { - assertTrue(checker.canWrite(inquiry("IN_PROGRESS"))); + assertTrue(checker.canWrite(inquiry("RESPONDED"))); } @Test @@ -64,14 +64,14 @@ class InquiryCommentPermissionCheckerTest { @Test void canDelete_ownerInOpenTrue() { - Inquiry i = inquiry("IN_PROGRESS"); + Inquiry i = inquiry("RESPONDED"); InquiryComment c = comment("alice", i); assertTrue(checker.canDelete(c, user("alice"))); } @Test void canDelete_otherUserFalse() { - Inquiry i = inquiry("IN_PROGRESS"); + Inquiry i = inquiry("RESPONDED"); InquiryComment c = comment("alice", i); assertFalse(checker.canDelete(c, user("bob"))); } @@ -102,7 +102,7 @@ class InquiryCommentPermissionCheckerTest { @Test void assertDeletable_notOwnerThrowsNotOwned() { - Inquiry i = inquiry("IN_PROGRESS"); + Inquiry i = inquiry("RESPONDED"); InquiryComment c = comment("alice", i); assertThrows(InquiryCommentNotOwnedException.class, () -> checker.assertDeletable(c, user("bob"))); @@ -110,7 +110,7 @@ class InquiryCommentPermissionCheckerTest { @Test void assertDeletable_ownerInOpenOk() { - Inquiry i = inquiry("IN_PROGRESS"); + Inquiry i = inquiry("RESPONDED"); InquiryComment c = comment("alice", i); assertDoesNotThrow(() -> checker.assertDeletable(c, user("alice"))); }