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.

Sign up for GitHub

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

Jump to bottom

[FIX] 유저 피드 조회 시 발생하는 NPE 해결 #189

Merged
merged 3 commits into from
Sep 18, 2024
Merged

[FIX] 유저 피드 조회 시 발생하는 NPE 해결 #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3a58e1
[STYLE] 코드 포맷팅
Kim-TaeUk Sep 17, 2024
35f50da
[FIX] novelIds 리스트 구할 때 null은 제외
Kim-TaeUk Sep 17, 2024
95b0d0c
[FIX] feed에 연결된 novel이 null일 때 발생하는 NPE 해결
Kim-TaeUk Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/main/java/org/websoso/WSSServer/dto/feed/UserFeedGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ public static UserFeedGetResponse of(Feed feed, Novel novel, Long visitorId) {
isLiked,
feed.getLikes().size(),
feed.getComments().size(),
novel.getNovelId(),
novel.getTitle(),
novel == null ?
null : novel.getNovelId(),
novel == null ?
null : novel.getTitle(),
novelRating,
novelRatingCount,
relevantCategories
Expand All @@ -69,21 +71,31 @@ private static List<Long> getLikeUsers(Feed feed) {
}

private static Long getNovelRatingCount(Novel novel) {
if (novel == null) {
return null;
}
return novel.getUserNovels()
.stream()
.filter(userNovel -> userNovel.getUserNovelRating() != 0.0f)
.count();
}

private static Float getNovelRatingSum(Novel novel) {
if (novel == null) {
return null;
}

return (float) novel.getUserNovels()
.stream()
.filter(userNovel -> userNovel.getUserNovelRating() != 0.0f)
.mapToDouble(UserNovel::getUserNovelRating)
.sum();
}

private static float getNovelRating(Novel novel, Long novelRatingCount) {
private static Float getNovelRating(Novel novel, Long novelRatingCount) {
if (novel == null) {
return null;
}
return novelRatingCount > 0
? getNovelRatingSum(novel) / novelRatingCount
: 0.0f;
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/websoso/WSSServer/service/FeedService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
Expand Down Expand Up @@ -333,11 +334,12 @@ public UserFeedsGetResponse getUserFeeds(User visitor, Long ownerId, Long lastFe
: visitor.getUserId();

if (owner.getIsProfilePublic() || isOwner(visitor, ownerId)) {
List<Feed> feedsByNoOffsetPagination = feedRepository.findFeedsByNoOffsetPagination(owner, lastFeedId,
size);
List<Feed> feedsByNoOffsetPagination =
feedRepository.findFeedsByNoOffsetPagination(owner, lastFeedId, size);

List<Long> novelIds = feedsByNoOffsetPagination.stream()
.map(Feed::getNovelId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
Map<Long, Novel> novelMap = novelRepository.findAllById(novelIds)
.stream()
Expand Down
Loading