Merge pull request #89 from Bamdoliro/perf/#86

[개선] 입학설명회 도메인 수정
Bamdoliro · Jun 12, 2024 · cb8ba00 · cb8ba00
2 parents e906600 + 848ace9
commit cb8ba00
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/com/bamdoliro/maru/application/fair/CreateAdmissionFairUseCase.java b/src/main/java/com/bamdoliro/maru/application/fair/CreateAdmissionFairUseCase.java
@@ -20,6 +20,7 @@ public void execute(CreateFairRequest request) {
                         .start(request.getStart())
                         .capacity(request.getCapacity())
                         .place(request.getPlace())
+                        .applicationUrl(request.getApplicationUrl())
                         .type(request.getType())
                         .applicationStartDate(request.getApplicationStartDate())
                         .applicationEndDate(request.getApplicationEndDate())

diff --git a/src/main/java/com/bamdoliro/maru/domain/fair/domain/Fair.java b/src/main/java/com/bamdoliro/maru/domain/fair/domain/Fair.java
@@ -44,6 +44,9 @@ public class Fair extends BaseTimeEntity {
     @Column(nullable = false, length = 30)
     private String place;
 
+    @Column(nullable = false)
+    private String applicationUrl;
+
     @Enumerated(EnumType.STRING)
     @Column(nullable = false, length = 20)
     private FairType type;
@@ -54,14 +57,16 @@ public class Fair extends BaseTimeEntity {
     @Column(nullable = false)
     private LocalDate applicationEndDate;
 
+
     @OneToMany(mappedBy = "fair", fetch = FetchType.LAZY)
     private final List<Attendee> attendeeList = new ArrayList<>();
 
     @Builder
-    public Fair(LocalDateTime start, Integer capacity, String place, FairType type, LocalDate applicationStartDate, LocalDate applicationEndDate) {
+    public Fair(LocalDateTime start, Integer capacity, String place, String applicationUrl, FairType type, LocalDate applicationStartDate, LocalDate applicationEndDate) {
         this.start = start;
         this.capacity = capacity;
         this.place = place;
+        this.applicationUrl = applicationUrl;
         this.type = type;
         this.applicationStartDate = applicationStartDate == null ? LocalDate.now() : applicationStartDate;
         this.applicationEndDate = applicationEndDate == null ? start.minusDays(3).toLocalDate() : applicationEndDate;

diff --git a/src/main/java/com/bamdoliro/maru/presentation/fair/dto/request/CreateFairRequest.java b/src/main/java/com/bamdoliro/maru/presentation/fair/dto/request/CreateFairRequest.java
@@ -29,6 +29,9 @@ public class CreateFairRequest {
     @Size(max = 30, message = "30자 이하여야 합니다.")
     private String place;
 
+    @NotBlank(message = "필수값입니다.")
+    private String applicationUrl;
+
     @NotNull(message = "필수값입니다.")
     private FairType type;
 

diff --git a/src/test/java/com/bamdoliro/maru/presentation/fair/FairControllerTest.java b/src/test/java/com/bamdoliro/maru/presentation/fair/FairControllerTest.java
@@ -72,6 +72,9 @@ class FairControllerTest extends RestDocsTestSupport {
                                 fieldWithPath("place")
                                         .type(JsonFieldType.STRING)
                                         .description("입학설명회 장소"),
+                                fieldWithPath("applicationUrl")
+                                        .type(JsonFieldType.STRING)
+                                        .description("입학설명회 신청 폼 링크"),
                                 fieldWithPath("type")
                                         .type(JsonFieldType.STRING)
                                         .description("<<fair-type,입학설명회 유형>>"),

diff --git a/src/test/java/com/bamdoliro/maru/shared/fixture/FairFixture.java b/src/test/java/com/bamdoliro/maru/shared/fixture/FairFixture.java
@@ -22,6 +22,7 @@ public static Fair createFair() {
                 LocalDateTime.of(2025, 4, 15, 10, 39),
                 120,
                 "서울시 강남구",
+                "https://docs.google.com",
                 FairType.STUDENT_AND_PARENT,
                 LocalDate.now(),
                 LocalDate.now().plusDays(3)
@@ -32,6 +33,7 @@ public static CreateFairRequest createFairRequest() {
                 LocalDateTime.of(2025, 4, 15, 10, 39),
                 120,
                 "서울시 강남구",
+                "https://docs.google.com",
                 FairType.STUDENT_AND_PARENT,
                 LocalDate.now(),
                 null
@@ -43,6 +45,7 @@ public static Fair createClosedFair() {
                 LocalDateTime.of(2005, 4, 15, 10, 39),
                 120,
                 "서울시 강남구",
+                "https://docs.google.com",
                 FairType.STUDENT_AND_PARENT,
                 LocalDate.now(),
                 LocalDate.now().plusDays(3)