[FEAT] 피드 비공개 기능 추가

src/main/java/org/websoso/WSSServer/domain/Feed.java

@@ -20,6 +20,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.websoso.WSSServer.dto.feed.FeedCreateRequest;
+import org.websoso.WSSServer.dto.feed.FeedUpdateRequest;
 
 @Getter
 @DynamicInsert
@@ -44,6 +46,9 @@ public class Feed {
     @Column(nullable = false)
     private Boolean isSpoiler;
 
+    @Column(columnDefinition = "Boolean default true", nullable = false)
+    private Boolean isPublic;
+
     @Column(nullable = false)
     private LocalDateTime createdDate;
 
@@ -69,21 +74,23 @@ public class Feed {
     @OneToOne(mappedBy = "feed", cascade = ALL, fetch = FetchType.LAZY, orphanRemoval = true)
     private PopularFeed popularFeed;
 
-    private Feed(String feedContent, Long novelId, Boolean isSpoiler, User user) {
-        this.feedContent = feedContent;
-        this.novelId = novelId;
-        this.isSpoiler = isSpoiler;
+    private Feed(FeedCreateRequest request, User user) {
+        this.feedContent = request.feedContent();
+        this.novelId = request.novelId();
+        this.isSpoiler = request.isSpoiler();
+        this.isPublic = request.isPublic();
         this.user = user;
     }
 
-    public static Feed create(String feedContent, Long novelId, Boolean isSpoiler, User user) {
-        return new Feed(feedContent, novelId, isSpoiler, user);
+    public static Feed create(FeedCreateRequest request, User user) {
+        return new Feed(request, user);
     }
 
-    public void updateFeed(String feedContent, Boolean isSpoiler, Long novelId) {
-        this.feedContent = feedContent;
-        this.isSpoiler = isSpoiler;
-        this.novelId = novelId;
+    public void updateFeed(FeedUpdateRequest request) {
+        this.feedContent = request.feedContent();
+        this.isSpoiler = request.isSpoiler();
+        this.isPublic = request.isPublic();
+        this.novelId = request.novelId();
         this.modifiedDate = LocalDateTime.now();
     }
 
@@ -100,6 +107,10 @@ public Long getWriterId() {
     }
 
     public boolean isMine(Long userId) {
-        return this.user.getUserId().equals(userId);
+        return this.getWriterId().equals(userId);
+    }
+
+    public boolean isVisibleTo(Long userId) {
+        return this.isPublic || this.isMine(userId);
     }
 }

src/main/java/org/websoso/WSSServer/dto/feed/FeedCreateRequest.java

@@ -10,11 +10,17 @@ public record FeedCreateRequest(
         @NotNull(message = "카테고리는 null일 수 없습니다.")
         @NotEmpty(message = "카테고리는 1개 이상 선택해야 합니다.")
         List<String> relevantCategories,
+
         @NotBlank(message = "피드 내용은 비어 있거나, 공백일 수 없습니다.")
         @Size(max = 2000, message = "피드 내용은 2000자를 초과할 수 없습니다.")
         String feedContent,
+
         Long novelId,
+
         @NotNull(message = "스포일러 여부는 null일 수 없습니다.")
-        Boolean isSpoiler
+        Boolean isSpoiler,
+
+        @NotNull(message = "공개 여부는 null일 수 없습니다.")
+        Boolean isPublic
 ) {
 }

src/main/java/org/websoso/WSSServer/dto/feed/FeedInfo.java

@@ -24,8 +24,8 @@ public record FeedInfo(
         List<String> relevantCategories,
         Boolean isSpoiler,
         Boolean isModified,
-        Boolean isMyFeed
-
+        Boolean isMyFeed,
+        Boolean isPublic
 ) {
     public static FeedInfo of(Feed feed, UserBasicInfo userBasicInfo, Novel novel, Boolean isLiked,
                               List<String> relevantCategories, Boolean isMyFeed) {
@@ -60,7 +60,8 @@ public static FeedInfo of(Feed feed, UserBasicInfo userBasicInfo, Novel novel, B
                 relevantCategories,
                 feed.getIsSpoiler(),
                 !feed.getCreatedDate().equals(feed.getModifiedDate()),
-                isMyFeed
+                isMyFeed,
+                feed.getIsPublic()
         );
     }
 

src/main/java/org/websoso/WSSServer/dto/feed/FeedUpdateRequest.java

@@ -10,11 +10,17 @@ public record FeedUpdateRequest(
         @NotNull(message = "카테고리는 null일 수 없습니다.")
         @NotEmpty(message = "카테고리는 1개 이상 선택해야 합니다.")
         List<String> relevantCategories,
+
         @NotBlank(message = "피드 내용은 비어 있거나, 공백일 수 없습니다.")
         @Size(max = 2000, message = "피드 내용은 2000자를 초과할 수 없습니다.")
         String feedContent,
+
         Long novelId,
+
         @NotNull(message = "스포일러 여부는 null일 수 없습니다.")
-        Boolean isSpoiler
+        Boolean isSpoiler,
+
+        @NotNull(message = "공개 여부는 null일 수 없습니다.")
+        Boolean isPublic
 ) {
 }

src/main/java/org/websoso/WSSServer/dto/feed/InterestFeedGetResponse.java

@@ -12,6 +12,7 @@ public record InterestFeedGetResponse(
         String novelImage,
         Float novelRating,
         Long novelRatingCount,
+        Boolean isPublic,
         String nickname,
         String avatarImage,
         String feedContent
@@ -27,6 +28,7 @@ public static InterestFeedGetResponse of(Novel novel, User user, Feed feed, Avat
                 novel.getNovelImage(),
                 novelRating,
                 novelRatingCount,
+                feed.getIsPublic(),
                 user.getNickname(),
                 avatar.getAvatarImage(),
                 feed.getFeedContent()

src/main/java/org/websoso/WSSServer/dto/feed/UserFeedGetResponse.java

@@ -23,7 +23,8 @@ public record UserFeedGetResponse(
         String title,
         Float novelRating,
         Long novelRatingCount,
-        List<String> relevantCategories
+        List<String> relevantCategories,
+        Boolean isPublic
 ) {
 
     public static UserFeedGetResponse of(Feed feed, Novel novel, Long visitorId) {
@@ -50,7 +51,8 @@ public static UserFeedGetResponse of(Feed feed, Novel novel, Long visitorId) {
                         null : novel.getTitle(),
                 novelRating,
                 novelRatingCount,
-                relevantCategories
+                relevantCategories,
+                feed.getIsPublic()
         );
     }
 

src/main/java/org/websoso/WSSServer/dto/popularFeed/PopularFeedGetResponse.java

@@ -7,7 +7,8 @@ public record PopularFeedGetResponse(
         String feedContent,
         Integer likeCount,
         Integer commentCount,
-        Boolean isSpoiler
+        Boolean isSpoiler,
+        Boolean isPublic
 ) {
 
     public static PopularFeedGetResponse of(PopularFeed popularFeed) {
@@ -16,7 +17,8 @@ public static PopularFeedGetResponse of(PopularFeed popularFeed) {
                 popularFeed.getFeed().getFeedContent(),
                 popularFeed.getFeed().getLikes().size(),
                 popularFeed.getFeed().getComments().size(),
-                popularFeed.getFeed().getIsSpoiler()
+                popularFeed.getFeed().getIsSpoiler(),
+                popularFeed.getFeed().getIsPublic()
         );
     }
 }

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

@@ -83,7 +83,7 @@ public class FeedService {
     public void createFeed(User user, FeedCreateRequest request) {
         Optional.ofNullable(request.novelId())
                 .ifPresent(novelService::getNovelOrException);
-        Feed feed = Feed.create(request.feedContent(), request.novelId(), request.isSpoiler(), user);
+        Feed feed = Feed.create(request, user);
         feedRepository.save(feed);
         feedCategoryService.createFeedCategory(feed, request.relevantCategories());
     }
@@ -94,7 +94,7 @@ public void updateFeed(Long feedId, FeedUpdateRequest request) {
         if (request.novelId() != null && feed.isNovelChanged(request.novelId())) {
             novelService.getNovelOrException(request.novelId());
         }
-        feed.updateFeed(request.feedContent(), request.isSpoiler(), request.novelId());
+        feed.updateFeed(request);
         feedCategoryService.updateFeedCategory(feed, request.relevantCategories());
     }
 
@@ -193,14 +193,25 @@ public FeedGetResponse getFeedById(User user, Long feedId) {
 
     @Transactional(readOnly = true)
     public FeedsGetResponse getFeeds(User user, String category, Long lastFeedId, int size) {
-        Slice<Feed> feeds = findFeedsByCategoryLabel(category == null ? DEFAULT_CATEGORY : category,
-                lastFeedId, user == null ? null : user.getUserId(), PageRequest.of(DEFAULT_PAGE_NUMBER, size));
+        Long userIdOrNull = Optional.ofNullable(user)
+                .map(User::getUserId)
+                .orElse(null);
 
-        List<FeedInfo> feedGetResponses = feeds.getContent().stream()
-                .map(feed -> createFeedInfo(feed, user)).toList();
+        Slice<Feed> feeds = findFeedsByCategoryLabel(getChosenCategoryOrDefault(category),
+                lastFeedId, userIdOrNull, PageRequest.of(DEFAULT_PAGE_NUMBER, size));
 
-        return FeedsGetResponse.of(category == null ? DEFAULT_CATEGORY : category, feeds.hasNext(),
-                feedGetResponses);
+        List<FeedInfo> feedGetResponses = feeds.getContent()
+                .stream()
+                .filter(feed -> feed.isVisibleTo(userIdOrNull))
+                .map(feed -> createFeedInfo(feed, user))
+                .toList();
+
+        return FeedsGetResponse.of(getChosenCategoryOrDefault(category), feeds.hasNext(), feedGetResponses);
+    }
+
+    private static String getChosenCategoryOrDefault(String category) {
+        return Optional.ofNullable(category)
+                .orElse(DEFAULT_CATEGORY);
     }
 
     public void createComment(User user, Long feedId, CommentCreateRequest request) {
@@ -322,6 +333,7 @@ public InterestFeedsGetResponse getInterestFeeds(User user) {
                 .collect(Collectors.toMap(Avatar::getAvatarId, avatar -> avatar));
 
         List<InterestFeedGetResponse> interestFeedGetResponses = interestFeeds.stream()
+                .filter(feed -> feed.isVisibleTo(user.getUserId()))
                 .map(feed -> {
                     Novel novel = novelMap.get(feed.getNovelId());
                     Avatar avatar = avatarMap.get(feed.getUser().getAvatarId());
@@ -332,14 +344,15 @@ public InterestFeedsGetResponse getInterestFeeds(User user) {
     }
 
     public NovelGetResponseFeedTab getFeedsByNovel(User user, Long novelId, Long lastFeedId, int size) {
-        Long userIdOrNull = user == null
-                ? null
-                : user.getUserId();
-
+        Long userIdOrNull = Optional.ofNullable(user)
+                .map(User::getUserId)
+                .orElse(null);
         Slice<Feed> feeds = feedRepository.findFeedsByNovelId(novelId, lastFeedId, userIdOrNull,
                 PageRequest.of(DEFAULT_PAGE_NUMBER, size));
 
-        List<FeedInfo> feedGetResponses = feeds.getContent().stream()
+        List<FeedInfo> feedGetResponses = feeds.getContent()
+                .stream()
+                .filter(feed -> feed.isVisibleTo(userIdOrNull))
                 .map(feed -> createFeedInfo(feed, user))
                 .toList();
 
@@ -349,28 +362,31 @@ public NovelGetResponseFeedTab getFeedsByNovel(User user, Long novelId, Long las
     @Transactional(readOnly = true)
     public UserFeedsGetResponse getUserFeeds(User visitor, Long ownerId, Long lastFeedId, int size) {
         User owner = userService.getUserOrException(ownerId);
-        Long visitorId = visitor == null
-                ? null
-                : visitor.getUserId();
+        Long visitorId = Optional.ofNullable(visitor)
+                .map(User::getUserId)
+                .orElse(null);
 
         if (owner.getIsProfilePublic() || isOwner(visitor, ownerId)) {
-            List<Feed> feedsByNoOffsetPagination =
-                    feedRepository.findFeedsByNoOffsetPagination(owner, lastFeedId, size);
+            List<Feed> feeds = feedRepository.findFeedsByNoOffsetPagination(owner, lastFeedId, size);
+
+            List<Feed> visibleFeeds = feeds.stream()
+                    .filter(feed -> feed.isVisibleTo(visitorId))
+                    .toList();
 
-            List<Long> novelIds = feedsByNoOffsetPagination.stream()
+            List<Long> novelIds = visibleFeeds.stream()
                     .map(Feed::getNovelId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
             Map<Long, Novel> novelMap = novelRepository.findAllById(novelIds)
                     .stream()
                     .collect(Collectors.toMap(Novel::getNovelId, novel -> novel));
 
-            List<UserFeedGetResponse> userFeedGetResponseList = feedsByNoOffsetPagination.stream()
+            List<UserFeedGetResponse> userFeedGetResponseList = visibleFeeds.stream()
                     .map(feed -> UserFeedGetResponse.of(feed, novelMap.get(feed.getNovelId()), visitorId))
                     .toList();
 
             // TODO Slice의 hasNext()로 판단하도록 수정
-            Boolean isLoadable = feedsByNoOffsetPagination.size() == size;
+            Boolean isLoadable = feeds.size() == size;
 
             return UserFeedsGetResponse.of(isLoadable, userFeedGetResponseList);
         }

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

@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.websoso.WSSServer.domain.Feed;
@@ -105,10 +104,17 @@ private String generateNotificationBodyFragment(Feed feed) {
 
     @Transactional(readOnly = true)
     public PopularFeedsGetResponse getPopularFeeds(User user) {
+        Long currentUserId = Optional.ofNullable(user)
+                .map(User::getUserId)
+                .orElse(null);
+
         List<PopularFeed> popularFeeds = Optional.ofNullable(user)
                 .map(u -> findPopularFeedsWithUser(u.getUserId()))
                 .orElseGet(this::findPopularFeedsWithoutUser);
-        List<PopularFeedGetResponse> popularFeedGetResponses = mapToPopularFeedGetResponseList(popularFeeds);
+
+        List<PopularFeedGetResponse> popularFeedGetResponses =
+                mapToPopularFeedGetResponseList(popularFeeds, currentUserId);
+
         return new PopularFeedsGetResponse(popularFeedGetResponses);
     }
 
@@ -120,8 +126,10 @@ private List<PopularFeed> findPopularFeedsWithoutUser() {
         return popularFeedRepository.findTop9ByOrderByPopularFeedIdDesc();
     }
 
-    private static List<PopularFeedGetResponse> mapToPopularFeedGetResponseList(List<PopularFeed> popularFeeds) {
+    private static List<PopularFeedGetResponse> mapToPopularFeedGetResponseList(List<PopularFeed> popularFeeds,
+                                                                                Long currentUserId) {
         return popularFeeds.stream()
+                .filter(pf -> pf.getFeed().isVisibleTo(currentUserId))
                 .map(PopularFeedGetResponse::of)
                 .toList();
     }