Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] 관심글 조회 API 케이스 분류 #183

Merged
merged 8 commits into from
Sep 12, 2024
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
package org.websoso.WSSServer.dto.feed;

import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;

import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;

public record InterestFeedsGetResponse(
List<InterestFeedGetResponse> recommendFeeds
List<InterestFeedGetResponse> recommendFeeds,

@JsonInclude(NON_NULL)
String message
) {

public static InterestFeedsGetResponse of(List<InterestFeedGetResponse> interestFeedGetResponses) {
return new InterestFeedsGetResponse(interestFeedGetResponses);
return new InterestFeedsGetResponse(interestFeedGetResponses, null);
}

public static InterestFeedsGetResponse of(List<InterestFeedGetResponse> interestFeedGetResponses, String message) {
return new InterestFeedsGetResponse(interestFeedGetResponses, message);
}
}
10 changes: 10 additions & 0 deletions src/main/java/org/websoso/WSSServer/service/FeedService.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import static org.websoso.WSSServer.exception.error.CustomUserError.PRIVATE_PROFILE_STATUS;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -269,12 +270,21 @@ public InterestFeedsGetResponse getInterestFeeds(User user) {
.map(UserNovel::getNovel)
.toList();

if (interestNovels.isEmpty()) {
return InterestFeedsGetResponse.of(Collections.emptyList(), "NO_INTEREST_NOVELS");
}

Map<Long, Novel> novelMap = interestNovels
.stream()
.collect(Collectors.toMap(Novel::getNovelId, novel -> novel));
List<Long> interestNovelIds = new ArrayList<>(novelMap.keySet());

List<Feed> interestFeeds = feedRepository.findTop10ByNovelIdInOrderByFeedIdDesc(interestNovelIds);

if (interestFeeds.isEmpty()) {
return InterestFeedsGetResponse.of(Collections.emptyList(), "NO_ASSOCIATED_FEEDS");
}

Set<Byte> avatarIds = interestFeeds.stream()
.map(feed -> feed.getUser().getAvatarId())
.collect(Collectors.toSet());
Expand Down
Loading