[release] BE

backend/build.gradle

@@ -54,6 +54,7 @@ dependencies {
 	// S3
 	implementation 'software.amazon.awssdk:s3:2.26.0'
 	implementation 'software.amazon.awssdk:auth:2.26.0'
+	implementation 'software.amazon.awssdk:url-connection-client:2.26.0'
 
 	// resize tool
 	implementation 'net.coobird:thumbnailator:0.4.14'

backend/src/main/java/moadong/club/controller/ClubApplyAdminController.java

@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
@@ -69,6 +70,16 @@ public ResponseEntity<?> getClubApplications(@CurrentUser CustomUserDetails user
         return Response.ok(clubApplyAdminService.getClubApplicationForms(user));
     }
 
+    @DeleteMapping("/application/{applicationFormId}")
+    @Operation(summary = "클럽 지원서 양식 삭제", description = "클럽의 지원서 양식을 삭제합니다")
+    @PreAuthorize("isAuthenticated()")
+    @SecurityRequirement(name = "BearerAuth")
+    public ResponseEntity<?> deleteClubApplicationForm(@PathVariable String applicationFormId,
+                                                       @CurrentUser CustomUserDetails user) {
+        clubApplyAdminService.deleteClubApplicationForm(applicationFormId, user);
+        return Response.ok("success delete application");
+    }
+
     @GetMapping("/apply/info/{applicationFormId}")
     @Operation(summary = "클럽 지원자 현황", description = "클럽 지원자 현황을 불러옵니다")
     @PreAuthorize("isAuthenticated()")
@@ -105,13 +116,16 @@ public ResponseEntity<?> removeApplicant(@PathVariable String applicationFormId,
         return Response.ok("success delete applicant");
     }
 
-    @GetMapping(value = "/applicant/{applicationFormId}/events",produces = "text/event-stream")
-    @Operation(summary = "지원자 상태 변경 실시간 이벤트", 
-               description = "지원자의 상태 변경을 실시간으로 받아볼 수 있는 SSE 엔드포인트입니다.")
+    @GetMapping(value = "/applicant/{applicationFormId}/events", produces = "text/event-stream")
+    @Operation(summary = "지원자 상태 변경 실시간 이벤트",
+            description = "지원자의 상태 변경을 실시간으로 받아볼 수 있는 SSE 엔드포인트입니다.")
     @PreAuthorize("isAuthenticated()")
     @SecurityRequirement(name = "BearerAuth")
-    public SseEmitter getApplicantStatusEvents(@PathVariable String applicationFormId,
+    public SseEmitter getApplicantStatusEvents(HttpServletResponse response,
+                                               @PathVariable String applicationFormId,
                                                @CurrentUser CustomUserDetails user) {
+        response.addHeader("X-Accel-Buffering", "no");
+        response.addHeader("Cache-Control", "no-cache");
         return clubApplyAdminService.createSseConnection(applicationFormId, user);
     }
 

backend/src/main/java/moadong/club/controller/ClubApplyPublicController.java

@@ -34,12 +34,11 @@ public ResponseEntity<?> applyToClub(@PathVariable String clubId,
         return Response.ok("success apply");
     }
 
-     @GetMapping("/apply")
+    @GetMapping("/apply")
     @Operation(summary = "클럽의 활성화된 지원서 목록 불러오기", description = "클럽의 활성화된 모든 지원서 목록을 불러옵니다")
     public ResponseEntity<?> getActiveApplicationForms(@PathVariable String clubId) {
         return Response.ok(clubApplyPublicService.getActiveApplicationForms(clubId));
     }
 
 
-
 }

backend/src/main/java/moadong/club/controller/ClubSearchController.java

@@ -29,7 +29,7 @@ public class ClubSearchController {
             + "keyword에 빈칸 입력 시 전체 검색<br>"
             + "recruitmentStatus, category, division에 all 입력 시 전체 검색<br>"
             + "<br>"
-            + "keyword는 대소문자 구분 없이 자유롭게 검색"
+            + "keyword는 대소문자 구분 없이 자유롭게 검색<br>"
             + "recruitmentStatus은 모집상태로 ALWAYS(상시모집), OPEN(모집중), CLOSED(모집마감), UPCOMING(모집예정)<br>"
             + "division은 분과로 중동<br>"
             + "category는 종류로 봉사, 종교, 취미교양, 학술, 운동, 공연, 기타<br>")

backend/src/main/java/moadong/club/entity/Club.java

@@ -1,14 +1,8 @@
 package moadong.club.entity;
 
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
-import com.google.firebase.messaging.Notification;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -25,6 +19,9 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
+import java.util.List;
+import java.util.Map;
+
 @Slf4j
 @Document("clubs")
 @AllArgsConstructor
@@ -49,15 +46,18 @@ public class Club implements Persistable<String> {
     @Field("recruitmentInformation")
     private ClubRecruitmentInformation clubRecruitmentInformation;
 
+    @Field("description")
+    private ClubDescription clubDescription;
+
     @Version
     private Long version;
-
     public Club() {
         this.name = "";
         this.category = "";
         this.division = "";
         this.state = ClubState.UNAVAILABLE;
         this.clubRecruitmentInformation = ClubRecruitmentInformation.builder().build();
+        this.clubDescription = ClubDescription.builder().build();
     }
 
     public Club(String userId) {
@@ -67,6 +67,7 @@ public Club(String userId) {
         this.state = ClubState.UNAVAILABLE;
         this.clubRecruitmentInformation = ClubRecruitmentInformation.builder().build();
         this.userId = userId;
+        this.clubDescription = ClubDescription.builder().build();
     }
 
     public Club(String id, String userId) {
@@ -77,15 +78,19 @@ public Club(String id, String userId) {
         this.state = ClubState.UNAVAILABLE;
         this.clubRecruitmentInformation = ClubRecruitmentInformation.builder().build();
         this.userId = userId;
+        this.clubDescription = ClubDescription.builder().build();
     }
 
     @Builder
     public Club(String name, String category, String division,
+                String userId,
                 ClubRecruitmentInformation clubRecruitmentInformation) {
         this.name = name;
         this.category = category;
         this.division = division;
+        this.userId = userId;
         this.clubRecruitmentInformation = clubRecruitmentInformation;
+        this.clubDescription = ClubDescription.builder().build();
     }
 
     public void update(ClubInfoRequest request) {
@@ -98,6 +103,7 @@ public void update(ClubInfoRequest request) {
         this.state = ClubState.AVAILABLE;
         this.socialLinks = request.socialLinks();
         this.clubRecruitmentInformation.update(request);
+        this.clubDescription = request.description().toEntity();
     }
 
     private void validateTags(List<String> tags) {

backend/src/main/java/moadong/club/entity/ClubApplicationForm.java

@@ -2,26 +2,32 @@
 
 import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
-import moadong.club.enums.ApplicantStatus;
+import moadong.club.enums.ApplicationFormMode;
 import moadong.club.enums.ApplicationFormStatus;
 import moadong.club.enums.SemesterTerm;
+import moadong.global.exception.ErrorCode;
+import moadong.global.exception.RestApiException;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
 @Document("club_application_forms")
 @AllArgsConstructor
 @Getter
 @Builder(toBuilder = true)
 public class ClubApplicationForm implements Persistable<String> {
+    private static final String[] externalApplicationUrlAllowed = {"https://forms.gle", "https://docs.google.com/forms", "https://form.naver.com", "https://naver.me"};
 
     @Id
     private String id;
@@ -57,9 +63,20 @@ public class ClubApplicationForm implements Persistable<String> {
     @Builder.Default
     private ApplicationFormStatus status = ApplicationFormStatus.UNPUBLISHED;
 
+    @NotNull
+    @Builder.Default
+    private ApplicationFormMode formMode = ApplicationFormMode.INTERNAL;
+
+    @Builder.Default
+    private String externalApplicationUrl = "";
+
     @Version
     private Long version;
 
+    public ApplicationFormMode getFormMode() {
+        return Optional.ofNullable(this.formMode).orElse(ApplicationFormMode.INTERNAL);
+    }
+
     public void updateFormTitle(String title) {
         this.title = title;
     }
@@ -89,6 +106,21 @@ public void updateFormStatus(boolean activeFlag) {
         this.status = ApplicationFormStatus.fromFlag(this.status, activeFlag);
     }
 
+    public void updateFormMode(ApplicationFormMode formMode) {
+        this.formMode = formMode;
+    }
+
+    public void updateExternalApplicationUrl(String externalApplicationUrl) {
+        boolean allowed = Arrays.stream(externalApplicationUrlAllowed)
+                .anyMatch(externalApplicationUrl::startsWith);
+
+        if (!allowed) {
+            throw new RestApiException(ErrorCode.NOT_ALLOWED_EXTERNAL_URL);
+        }
+
+        this.externalApplicationUrl = externalApplicationUrl.trim();
+    }
+
     @Override
     public boolean isNew() {
         return this.version == null;

backend/src/main/java/moadong/club/entity/ClubAward.java

@@ -0,0 +1,19 @@
+package moadong.club.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ClubAward {
+
+    private String semester;
+
+    private List<String> achievements;
+}

backend/src/main/java/moadong/club/entity/ClubDescription.java

@@ -0,0 +1,27 @@
+package moadong.club.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ClubDescription {
+
+    private String introDescription;
+
+    private String activityDescription;
+
+    private List<ClubAward> awards;
+
+    private ClubIdealCandidate idealCandidate;
+
+    private String benefits;
+
+    private List<Faq> faqs;
+}

backend/src/main/java/moadong/club/entity/ClubIdealCandidate.java

@@ -0,0 +1,19 @@
+package moadong.club.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ClubIdealCandidate {
+
+    private List<String> tags;
+
+    private String content;
+}

backend/src/main/java/moadong/club/entity/ClubRecruitmentInformation.java

@@ -6,10 +6,6 @@
 import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -19,6 +15,12 @@
 import moadong.global.RegexConstants;
 import org.checkerframework.common.aliasing.qual.Unique;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.List;
+
 @AllArgsConstructor
 @Getter
 @Builder(toBuilder = true)
@@ -38,19 +40,16 @@ public class ClubRecruitmentInformation {
     @Column(length = 30)
     private String introduction;
 
-    @Column(length = 20000)
-    private String description;
-
     @Column(length = 5)
     private String presidentName;
 
     @Pattern(regexp = RegexConstants.PHONE_NUMBER, message = "전화번호 형식이 올바르지 않습니다.")
     @Column(length = 13)
     private String presidentTelephoneNumber;
 
-    private LocalDateTime recruitmentStart;
+    private Instant recruitmentStart;
 
-    private LocalDateTime recruitmentEnd;
+    private Instant recruitmentEnd;
 
     private String recruitmentTarget;
 
@@ -60,12 +59,12 @@ public class ClubRecruitmentInformation {
 
     private List<String> tags;
 
-    private List<Faq> faqs;
-
     @Enumerated(EnumType.STRING)
     @NotNull
     private ClubRecruitmentStatus clubRecruitmentStatus;
 
+    private LocalDateTime lastModifiedDate;
+
     public void updateLogo(String logo) {
         this.logo = logo;
     }
@@ -75,12 +74,10 @@ public void updateRecruitmentStatus(ClubRecruitmentStatus status) {
     }
 
     public void updateDescription(ClubRecruitmentInfoUpdateRequest request) {
-        this.description = request.description();
         this.recruitmentStart = request.recruitmentStart();
         this.recruitmentEnd = request.recruitmentEnd();
         this.recruitmentTarget = request.recruitmentTarget();
         this.externalApplicationUrl = request.externalApplicationUrl();
-        this.faqs = request.faqs();
     }
 
     public boolean hasRecruitmentPeriod() {
@@ -121,4 +118,12 @@ public void update(ClubInfoRequest request) {
     public void updateCover(String cover) {
         this.cover = cover;
     }
+
+    private void setLastModifiedDate(LocalDateTime lastModifiedDate) {
+        this.lastModifiedDate = lastModifiedDate;
+    }
+
+    public void updateLastModifiedDate() {
+        setLastModifiedDate(LocalDateTime.now());
+    }
 }