diff --git a/src/main/java/com/example/log4u/domain/follow/repository/FollowQuerydsl.java b/src/main/java/com/example/log4u/domain/follow/repository/FollowQuerydsl.java index 9a0f7f8..a362a01 100644 --- a/src/main/java/com/example/log4u/domain/follow/repository/FollowQuerydsl.java +++ b/src/main/java/com/example/log4u/domain/follow/repository/FollowQuerydsl.java @@ -25,13 +25,9 @@ public FollowQuerydsl() { super(Follow.class); } - private NumberPath getNumberPath(boolean isFollowTarget) { - return isFollowTarget ? follow.targetId : follow.initiatorId; - } - private BooleanBuilder getBooleanBuilder(boolean isFollowTarget, Long userId, Long cursorId, String keyword) { BooleanBuilder builder = new BooleanBuilder(); - NumberPath numberPath = getNumberPath(isFollowTarget); + NumberPath numberPath = isFollowTarget ? follow.targetId : follow.initiatorId; builder.and(numberPath.eq(userId)); @@ -50,15 +46,13 @@ private List getContent(boolean isFollowTarget, Long u String keyword) { BooleanBuilder builder = getBooleanBuilder(isFollowTarget, userId, cursorId, keyword); - NumberPath numberPath = getNumberPath(isFollowTarget); + NumberPath numberPath = isFollowTarget ? follow.targetId : follow.initiatorId; + NumberPath numberPath2 = isFollowTarget ? follow.initiatorId : follow.targetId; - return from(follow) - .innerJoin(user) + return from(follow).innerJoin(user) .on(user.userId.eq(numberPath)) - .select(Projections.constructor(UserThumbnailResponseDto.class, - numberPath, - user.nickname, - user.profileImage)) + .select( + Projections.constructor(UserThumbnailResponseDto.class, numberPath2, user.nickname, user.profileImage)) .where(builder) .distinct() .fetch();