Skip to content

[deploy] 배포 #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dev2yup merged 1 commit into from
Mar 5, 2026
Merged

[deploy] 배포 #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions clokey-api/src/main/java/org/clokey/domain/member/dto/response/FollowMemberResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ public record FollowMemberResponse(
description = "팔로잉 or 팔로워의 PofileImageUrl",
example = "https://example.com/profile/john.jpg")
String profileImageUrl,
@Schema(description = "해당 멤버가 공개 계정인지?", example = "true") boolean isPublic,
@Schema(description = "요청자가 이 멤버를 팔로우하고 있는가?", example = "true") boolean isFollowingMember,
@Schema(description = "해당 멤버가 본인(요청자)인가?", example = "false") boolean isMe) {}
92 changes: 63 additions & 29 deletions clokey-api/src/main/java/org/clokey/domain/member/repository/FollowRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
import static org.clokey.member.entity.QFollow.follow;
import static org.clokey.member.entity.QMember.member;

import com.querydsl.core.types.Projections;
import com.querydsl.core.Tuple;
import com.querydsl.core.types.Expression;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.jpa.JPAExpressions;
import com.querydsl.jpa.impl.JPAQueryFactory;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.clokey.domain.member.dto.response.FollowMemberResponse;
import org.clokey.member.entity.QBlock;
import org.clokey.member.entity.QFollow;
import org.clokey.member.enums.Visibility;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.SliceImpl;
Expand All @@ -28,23 +31,25 @@ public class FollowRepositoryImpl implements FollowRepositoryCustom {
public Slice<FollowMemberResponse> findAllFollowingsByMemberId(
Long currentId, Long targetId, Long lastFollowId, Integer size) {
QFollow followSub = new QFollow("followSub");
BooleanExpression isFollowingExpression =
JPAExpressions.selectOne()
.from(followSub)
.where(
followSub.followFrom.id.eq(currentId),
followSub.followTo.id.eq(member.id))
.exists();
BooleanExpression isMeExpression = member.id.eq(currentId);

List<FollowMemberResponse> results =
List<Tuple> tuples =
queryFactory
.select(
Projections.constructor(
FollowMemberResponse.class,
follow.id,
member.id,
member.nickname,
member.profileImageUrl,
JPAExpressions.selectOne()
.from(followSub)
.where(
followSub.followFrom.id.eq(currentId),
followSub.followTo.id.eq(member.id))
.exists(),
member.id.eq(currentId)))
follow.id,
member.id,
member.nickname,
member.profileImageUrl,
member.visibility,
isFollowingExpression,
isMeExpression)
.from(follow)
.join(follow.followTo, member)
.where(
Expand All @@ -55,30 +60,35 @@ public Slice<FollowMemberResponse> findAllFollowingsByMemberId(
.orderBy(follow.id.desc())
.fetch();

List<FollowMemberResponse> results =
mapToFollowMemberResponses(tuples, isFollowingExpression, isMeExpression);

return checkLastPage(size, results);
}

@Override
public Slice<FollowMemberResponse> findAllFollowersByMemberId(
Long currentId, Long targetId, Long lastFollowId, Integer size) {
QFollow followSub = new QFollow("followSub");
BooleanExpression isFollowingExpression =
JPAExpressions.selectOne()
.from(followSub)
.where(
followSub.followFrom.id.eq(currentId),
followSub.followTo.id.eq(member.id))
.exists();
BooleanExpression isMeExpression = member.id.eq(currentId);

List<FollowMemberResponse> results =
List<Tuple> tuples =
queryFactory
.select(
Projections.constructor(
FollowMemberResponse.class,
follow.id,
member.id,
member.nickname,
member.profileImageUrl,
JPAExpressions.selectOne()
.from(followSub)
.where(
followSub.followFrom.id.eq(currentId),
followSub.followTo.id.eq(member.id))
.exists(),
member.id.eq(currentId)))
follow.id,
member.id,
member.nickname,
member.profileImageUrl,
member.visibility,
isFollowingExpression,
isMeExpression)
.from(follow)
.join(follow.followFrom, member)
.where(
Expand All @@ -89,9 +99,33 @@ public Slice<FollowMemberResponse> findAllFollowersByMemberId(
.orderBy(follow.id.desc())
.fetch();

List<FollowMemberResponse> results =
mapToFollowMemberResponses(tuples, isFollowingExpression, isMeExpression);

return checkLastPage(size, results);
}

private List<FollowMemberResponse> mapToFollowMemberResponses(
List<Tuple> tuples,
Expression<Boolean> isFollowingExpression,
Expression<Boolean> isMeExpression) {
List<FollowMemberResponse> responses = new ArrayList<>(tuples.size());

for (Tuple tuple : tuples) {
responses.add(
new FollowMemberResponse(
tuple.get(follow.id),
tuple.get(member.id),
tuple.get(member.nickname),
tuple.get(member.profileImageUrl),
Visibility.PUBLIC.equals(tuple.get(member.visibility)),
Boolean.TRUE.equals(tuple.get(isFollowingExpression)),
Boolean.TRUE.equals(tuple.get(isMeExpression))));
}

return responses;
}

private BooleanExpression blockFilter(Long currentId) {
QBlock blockCheck = new QBlock("blockCheck");

Expand Down
10 changes: 10 additions & 0 deletions clokey-api/src/test/java/org/clokey/domain/member/controller/MemberControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,13 +544,15 @@ class 팔로잉_팔로워_목록_조회_요청_시 {
2L,
"nickname1",
"https://img.example.com/bg.jpg",
true,
false,
false),
new FollowMemberResponse(
1L,
1L,
"nickname2",
"https://img.example2.com/bg.jpg",
false,
true,
false));

Expand All @@ -569,7 +571,9 @@ class 팔로잉_팔로워_목록_조회_요청_시 {
.andExpect(jsonPath("$.code").value("COMMON200"))
.andExpect(jsonPath("$.message").value("성공입니다."))
.andExpect(jsonPath("$.result.content[0].followId").value(2L))
.andExpect(jsonPath("$.result.content[0].isPublic").value(true))
.andExpect(jsonPath("$.result.content[1].followId").value(1L))
.andExpect(jsonPath("$.result.content[1].isPublic").value(false))
.andExpect(jsonPath("$.result.isLast").value(true));
}

Expand All @@ -584,13 +588,15 @@ class 팔로잉_팔로워_목록_조회_요청_시 {
"nickname2",
"https://img.example.com/bg.jpg",
false,
false,
false),
new FollowMemberResponse(
1L,
1L,
"nickname1",
"https://img.example2.com/bg.jpg",
true,
true,
true));

given(memberService.getFollows(1L, null, false, 5))
Expand All @@ -608,7 +614,9 @@ class 팔로잉_팔로워_목록_조회_요청_시 {
.andExpect(jsonPath("$.code").value("COMMON200"))
.andExpect(jsonPath("$.message").value("성공입니다."))
.andExpect(jsonPath("$.result.content[0].followId").value(2L))
.andExpect(jsonPath("$.result.content[0].isPublic").value(false))
.andExpect(jsonPath("$.result.content[1].followId").value(1L))
.andExpect(jsonPath("$.result.content[1].isPublic").value(true))
.andExpect(jsonPath("$.result.isLast").value(true));
}

Expand All @@ -623,6 +631,7 @@ class 팔로잉_팔로워_목록_조회_요청_시 {
"nickname1",
"https://img.example.com/bg.jpg",
true,
true,
false));

given(memberService.getFollows(1L, null, true, 1))
Expand All @@ -641,6 +650,7 @@ class 팔로잉_팔로워_목록_조회_요청_시 {
.andExpect(jsonPath("$.code").value("COMMON200"))
.andExpect(jsonPath("$.message").value("성공입니다."))
.andExpect(jsonPath("$.result.content[0].followId").value(2L))
.andExpect(jsonPath("$.result.content[0].isPublic").value(true))
.andExpect(jsonPath("$.result.isLast").value(false));
}

Expand Down
Loading