[refactor] 동아리 수정 API 명세 변경

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

@@ -1,8 +1,5 @@
 package moadong.club.entity;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
@@ -22,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
@@ -46,6 +46,9 @@ public class Club implements Persistable<String> {
     @Field("recruitmentInformation")
     private ClubRecruitmentInformation clubRecruitmentInformation;
 
+    @Field("description")
+    private ClubDescription clubDescription;
+
     @Version
     private Long version;
     public Club() {
@@ -54,6 +57,7 @@ public Club() {
         this.division = "";
         this.state = ClubState.UNAVAILABLE;
         this.clubRecruitmentInformation = ClubRecruitmentInformation.builder().build();
+        this.clubDescription = ClubDescription.builder().build();
     }
 
     public Club(String userId) {
@@ -63,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) {
@@ -73,6 +78,7 @@ public Club(String id, String userId) {
         this.state = ClubState.UNAVAILABLE;
         this.clubRecruitmentInformation = ClubRecruitmentInformation.builder().build();
         this.userId = userId;
+        this.clubDescription = ClubDescription.builder().build();
     }
 
     @Builder
@@ -82,6 +88,7 @@ public Club(String name, String category, String division,
         this.category = category;
         this.division = division;
         this.clubRecruitmentInformation = clubRecruitmentInformation;
+        this.clubDescription = ClubDescription.builder().build();
     }
 
     public void update(ClubInfoRequest request) {
@@ -94,6 +101,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/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,22 +6,21 @@
 import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
-
-import java.time.Instant;
-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;
-import lombok.Setter;
 import moadong.club.enums.ClubRecruitmentStatus;
 import moadong.club.payload.request.ClubInfoRequest;
 import moadong.club.payload.request.ClubRecruitmentInfoUpdateRequest;
 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)
@@ -41,9 +40,6 @@ public class ClubRecruitmentInformation {
     @Column(length = 30)
     private String introduction;
 
-    @Column(length = 20000)
-    private String description;
-
     @Column(length = 5)
     private String presidentName;
 
@@ -63,8 +59,6 @@ public class ClubRecruitmentInformation {
 
     private List<String> tags;
 
-    private List<Faq> faqs;
-
     @Enumerated(EnumType.STRING)
     @NotNull
     private ClubRecruitmentStatus clubRecruitmentStatus;
@@ -80,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() {

backend/src/main/java/moadong/club/payload/dto/ClubAwardDto.java

@@ -0,0 +1,25 @@
+package moadong.club.payload.dto;
+
+import jakarta.validation.constraints.Size;
+import moadong.club.entity.ClubAward;
+
+import java.util.List;
+
+public record ClubAwardDto(
+    @Size(max = 50)
+    String semester,
+
+    List<@Size(max = 100) String> achievements
+) {
+    public static ClubAwardDto from(ClubAward clubAward) {
+        if (clubAward == null) return null;
+        return new ClubAwardDto(clubAward.getSemester(), clubAward.getAchievements());
+    }
+
+    public ClubAward toEntity() {
+        return ClubAward.builder()
+                .semester(semester)
+                .achievements(achievements)
+                .build();
+    }
+}

backend/src/main/java/moadong/club/payload/dto/ClubDescriptionDto.java

@@ -0,0 +1,50 @@
+package moadong.club.payload.dto;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Size;
+import moadong.club.entity.ClubDescription;
+
+import java.util.List;
+
+public record ClubDescriptionDto(
+    @Size(max = 500)
+    String introDescription,
+
+    @Size(max = 1000)
+    String activityDescription,
+
+    @Valid
+    List<ClubAwardDto> awards,
+
+    @Valid
+    ClubIdealCandidateDto idealCandidate,
+
+    @Size(max = 1000)
+    String benefits,
+
+    @Valid
+    List<FaqDto> faqs
+) {
+    public static ClubDescriptionDto from(ClubDescription description) {
+        if (description == null) return null;
+        return new ClubDescriptionDto(
+            description.getIntroDescription(),
+            description.getActivityDescription(),
+            description.getAwards() == null ? null : description.getAwards().stream().map(ClubAwardDto::from).toList(),
+            ClubIdealCandidateDto.from(description.getIdealCandidate()),
+            description.getBenefits(),
+            description.getFaqs() == null ? null : description.getFaqs().stream().map(FaqDto::from).toList()
+        );
+    }
+
+    public ClubDescription toEntity() {
+        return ClubDescription.builder()
+                .introDescription(introDescription)
+                .activityDescription(activityDescription)
+                .awards(awards == null ? null : awards.stream().map(ClubAwardDto::toEntity).toList())
+                .idealCandidate(idealCandidate == null ? null : idealCandidate.toEntity())
+                .benefits(benefits)
+                .faqs(faqs == null ? null : faqs.stream().map(FaqDto::toEntity).toList())
+                .build();
+    }
+}

backend/src/main/java/moadong/club/payload/dto/ClubDetailedResult.java

@@ -1,12 +1,12 @@
 package moadong.club.payload.dto;
 
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Map;
 import lombok.Builder;
 import moadong.club.entity.Club;
 import moadong.club.entity.ClubRecruitmentInformation;
-import moadong.club.entity.Faq;
+
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
 
 @Builder
 public record ClubDetailedResult(
@@ -18,7 +18,7 @@ public record ClubDetailedResult(
         String state,
         List<String> feeds,
         String introduction,
-        String description,
+        ClubDescriptionDto description,
         String presidentName,
         String presidentPhoneNumber,
         String recruitmentStart,
@@ -29,12 +29,10 @@ public record ClubDetailedResult(
         Map<String, String> socialLinks,
         String category,
         String division,
-        List<Faq> faqs,
-        String lastModifiedDate,
-        List<ClubSearchResult> recommendClubs
+        String lastModifiedDate
 ) {
 
-    public static ClubDetailedResult of(Club club, List<ClubSearchResult> recommendClubs) {
+    public static ClubDetailedResult of(Club club) {
         ClubRecruitmentInformation clubRecruitmentInformation = club.getClubRecruitmentInformation();
 
         String start = "미정";
@@ -66,8 +64,7 @@ public static ClubDetailedResult of(Club club, List<ClubSearchResult> recommendC
                 .division(club.getDivision() == null ? "" : club.getDivision())
                 .introduction(clubRecruitmentInformation.getIntroduction() == null ? ""
                         : clubRecruitmentInformation.getIntroduction())
-                .description(clubRecruitmentInformation.getDescription() == null ? ""
-                        : clubRecruitmentInformation.getDescription())
+                .description(ClubDescriptionDto.from(club.getClubDescription()))
                 .presidentName(clubRecruitmentInformation.getPresidentName() == null ? ""
                         : clubRecruitmentInformation.getPresidentName())
                 .presidentPhoneNumber(
@@ -83,10 +80,7 @@ public static ClubDetailedResult of(Club club, List<ClubSearchResult> recommendC
                         club.getClubRecruitmentInformation().getExternalApplicationUrl())
                 .socialLinks(club.getSocialLinks() == null ? Map.of()
                         : club.getSocialLinks())
-                .faqs(club.getClubRecruitmentInformation().getFaqs() == null ? List.of()
-                        : club.getClubRecruitmentInformation().getFaqs())
                 .lastModifiedDate(lastModifiedDate)
-                .recommendClubs(recommendClubs)
                 .build();
     }
 

backend/src/main/java/moadong/club/payload/dto/ClubIdealCandidateDto.java

@@ -0,0 +1,25 @@
+package moadong.club.payload.dto;
+
+import jakarta.validation.constraints.Size;
+import moadong.club.entity.ClubIdealCandidate;
+
+import java.util.List;
+
+public record ClubIdealCandidateDto(
+    List<@Size(max = 10) String> tags,
+
+    @Size(max = 700)
+    String content
+) {
+    public static ClubIdealCandidateDto from(ClubIdealCandidate candidate) {
+        if (candidate == null) return null;
+        return new ClubIdealCandidateDto(candidate.getTags(), candidate.getContent());
+    }
+
+    public ClubIdealCandidate toEntity() {
+        return ClubIdealCandidate.builder()
+                .tags(tags)
+                .content(content)
+                .build();
+    }
+}

backend/src/main/java/moadong/club/payload/dto/FaqDto.java

@@ -0,0 +1,21 @@
+package moadong.club.payload.dto;
+
+import jakarta.validation.constraints.Size;
+import moadong.club.entity.Faq;
+
+public record FaqDto(
+    @Size(max = 100)
+    String question,
+
+    @Size(max = 500)
+    String answer
+) {
+    public static FaqDto from(Faq faq) {
+        if (faq == null) return null;
+        return new FaqDto(faq.getQuestion(), faq.getAnswer());
+    }
+
+    public Faq toEntity() {
+        return new Faq(question, answer);
+    }
+}