refactor: 이벤트 설명을 기본 정보로 변경 (#1273)

kimsh1017 · web-flow · commit 81e5e73f39f9 · 2025-11-09T13:41:38.000+09:00
* refactor: 신청 폼 설명을 행사 설명으로 변경

* refactor: 설명 필드를 기본 정보 도메인 로직으로 이동

* refactor: dto 변경

* refactor: 생성, 수정 서비스 로직 변경

* test: 테스트 생성, 수정 로직 변경
diff --git a/src/main/java/com/gdschongik/gdsc/domain/event/application/EventService.java b/src/main/java/com/gdschongik/gdsc/domain/event/application/EventService.java
@@ -53,6 +53,7 @@ public EventCreateResponse createEvent(EventCreateRequest request) {
                 request.name(),
                 request.venue(),
                 request.startAt(),
+                request.description(),
                 request.applicationPeriod(),
                 request.regularRoleOnlyStatus(),
                 request.mainEventMaxApplicantCount(),
@@ -86,6 +87,7 @@ public void updateEventBasicInfo(Long eventId, EventUpdateBasicInfoRequest reque
                 request.name(),
                 request.venue(),
                 request.startAt(),
+                request.description(),
                 request.applicationPeriod(),
                 request.regularRoleOnlyStatus(),
                 request.mainEventMaxApplicantCount(),
@@ -105,7 +107,6 @@ public void updateEventFormInfo(Long eventId, EventUpdateFormInfoRequest request
 
         eventDomainService.updateFormInfo(
                 event,
-                request.applicationDescription(),
                 request.afterPartyStatus(),
                 request.prePaymentStatus(),
                 request.postPaymentStatus(),
diff --git a/src/main/java/com/gdschongik/gdsc/domain/event/domain/Event.java b/src/main/java/com/gdschongik/gdsc/domain/event/domain/Event.java
@@ -39,9 +39,9 @@ public class Event extends BaseEntity {
     @Column(name = "start_at")
     private LocalDateTime startAt;
 
-    @Comment("[메타] 행사 신청 폼 설명")
+    @Comment("[메타] 행사 설명")
     @Column(columnDefinition = "TEXT")
-    private String applicationDescription;
+    private String description;
 
     @Comment("행사 신청 기간")
     @Embedded
@@ -93,7 +93,7 @@ private Event(
             String name,
             String venue,
             LocalDateTime startAt,
-            String applicationDescription,
+            String description,
             Period applicationPeriod,
             UsageStatus regularRoleOnlyStatus,
             UsageStatus afterPartyStatus,
@@ -106,7 +106,7 @@ private Event(
         this.name = name;
         this.venue = venue;
         this.startAt = startAt;
-        this.applicationDescription = applicationDescription;
+        this.description = description;
         this.applicationPeriod = applicationPeriod;
         this.regularRoleOnlyStatus = regularRoleOnlyStatus;
         this.afterPartyStatus = afterPartyStatus;
@@ -123,6 +123,7 @@ public static Event create(
             String name,
             String venue,
             LocalDateTime startAt,
+            String description,
             Period applicationPeriod,
             UsageStatus regularRoleOnlyStatus,
             Integer mainEventMaxApplicantCount,
@@ -132,7 +133,7 @@ public static Event create(
                 .name(name)
                 .venue(venue)
                 .startAt(startAt)
-                .applicationDescription(null)
+                .description(description)
                 .applicationPeriod(applicationPeriod)
                 .regularRoleOnlyStatus(regularRoleOnlyStatus)
                 .afterPartyStatus(ENABLED)
@@ -162,13 +163,15 @@ public void updateBasicInfo(
             String name,
             String venue,
             LocalDateTime startAt,
+            String description,
             Period applicationPeriod,
             UsageStatus regularRoleOnlyStatus,
             Integer mainEventMaxApplicantCount,
             Integer afterPartyMaxApplicantCount) {
         this.name = name;
         this.venue = venue;
         this.startAt = startAt;
+        this.description = description;
         this.applicationPeriod = applicationPeriod;
         this.regularRoleOnlyStatus = regularRoleOnlyStatus;
         this.mainEventMaxApplicantCount = mainEventMaxApplicantCount;
@@ -181,15 +184,13 @@ public void updateBasicInfo(
      * @see EventDomainService
      */
     public void updateFormInfo(
-            String applicationDescription,
             UsageStatus afterPartyStatus,
             UsageStatus prePaymentStatus,
             UsageStatus postPaymentStatus,
             UsageStatus rsvpQuestionStatus,
             UsageStatus noticeConfirmQuestionStatus) {
         validatePaymentStatus(afterPartyStatus, prePaymentStatus, postPaymentStatus);
 
-        this.applicationDescription = applicationDescription;
         this.afterPartyStatus = afterPartyStatus;
         this.prePaymentStatus = prePaymentStatus;
         this.postPaymentStatus = postPaymentStatus;
diff --git a/src/main/java/com/gdschongik/gdsc/domain/event/domain/service/EventDomainService.java b/src/main/java/com/gdschongik/gdsc/domain/event/domain/service/EventDomainService.java
@@ -26,6 +26,7 @@ public void updateBasicInfo(
             String name,
             String venue,
             LocalDateTime startAt,
+            String description,
             Period applicationPeriod,
             UsageStatus regularRoleOnlyStatus,
             @Nullable Integer mainEventMaxApplicantCount,
@@ -44,6 +45,7 @@ public void updateBasicInfo(
                 name,
                 venue,
                 startAt,
+                description,
                 applicationPeriod,
                 regularRoleOnlyStatus,
                 mainEventMaxApplicantCount,
@@ -79,7 +81,6 @@ private void validateAlreadyExistsEventParticipation(boolean eventParticipationE
      */
     public void updateFormInfo(
             Event event,
-            String applicationDescription,
             UsageStatus afterPartyStatus,
             UsageStatus prePaymentStatus,
             UsageStatus postPaymentStatus,
@@ -89,11 +90,6 @@ public void updateFormInfo(
         validateAlreadyExistsEventParticipation(eventParticipationExists);
 
         event.updateFormInfo(
-                applicationDescription,
-                afterPartyStatus,
-                prePaymentStatus,
-                postPaymentStatus,
-                rsvpQuestionStatus,
-                noticeConfirmQuestionStatus);
+                afterPartyStatus, prePaymentStatus, postPaymentStatus, rsvpQuestionStatus, noticeConfirmQuestionStatus);
     }
 }
diff --git a/src/main/java/com/gdschongik/gdsc/domain/event/dto/dto/EventDto.java b/src/main/java/com/gdschongik/gdsc/domain/event/dto/dto/EventDto.java
@@ -27,7 +27,7 @@ public static EventDto from(Event event) {
                 event.getName(),
                 event.getVenue(),
                 event.getStartAt(),
-                event.getApplicationDescription(),
+                event.getDescription(),
                 event.getApplicationPeriod(),
                 event.getRegularRoleOnlyStatus(),
                 event.getAfterPartyStatus(),
diff --git a/src/main/java/com/gdschongik/gdsc/domain/event/dto/request/EventCreateRequest.java b/src/main/java/com/gdschongik/gdsc/domain/event/dto/request/EventCreateRequest.java
@@ -12,6 +12,7 @@ public record EventCreateRequest(
         @NotBlank String name,
         String venue,
         @NotNull LocalDateTime startAt,
+        String description,
         @NotNull Period applicationPeriod,
         @NotNull UsageStatus regularRoleOnlyStatus,
         @Positive @Schema(description = "본 행사 최대 신청 가능 인원. 제한 없음은 null을 입력합니다.") Integer mainEventMaxApplicantCount,
diff --git a/src/main/java/com/gdschongik/gdsc/domain/event/dto/request/EventUpdateBasicInfoRequest.java b/src/main/java/com/gdschongik/gdsc/domain/event/dto/request/EventUpdateBasicInfoRequest.java
@@ -11,6 +11,7 @@ public record EventUpdateBasicInfoRequest(
         @NotBlank String name,
         String venue,
         @NotNull LocalDateTime startAt,
+        String description,
         @NotNull Period applicationPeriod,
         @NotNull UsageStatus regularRoleOnlyStatus,
         @Positive Integer mainEventMaxApplicantCount,
diff --git a/src/main/java/com/gdschongik/gdsc/domain/event/dto/request/EventUpdateFormInfoRequest.java b/src/main/java/com/gdschongik/gdsc/domain/event/dto/request/EventUpdateFormInfoRequest.java
@@ -1,11 +1,9 @@
 package com.gdschongik.gdsc.domain.event.dto.request;
 
 import com.gdschongik.gdsc.domain.event.domain.UsageStatus;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
 public record EventUpdateFormInfoRequest(
-        @NotBlank String applicationDescription,
         @NotNull UsageStatus afterPartyStatus,
         @NotNull UsageStatus prePaymentStatus,
         @NotNull UsageStatus postPaymentStatus,
diff --git a/src/test/java/com/gdschongik/gdsc/domain/event/application/EventParticipationServiceTest.java b/src/test/java/com/gdschongik/gdsc/domain/event/application/EventParticipationServiceTest.java
@@ -1063,6 +1063,7 @@ private Event createAfterPartyDisabledEvent() {
                 EVENT_NAME,
                 VENUE,
                 EVENT_START_AT,
+                EVENT_DESCRIPTION,
                 EVENT_APPLICATION_PERIOD,
                 REGULAR_ROLE_ONLY_STATUS,
                 MAIN_EVENT_MAX_APPLICATION_COUNT,
@@ -1077,6 +1078,7 @@ private Event createEvent(String name) {
                 name,
                 VENUE,
                 EVENT_START_AT,
+                EVENT_DESCRIPTION,
                 EVENT_APPLICATION_PERIOD,
                 REGULAR_ROLE_ONLY_STATUS,
                 MAIN_EVENT_MAX_APPLICATION_COUNT,
diff --git a/src/test/java/com/gdschongik/gdsc/domain/event/application/EventServiceTest.java b/src/test/java/com/gdschongik/gdsc/domain/event/application/EventServiceTest.java
@@ -5,6 +5,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import com.gdschongik.gdsc.domain.event.domain.Event;
+import com.gdschongik.gdsc.domain.event.domain.UsageStatus;
 import com.gdschongik.gdsc.domain.event.dto.request.EventCreateRequest;
 import com.gdschongik.gdsc.domain.event.dto.request.EventUpdateBasicInfoRequest;
 import com.gdschongik.gdsc.domain.event.dto.request.EventUpdateFormInfoRequest;
@@ -29,6 +30,7 @@ class 이벤트_생성시 {
                     EVENT_NAME,
                     VENUE,
                     EVENT_START_AT,
+                    EVENT_DESCRIPTION,
                     EVENT_APPLICATION_PERIOD,
                     REGULAR_ROLE_ONLY_STATUS,
                     MAIN_EVENT_MAX_APPLICATION_COUNT,
@@ -50,6 +52,7 @@ class 이벤트_기본_정보_수정시 {
                     EVENT_NAME,
                     VENUE,
                     EVENT_START_AT,
+                    EVENT_DESCRIPTION,
                     EVENT_APPLICATION_PERIOD,
                     REGULAR_ROLE_ONLY_STATUS,
                     MAIN_EVENT_MAX_APPLICATION_COUNT,
@@ -72,6 +75,7 @@ class 이벤트_기본_정보_수정시 {
                     updatedName,
                     VENUE,
                     EVENT_START_AT,
+                    EVENT_DESCRIPTION,
                     EVENT_APPLICATION_PERIOD,
                     REGULAR_ROLE_ONLY_STATUS,
                     MAIN_EVENT_MAX_APPLICATION_COUNT,
@@ -93,7 +97,6 @@ class 이벤트_폼_정보_수정시 {
             // given
             Long invalidId = 999L;
             var request = new EventUpdateFormInfoRequest(
-                    APPLICATION_DESCRIPTION,
                     AFTER_PARTY_STATUS,
                     PRE_PAYMENT_STATUS,
                     POST_PAYMENT_STATUS,
@@ -112,21 +115,20 @@ class 이벤트_폼_정보_수정시 {
             Event event = createEvent();
             Long eventId = event.getId();
 
-            String updatedApplicationDescription = "수정된 행사 설명";
+            UsageStatus updatedRsvpQuestionStatus = UsageStatus.ENABLED;
             var request = new EventUpdateFormInfoRequest(
-                    updatedApplicationDescription,
                     AFTER_PARTY_STATUS,
                     PRE_PAYMENT_STATUS,
                     POST_PAYMENT_STATUS,
-                    RSVP_QUESTION_STATUS,
+                    updatedRsvpQuestionStatus,
                     NOTICE_CONFIRM_QUESTION_STATUS);
 
             // when
             eventService.updateEventFormInfo(eventId, request);
 
             // then
-            assertThat(eventRepository.findById(eventId).get().getApplicationDescription())
-                    .isEqualTo(updatedApplicationDescription);
+            assertThat(eventRepository.findById(eventId).get().getRsvpQuestionStatus())
+                    .isEqualTo(updatedRsvpQuestionStatus);
         }
     }
 }
diff --git a/src/test/java/com/gdschongik/gdsc/domain/event/domain/EventDomainServiceTest.java b/src/test/java/com/gdschongik/gdsc/domain/event/domain/EventDomainServiceTest.java
@@ -33,6 +33,7 @@ class 이벤트_기본정보를_수정할_때 {
                             EVENT_NAME,
                             VENUE,
                             EVENT_START_AT,
+                            EVENT_DESCRIPTION,
                             EVENT_APPLICATION_PERIOD,
                             newRegularRoleOnlyStatus,
                             null,
@@ -59,6 +60,7 @@ class 이벤트_기본정보를_수정할_때 {
                     EVENT_NAME,
                     VENUE,
                     EVENT_START_AT,
+                    EVENT_DESCRIPTION,
                     EVENT_APPLICATION_PERIOD,
                     REGULAR_ROLE_ONLY_STATUS,
                     newMainEventMaxApplicantCount,
@@ -86,6 +88,7 @@ class 이벤트_기본정보를_수정할_때 {
                     EVENT_NAME,
                     VENUE,
                     EVENT_START_AT,
+                    EVENT_DESCRIPTION,
                     EVENT_APPLICATION_PERIOD,
                     REGULAR_ROLE_ONLY_STATUS,
                     newMainEventMaxApplicantCount,
@@ -113,6 +116,7 @@ class 이벤트_기본정보를_수정할_때 {
                             EVENT_NAME,
                             VENUE,
                             EVENT_START_AT,
+                            EVENT_DESCRIPTION,
                             EVENT_APPLICATION_PERIOD,
                             REGULAR_ROLE_ONLY_STATUS,
                             newMainEventMaxApplicantCount,
@@ -136,7 +140,6 @@ class 이벤트_폼_정보를_수정할_때 {
             // when & then
             assertThatThrownBy(() -> eventDomainService.updateFormInfo(
                             event,
-                            APPLICATION_DESCRIPTION,
                             AFTER_PARTY_STATUS,
                             PRE_PAYMENT_STATUS,
                             POST_PAYMENT_STATUS,
diff --git a/src/test/java/com/gdschongik/gdsc/domain/event/domain/EventTest.java b/src/test/java/com/gdschongik/gdsc/domain/event/domain/EventTest.java
@@ -25,6 +25,7 @@ class 행사_생성시 {
                     EVENT_NAME,
                     VENUE,
                     EVENT_START_AT,
+                    EVENT_DESCRIPTION,
                     EVENT_APPLICATION_PERIOD,
                     REGULAR_ROLE_ONLY_STATUS,
                     MAIN_EVENT_MAX_APPLICATION_COUNT,
@@ -56,7 +57,6 @@ class 폼_정보_수정시 {
 
             // when & then
             assertThatThrownBy(() -> event.updateFormInfo(
-                            APPLICATION_DESCRIPTION,
                             DISABLED, // 뒤풀이 비활성화
                             ENABLED, // 사전 결제 활성화
                             ENABLED,
@@ -74,7 +74,6 @@ class 폼_정보_수정시 {
 
             // when
             event.updateFormInfo(
-                    APPLICATION_DESCRIPTION,
                     DISABLED, // 뒤풀이 비활성화
                     DISABLED,
                     DISABLED,
diff --git a/src/test/java/com/gdschongik/gdsc/global/common/constant/EventConstant.java b/src/test/java/com/gdschongik/gdsc/global/common/constant/EventConstant.java
@@ -9,7 +9,7 @@ public class EventConstant {
     private EventConstant() {}
 
     public static final String EVENT_NAME = "2025년 1학기 새내기 배움터";
-    public static final String APPLICATION_DESCRIPTION =
+    public static final String EVENT_DESCRIPTION =
             "2025년 1학기 새내기 배움터 신청 폼입니다. 진행일시는 3월 15일, 신청 기간은 3월 1일부터 3월 14일까지입니다.";
     public static final String VENUE = "홍익대학교 제 4공학관(T동) 608호";
     public static final LocalDateTime EVENT_START_AT = LocalDateTime.of(2025, 3, 15, 0, 0);
diff --git a/src/test/java/com/gdschongik/gdsc/helper/FixtureHelper.java b/src/test/java/com/gdschongik/gdsc/helper/FixtureHelper.java
@@ -170,6 +170,7 @@ public Event createEventWithAfterParty(Long id, UsageStatus regularRoleOnlyStatu
                 EVENT_NAME,
                 VENUE,
                 EVENT_START_AT,
+                EVENT_DESCRIPTION,
                 EVENT_APPLICATION_PERIOD,
                 regularRoleOnlyStatus,
                 MAIN_EVENT_MAX_APPLICATION_COUNT,
@@ -184,6 +185,7 @@ public Event createEventWithoutAfterParty(Long id) {
                 EVENT_NAME,
                 VENUE,
                 EVENT_START_AT,
+                EVENT_DESCRIPTION,
                 EVENT_APPLICATION_PERIOD,
                 REGULAR_ROLE_ONLY_STATUS,
                 MAIN_EVENT_MAX_APPLICATION_COUNT,
diff --git a/src/test/java/com/gdschongik/gdsc/helper/IntegrationTest.java b/src/test/java/com/gdschongik/gdsc/helper/IntegrationTest.java
@@ -347,6 +347,7 @@ protected Event createEvent() {
                 EVENT_NAME,
                 VENUE,
                 EVENT_START_AT,
+                EVENT_DESCRIPTION,
                 EVENT_APPLICATION_PERIOD,
                 REGULAR_ROLE_ONLY_STATUS,
                 MAIN_EVENT_MAX_APPLICATION_COUNT,
