|
1 | 1 | package com.photi.server.domain.user.custom |
2 | 2 |
|
| 3 | +import com.photi.server.domain.base.ServiceStatus.ACTIVE |
3 | 4 | import com.photi.server.domain.base.ServiceStatus.END |
4 | 5 | import com.photi.server.domain.challenge.ChallengeMemberStatus |
5 | 6 | import com.photi.server.domain.challenge.ChallengeMemberStatus.PROGRESS |
@@ -108,7 +109,11 @@ class UserCustomRepositoryImpl( |
108 | 109 | .select(challengeMember.count()) |
109 | 110 | .from(challengeMember) |
110 | 111 | .join(challengeMember.user) |
111 | | - .where(challengeMember.user.id.eq(userId), eqChallengeMemberStatus(PROGRESS)) |
| 112 | + .where( |
| 113 | + challengeMember.user.id.eq(userId), |
| 114 | + eqChallengeMemberStatus(PROGRESS), |
| 115 | + challengeMember.challenge.serviceStatus.eq(ACTIVE), |
| 116 | + ) |
112 | 117 | .fetchOne()?.toInt() ?: 0 |
113 | 118 |
|
114 | 119 | return queryFactory |
@@ -250,7 +255,11 @@ class UserCustomRepositoryImpl( |
250 | 255 | .from(challengeMember) |
251 | 256 | .join(challengeMember.challenge) |
252 | 257 | .join(challengeMember.user) |
253 | | - .where(challengeMember.user.id.eq(userId), eqChallengeMemberStatus(PROGRESS)) |
| 258 | + .where( |
| 259 | + challengeMember.user.id.eq(userId), |
| 260 | + eqChallengeMemberStatus(PROGRESS), |
| 261 | + challengeMember.challenge.serviceStatus.eq(ACTIVE), |
| 262 | + ) |
254 | 263 | .orderBy(challengeMember.challenge.proveTime.asc()) |
255 | 264 | .offset(pageable.offset) |
256 | 265 | .limit(pageSize + 1L) |
|
0 commit comments