refactor(charge): 충전 이벤트 작업 패키지를 정리한다
This commit is contained in:
@@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.can.charge
|
|||||||
import com.fasterxml.jackson.databind.ObjectMapper
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
import kr.co.bootpay.Bootpay
|
import kr.co.bootpay.Bootpay
|
||||||
import kr.co.vividnext.sodalive.can.CanRepository
|
import kr.co.vividnext.sodalive.can.CanRepository
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobService
|
|
||||||
import kr.co.vividnext.sodalive.can.coupon.CanCouponNumberRepository
|
import kr.co.vividnext.sodalive.can.coupon.CanCouponNumberRepository
|
||||||
import kr.co.vividnext.sodalive.can.coupon.CouponType
|
import kr.co.vividnext.sodalive.can.coupon.CouponType
|
||||||
import kr.co.vividnext.sodalive.can.payment.Payment
|
import kr.co.vividnext.sodalive.can.payment.Payment
|
||||||
@@ -20,6 +19,7 @@ import kr.co.vividnext.sodalive.point.MemberPointRepository
|
|||||||
import kr.co.vividnext.sodalive.point.PointGrantLog
|
import kr.co.vividnext.sodalive.point.PointGrantLog
|
||||||
import kr.co.vividnext.sodalive.point.PointGrantLogRepository
|
import kr.co.vividnext.sodalive.point.PointGrantLogRepository
|
||||||
import kr.co.vividnext.sodalive.useraction.ActionType
|
import kr.co.vividnext.sodalive.useraction.ActionType
|
||||||
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobService
|
||||||
import okhttp3.MediaType.Companion.toMediaTypeOrNull
|
import okhttp3.MediaType.Companion.toMediaTypeOrNull
|
||||||
import okhttp3.OkHttpClient
|
import okhttp3.OkHttpClient
|
||||||
import okhttp3.Request
|
import okhttp3.Request
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package kr.co.vividnext.sodalive.admin.event.charge
|
package kr.co.vividnext.sodalive.v2.admin.event.charge
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.common.ApiResponse
|
import kr.co.vividnext.sodalive.common.ApiResponse
|
||||||
import org.springframework.security.access.prepost.PreAuthorize
|
import org.springframework.security.access.prepost.PreAuthorize
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
package kr.co.vividnext.sodalive.admin.event.charge
|
package kr.co.vividnext.sodalive.v2.admin.event.charge
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJob
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJob
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobStatus
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobStatus
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobType
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobType
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
|
|
||||||
data class AdminChargeEventJobResponse(
|
data class AdminChargeEventJobResponse(
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package kr.co.vividnext.sodalive.admin.event.charge
|
package kr.co.vividnext.sodalive.v2.admin.event.charge
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobRepository
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobRepository
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobStatus
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobStatus
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
import org.springframework.transaction.annotation.Transactional
|
import org.springframework.transaction.annotation.Transactional
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package kr.co.vividnext.sodalive.can.charge.event
|
package kr.co.vividnext.sodalive.v2.can.charge.event
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.can.payment.PaymentGateway
|
import kr.co.vividnext.sodalive.can.payment.PaymentGateway
|
||||||
import kr.co.vividnext.sodalive.common.BaseEntity
|
import kr.co.vividnext.sodalive.common.BaseEntity
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package kr.co.vividnext.sodalive.can.charge.event
|
package kr.co.vividnext.sodalive.v2.can.charge.event
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository
|
import org.springframework.data.jpa.repository.JpaRepository
|
||||||
import org.springframework.data.jpa.repository.Lock
|
import org.springframework.data.jpa.repository.Lock
|
||||||
@@ -48,7 +48,7 @@ interface ChargeEventJobRepository : JpaRepository<ChargeEventJob, Long> {
|
|||||||
@Query(
|
@Query(
|
||||||
"""
|
"""
|
||||||
select j from ChargeEventJob j
|
select j from ChargeEventJob j
|
||||||
where j.status in (kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobStatus.PENDING, kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobStatus.FAILED)
|
where j.status in (kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobStatus.PENDING, kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobStatus.FAILED)
|
||||||
order by j.createdAt desc
|
order by j.createdAt desc
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
package kr.co.vividnext.sodalive.can.charge.event
|
package kr.co.vividnext.sodalive.v2.can.charge.event
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.can.charge.Charge
|
import kr.co.vividnext.sodalive.can.charge.Charge
|
||||||
import kr.co.vividnext.sodalive.can.charge.ChargeRepository
|
import kr.co.vividnext.sodalive.can.charge.ChargeRepository
|
||||||
import kr.co.vividnext.sodalive.can.charge.ChargeStatus
|
import kr.co.vividnext.sodalive.can.charge.ChargeStatus
|
||||||
|
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventRepository
|
||||||
import kr.co.vividnext.sodalive.can.payment.Payment
|
import kr.co.vividnext.sodalive.can.payment.Payment
|
||||||
import kr.co.vividnext.sodalive.can.payment.PaymentGateway
|
import kr.co.vividnext.sodalive.can.payment.PaymentGateway
|
||||||
import kr.co.vividnext.sodalive.can.payment.PaymentStatus
|
import kr.co.vividnext.sodalive.can.payment.PaymentStatus
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package kr.co.vividnext.sodalive.can.charge.event
|
package kr.co.vividnext.sodalive.v2.can.charge.event
|
||||||
|
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
import org.springframework.scheduling.annotation.Scheduled
|
import org.springframework.scheduling.annotation.Scheduled
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
package kr.co.vividnext.sodalive.admin.event.charge
|
package kr.co.vividnext.sodalive.v2.admin.event.charge
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJob
|
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobRepository
|
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobStatus
|
|
||||||
import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobType
|
|
||||||
import kr.co.vividnext.sodalive.can.payment.PaymentGateway
|
import kr.co.vividnext.sodalive.can.payment.PaymentGateway
|
||||||
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJob
|
||||||
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobRepository
|
||||||
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobStatus
|
||||||
|
import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobType
|
||||||
import org.junit.jupiter.api.Assertions.assertEquals
|
import org.junit.jupiter.api.Assertions.assertEquals
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
import org.mockito.Mockito
|
import org.mockito.Mockito
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package kr.co.vividnext.sodalive.can.charge.event
|
package kr.co.vividnext.sodalive.v2.can.charge.event
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.can.charge.Charge
|
import kr.co.vividnext.sodalive.can.charge.Charge
|
||||||
import kr.co.vividnext.sodalive.can.charge.ChargeRepository
|
import kr.co.vividnext.sodalive.can.charge.ChargeRepository
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package kr.co.vividnext.sodalive.can.charge.event
|
package kr.co.vividnext.sodalive.v2.can.charge.event
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.can.payment.PaymentGateway
|
import kr.co.vividnext.sodalive.can.payment.PaymentGateway
|
||||||
import org.junit.jupiter.api.Assertions.assertEquals
|
import org.junit.jupiter.api.Assertions.assertEquals
|
||||||
Reference in New Issue
Block a user