Skip to content

Commit 4eede06

Browse files
authored
#244 [refactor] 사용자 참여 중인 챌린지, 갯수 조회 조건 수정 (#245)
1 parent 4c914e1 commit 4eede06

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/main/kotlin/com/photi/server/domain/user/custom/UserCustomRepositoryImpl.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.photi.server.domain.user.custom
22

3+
import com.photi.server.domain.base.ServiceStatus.ACTIVE
34
import com.photi.server.domain.base.ServiceStatus.END
45
import com.photi.server.domain.challenge.ChallengeMemberStatus
56
import com.photi.server.domain.challenge.ChallengeMemberStatus.PROGRESS
@@ -108,7 +109,11 @@ class UserCustomRepositoryImpl(
108109
.select(challengeMember.count())
109110
.from(challengeMember)
110111
.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+
)
112117
.fetchOne()?.toInt() ?: 0
113118

114119
return queryFactory
@@ -250,7 +255,11 @@ class UserCustomRepositoryImpl(
250255
.from(challengeMember)
251256
.join(challengeMember.challenge)
252257
.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+
)
254263
.orderBy(challengeMember.challenge.proveTime.asc())
255264
.offset(pageable.offset)
256265
.limit(pageSize + 1L)

0 commit comments

Comments
 (0)