Merge pull request #205 from Moadong/develop/be

[release] BE 1-4차 배포

Author: Due-IT

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

@@ -5,6 +5,7 @@
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -14,9 +15,6 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Document("clubs")
 @AllArgsConstructor
 @Getter
@@ -44,6 +42,7 @@ public class Club {
 
     @Field("recruitmentInformation")
     private ClubRecruitmentInformation clubRecruitmentInformation;
+
     public Club() {
         this.name = "";
         this.category = "";
@@ -53,7 +52,8 @@ public Club() {
     }
 
     @Builder
-    public Club(String name, String category, String division, ClubRecruitmentInformation clubRecruitmentInformation) {
+    public Club(String name, String category, String division,
+        ClubRecruitmentInformation clubRecruitmentInformation) {
         this.name = name;
         this.category = category;
         this.division = division;
@@ -67,25 +67,25 @@ public void update(ClubInfoRequest request) {
         this.state = ClubState.AVAILABLE;
 
         this.clubRecruitmentInformation = ClubRecruitmentInformation.builder()
-                .presidentName(request.clubPresidentName())
-                .presidentTelephoneNumber(request.telephoneNumber())
-                .introduction(request.introduction())
-                .recruitmentStart(request.recruitmentStart())
-                .recruitmentEnd(request.recruitmentEnd())
-                .recruitmentTarget(request.recruitmentTarget())
-                .tags(request.tags())
-                .build();
+            .presidentName(request.clubPresidentName())
+            .presidentTelephoneNumber(request.telephoneNumber())
+            .introduction(request.introduction())
+            .recruitmentStart(request.recruitmentStart())
+            .recruitmentEnd(request.recruitmentEnd())
+            .recruitmentTarget(request.recruitmentTarget())
+            .tags(request.tags())
+            .build();
     }
 
-    public void update(ClubDescriptionUpdateRequest request){
+    public void update(ClubDescriptionUpdateRequest request) {
         clubRecruitmentInformation.updateDescription(request);
     }
 
-    public void updateLogo(String logo){
+    public void updateLogo(String logo) {
         this.clubRecruitmentInformation.updateLogo(logo);
     }
 
-    public void updateFeedImages(List<String> feedImages){
+    public void updateFeedImages(List<String> feedImages) {
         this.clubRecruitmentInformation.updateFeedImages(feedImages);
     }
 }

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

@@ -59,16 +59,7 @@ public class ClubRecruitmentInformation {
     @NotNull
     private RecruitmentStatus recruitmentStatus;
 
-    public void updateInfo(ClubInfoRequest request) {
-        this.introduction = request.introduction();
-        this.presidentName = request.clubPresidentName();
-        this.presidentTelephoneNumber = request.telephoneNumber();
-        this.recruitmentStart = request.recruitmentStart();
-        this.recruitmentEnd = request.recruitmentEnd();
-        this.recruitmentTarget = request.recruitmentTarget();
-        this.recruitmentStatus = RecruitmentStatus.UPCOMING;
-        this.tags = request.tags();
-    }
+    private String recruitmentForm;
 
     public ClubRecruitmentInformation updateLogo(String logo) {
         this.logo = logo;

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

@@ -14,11 +14,14 @@ public record ClubDetailedResult(
     List<String> tags,
     String state,
     List<String> feeds,
+    String introduction,
     String description,
     String presidentName,
     String presidentPhoneNumber,
     String recruitmentPeriod,
     String recruitmentTarget,
+    String recruitmentStatus,
+    String recruitmentForm,
     String category,
     String division
 ) {
@@ -34,16 +37,20 @@ public static ClubDetailedResult of(Club club) {
         return ClubDetailedResult.builder()
             .id(club.getId())
             .name(club.getName())
+            .logo(club.getClubRecruitmentInformation().getLogo())
+            .tags(clubRecruitmentInformation.getTags())
+            .state(club.getState().getDesc())
+            .feeds(clubRecruitmentInformation.getFeedImages())
             .category(club.getCategory())
             .division(club.getDivision())
-            .state(club.getState().getDesc())
+            .introduction(clubRecruitmentInformation.getIntroduction())
             .description(clubRecruitmentInformation.getDescription())
             .presidentName(clubRecruitmentInformation.getPresidentName())
             .presidentPhoneNumber(clubRecruitmentInformation.getPresidentTelephoneNumber())
-            .feeds(clubRecruitmentInformation.getFeedImages())
-            .tags(clubRecruitmentInformation.getTags())
             .recruitmentPeriod(period)
             .recruitmentTarget(clubRecruitmentInformation.getRecruitmentTarget())
+            .recruitmentStatus(clubRecruitmentInformation.getRecruitmentStatus().toString())
+            .recruitmentForm(clubRecruitmentInformation.getRecruitmentForm())
             .build();
     }
 

backend/src/main/java/moadong/club/repository/ClubSearchRepository.java

@@ -1,5 +1,7 @@
 package moadong.club.repository;
 
+import java.util.ArrayList;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import moadong.club.enums.ClubState;
 import moadong.club.payload.dto.ClubSearchResult;
@@ -11,21 +13,20 @@
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.stereotype.Repository;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
 @Repository
 @AllArgsConstructor
 public class ClubSearchRepository {
+
     private final MongoTemplate mongoTemplate;
 
-    public List<ClubSearchResult> searchClubsByKeyword(String keyword, String recruitmentStatus, String division, String category) {
+    public List<ClubSearchResult> searchClubsByKeyword(String keyword, String recruitmentStatus,
+        String division, String category) {
         List<AggregationOperation> operations = new ArrayList<>();
 
         operations.add(Aggregation.match(
-                new Criteria().andOperator(
-                        Criteria.where("state").is(ClubState.AVAILABLE.getName()))
+            new Criteria().andOperator(
+                Criteria.where("state").is(ClubState.AVAILABLE.getName()))
         ));
 
         Criteria criteria = getMatchedCriteria(recruitmentStatus, division, category);
@@ -36,33 +37,37 @@ public List<ClubSearchResult> searchClubsByKeyword(String keyword, String recrui
 
         if (keyword != null && !keyword.trim().isEmpty()) {
             operations.add(Aggregation.match(new Criteria().orOperator(
-                    Criteria.where("name").regex(keyword, "i"),
-                    Criteria.where("recruitmentInformation.introduction").regex(keyword, "i"),
-                    Criteria.where("recruitmentInformation.description").regex(keyword, "i"),
-                    Criteria.where("recruitmentInformation.tags").regex(keyword, "i")
+                Criteria.where("name").regex(keyword, "i"),
+                Criteria.where("recruitmentInformation.introduction").regex(keyword, "i"),
+                Criteria.where("recruitmentInformation.description").regex(keyword, "i"),
+                Criteria.where("recruitmentInformation.tags").regex(keyword, "i")
             )));
         }
         operations.add(Aggregation.unwind("club_tags", true));
 
         operations.add(
-                Aggregation.project("name", "state", "category", "division")
-                        .and("recruitmentInformation.introduction").as("introduction")
-                        .and("recruitmentInformation.recruitmentStatus").as("recruitmentStatus")
-                        .and("recruitmentInformation.logo").as("logo")
-                        .and("recruitmentInformation.tags").as("tags"));
+            Aggregation.project("name", "state", "category", "division")
+                .and("recruitmentInformation.introduction").as("introduction")
+                .and("recruitmentInformation.recruitmentStatus").as("recruitmentStatus")
+                .and("recruitmentInformation.logo").as("logo")
+                .and("recruitmentInformation.tags").as("tags"));
 
-        operations.add(Aggregation.sort(Sort.by(Sort.Order.asc("division"), Sort.Order.asc("category"))));
+        operations.add(
+            Aggregation.sort(Sort.by(Sort.Order.asc("division"), Sort.Order.asc("category"))));
 
         Aggregation aggregation = Aggregation.newAggregation(operations);
-        AggregationResults<ClubSearchResult> results = mongoTemplate.aggregate(aggregation, "clubs", ClubSearchResult.class);
+        AggregationResults<ClubSearchResult> results = mongoTemplate.aggregate(aggregation, "clubs",
+            ClubSearchResult.class);
         return results.getMappedResults();
     }
 
-    private Criteria getMatchedCriteria(String recruitmentStatus, String division, String category) {
+    private Criteria getMatchedCriteria(String recruitmentStatus, String division,
+        String category) {
         List<Criteria> criteriaList = new ArrayList<>();
 
         if (recruitmentStatus != null && !"all".equalsIgnoreCase(recruitmentStatus)) {
-            criteriaList.add(Criteria.where("recruitmentInformation.recruitmentStatus").is(recruitmentStatus));
+            criteriaList.add(
+                Criteria.where("recruitmentInformation.recruitmentStatus").is(recruitmentStatus));
         }
         if (division != null && !"all".equalsIgnoreCase(division)) {
             criteriaList.add(Criteria.where("division").is(division));
@@ -74,6 +79,6 @@ private Criteria getMatchedCriteria(String recruitmentStatus, String division, S
         if (!criteriaList.isEmpty()) {
             return new Criteria().andOperator(criteriaList.toArray(new Criteria[0]));
         }
-        return null;
+        return new Criteria();
     }
 }