Merge branch 'main' of https://github.com/LIKELION-TEAM4-HACKATHON/ba…

…ck-end
LIKELION-TEAM4-HACKATHON · Aug 5, 2024 · 7ae7c87 · 7ae7c87
2 parents 71fb428 + 8b55e57
commit 7ae7c87
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 36 deletions.
diff --git a/src/main/java/likelion/MZConnent/api/club/ClubController.java b/src/main/java/likelion/MZConnent/api/club/ClubController.java
@@ -1,9 +1,7 @@
 package likelion.MZConnent.api.club;
 
-import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import likelion.MZConnent.domain.member.Member;
-import likelion.MZConnent.dto.club.request.ClubSimpleRequest;
 import likelion.MZConnent.dto.club.request.CreateClubRequest;
 import likelion.MZConnent.dto.club.response.*;
 import likelion.MZConnent.jwt.principle.UserPrinciple;
@@ -80,17 +78,17 @@ public ResponseEntity<ClubDetailResponse> getClubDetail(@PathVariable Long clubI
     public ResponseEntity<PageContentResponse<ClubSimpleResponse>> getClubList(
             @RequestParam(value = "page", defaultValue = "0") int pageNumber,
             @RequestParam(value = "sort", defaultValue = "createdDate") String sortWay,
-            @RequestBody ClubSimpleRequest request) {
+            @RequestParam(value = "cultureCategoryId", required = false, defaultValue = "0") long cultureCategoryId,
+            @RequestParam(value = "regionId", required = false, defaultValue = "0") long regionId) {
 
         Pageable pageable;
-        if(sortWay.equals("meetingDate")){
+        if (sortWay.equals("meetingDate")) {
             pageable = PageRequest.of(pageNumber, 6, Sort.by(sortWay).ascending());
-        }
-        else {
+        } else {
             pageable = PageRequest.of(pageNumber, 6, Sort.by(sortWay).descending());
         }
 
-        PageContentResponse<ClubSimpleResponse> clubList = clubInfoService.getClubList(request, pageable);
+        PageContentResponse<ClubSimpleResponse> clubList = clubInfoService.getClubList(cultureCategoryId, regionId, pageable);
         return ResponseEntity.ok(clubList);
     }
 }
diff --git a/src/main/java/likelion/MZConnent/domain/member/Member.java b/src/main/java/likelion/MZConnent/domain/member/Member.java
@@ -22,7 +22,7 @@
 @ToString
 @NoArgsConstructor
 public class Member {
-    public static final String DEFAULT_PROFILE_IMAGE_URL = "https://mzconnect-bucket.s3.ap-northeast-2.amazonaws.com/default_profile.png";
+    public static final String DEFAULT_PROFILE_IMAGE_URL = "https://mzconnect-bucket.s3.ap-northeast-2.amazonaws.com/default_image.jpeg";
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

diff --git a/src/main/java/likelion/MZConnent/dto/club/request/ClubSimpleRequest.java b/src/main/java/likelion/MZConnent/dto/club/request/ClubSimpleRequest.java
diff --git a/src/main/java/likelion/MZConnent/repository/club/ClubRepository.java b/src/main/java/likelion/MZConnent/repository/club/ClubRepository.java
@@ -15,12 +15,15 @@
 public interface ClubRepository extends JpaRepository<Club, Long> {
 
     // status가 OPEN인 클럽만 조회
-    // cultureId와 regionId가 0이면 무시
-    // cultureId와 regionId가 0이 아니면 해당 cultureId와 regionId에 맞는 클럽만 조회
-    @Query("SELECT c FROM Club c WHERE c.status = 'OPEN' " +
-            "AND (:cultureId = 0 OR c.culture.cultureId = :cultureId) " +
+    // cultureCategoryId와 regionId가 0이면 무시
+    // cultureCategoryId와 regionId가 0이 아니면 해당 cultureCategoryId와 regionId에 맞는 클럽만 조회
+    @Query("SELECT c FROM Club c " +
+            "JOIN c.culture cu " +
+            "JOIN cu.cultureCategory cc " +
+            "WHERE c.status = 'OPEN' " +
+            "AND (:cultureCategoryId = 0 OR cc.id = :cultureCategoryId) " +
             "AND (:regionId = 0 OR c.region.regionId = :regionId)")
-    Page<Club> findAllByFilters(@Param("cultureId") Long cultureId,
+    Page<Club> findAllByFilters(@Param("cultureCategoryId") Long cultureCategoryId,
                                 @Param("regionId") Long regionId,
                                 Pageable pageable);
 

diff --git a/src/main/java/likelion/MZConnent/service/club/ClubInfoService.java b/src/main/java/likelion/MZConnent/service/club/ClubInfoService.java
@@ -5,7 +5,6 @@
 import likelion.MZConnent.domain.member.Member;
 import likelion.MZConnent.dto.club.LeaderDto;
 import likelion.MZConnent.dto.club.SelfIntroductionDto;
-import likelion.MZConnent.dto.club.request.ClubSimpleRequest;
 import likelion.MZConnent.dto.club.response.ClubDetailResponse;
 import likelion.MZConnent.dto.club.response.ClubSimpleResponse;
 import likelion.MZConnent.dto.club.response.PageContentResponse;
@@ -85,10 +84,10 @@ private ClubDetailResponse buildClubDetailResponse(Long clubId, Member member) {
                 .build();
     }
 
-    public PageContentResponse<ClubSimpleResponse> getClubList(ClubSimpleRequest request, Pageable pageable) {
+    public PageContentResponse<ClubSimpleResponse> getClubList(long cultureCategoryId, long regionId, Pageable pageable) {
         Page<Club> clubs = clubRepository.findAllByFilters(
-                request.getCultureId(),
-                request.getRegionId(),
+                cultureCategoryId,
+                regionId,
                 pageable);
 
         return new PageContentResponse<>(