Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,30 @@
import java.util.List;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

public interface FollowRepository extends JpaRepository<Follow, Long> {
Optional<Follow> findByFollowerAndFollowing(User follower, User following);

List<Follow> findByFollower(User follower);

@Query(
"SELECT f FROM Follow f "
+ "JOIN FETCH f.following u "
+ "LEFT JOIN FETCH u.avatarList "
+ "WHERE f.follower = :follower")
List<Follow> findByFollowerWithFollowingAndAvatars(@Param("follower") User follower);

List<Follow> findByFollowing(User following);

@Query(
"SELECT f FROM Follow f "
+ "JOIN FETCH f.follower u "
+ "LEFT JOIN FETCH u.avatarList "
+ "WHERE f.following = :following")
List<Follow> findByFollowingWithFollowerAndAvatars(@Param("following") User following);

boolean existsByFollowerAndFollowing(User follower, User following);

void deleteByFollowerAndFollowing(User follower, User following);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ public List<FollowResponseDTO> getFollowers(Long userId) {
.orElseThrow(() -> new CustomApiException(ErrorCode.USER_NOT_FOUND, "사용자를 찾을 수 없습니다."));

List<User> userList =
followRepository.findByFollowing(user).stream().map(Follow::getFollower).toList();
followRepository.findByFollowingWithFollowerAndAvatars(user).stream()
.map(Follow::getFollower)
.toList();

return userList.stream()
.map(
Expand All @@ -109,8 +111,11 @@ public List<FollowResponseDTO> getFollowing(Long userId) {
userRepository
.findById(userId)
.orElseThrow(() -> new CustomApiException(ErrorCode.USER_NOT_FOUND, "사용자를 찾을 수 없습니다."));

List<User> userList =
followRepository.findByFollower(user).stream().map(Follow::getFollowing).toList();
followRepository.findByFollowerWithFollowingAndAvatars(user).stream()
.map(Follow::getFollowing)
.toList();

return userList.stream()
.map(
Expand Down
Loading