diff --git a/src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteQueryService.java b/src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteQueryService.java index 9f380a85..55a34169 100644 --- a/src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteQueryService.java +++ b/src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteQueryService.java @@ -107,7 +107,7 @@ public SharedNoteExploreGetResponse findExploreSharedNote(Member member, List viewcountMap = mapIdsAndViewcount(sharedNotes); return SharedNoteExploreGetResponse.of(pages.getTotalElements(), sharedNotes, purchasedIds, likedNoteIds, - viewcountMap); + viewcountMap, member.getMemberId()); } private Map mapIdsAndViewcount(List sharedNotes) { @@ -181,7 +181,7 @@ private UserSharedNotesGetResponse getUserLikedSharedNotes(Member member, Limjan sharedNotes.stream().map(SharedNote::getSharedNoteId).toList())); Map viewcountMap = mapIdsAndViewcount(sharedNotes); - return UserSharedNotesGetResponse.ofLiked(sharedNotes, purchasedIds, viewcountMap); + return UserSharedNotesGetResponse.ofLiked(sharedNotes, purchasedIds, viewcountMap, member.getMemberId()); } @Transactional(readOnly = true) diff --git a/src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteExploreGetResponse.java b/src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteExploreGetResponse.java index ccda4c34..70c3452a 100644 --- a/src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteExploreGetResponse.java +++ b/src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteExploreGetResponse.java @@ -17,14 +17,14 @@ public record SharedNoteExploreGetResponse( ) { public static SharedNoteExploreGetResponse of(long totalResults, List sharedNotes, - Set isPurchaseMap, Set likedNotes, Map viewCountMap + Set isPurchaseMap, Set likedNotes, Map 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())) diff --git a/src/main/java/umc/th/juinjang/api/note/shared/service/response/UserSharedNotesGetResponse.java b/src/main/java/umc/th/juinjang/api/note/shared/service/response/UserSharedNotesGetResponse.java index 0f539a07..133a90d4 100644 --- a/src/main/java/umc/th/juinjang/api/note/shared/service/response/UserSharedNotesGetResponse.java +++ b/src/main/java/umc/th/juinjang/api/note/shared/service/response/UserSharedNotesGetResponse.java @@ -17,11 +17,11 @@ public record UserSharedNotesGetResponse( ) { public static UserSharedNotesGetResponse ofLiked(List sharedNotes, Set isPurchaseMap, - Map viewCountMap) { + Map 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() @@ -33,7 +33,7 @@ public static UserSharedNotesGetResponse ofShared(Member member, List UsersSharedNoteResponse.of( it, it.getLimjang(), - false, + true, likedNotes.contains(it.getSharedNoteId()), viewCountMap.get(it.getSharedNoteId()), member