Skip to content

fix: fix bug of read funding list from non-member WISH-461 #243

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
ChoiWheatley merged 1 commit into from
Mar 9, 2025
Merged

fix: fix bug of read funding list from non-member WISH-461 #243

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
49 changes: 27 additions & 22 deletions src/features/funding/funding.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,29 +105,34 @@ export class FundingService {
}
}
} else {
queryBuilder.where('funding.fundUser != :userId', {
userId: user.userId,
});
let friendIdsArray = [];

// 회원이 펀딩 목록을 조회하는 경우, 친구 목록 조회
if (user) {
queryBuilder.where('funding.fundUser != :userId', {
userId: user.userId,
});

const friendIds = await this.friendRepository
.createQueryBuilder('friend')
.where('friend.status = :status', { status: FriendStatus.Friend })
.andWhere(
new Brackets((qb) => {
qb.where('friend.userId = :userId', { userId }).orWhere(
'friend.friendId = :userId',
{ userId },
);
}),
)
.select(
'CASE WHEN friend.userId = :userId THEN friend.friendId ELSE friend.userId END',
'friendId',
)
.setParameter('userId', userId)
.getRawMany();

const friendIdsArray = friendIds.map((friend) => friend.friendId);
const friendIds = await this.friendRepository
.createQueryBuilder('friend')
.where('friend.status = :status', { status: FriendStatus.Friend })
.andWhere(
new Brackets((qb) => {
qb.where('friend.userId = :userId', { userId: user.userId }).orWhere(
'friend.friendId = :userId',
{ userId: user.userId },
);
}),
)
.select(
'CASE WHEN friend.userId = :userId THEN friend.friendId ELSE friend.userId END',
'friendId',
)
.setParameter('userId', userId)
.getRawMany();

friendIdsArray = friendIds.map((friend) => friend.friendId);
}

if (friendIdsArray.length > 0) {
// 친구 목록이 있는 경우
Expand Down