Merge branch 'develop' into test

Author: jickDo

src/main/java/potatoes/server/chat/dto/ParticipantsInfoResponse.java

@@ -3,7 +3,7 @@
 import potatoes.server.user.entity.User;
 
 public record ParticipantsInfoResponse(
-	String user,
+	String nickname,
 	String email,
 	String description,
 	long travelCount,

src/main/java/potatoes/server/travel/controller/TravelController.java

@@ -2,6 +2,7 @@
 
 import static org.springframework.http.MediaType.*;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.http.ResponseEntity;
@@ -19,6 +20,7 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import potatoes.server.travel.dto.CreateTravelRequest;
+import potatoes.server.travel.dto.SimpleTravelResponse;
 import potatoes.server.travel.dto.TravelDetailResponse;
 import potatoes.server.travel.service.TravelService;
 import potatoes.server.utils.CommonResponse;
@@ -66,6 +68,15 @@ public ResponseEntity<CommonResponse<?>> deleteTravelByOrganizer(
 		return ResponseEntity.ok(CommonResponse.create());
 	}
 
+	@Operation(summary = "이번 주 인기 여행 조회", description = "이번 주 인기가 많은 여행 모임 반환")
+	@GetMapping("/popular")
+	public ResponseEntity<CommonResponse<List<SimpleTravelResponse>>> getPopularTravels(
+		@NonLoginAuthorization @Parameter(hidden = true) Optional<Long> userId
+	) {
+		// TODO - 조회수 카운트 방법 논의 필요
+		return ResponseEntity.ok(CommonResponse.from(travelService.getPopularTravels(userId)));
+	}
+
 	@Operation(summary = "동행 (참여자)", description = "여행을 동행합니다.")
 	@PostMapping("{travelId}/participation")
 	public ResponseEntity<CommonResponse<?>> participateInTravel(

src/main/java/potatoes/server/travel/controller/TravelPaginationController.java

@@ -13,7 +13,6 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import potatoes.server.travel.dto.GetMyTravelResponse;
-import potatoes.server.travel.dto.SimpleTravelResponse;
 import potatoes.server.travel.dto.TravelSummaryResponse;
 import potatoes.server.travel.service.TravelService;
 import potatoes.server.utils.CommonResponse;
@@ -47,17 +46,6 @@ public ResponseEntity<CommonResponse<PageResponse<TravelSummaryResponse>>> getTr
 				travelService.getTravelList(page, size, isDomestic, startAt, endAt, sortOrder, query, userId)));
 	}
 
-	@Operation(summary = "이번 주 인기 여행 조회", description = "이번 주 인기가 많은 여행 모임 반환")
-	@GetMapping("/popular")
-	public ResponseEntity<CommonResponse<PageResponse<SimpleTravelResponse>>> getPopularTravels(
-		@RequestParam(required = false, defaultValue = "0") int page,
-		@RequestParam(required = false, defaultValue = "8") int size,
-		@NonLoginAuthorization @Parameter(hidden = true) Optional<Long> userId
-	) {
-		// TODO - 조회수 카운트 방법 논의 필요
-		return ResponseEntity.ok(CommonResponse.from(travelService.getPopularTravels(page, size, userId)));
-	}
-
 	@Operation(summary = "내가 만든 여행", description = "내 프로필에서 사용하는 사용자가 생성한 여행리스트를 조회합니다.")
 	@GetMapping("/mine")
 	public ResponseEntity<CommonResponse<PageResponse<GetMyTravelResponse>>> getMyTravels(

src/main/java/potatoes/server/travel/dto/SimpleTravelResponse.java

@@ -10,7 +10,7 @@ public record SimpleTravelResponse(
 	int maxTravelMateCount,
 	int currentTravelMateCount,
 	boolean isDomestic,
-	Boolean isBookmark,
+	Boolean bookmarkFlag,
 	String travelLocation,
 	String travelImage,
 	String startAt,

src/main/java/potatoes/server/travel/repository/TravelRepository.java

@@ -1,6 +1,7 @@
 package potatoes.server.travel.repository;
 
 import java.time.Instant;
+import java.util.List;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -26,5 +27,5 @@ Page<Travel> findTravels(@Param("isDomestic") Boolean isDomestic,
 		@Param("query") String query,
 		Pageable pageable);
 
-	Page<Travel> findAllByOrderByIdDesc(Pageable pageable);
+	List<Travel> findTop8ByOrderByIdDesc();
 }

src/main/java/potatoes/server/travel/service/TravelService.java

@@ -8,6 +8,7 @@
 import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -208,9 +209,9 @@ private String getSortField(TravelSortType sortOrder) {
 		};
 	}
 
-	public PageResponse<SimpleTravelResponse> getPopularTravels(int page, int size, Optional<Long> userId) {
-		Pageable pageable = PageRequest.of(page, size);
-		Page<SimpleTravelResponse> travels = travelRepository.findAllByOrderByIdDesc(pageable)
+	public List<SimpleTravelResponse> getPopularTravels(Optional<Long> userId) {
+		return travelRepository.findTop8ByOrderByIdDesc()
+			.stream()
 			.map(travel -> {
 				int currentTravelMate = (int)travelUserRepository.countByTravel(travel);
 
@@ -219,9 +220,8 @@ public PageResponse<SimpleTravelResponse> getPopularTravels(int page, int size,
 					.orElse(null);
 
 				return SimpleTravelResponse.from(travel, currentTravelMate, isBookmark);
-			});
-
-		return PageResponse.from(travels);
+			})
+			.collect(Collectors.toList());
 	}
 
 	@Transactional

src/main/java/potatoes/server/user/dto/PopularUserResponse.java

@@ -3,7 +3,7 @@
 public record PopularUserResponse(
 	Long userId,
 	String profileImage,
-	String nickName,
+	String nickname,
 	int openTravelCount,
 	long reviewCount,
 	String hashTags