Skip to content

Commit 86126b0

Browse files
Merge pull request #441 from Juinjang/feat/#440
[feat/#440] 내가 공유한 임장의 경우에도 isPurchase true로 반환
2 parents e48226f + 78a329f commit 86126b0

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteQueryService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public SharedNoteExploreGetResponse findExploreSharedNote(Member member, List<St
107107

108108
Map<Long, Long> viewcountMap = mapIdsAndViewcount(sharedNotes);
109109
return SharedNoteExploreGetResponse.of(pages.getTotalElements(), sharedNotes, purchasedIds, likedNoteIds,
110-
viewcountMap);
110+
viewcountMap, member.getMemberId());
111111
}
112112

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

184-
return UserSharedNotesGetResponse.ofLiked(sharedNotes, purchasedIds, viewcountMap);
184+
return UserSharedNotesGetResponse.ofLiked(sharedNotes, purchasedIds, viewcountMap, member.getMemberId());
185185
}
186186

187187
@Transactional(readOnly = true)

src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteExploreGetResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ public record SharedNoteExploreGetResponse(
1717
) {
1818

1919
public static SharedNoteExploreGetResponse of(long totalResults, List<SharedNote> sharedNotes,
20-
Set<Long> isPurchaseMap, Set<Long> likedNotes, Map<Long, Long> viewCountMap
20+
Set<Long> isPurchaseMap, Set<Long> likedNotes, Map<Long, Long> viewCountMap, long requestMemberId
2121
) {
2222
return new SharedNoteExploreGetResponse(totalResults,
2323
sharedNotes.stream()
2424
.map(it -> SharedNoteExploreResponse.of(
2525
it,
2626
it.getLimjang(),
27-
isPurchaseMap.contains(it.getSharedNoteId()),
27+
isPurchaseMap.contains(it.getSharedNoteId()) || it.getMember().getMemberId() == requestMemberId,
2828
likedNotes.contains(it.getSharedNoteId()),
2929
viewCountMap.get(it.getSharedNoteId()),
3030
it.getMember()))

src/main/java/umc/th/juinjang/api/note/shared/service/response/UserSharedNotesGetResponse.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public record UserSharedNotesGetResponse(
1717
) {
1818

1919
public static UserSharedNotesGetResponse ofLiked(List<SharedNote> sharedNotes, Set<Long> isPurchaseMap,
20-
Map<Long, Long> viewCountMap) {
20+
Map<Long, Long> viewCountMap, long requestMemberId) {
2121
return new UserSharedNotesGetResponse(sharedNotes.stream().map(it -> UsersSharedNoteResponse.of(
2222
it,
2323
it.getLimjang(),
24-
isPurchaseMap.contains(it.getSharedNoteId()),
24+
isPurchaseMap.contains(it.getSharedNoteId()) || it.getMember().getMemberId() == requestMemberId,
2525
true,
2626
viewCountMap.get(it.getSharedNoteId()),
2727
it.getMember()
@@ -33,7 +33,7 @@ public static UserSharedNotesGetResponse ofShared(Member member, List<SharedNote
3333
return new UserSharedNotesGetResponse(sharedNotes.stream().map(it -> UsersSharedNoteResponse.of(
3434
it,
3535
it.getLimjang(),
36-
false,
36+
true,
3737
likedNotes.contains(it.getSharedNoteId()),
3838
viewCountMap.get(it.getSharedNoteId()),
3939
member

0 commit comments

Comments
 (0)