diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanRepository.kt index b66d609..fcc3f2f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanRepository.kt @@ -23,7 +23,6 @@ import org.springframework.stereotype.Repository interface CanRepository : JpaRepository, CanQueryRepository interface CanQueryRepository { - fun findAllByStatus(status: CanStatus): List fun findAllByStatusAndCurrency(status: CanStatus, currency: String): List fun getCanUseStatus(member: Member, pageable: Pageable): List fun getCanChargeStatus(member: Member, pageable: Pageable, container: String): List @@ -33,25 +32,6 @@ interface CanQueryRepository { @Repository class CanQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : CanQueryRepository { - override fun findAllByStatus(status: CanStatus): List { - return queryFactory - .select( - QCanResponse( - can1.id, - can1.title, - can1.can, - can1.rewardCan, - can1.price.intValue(), - can1.currency, - can1.price.stringValue() - ) - ) - .from(can1) - .where(can1.status.eq(status)) - .orderBy(can1.currency.asc(), can1.can.asc()) - .fetch() - } - override fun findAllByStatusAndCurrency(status: CanStatus, currency: String): List { return queryFactory .select( diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt index b399882..27ef531 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt @@ -17,7 +17,7 @@ class CanService(private val repository: CanRepository) { GeoCountry.KR -> "KRW" else -> "USD" } - return repository.findAllByStatus(status = CanStatus.SALE) + return repository.findAllByStatusAndCurrency(status = CanStatus.SALE, currency = currency) } fun getCanStatus(member: Member, container: String): GetCanStatusResponse {