[feat/#137] 기록에 좋아요한 유저 목록을 조회

clokey-api/src/main/java/org/clokey/domain/like/controller/LikeController.java

@@ -6,6 +6,7 @@
 import lombok.RequiredArgsConstructor;
 import org.clokey.code.GlobalBaseSuccessCode;
 import org.clokey.domain.like.dto.response.LikedHistoriesResponse;
+import org.clokey.domain.like.dto.response.LikedMembersResponse;
 import org.clokey.domain.like.service.LikeService;
 import org.clokey.global.annotation.PageSize;
 import org.clokey.response.BaseResponse;
@@ -26,8 +27,27 @@ public class LikeController {
 
     private final LikeService likeService;
 
+    @GetMapping("/users")
+    @Operation(
+            operationId = "Like_getLikedMembers",
+            summary = "좋아요한 유저 조회",
+            description = "내 기록을 좋아요한 유저를 조회합니다")
+    public BaseResponse<SliceResponse<LikedMembersResponse.LikedMemberPreview>> getLikedMembers(
+            @Parameter(description = "기록 ID") @RequestParam Long historyId,
+            @Parameter(description = "이전 페이지의 좋아요 ID (첫 요청 시 생략)") @RequestParam(required = false)
+                    Long lastLikeId,
+            @Parameter(description = "페이지당 조회할 개수") @RequestParam @PageSize Integer size) {
+        SliceResponse<LikedMembersResponse.LikedMemberPreview> response =
+                likeService.getLikedMembers(historyId, lastLikeId, size);
+
+        return BaseResponse.onSuccess(GlobalBaseSuccessCode.OK, response);
+    }
+
     @GetMapping("/histories")
-    @Operation(summary = "좋아요한 기록 조회", description = "사용자가 좋아요한 기록을 조회합니다.")
+    @Operation(
+            operationId = "Like_getLikedHistories",
+            summary = "좋아요한 기록 조회",
+            description = "사용자가 좋아요한 기록을 조회합니다.")
     public BaseResponse<SliceResponse<LikedHistoriesResponse.LikedHistoryPreview>>
             getLikedHistories(
                     @Parameter(description = "이전 페이지의 좋아요 ID (첫 요청 시 생략)")

clokey-api/src/main/java/org/clokey/domain/like/dto/response/LikedMembersResponse.java

@@ -0,0 +1,18 @@
+package org.clokey.domain.like.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+
+@Schema(description = "좋아요 유저 조회 결과")
+public record LikedMembersResponse(
+        @Schema(description = "유저 미리보기 목록") List<LikedMemberPreview> memberPreviews,
+        @Schema(description = "마지막 페이지 여부", example = "false") boolean isLast) {
+
+    @Schema(description = "유저 미리보기 DTO")
+    public record LikedMemberPreview(
+            @Schema(description = "유저 ID", example = "30") Long id,
+            @Schema(description = "클로키 ID", example = "@Clokey_USER1") String codiveId,
+            @Schema(description = "프로필 이미지 URL") String imageUrl,
+            @Schema(description = "닉네임") String nickname,
+            @Schema(description = "팔로우 여부") boolean followStatus) {}
+}

clokey-api/src/main/java/org/clokey/domain/like/repository/MemberLikeRepository.java

@@ -9,11 +9,8 @@
 
 public interface MemberLikeRepository extends JpaRepository<MemberLike, Long> {
 
-<<<<<<< HEAD
-=======
     long countByHistoryId(Long historyId);
 
->>>>>>> 707263d5afbbd10030259d946f7748710380a71c
     @Query(
             """
         SELECT ml
@@ -24,8 +21,6 @@ public interface MemberLikeRepository extends JpaRepository<MemberLike, Long> {
         """)
     List<MemberLike> findLikedHistoriesByMemberId(
             Long memberId, Long lastLikeId, Pageable pageable);
-<<<<<<< HEAD
-=======
 
     @Query(
             """
@@ -38,5 +33,4 @@ List<MemberLike> findLikedHistoriesByMemberId(
     List<MemberLike> findLikeMembersByHistoryId(Long historyId, Long lastLikeId, Pageable pageable);
 
     Optional<MemberLike> findByMemberIdAndHistoryId(Long memberId, Long historyId);
->>>>>>> 707263d5afbbd10030259d946f7748710380a71c
 }

clokey-api/src/main/java/org/clokey/domain/like/service/LikeService.java

@@ -1,9 +1,13 @@
 package org.clokey.domain.like.service;
 
 import org.clokey.domain.like.dto.response.LikedHistoriesResponse;
+import org.clokey.domain.like.dto.response.LikedMembersResponse;
 import org.clokey.response.SliceResponse;
 
 public interface LikeService {
+    SliceResponse<LikedMembersResponse.LikedMemberPreview> getLikedMembers(
+            Long historyId, Long lastLikedId, Integer size);
+
     SliceResponse<LikedHistoriesResponse.LikedHistoryPreview> getLikedHistories(
             Long lastLikedId, Integer size);
 

clokey-api/src/main/java/org/clokey/domain/like/service/LikeServiceImpl.java

@@ -1,16 +1,20 @@
 package org.clokey.domain.like.service;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.clokey.domain.history.exception.HistoryErrorCode;
 import org.clokey.domain.history.repository.HistoryImageRepository;
 import org.clokey.domain.history.repository.HistoryRepository;
 import org.clokey.domain.like.dto.response.LikedHistoriesResponse;
+import org.clokey.domain.like.dto.response.LikedMembersResponse;
 import org.clokey.domain.like.repository.MemberLikeRepository;
 import org.clokey.domain.member.repository.BlockRepository;
+import org.clokey.domain.member.repository.FollowRepository;
 import org.clokey.exception.BaseCustomException;
 import org.clokey.global.util.MemberUtil;
 import org.clokey.history.entity.History;
@@ -19,6 +23,7 @@
 import org.clokey.response.SliceResponse;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -32,6 +37,7 @@ public class LikeServiceImpl implements LikeService {
     private final HistoryImageRepository historyImageRepository;
     private final HistoryRepository historyRepository;
     private final BlockRepository blockRepository;
+    private final FollowRepository followRepository;
 
     @Override
     public SliceResponse<LikedHistoriesResponse.LikedHistoryPreview> getLikedHistories(
@@ -115,4 +121,46 @@ private boolean isBlockedByOrBlocking(Long fromId, Long toId) {
                 fromId, toId,
                 toId, fromId);
     }
+
+    @Override
+    public SliceResponse<LikedMembersResponse.LikedMemberPreview> getLikedMembers(
+            Long historyId, Long lastLikeId, Integer size) {
+
+        Member currentMember = memberUtil.getCurrentMember();
+        Pageable pageable = PageRequest.of(0, size + 1, Sort.by(Sort.Direction.DESC, "id"));
+
+        List<MemberLike> likes =
+                memberLikeRepository.findLikeMembersByHistoryId(historyId, lastLikeId, pageable);
+
+        boolean isLast = likes.size() <= size;
+
+        if (!isLast) {
+            likes = likes.subList(0, size);
+        }
+
+        if (likes.isEmpty()) {
+            return new SliceResponse<>(List.of(), true);
+        }
+
+        List<Member> members = likes.stream().map(MemberLike::getMember).toList();
+        List<Long> memberIds = members.stream().map(Member::getId).toList();
+
+        Set<Long> followedIdSet =
+                new HashSet<>(
+                        followRepository.findFollowedMemberIds(currentMember.getId(), memberIds));
+
+        List<LikedMembersResponse.LikedMemberPreview> previews =
+                members.stream()
+                        .map(
+                                member ->
+                                        new LikedMembersResponse.LikedMemberPreview(
+                                                member.getId(),
+                                                member.getClokeyId(),
+                                                member.getProfileImageUrl(),
+                                                member.getNickname(),
+                                                followedIdSet.contains(member.getId())))
+                        .toList();
+
+        return new SliceResponse<>(previews, isLast);
+    }
 }

clokey-api/src/main/java/org/clokey/domain/member/repository/FollowRepository.java

@@ -1,12 +1,23 @@
 package org.clokey.domain.member.repository;
 
+import java.util.List;
 import java.util.Optional;
 import org.clokey.member.entity.Follow;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface FollowRepository extends JpaRepository<Follow, Long>, FollowRepositoryCustom {
 
     boolean existsByFollowFrom_IdAndFollowTo_Id(Long fromMemberId, Long toMemberId);
 
+    @Query(
+            """
+    SELECT f.followTo.id
+    FROM Follow f
+    WHERE f.followFrom.id = :fromMemberId
+      AND f.followTo.id IN :toMemberIds
+""")
+    List<Long> findFollowedMemberIds(Long fromMemberId, List<Long> toMemberIds);
+
     Optional<Follow> findByFollowFrom_IdAndFollowTo_Id(Long fromMemberId, Long toMemberId);
 }

clokey-api/src/test/java/org/clokey/domain/like/controller/LikeControllerTest.java

@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.List;
 import org.clokey.domain.like.dto.response.LikedHistoriesResponse;
+import org.clokey.domain.like.dto.response.LikedMembersResponse;
 import org.clokey.domain.like.service.LikeService;
 import org.clokey.response.SliceResponse;
 import org.junit.jupiter.api.Nested;
@@ -130,4 +131,94 @@ class 좋아요한_기록_조회_시 {
                     .andExpect(jsonPath("$.result.isLast").value(false));
         }
     }
+
+    @Nested
+    class 좋아요한_유저_조회_시 {
+        @Test
+        void 유효한_요청이면_좋아요한_유저를_반환한다() throws Exception {
+            // given
+            List<LikedMembersResponse.LikedMemberPreview> previews =
+                    List.of(
+                            new LikedMembersResponse.LikedMemberPreview(
+                                    1L, "codive1", "https://img.com/img1.jpg", "nickname1", true),
+                            new LikedMembersResponse.LikedMemberPreview(
+                                    2L, "codive2", "https://img.com/img2.jpg", "nickname2", false));
+
+            SliceResponse<LikedMembersResponse.LikedMemberPreview> sliceResponse =
+                    new SliceResponse<>(previews, true);
+
+            given(likeService.getLikedMembers(any(), any(), anyInt())).willReturn(sliceResponse);
+
+            ResultActions perform =
+                    mockMvc.perform(
+                            get("/likes/users")
+                                    .param("historyId", "1")
+                                    .param("size", "10")
+                                    .contentType(MediaType.APPLICATION_JSON));
+
+            // then
+            perform.andExpect(status().isOk())
+                    .andExpect(jsonPath("$.code").value("COMMON200"))
+                    .andExpect(jsonPath("$.message").value("성공입니다."))
+                    .andExpect(jsonPath("$.result.content[0].id").value(1L))
+                    .andExpect(jsonPath("$.result.content[0].codiveId").value("codive1"))
+                    .andExpect(
+                            jsonPath("$.result.content[0].imageUrl")
+                                    .value("https://img.com/img1.jpg"))
+                    .andExpect(jsonPath("$.result.content[0].nickname").value("nickname1"))
+                    .andExpect(jsonPath("$.result.content[0].followStatus").value(true))
+                    .andExpect(jsonPath("$.result.content[1].id").value(2L))
+                    .andExpect(jsonPath("$.result.content[1].codiveId").value("codive2"))
+                    .andExpect(
+                            jsonPath("$.result.content[1].imageUrl")
+                                    .value("https://img.com/img2.jpg"))
+                    .andExpect(jsonPath("$.result.content[1].nickname").value("nickname2"))
+                    .andExpect(jsonPath("$.result.content[1].followStatus").value(false))
+                    .andExpect(jsonPath("$.result.isLast").value(true));
+        }
+
+        @Test
+        void 마지막_페이지가_아닌_경우_isLast를_false로_응답한다() throws Exception {
+            // given
+            List<LikedMembersResponse.LikedMemberPreview> previews =
+                    List.of(
+                            new LikedMembersResponse.LikedMemberPreview(
+                                    1L, "codive1", "https://img.com/img1.jpg", "nickname1", true),
+                            new LikedMembersResponse.LikedMemberPreview(
+                                    2L, "codive2", "https://img.com/img2.jpg", "nickname2", false));
+
+            SliceResponse<LikedMembersResponse.LikedMemberPreview> sliceResponse =
+                    new SliceResponse<>(previews, false);
+
+            given(likeService.getLikedMembers(any(), any(), anyInt())).willReturn(sliceResponse);
+
+            // when
+            ResultActions perform =
+                    mockMvc.perform(
+                            get("/likes/users")
+                                    .param("historyId", "1")
+                                    .param("size", "10")
+                                    .contentType(MediaType.APPLICATION_JSON));
+
+            // then
+            perform.andExpect(status().isOk())
+                    .andExpect(jsonPath("$.code").value("COMMON200"))
+                    .andExpect(jsonPath("$.message").value("성공입니다."))
+                    .andExpect(jsonPath("$.result.content[0].id").value(1L))
+                    .andExpect(jsonPath("$.result.content[0].codiveId").value("codive1"))
+                    .andExpect(
+                            jsonPath("$.result.content[0].imageUrl")
+                                    .value("https://img.com/img1.jpg"))
+                    .andExpect(jsonPath("$.result.content[0].nickname").value("nickname1"))
+                    .andExpect(jsonPath("$.result.content[0].followStatus").value(true))
+                    .andExpect(jsonPath("$.result.content[1].id").value(2L))
+                    .andExpect(jsonPath("$.result.content[1].codiveId").value("codive2"))
+                    .andExpect(
+                            jsonPath("$.result.content[1].imageUrl")
+                                    .value("https://img.com/img2.jpg"))
+                    .andExpect(jsonPath("$.result.content[1].nickname").value("nickname2"))
+                    .andExpect(jsonPath("$.result.content[1].followStatus").value(false))
+                    .andExpect(jsonPath("$.result.isLast").value(false));
+        }
+    }
 }