Skip to content

Commit

Permalink
GETP-120 fix: 프로젝트 목록 조회의 필터링 적용 시 회원 ID를 비교하지 않던 오류 수정 (#163)
Browse files Browse the repository at this point in the history
  • Loading branch information
scv1702 authored Sep 24, 2024
1 parent 59cc17d commit 03c674a
Showing 1 changed file with 8 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,10 @@ class FindProjectAdapter extends QueryDslSupport implements FindProjectPort {
private final CountProjectApplicationPort countProjectApplicationPort;
private final ProjectPersistenceMapper mapper;

private BooleanExpression peopleMemberIdEq(final MemberId memberId) {
private BooleanExpression memberIdEq(final MemberId memberId) {
return Optional.ofNullable(memberId)
.map(MemberId::getValue)
.map(people.memberId::eq)
.orElse(null);
}

private BooleanExpression likeMemberIdEq(final MemberId memberId) {
return Optional.ofNullable(memberId)
.map(MemberId::getValue)
.map(people.memberId::eq)
.orElse(null);
}

private BooleanExpression clientMemberIdEq(final MemberId memberId) {
return Optional.ofNullable(memberId)
.map(MemberId::getValue)
.map(client.memberId::eq)
.map(member.id::eq)
.orElse(null);
}

Expand All @@ -82,16 +68,18 @@ private <T> JPAQuery<T> buildQuery(
if (filter.isApplied()) {
selectFrom.join(application).on(project.id.eq(application.projectId))
.join(people).on(application.applicantId.eq(people.id))
.where(peopleMemberIdEq(memberId));
.join(member).on(people.memberId.eq(member.id))
.where(memberIdEq(memberId));
}
if (filter.isLiked()) {
selectFrom.join(like).on(project.id.eq(like.projectId))
.join(member).on(likeMemberIdEq(memberId))
.where(like.projectId.eq(project.id));
.join(member).on(like.memberId.eq(member.id))
.where(memberIdEq(memberId));
}
if (filter.isCommissioned()) {
selectFrom.join(client).on(project.clientId.eq(client.id))
.where(clientMemberIdEq(memberId));
.join(member).on(client.memberId.eq(member.id))
.where(memberIdEq(memberId));
}
if (filter.isClosed()) {
selectFrom.where(project.status.eq(ProjectStatus.CANCELLED));
Expand Down

0 comments on commit 03c674a

Please sign in to comment.