JECT-Study · jschoi-96 · Nov 30, 2024 · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024
@@ -177,12 +177,18 @@ public List<GameSetResponse> findLatestGames(final String tagName, final Pageabl
     }
 
     @Transactional(readOnly = true)
-    public List<GameSetResponse> findBestGames(final String tagName, final Pageable pageable,
+    public List<GameSetResponse> findPopularGamesWithTag(final String tagName, final Pageable pageable,
                                                final GuestOrApiMember guestOrApiMember) {
         List<GameSet> gameSets = gameSetRepository.findGamesByViews(tagName, pageable);
         return gameSetResponses(guestOrApiMember, gameSets);
     }
 
+    @Transactional(readOnly = true)
+    public List<GameSetResponse> findPopularGamesWithoutTag(final Pageable pageable, final GuestOrApiMember guestOrApiMember) {
+        List<GameSet> popularGames = gameSetRepository.findPopularGames(pageable);
+        return gameSetResponses(guestOrApiMember, popularGames);
+    }
-    @Transactional(readOnly = true)
-    public List<GameSetResponse> findPopularGamesWithoutTag(final Pageable pageable, final GuestOrApiMember guestOrApiMember) {
-        List<GameSet> popularGames = gameSetRepository.findPopularGames(pageable);
-        return gameSetResponses(guestOrApiMember, popularGames);
-    }
+    /**
+     * 전체 게시물 중 인기 게시물을 조회수 기준으로 조회합니다.
+     * 최대 16개의 게시물을 반환합니다.
+     *
+     * @param pageable 페이지 정보 (size는 16 이하여야 함)
+     * @param guestOrApiMember 요청한 사용자 정보
+     * @return 조회수 내림차순으로 정렬된 게시물 목록
+     * @throws IllegalArgumentException 페이지 크기가 16을 초과하는 경우
+     */
+    @Transactional(readOnly = true)
+    public List<GameSetResponse> findPopularGamesWithoutTag(final Pageable pageable, final GuestOrApiMember guestOrApiMember) {
+        if (pageable.getPageSize() > 16) {
+            throw new IllegalArgumentException("페이지 크기는 16을 초과할 수 없습니다.");
+        }
+        List<GameSet> popularGames = gameSetRepository.findPopularGames(pageable);
+        return gameSetResponses(guestOrApiMember, popularGames);
+    }
-    @Transactional(readOnly = true)
-    public List<GameSetResponse> findPopularGamesWithoutTag(final Pageable pageable, final GuestOrApiMember guestOrApiMember) {
-        List<GameSet> popularGames = gameSetRepository.findPopularGames(pageable);
-        return gameSetResponses(guestOrApiMember, popularGames);
-    }
+    /**
+     * 전체 게시물 중 인기 게시물을 조회수 기준으로 조회합니다.
+     * 최대 16개의 게시물을 반환합니다.
+     *
+     * @param pageable 페이지 정보 (size는 16 이하여야 함)
+     * @param guestOrApiMember 요청한 사용자 정보
+     * @return 조회수 내림차순으로 정렬된 게시물 목록
+     * @throws IllegalArgumentException 페이지 크기가 16을 초과하는 경우
+     */
+    @Transactional(readOnly = true)
+    public List<GameSetResponse> findPopularGamesWithoutTag(final Pageable pageable, final GuestOrApiMember guestOrApiMember) {
+        if (pageable.getPageSize() > 16) {
+            throw new IllegalArgumentException("페이지 크기는 16을 초과할 수 없습니다.");
+        }
+        List<GameSet> popularGames = gameSetRepository.findPopularGames(pageable);
+        return gameSetResponses(guestOrApiMember, popularGames);
+    }
+
     private List<GameSetResponse> gameSetResponses(GuestOrApiMember guestOrApiMember, List<GameSet> gameSets) {
         if (guestOrApiMember.isGuest()) {
             return gameSets.stream()

@@ -21,4 +21,9 @@ public interface GameSetRepository extends JpaRepository<GameSet, Long> {
             "WHERE g.mainTag.name = :name " +
             "ORDER BY g.views DESC, g.createdAt DESC")
     List<GameSet> findGamesByViews(@Param("name") String mainTag, Pageable pageable);
+
+    @Query("SELECT g FROM GameSet g "
+            + "ORDER BY g.views DESC, " 
+            + "g.createdAt DESC")
+    List<GameSet> findPopularGames(Pageable pageable);
 }
@@ -69,15 +69,19 @@ public List<GameSetResponse> findLatestGames(
         return gameService.findLatestGames(tagName, pageable, guestOrApiMember);
     }
 
-    @GetMapping("/best")
-    @Operation(summary = "조회수 순으로 밸런스 게임 조회", description = "조회수 순으로 정렬된 16개의 게임 목록을 리턴합니다.")
-    public List<GameSetResponse> findBestGames(
-            @RequestParam String tagName,
+    @GetMapping("/popular")
+    @Operation(summary = "인기순으로 밸런스 게임 조회",
+            description = "메인 태그가 주어지면 해당 태그의 게임을 인기순으로 조회, 없으면 밸런스 게임 전체를 인기순으로 조회합니다.")
+    public List<GameSetResponse> findPopularGamesWithTag(
+            @RequestParam(required = false) String tagName,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "16") int size,
             @Parameter(hidden = true) @AuthPrincipal final GuestOrApiMember guestOrApiMember
     ) {
         Pageable pageable = PageRequest.of(page, size);
-        return gameService.findBestGames(tagName, pageable, guestOrApiMember);
+        if (tagName != null) {
+            return gameService.findPopularGamesWithTag(tagName, pageable, guestOrApiMember);
+        }
+        return gameService.findPopularGamesWithoutTag(pageable, guestOrApiMember);
     }
 }