Type: 피드 목록 조회 시 좋아요 개수, 여부 반환 (#78)

Feature/78 get feed like
Beach-Combine · Mar 16, 2023 · 71802c4 · 71802c4
2 parents f993d8c + bfdad0e
commit 71802c4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/beachcombine/backend/controller/FeedController.java b/src/main/java/beachcombine/backend/controller/FeedController.java
@@ -39,9 +39,9 @@ public ResponseEntity<IdResponse> saveFeed(@AuthenticationPrincipal PrincipalDet
 
     // 피드 목록 조회
     @GetMapping("")
-    public ResponseEntity<List<FeedResponse>> getFeedList() {
+    public ResponseEntity<List<FeedResponse>> getFeedList(@AuthenticationPrincipal PrincipalDetails userDetails) {
 
-        List<FeedResponse> response = feedService.getFeedList();
+        List<FeedResponse> response = feedService.getFeedList(userDetails.getMember().getId());
         return ResponseEntity.status(HttpStatus.OK).body(response);
     }
 

diff --git a/src/main/java/beachcombine/backend/dto/response/FeedResponse.java b/src/main/java/beachcombine/backend/dto/response/FeedResponse.java
@@ -18,4 +18,6 @@ public class FeedResponse {
     private String beforeImage;
     private String afterImage;
     private String beachName;
+    private boolean isPreferred;
+    private Long like;
 }
diff --git a/src/main/java/beachcombine/backend/repository/MemberPreferredFeedRepository.java b/src/main/java/beachcombine/backend/repository/MemberPreferredFeedRepository.java
@@ -9,4 +9,6 @@ public interface MemberPreferredFeedRepository extends JpaRepository<MemberPrefe
 
     Boolean existsByMemberAndFeed(Member member, Feed feed);
     void deleteByMemberAndFeed(Member member, Feed feed);
+
+    Long countByFeed(Feed feed);
 }
diff --git a/src/main/java/beachcombine/backend/service/FeedService.java b/src/main/java/beachcombine/backend/service/FeedService.java
@@ -8,6 +8,7 @@
 import beachcombine.backend.dto.request.FeedSaveRequest;
 import beachcombine.backend.dto.response.FeedResponse;
 import beachcombine.backend.repository.FeedRepository;
+import beachcombine.backend.repository.MemberPreferredFeedRepository;
 import beachcombine.backend.repository.MemberRepository;
 import beachcombine.backend.repository.RecordRepository;
 import lombok.RequiredArgsConstructor;
@@ -28,6 +29,7 @@ public class FeedService {
     private final RecordRepository recordRepository;
     private final ImageService imageService;
     private final MemberRepository memberRepository;
+    private final MemberPreferredFeedRepository memberPreferredFeedRepository;
 
     // 피드 기록하기
     public Long saveFeed(Long memberId, FeedSaveRequest request, Long recordId) {
@@ -69,7 +71,9 @@ public void deleteFeed(Long memberId, Long feedId) {
 
     // 피드 목록 조회
     @Transactional(readOnly = true)
-    public List<FeedResponse> getFeedList() {
+    public List<FeedResponse> getFeedList(Long memberId) {
+
+        Member findMember = getMemberOrThrow(memberId);
 
         List<Feed> findFeedList = feedRepository.findAllByOrderByCreatedDateDesc();
         List<FeedResponse> responseList = new ArrayList<>();
@@ -89,6 +93,8 @@ public List<FeedResponse> getFeedList() {
                     .beforeImage(beforeImageUrl)
                     .afterImage(afterImageUrl)
                     .beachName(record.getBeach().getName())
+                    .isPreferred(memberPreferredFeedRepository.existsByMemberAndFeed(findMember, feed))
+                    .like(memberPreferredFeedRepository.countByFeed(feed))
                     .build();
             responseList.add(feedResponse);
         }