diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRepository.kt index 60f4e6b..f7bb09b 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRepository.kt @@ -26,7 +26,8 @@ class AdminCanQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : A can1.can, can1.rewardCan, can1.price, - can1.currency + can1.currency, + can1.price.stringValue() ) ) .from(can1) 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 c7f08a8..9ed5af7 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,24 +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, - can1.currency - ) - ) - .from(can1) - .where(can1.status.eq(status)) - .orderBy(can1.can.asc()) - .fetch() - } - override fun findAllByStatusAndCurrency(status: CanStatus, currency: String): List { return queryFactory .select( @@ -60,7 +41,8 @@ class CanQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : CanQue can1.can, can1.rewardCan, can1.price, - can1.currency + can1.currency, + can1.price.stringValue() ) ) .from(can1) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt index 9e3b692..bc82579 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt @@ -9,5 +9,6 @@ data class CanResponse @QueryProjection constructor( val can: Int, val rewardCan: Int, val price: BigDecimal, - val currency: String + val currency: String, + val priceStr: String )