Merge branch 'develop' into deploy

Author: jud1thDev

.idea/workspace.xml

@@ -18,7 +18,10 @@ bin/
 !**/src/test/**/bin/
 
 ### IntelliJ IDEA ###
-.idea
+.idea/
+.idea/*
+!.idea/codeStyles/
+!.idea/inspectionProfiles/
 *.iws
 *.iml
 *.ipr

bookduck/.gitignore

@@ -44,9 +44,9 @@ public ResponseEntity<Long> createClub(@Valid @RequestBody ClubCreateRequestDto
     @Operation(summary = "최근 모집 중인 클럽 보기", description = "최근 생성된, 모집 중인 클럽을 표시합니다.")
     @GetMapping("/new")
     public ResponseEntity<ClubSearchListResponseDto> findRecentActiveClubs(
-            @RequestParam(defaultValue = "latest") String sort,
+            @RequestParam(value = "orderBy", defaultValue = "latest") String orderBy,
             @PageableDefault(size = 10) Pageable pageable) {
-        return ResponseEntity.ok(clubService.findRecentActiveClubs(pageable, sort));
+        return ResponseEntity.ok(clubService.findRecentActiveClubs(pageable, orderBy));
     }
 
     @Operation(summary = "클럽 검색", description = "클럽명, 책 제목, 저자명으로 클럽을 검색합니다. 정렬 기준: 정확도순 > 가입인원순 > 최근생성순 > 곧종료순")

bookduck/src/main/java/com/mmc/bookduck/domain/club/controller/ClubController.java

@@ -356,13 +356,13 @@ public LocalDateTime getLastReadAt(ClubMember clubMember) {
     }
 
     @Transactional(readOnly = true)
-    public ClubSearchListResponseDto findRecentActiveClubs(Pageable pageable, String sort) {
+    public ClubSearchListResponseDto findRecentActiveClubs(Pageable pageable, String orderBy) {
         Page<Club> clubPage;
 
-        if (!"latest".equalsIgnoreCase(sort) && !"popular".equalsIgnoreCase(sort)) {
+        if (!"latest".equalsIgnoreCase(orderBy) && !"popular".equalsIgnoreCase(orderBy)) {
             throw new CustomException(ErrorCode.INVALID_SORT_PARAMETER);
         }
-        if ("popular".equalsIgnoreCase(sort)) {
+        if ("popular".equalsIgnoreCase(orderBy)) {
             // 인기순: 정원 마감률 높은 순 + 최신순
             clubPage = clubRepository.findByClubStatusOrderByPopularityDesc(ClubStatus.ACTIVE, pageable);
         } else {