[FIX] 파라미터 null 값 허용

Author: sansan20535

src/main/java/org/websoso/WSSServer/controller/FeedController.java

@@ -71,7 +71,7 @@ public ResponseEntity<FeedsGetResponse> getFeeds(@AuthenticationPrincipal User u
                                                      @RequestParam(value = "category", required = false) String category,
                                                      @RequestParam("lastFeedId") Long lastFeedId,
                                                      @RequestParam("size") int size,
-                                                     @RequestParam("feedsOption") FeedGetOption feedGetOption) {
+                                                     @RequestParam(value = "feedsOption", required = false) FeedGetOption feedGetOption) {
         return ResponseEntity
                 .status(OK)
                 .body(feedService.getFeeds(user, category, lastFeedId, size, feedGetOption));

src/main/java/org/websoso/WSSServer/controller/UserController.java

@@ -164,10 +164,10 @@ public ResponseEntity<UserFeedsGetResponse> getUserFeeds(@AuthenticationPrincipa
                                                              @PathVariable("userId") Long userId,
                                                              @RequestParam("lastFeedId") Long lastFeedId,
                                                              @RequestParam("size") int size,
-                                                             @RequestParam("isVisible") boolean isVisible,
-                                                             @RequestParam("isUnVisible") boolean isUnVisible,
-                                                             @RequestParam("genreNames") List<String> genreNames,
-                                                             @RequestParam("sortCriteria") SortCriteria sortCriteria) {
+                                                             @RequestParam(value = "isVisible", required = false) Boolean isVisible,
+                                                             @RequestParam(value = "isUnVisible", required = false) Boolean isUnVisible,
+                                                             @RequestParam(value = "genreNames", required = false) List<String> genreNames,
+                                                             @RequestParam(value = "sortCriteria", required = false) SortCriteria sortCriteria) {
         return ResponseEntity
                 .status(OK)
                 // ToDo: isVisible -> isPublic으로 수정

src/main/java/org/websoso/WSSServer/repository/FeedCustomRepositoryImpl.java

@@ -66,7 +66,7 @@ public List<Feed> findFeedsByNoOffsetPagination(User owner, Long lastFeedId, int
                         ltFeedId(lastFeedId),
                         eqVisible(isVisible),
                         eqUnVisible(isUnVisible),
-                        genre.in(genres)
+                        checkGenres(genres)
                 )
                 .orderBy(
                         checkSortCriteria(sortCriteria),
@@ -95,16 +95,22 @@ private BooleanExpression ltFeedId(Long lastFeedId) {
         return feed.feedId.lt(lastFeedId);
     }
 
-    private BooleanExpression eqVisible(boolean isVisible) {
-        return feed.isPublic.eq(isVisible);
+    private BooleanExpression eqVisible(Boolean isVisible) {
+        if (isVisible != null) {
+            return feed.isPublic.eq(isVisible);
+        }
+        return null;
     }
 
-    private BooleanExpression eqUnVisible(boolean isUnVisible) {
-        return feed.isPublic.eq(isUnVisible);
+    private BooleanExpression eqUnVisible(Boolean isUnVisible) {
+        if (isUnVisible != null) {
+            return feed.isPublic.eq(isUnVisible);
+        }
+        return null;
     }
 
     private OrderSpecifier<?> checkSortCriteria(SortCriteria sortCriteria) {
-        if (sortCriteria.equals(SortCriteria.OLD)) {
+        if (sortCriteria != null && sortCriteria.equals(SortCriteria.OLD)) {
             return new OrderSpecifier<>(Order.ASC, feed.createdDate);
         }
         return new OrderSpecifier<>(Order.DESC, feed.createdDate);

src/main/java/org/websoso/WSSServer/service/FeedService.java

@@ -447,18 +447,16 @@ public NovelGetResponseFeedTab getFeedsByNovel(User user, Long novelId, Long las
     }
 
     @Transactional(readOnly = true)
-    public UserFeedsGetResponse getUserFeeds(User visitor, Long ownerId, Long lastFeedId, int size, boolean isVisible,
-                                             boolean isUnVisible, List<String> genreNames,
+    public UserFeedsGetResponse getUserFeeds(User visitor, Long ownerId, Long lastFeedId, int size, Boolean isVisible,
+                                             Boolean isUnVisible, List<String> genreNames,
                                              SortCriteria sortCriteria) {
         User owner = userService.getUserOrException(ownerId);
         Long visitorId = Optional.ofNullable(visitor)
                 .map(User::getUserId)
                 .orElse(null);
 
         if (owner.getIsProfilePublic() || isOwner(visitor, ownerId)) {
-            List<Genre> genres = genreNames.stream()
-                    .map(genreService::getGenreOrException)
-                    .toList();
+            List<Genre> genres = getGenres(genreNames);
 
             List<Feed> feeds = feedRepository.findFeedsByNoOffsetPagination(owner, lastFeedId, size, isVisible,
                     isUnVisible, sortCriteria, genres);
@@ -493,4 +491,13 @@ private static boolean isOwner(User visitor, Long ownerId) {
         //TODO 현재는 비로그인 회원인 경우
         return visitor != null && visitor.getUserId().equals(ownerId);
     }
+
+    private List<Genre> getGenres(List<String> genreNames) {
+        if (genreNames != null && !genreNames.isEmpty()) {
+            return genreNames.stream()
+                    .map(genreService::getGenreOrException)
+                    .toList();
+        }
+        return null;
+    }
 }