Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public SharedNoteExploreGetResponse findExploreSharedNote(Member member, List<St

Map<Long, Long> viewcountMap = mapIdsAndViewcount(sharedNotes);
return SharedNoteExploreGetResponse.of(pages.getTotalElements(), sharedNotes, purchasedIds, likedNoteIds,
viewcountMap);
viewcountMap, member.getMemberId());
}

private Map<Long, Long> mapIdsAndViewcount(List<SharedNote> sharedNotes) {
Expand Down Expand Up @@ -181,7 +181,7 @@ private UserSharedNotesGetResponse getUserLikedSharedNotes(Member member, Limjan
sharedNotes.stream().map(SharedNote::getSharedNoteId).toList()));
Map<Long, Long> viewcountMap = mapIdsAndViewcount(sharedNotes);

return UserSharedNotesGetResponse.ofLiked(sharedNotes, purchasedIds, viewcountMap);
return UserSharedNotesGetResponse.ofLiked(sharedNotes, purchasedIds, viewcountMap, member.getMemberId());
}

@Transactional(readOnly = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ public record SharedNoteExploreGetResponse(
) {

public static SharedNoteExploreGetResponse of(long totalResults, List<SharedNote> sharedNotes,
Set<Long> isPurchaseMap, Set<Long> likedNotes, Map<Long, Long> viewCountMap
Set<Long> isPurchaseMap, Set<Long> likedNotes, Map<Long, Long> viewCountMap, long requestMemberId
) {
return new SharedNoteExploreGetResponse(totalResults,
sharedNotes.stream()
.map(it -> SharedNoteExploreResponse.of(
it,
it.getLimjang(),
isPurchaseMap.contains(it.getSharedNoteId()),
isPurchaseMap.contains(it.getSharedNoteId()) || it.getMember().getMemberId() == requestMemberId,
likedNotes.contains(it.getSharedNoteId()),
viewCountMap.get(it.getSharedNoteId()),
it.getMember()))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ public record UserSharedNotesGetResponse(
) {

public static UserSharedNotesGetResponse ofLiked(List<SharedNote> sharedNotes, Set<Long> isPurchaseMap,
Map<Long, Long> viewCountMap) {
Map<Long, Long> viewCountMap, long requestMemberId) {
return new UserSharedNotesGetResponse(sharedNotes.stream().map(it -> UsersSharedNoteResponse.of(
it,
it.getLimjang(),
isPurchaseMap.contains(it.getSharedNoteId()),
isPurchaseMap.contains(it.getSharedNoteId()) || it.getMember().getMemberId() == requestMemberId,
true,
viewCountMap.get(it.getSharedNoteId()),
it.getMember()
Expand All @@ -33,7 +33,7 @@ public static UserSharedNotesGetResponse ofShared(Member member, List<SharedNote
return new UserSharedNotesGetResponse(sharedNotes.stream().map(it -> UsersSharedNoteResponse.of(
it,
it.getLimjang(),
false,
true,
likedNotes.contains(it.getSharedNoteId()),
viewCountMap.get(it.getSharedNoteId()),
member
Expand Down