feat: 좋아요 수 반환 및 피드 조회 기능 구현

# 변경점 👍
1. DiaryLikeCount 조회 쿼리 추가
2. 소셜 기능을 통한 다이어리 조회 시 응답에 likeCount 추가

# 비고 ✏
likeCount 조회의 경우 JPQL 쿼리 결과를 DiaryLikeCountDto list로 받아서 Map으로 변환하는 형식으로
사용했습니다

---------

Co-authored-by: jinwon1234 <[email protected]>

Author: sinsehwan

src/main/java/apptive/team5/diary/controller/DiaryController.java

@@ -1,10 +1,7 @@
 package apptive.team5.diary.controller;
 
 import apptive.team5.diary.domain.DiaryEntity;
-import apptive.team5.diary.dto.DiaryCreateRequest;
-import apptive.team5.diary.dto.DiaryResponseDto;
-import apptive.team5.diary.dto.DiaryUpdateRequestDto;
-import apptive.team5.diary.dto.UserDiaryResponseDto;
+import apptive.team5.diary.dto.*;
 import apptive.team5.diary.service.DiaryService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -36,7 +33,7 @@ public class DiaryController {
     private final DiaryService diaryService;
 
     @GetMapping("/my")
-    public ResponseEntity<Page<DiaryResponseDto>> getMyMusicDiary(
+    public ResponseEntity<Page<MyDiaryResponseDto>> getMyMusicDiary(
             @AuthenticationPrincipal
             Long userId,
             @RequestParam(defaultValue = "0")
@@ -45,7 +42,22 @@ public ResponseEntity<Page<DiaryResponseDto>> getMyMusicDiary(
             int size
     ) {
 
-        Page<DiaryResponseDto> response = diaryService.getMyDiaries(userId, PageRequest.of(page, size));
+        Page<MyDiaryResponseDto> response = diaryService.getMyDiaries(userId, PageRequest.of(page, size));
+
+        return ResponseEntity.status(HttpStatus.OK).body(response);
+    }
+
+    @GetMapping("/my/feeds")
+    public ResponseEntity<Page<FeedDiaryResponseDto>> getMyUserDiaryFeeds(
+            @AuthenticationPrincipal
+            Long userId,
+            @RequestParam(defaultValue = "0")
+            int page,
+            @RequestParam(defaultValue = "5")
+            int size
+    ) {
+
+        Page<FeedDiaryResponseDto> response = diaryService.getDiariesFeeds(userId, PageRequest.of(page, size));
 
         return ResponseEntity.status(HttpStatus.OK).body(response);
     }
@@ -66,15 +78,15 @@ public ResponseEntity<Page<UserDiaryResponseDto>> getUserDiaries(
     }
 
     @GetMapping("/my/calendar")
-    public ResponseEntity<List<DiaryResponseDto>> getMyDiariesByPeriod(
+    public ResponseEntity<List<MyDiaryResponseDto>> getMyDiariesByPeriod(
             @AuthenticationPrincipal
             Long userId,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
             LocalDate start,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
             LocalDate end
     ) {
-        List<DiaryResponseDto> response = diaryService.getMyDiariesByPeriod(userId, start, end);
+        List<MyDiaryResponseDto> response = diaryService.getMyDiariesByPeriod(userId, start, end);
         return ResponseEntity.status(HttpStatus.OK).body(response);
     }
 

src/main/java/apptive/team5/diary/domain/DiaryEntity.java

@@ -112,6 +112,10 @@ public boolean isScopeKillingPart() {
         return this.scope == DiaryScope.KILLING_PART;
     }
 
+    public boolean isScopePrivate() {
+        return this.scope == DiaryScope.PRIVATE;
+    }
+
     public void update(
             String musicTitle,
             String artist,

src/main/java/apptive/team5/diary/dto/DiaryLikeCountDto.java

@@ -0,0 +1,7 @@
+package apptive.team5.diary.dto;
+
+public record DiaryLikeCountDto (
+        Long diaryId,
+        Long likeCount
+) {
+}

src/main/java/apptive/team5/diary/dto/FeedDiaryResponseDto.java

@@ -0,0 +1,65 @@
+package apptive.team5.diary.dto;
+
+import apptive.team5.diary.domain.DiaryEntity;
+import apptive.team5.diary.domain.DiaryScope;
+import apptive.team5.global.exception.BadRequestException;
+import apptive.team5.global.exception.ExceptionCode;
+import apptive.team5.global.util.S3Util;
+import apptive.team5.user.domain.UserEntity;
+
+import java.time.LocalDateTime;
+
+public record FeedDiaryResponseDto(
+        Long diaryId,
+        String artist,
+        String musicTitle,
+        String albumImageUrl,
+        String content,
+        String videoUrl,
+        DiaryScope scope,
+        String duration,
+        String start,
+        String end,
+        LocalDateTime createDate,
+        LocalDateTime updateDate,
+        boolean isLiked,
+        Long likeCount,
+        Long userId,
+        String username,
+        String tag,
+        String profileImageUrl
+) {
+
+    public static String defaultContentMsg = "비공개 일기입니다.";
+    public static FeedDiaryResponseDto from(DiaryEntity diary, boolean isLiked, Long likeCount, Long currentUserId, UserEntity user) {
+        String contentResponse = diary.getContent();
+
+        if (!diary.isMyDiary(currentUserId) && diary.isScopeKillingPart()) {
+            contentResponse = defaultContentMsg;
+        }
+
+        if (!diary.isMyDiary(currentUserId) && diary.isScopePrivate())
+            throw new BadRequestException(ExceptionCode.ACCESS_DENIED_DIARY.getDescription());
+
+        return new FeedDiaryResponseDto(
+                diary.getId(),
+                diary.getArtist(),
+                diary.getMusicTitle(),
+                diary.getAlbumImageUrl(),
+                contentResponse,
+                diary.getVideoUrl(),
+                diary.getScope(),
+                diary.getDuration(),
+                diary.getStart(),
+                diary.getEnd(),
+                diary.getCreateDateTime(),
+                diary.getUpdateDateTime(),
+                isLiked,
+                likeCount,
+                user.getId(),
+                user.getUsername(),
+                user.getTag(),
+                S3Util.s3Url + user.getProfileImage()
+        );
+    }
+}

…ve/team5/diary/dto/DiaryResponseDto.java …/team5/diary/dto/MyDiaryResponseDto.javasrc/main/java/apptive/team5/diary/dto/DiaryResponseDto.java renamed to src/main/java/apptive/team5/diary/dto/MyDiaryResponseDto.java src/main/java/apptive/team5/diary/dto/DiaryResponseDto.java renamed to src/main/java/apptive/team5/diary/dto/MyDiaryResponseDto.java

@@ -5,7 +5,7 @@
 import apptive.team5.diary.domain.DiaryScope;
 import java.time.LocalDateTime;
 
-public record DiaryResponseDto(
+public record MyDiaryResponseDto(
         String artist,
         String musicTitle,
         String albumImageUrl,
@@ -18,8 +18,8 @@ public record DiaryResponseDto(
         LocalDateTime createDate,
         LocalDateTime updateDate
 ) {
-    public static DiaryResponseDto from(DiaryEntity diary) {
-        return new DiaryResponseDto(
+    public static MyDiaryResponseDto from(DiaryEntity diary) {
+        return new MyDiaryResponseDto(
                 diary.getArtist(),
                 diary.getMusicTitle(),
                 diary.getAlbumImageUrl(),

src/main/java/apptive/team5/diary/dto/UserDiaryResponseDto.java

@@ -2,7 +2,8 @@
 
 import apptive.team5.diary.domain.DiaryEntity;
 import apptive.team5.diary.domain.DiaryScope;
-import apptive.team5.user.domain.UserEntity;
+import apptive.team5.global.exception.BadRequestException;
+import apptive.team5.global.exception.ExceptionCode;
 
 import java.time.LocalDateTime;
 
@@ -19,17 +20,20 @@ public record UserDiaryResponseDto(
         String end,
         LocalDateTime createDate,
         LocalDateTime updateDate,
-        boolean isLiked
+        boolean isLiked,
+        Long likeCount
 ) {
     public static String defaultContentMsg = "비공개 일기입니다.";
-    public static UserDiaryResponseDto from(DiaryEntity diary, boolean isLiked, Long currentUserId) {
+    public static UserDiaryResponseDto from(DiaryEntity diary, boolean isLiked, Long likeCount, Long currentUserId) {
         String contentResponse = diary.getContent();
 
-        if (!diary.isMyDiary(currentUserId) &&
-            diary.isScopeKillingPart()) {
+        if (!diary.isMyDiary(currentUserId) && diary.isScopeKillingPart()) {
             contentResponse = defaultContentMsg;
         }
 
+        if (!diary.isMyDiary(currentUserId) && diary.isScopePrivate())
+            throw new BadRequestException(ExceptionCode.ACCESS_DENIED_DIARY.getDescription());
+
         return new UserDiaryResponseDto(
                 diary.getId(),
                 diary.getArtist(),
@@ -43,7 +47,8 @@ public static UserDiaryResponseDto from(DiaryEntity diary, boolean isLiked, Long
                 diary.getEnd(),
                 diary.getCreateDateTime(),
                 diary.getUpdateDateTime(),
-                isLiked
+                isLiked,
+                likeCount
         );
     }
 }

src/main/java/apptive/team5/diary/repository/DiaryLikeRepository.java

@@ -2,6 +2,7 @@
 
 import apptive.team5.diary.domain.DiaryEntity;
 import apptive.team5.diary.domain.DiaryLikeEntity;
+import apptive.team5.diary.dto.DiaryLikeCountDto;
 import apptive.team5.user.domain.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
@@ -31,6 +32,14 @@ Set<Long> findLikedDiaryIdsByUser(
             List<Long> diaryIds
     );
 
+    @Query("""
+            SELECT new apptive.team5.diary.dto.DiaryLikeCountDto(dl.diary.id, COUNT(dl.id))
+            FROM DiaryLikeEntity dl
+            WHERE dl.diary.id IN :diaryIds
+            GROUP BY dl.diary.id
+    """)
+    List<DiaryLikeCountDto> findLikeCountsByDiaryIds(@Param("diaryIds") List<Long> diaryIds);
+
     @Modifying(clearAutomatically = true)
     @Query("""
             DELETE FROM DiaryLikeEntity dl

src/main/java/apptive/team5/diary/repository/DiaryRepository.java

@@ -11,6 +11,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
 
 public interface DiaryRepository extends JpaRepository<DiaryEntity, Long> {
     Page<DiaryEntity> findByUser(UserEntity user, Pageable pageable);
@@ -27,4 +28,10 @@ public interface DiaryRepository extends JpaRepository<DiaryEntity, Long> {
     @Query("delete from DiaryEntity d where d.user.id = :userId")
     @Modifying(clearAutomatically = true)
     void deleteByUserId(Long userId);
+
+    @Query("select d from DiaryEntity d where d.user.id in :userIds")
+    Page<DiaryEntity> findByUserIdsPage(Set<Long> userIds, Pageable pageable);
+
+    @Query("select d from DiaryEntity d join fetch d.user where d.user.id in :userIds and d.scope in :scopes")
+    Page<DiaryEntity> findByUserIdsAndScopseWithUserPage(Set<Long> userIds, List<DiaryScope> scopes, Pageable pageable);
 }

src/main/java/apptive/team5/diary/service/DiaryLikeLowService.java

@@ -2,6 +2,7 @@
 
 import apptive.team5.diary.domain.DiaryEntity;
 import apptive.team5.diary.domain.DiaryLikeEntity;
+import apptive.team5.diary.dto.DiaryLikeCountDto;
 import apptive.team5.diary.repository.DiaryLikeRepository;
 import apptive.team5.global.exception.ExceptionCode;
 import apptive.team5.global.exception.NotFoundEntityException;
@@ -11,7 +12,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -39,6 +42,21 @@ public Set<Long> findLikedDiaryIdsByUser(Long currentUserId, List<Long> diaryIds
         return diaryLikeRepository.findLikedDiaryIdsByUser(currentUserId, diaryIds);
     }
 
+    @Transactional(readOnly = true)
+    public Map<Long, Long> findLikeCountsByDiaryIds(List<Long> diaryIds) {
+        if (diaryIds == null || diaryIds.isEmpty()) {
+            return Map.of();
+        }
+
+        return diaryLikeRepository.findLikeCountsByDiaryIds(diaryIds)
+                .stream()
+                .collect(Collectors.toMap(
+                        DiaryLikeCountDto::diaryId,
+                        DiaryLikeCountDto::likeCount,
+                        (a, b) -> a
+                ));
+    }
+
     public void deleteDiaryLike(DiaryLikeEntity diaryLike) {
         diaryLikeRepository.delete(diaryLike);
     }

src/main/java/apptive/team5/diary/service/DiaryLowService.java

@@ -15,6 +15,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
 
 @Service
 @RequiredArgsConstructor
@@ -76,4 +77,12 @@ public void deleteByUserId(Long userId) {
         diaryRepository.deleteByUserId(userId);
     }
 
+    public Page<DiaryEntity> findByUserIds(Set<Long> userIds, Pageable pageable) {
+        return diaryRepository.findByUserIdsPage(userIds, pageable);
+    }
+
+    public Page<DiaryEntity> findByUserIdsAndScopseWithUserPage(Set<Long> userIds, List<DiaryScope> scopes, Pageable pageable) {
+        return diaryRepository.findByUserIdsAndScopseWithUserPage(userIds, scopes, pageable);
+    }
+
 }