src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt

@@ -5,7 +5,6 @@ import kr.co.bootpay.Bootpay
 import kr.co.vividnext.sodalive.can.CanRepository
 import kr.co.vividnext.sodalive.can.charge.event.ChargeSpringEvent
 import kr.co.vividnext.sodalive.can.coupon.CanCouponNumberRepository
-import kr.co.vividnext.sodalive.can.coupon.CouponType
 import kr.co.vividnext.sodalive.can.payment.Payment
 import kr.co.vividnext.sodalive.can.payment.PaymentGateway
 import kr.co.vividnext.sodalive.can.payment.PaymentStatus
@@ -13,11 +12,6 @@ import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.google.GooglePlayService
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRepository
-import kr.co.vividnext.sodalive.point.MemberPoint
-import kr.co.vividnext.sodalive.point.MemberPointRepository
-import kr.co.vividnext.sodalive.point.PointGrantLog
-import kr.co.vividnext.sodalive.point.PointGrantLogRepository
-import kr.co.vividnext.sodalive.useraction.ActionType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -33,7 +27,6 @@ import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.math.BigDecimal
 import java.math.RoundingMode
-import java.time.LocalDateTime
 
 @Service
 @Transactional(readOnly = true)
@@ -43,9 +36,6 @@ class ChargeService(
     private val memberRepository: MemberRepository,
     private val couponNumberRepository: CanCouponNumberRepository,
 
-    private val grantLogRepository: PointGrantLogRepository,
-    private val memberPointRepository: MemberPointRepository,
-
     private val objectMapper: ObjectMapper,
     private val okHttpClient: OkHttpClient,
     private val applicationEventPublisher: ApplicationEventPublisher,
@@ -67,63 +57,30 @@ class ChargeService(
 ) {
 
     @Transactional
-    fun chargeByCoupon(couponNumber: String, member: Member): String {
+    fun chargeByCoupon(couponNumber: String, member: Member) {
         val canCouponNumber = couponNumberRepository.findByCouponNumber(couponNumber = couponNumber)
             ?: throw SodaException("잘못된 쿠폰번호입니다.\n고객센터로 문의해 주시기 바랍니다.")
 
         if (canCouponNumber.member != null) {
             throw SodaException("이미 사용한 쿠폰번호 입니다.")
         }
+
         canCouponNumber.member = member
 
         val coupon = canCouponNumber.canCoupon!!
+        val couponCharge = Charge(0, coupon.can, status = ChargeStatus.COUPON)
+        couponCharge.title = "${coupon.can} 캔"
+        couponCharge.member = member
 
-        when (coupon.couponType) {
-            CouponType.CAN -> {
-                val couponCharge = Charge(0, coupon.can, status = ChargeStatus.COUPON)
-                couponCharge.title = "${coupon.can} 캔"
-                couponCharge.member = member
+        val payment = Payment(
+            status = PaymentStatus.COMPLETE,
+            paymentGateway = PaymentGateway.PG
+        )
+        payment.method = coupon.couponName
+        couponCharge.payment = payment
+        chargeRepository.save(couponCharge)
 
-                val payment = Payment(
-                    status = PaymentStatus.COMPLETE,
-                    paymentGateway = PaymentGateway.PG
-                )
-                payment.method = coupon.couponName
-                couponCharge.payment = payment
-                chargeRepository.save(couponCharge)
-
-                member.charge(0, coupon.can, "pg")
-                return "쿠폰 사용이 완료되었습니다.\n${coupon.can}캔이 지급되었습니다."
-            }
-
-            CouponType.POINT -> {
-                val memberId = member.id!!
-                val point = coupon.can
-                val actionType = ActionType.COUPON
-
-                grantLogRepository.save(
-                    PointGrantLog(
-                        memberId = memberId,
-                        point = point,
-                        actionType = actionType,
-                        policyId = null,
-                        orderId = null,
-                        couponName = coupon.couponName
-                    )
-                )
-
-                memberPointRepository.save(
-                    MemberPoint(
-                        memberId = memberId,
-                        point = point,
-                        actionType = actionType,
-                        expiresAt = LocalDateTime.now().plusDays(3)
-                    )
-                )
-
-                return "쿠폰 사용이 완료되었습니다.\n${coupon.can}포인트가 지급되었습니다."
-            }
-        }
+        member.charge(0, coupon.can, "pg")
     }
 
     @Transactional

src/main/kotlin/kr/co/vividnext/sodalive/can/coupon/CanCoupon.kt

@@ -3,21 +3,13 @@ package kr.co.vividnext.sodalive.can.coupon
 import kr.co.vividnext.sodalive.common.BaseEntity
 import java.time.LocalDateTime
 import javax.persistence.Entity
-import javax.persistence.EnumType
-import javax.persistence.Enumerated
 
 @Entity
 data class CanCoupon(
     val couponName: String,
-    @Enumerated(EnumType.STRING)
-    val couponType: CouponType,
     val can: Int,
     val couponCount: Int,
     var validity: LocalDateTime,
     var isActive: Boolean,
     var isMultipleUse: Boolean
 ) : BaseEntity()
-
-enum class CouponType {
-    CAN, POINT
-}

src/main/kotlin/kr/co/vividnext/sodalive/can/coupon/CanCouponController.kt

@@ -109,11 +109,11 @@ class CanCouponController(private val service: CanCouponService) {
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        val completeMessage = service.useCanCoupon(
-            couponNumber = request.couponNumber,
-            memberId = member.id!!
+        ApiResponse.ok(
+            service.useCanCoupon(
+                couponNumber = request.couponNumber,
+                memberId = member.id!!
+            )
         )
-
-        ApiResponse.ok(Unit, completeMessage)
     }
 }

src/main/kotlin/kr/co/vividnext/sodalive/can/coupon/CanCouponNumberRepository.kt

@@ -79,7 +79,6 @@ class CanCouponNumberQueryRepositoryImpl(private val queryFactory: JPAQueryFacto
     override fun findByCouponNumber(couponNumber: String): CanCouponNumber? {
         return queryFactory
             .selectFrom(canCouponNumber)
-            .innerJoin(canCouponNumber.canCoupon, canCoupon)
             .where(canCouponNumber.couponNumber.eq(couponNumber))
             .fetchFirst()
     }

src/main/kotlin/kr/co/vividnext/sodalive/can/coupon/CanCouponRepository.kt

@@ -1,6 +1,5 @@
 package kr.co.vividnext.sodalive.can.coupon
 
-import com.querydsl.core.types.dsl.CaseBuilder
 import com.querydsl.core.types.dsl.DateTimePath
 import com.querydsl.core.types.dsl.Expressions
 import com.querydsl.core.types.dsl.StringTemplate
@@ -31,9 +30,6 @@ class CanCouponQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) :
                 QGetCouponListItemResponse(
                     canCoupon.id,
                     canCoupon.couponName,
-                    CaseBuilder()
-                        .`when`(canCoupon.couponType.eq(CouponType.POINT)).then("포인트 쿠폰")
-                        .otherwise("캔 쿠폰"),
                     canCoupon.can,
                     canCoupon.couponCount,
                     Expressions.ZERO,

src/main/kotlin/kr/co/vividnext/sodalive/can/coupon/CanCouponService.kt

@@ -68,12 +68,15 @@ class CanCouponService(
 
     fun getCouponList(offset: Long, limit: Long): GetCouponListResponse {
         val totalCount = repository.getCouponTotalCount()
+
         val items = repository.getCouponList(offset = offset, limit = limit)
+            .asSequence()
             .map {
                 val useCouponCount = couponNumberRepository.getUseCouponCount(id = it.id)
                 it.useCouponCount = useCouponCount
                 it
             }
+            .toList()
 
         return GetCouponListResponse(totalCount, items)
     }
@@ -121,7 +124,7 @@ class CanCouponService(
         }
     }
 
-    fun useCanCoupon(couponNumber: String, memberId: Long): String {
+    fun useCanCoupon(couponNumber: String, memberId: Long) {
         val member = memberRepository.findByIdOrNull(id = memberId)
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
@@ -129,7 +132,7 @@ class CanCouponService(
 
         issueService.validateAvailableUseCoupon(couponNumber, memberId)
 
-        return chargeService.chargeByCoupon(couponNumber, member)
+        chargeService.chargeByCoupon(couponNumber, member)
     }
 
     private fun insertHyphens(input: String): String {

src/main/kotlin/kr/co/vividnext/sodalive/can/coupon/GenerateCanCouponRequest.kt

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class GenerateCanCouponRequest(
     @JsonProperty("couponName") val couponName: String,
-    @JsonProperty("couponType") val couponType: CouponType,
     @JsonProperty("can") val can: Int,
     @JsonProperty("validity") val validity: String,
     @JsonProperty("isMultipleUse") val isMultipleUse: Boolean,

src/main/kotlin/kr/co/vividnext/sodalive/can/coupon/GetCouponListResponse.kt

@@ -10,7 +10,6 @@ data class GetCouponListResponse(
 data class GetCouponListItemResponse @QueryProjection constructor(
     val id: Long,
     val couponName: String,
-    val couponType: String,
     val can: Int,
     val couponCount: Int,
     var useCouponCount: Int,

src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt

@@ -262,8 +262,7 @@ class AudioContentQueryRepositoryImpl(
                     audioContent.releaseDate.gt(LocalDateTime.now()),
                     Expressions.asBoolean(false),
                     Expressions.asBoolean(false),
-                    audioContent.remaining.loe(0),
-                    audioContent.isPointAvailable
+                    audioContent.remaining.loe(0)
                 )
             )
             .from(audioContent)
@@ -489,8 +488,7 @@ class AudioContentQueryRepositoryImpl(
                     member.profileImage.prepend("/").prepend(imageHost),
                     member.nickname,
                     audioContent.price,
-                    audioContent.duration,
-                    audioContent.isPointAvailable
+                    audioContent.duration
                 )
             )
             .from(audioContent)
@@ -559,8 +557,7 @@ class AudioContentQueryRepositoryImpl(
                     member.profileImage.prepend("/").prepend(imageHost),
                     member.nickname,
                     audioContent.price,
-                    audioContent.duration,
-                    audioContent.isPointAvailable
+                    audioContent.duration
                 )
             )
             .from(audioContent)
@@ -779,8 +776,7 @@ class AudioContentQueryRepositoryImpl(
                     member.profileImage.prepend("/").prepend(cloudfrontHost),
                     member.nickname,
                     audioContent.price,
-                    audioContent.duration,
-                    audioContent.isPointAvailable
+                    audioContent.duration
                 )
             )
             .from(audioContent)
@@ -900,8 +896,7 @@ class AudioContentQueryRepositoryImpl(
                         .prepend(imageHost),
                     member.nickname,
                     audioContent.price,
-                    audioContent.duration,
-                    audioContent.isPointAvailable
+                    audioContent.duration
                 )
             )
             .from(audioContent)
@@ -961,8 +956,7 @@ class AudioContentQueryRepositoryImpl(
                     member.profileImage.prepend("/").prepend(imageHost),
                     member.nickname,
                     audioContent.price,
-                    audioContent.duration,
-                    audioContent.isPointAvailable
+                    audioContent.duration
                 )
             )
             .from(audioContentCurationItem)
@@ -1024,7 +1018,6 @@ class AudioContentQueryRepositoryImpl(
                     audioContent.duration,
                     member.id,
                     member.nickname,
-                    audioContent.isPointAvailable,
                     member.profileImage.prepend("/").prepend(imageHost)
                 )
             )

src/main/kotlin/kr/co/vividnext/sodalive/content/GetAudioContentListResponse.kt

@@ -21,6 +21,5 @@ data class GetAudioContentListItem @QueryProjection constructor(
     val isScheduledToOpen: Boolean,
     var isRented: Boolean,
     var isOwned: Boolean,
-    var isSoldOut: Boolean,
-    val isPointAvailable: Boolean
+    var isSoldOut: Boolean
 )

src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainItem.kt

@@ -11,6 +11,5 @@ data class GetAudioContentMainItem @QueryProjection constructor(
     @JsonProperty("creatorProfileImageUrl") val creatorProfileImageUrl: String,
     @JsonProperty("creatorNickname") val creatorNickname: String,
     @JsonProperty("price") val price: Int,
-    @JsonProperty("duration") val duration: String,
-    @JsonProperty("isPointAvailable") val isPointAvailable: Boolean
+    @JsonProperty("duration") val duration: String
 )

src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentRanking.kt

@@ -18,6 +18,5 @@ data class GetAudioContentRankingItem @QueryProjection constructor(
     @JsonProperty("duration") val duration: String,
     @JsonProperty("creatorId") val creatorId: Long,
     @JsonProperty("creatorNickname") val creatorNickname: String,
-    @JsonProperty("isPointAvailable") val isPointAvailable: Boolean,
     @JsonProperty("creatorProfileImageUrl") val creatorProfileImageUrl: String
 )

src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt

@@ -94,8 +94,7 @@ class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFact
                     member.profileImage.prepend("/").prepend(cloudfrontHost),
                     member.nickname,
                     audioContent.price,
-                    audioContent.duration,
-                    audioContent.isPointAvailable
+                    audioContent.duration
                 )
             )
             .from(audioContent)

src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/ContentMainTabTagCurationRepository.kt

@@ -97,8 +97,7 @@ class ContentMainTabTagCurationRepository(
                     member.profileImage.prepend("/").prepend(imageHost),
                     member.nickname,
                     audioContent.price,
-                    audioContent.duration,
-                    audioContent.isPointAvailable
+                    audioContent.duration
                 )
             )
             .from(contentHashTagCurationItem)

src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt

@@ -210,8 +210,7 @@ class OrderQueryRepositoryImpl(
                         .prepend(coverImageHost),
                     member.nickname,
                     audioContent.price,
-                    audioContent.duration,
-                    audioContent.isPointAvailable
+                    audioContent.duration
                 )
             )
             .from(order)

src/main/kotlin/kr/co/vividnext/sodalive/content/series/content/ContentSeriesContentRepository.kt

@@ -124,8 +124,7 @@ class ContentSeriesContentQueryRepositoryImpl(
                     audioContent.duration,
                     audioContent.price,
                     Expressions.asBoolean(false),
-                    Expressions.asBoolean(false),
-                    audioContent.isPointAvailable
+                    Expressions.asBoolean(false)
                 )
             )
             .from(seriesContent)

src/main/kotlin/kr/co/vividnext/sodalive/content/series/content/GetSeriesContentListResponse.kt

@@ -15,6 +15,5 @@ data class GetSeriesContentListItem @QueryProjection constructor(
     val duration: String,
     val price: Int,
     var isRented: Boolean,
-    var isOwned: Boolean,
-    val isPointAvailable: Boolean
+    var isOwned: Boolean
 )

src/main/kotlin/kr/co/vividnext/sodalive/point/PointGrantLog.kt

@@ -13,6 +13,5 @@ data class PointGrantLog(
     @Enumerated(EnumType.STRING)
     val actionType: ActionType,
     val policyId: Long?,
-    val orderId: Long?,
-    val couponName: String? = null
+    val orderId: Long?
 ) : BaseEntity()

src/main/kotlin/kr/co/vividnext/sodalive/point/PointGrantLogRepository.kt

@@ -63,11 +63,11 @@ class PointGrantLogQueryRepositoryImpl(
                 QGetPointRewardStatusResponse(
                     pointGrantLog.point.stringValue().concat(" 포인트"),
                     formattedDate,
-                    pointRewardPolicy.title.coalesce(pointGrantLog.couponName)
+                    pointRewardPolicy.title
                 )
             )
             .from(pointGrantLog)
-            .leftJoin(pointRewardPolicy).on(pointGrantLog.policyId.eq(pointRewardPolicy.id))
+            .innerJoin(pointRewardPolicy).on(pointGrantLog.policyId.eq(pointRewardPolicy.id))
             .where(pointGrantLog.memberId.eq(memberId))
             .orderBy(pointGrantLog.id.desc())
             .fetch()

src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt

@@ -102,7 +102,6 @@ class RankingRepository(
                     audioContent.duration,
                     member.id,
                     member.nickname,
-                    audioContent.isPointAvailable,
                     member.profileImage.prepend("/").prepend(imageHost)
                 )
             )
@@ -561,7 +560,6 @@ class RankingRepository(
                     audioContent.duration,
                     member.id,
                     member.nickname,
-                    audioContent.isPointAvailable,
                     member.profileImage.prepend("/").prepend(imageHost)
                 )
             )
@@ -728,7 +726,6 @@ class RankingRepository(
                     audioContent.duration,
                     member.id,
                     member.nickname,
-                    audioContent.isPointAvailable,
                     member.profileImage.prepend("/").prepend(imageHost)
                 )
             )
@@ -785,7 +782,6 @@ class RankingRepository(
                     audioContent.duration,
                     member.id,
                     member.nickname,
-                    audioContent.isPointAvailable,
                     member.profileImage.prepend("/").prepend(imageHost)
                 )
             )

src/main/kotlin/kr/co/vividnext/sodalive/useraction/ActionType.kt

@@ -5,6 +5,5 @@ enum class ActionType(val displayName: String) {
     USER_AUTHENTICATION("본인인증"),
     CONTENT_COMMENT("콘텐츠 댓글"),
     ORDER_CONTENT_COMMENT("구매한 콘텐츠 댓글"),
-    LIVE_CONTINUOUS_LISTEN_30("라이브 연속 청취 30분"),
-    COUPON("쿠폰")
+    LIVE_CONTINUOUS_LISTEN_30("라이브 연속 청취 30분")
 }