diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt index 50f8a4e5..64a57f4e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt @@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.can.charge import com.fasterxml.jackson.databind.ObjectMapper import kr.co.bootpay.Bootpay 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.CouponType 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.PointGrantLogRepository import kr.co.vividnext.sodalive.useraction.ActionType +import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobService import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.OkHttpClient import okhttp3.Request diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobController.kt similarity index 93% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobController.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobController.kt index 48e6b36e..28e07e6f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobController.kt @@ -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 org.springframework.security.access.prepost.PreAuthorize diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobResponse.kt similarity index 82% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobResponse.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobResponse.kt index b51546e0..235e6e81 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobResponse.kt @@ -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.can.charge.event.ChargeEventJobStatus -import kr.co.vividnext.sodalive.can.charge.event.ChargeEventJobType +import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJob +import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobStatus +import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobType import java.time.LocalDateTime data class AdminChargeEventJobResponse( diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobService.kt similarity index 78% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobService.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobService.kt index 63182b11..58e1e855 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobService.kt @@ -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.can.charge.event.ChargeEventJobStatus +import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobRepository +import kr.co.vividnext.sodalive.v2.can.charge.event.ChargeEventJobStatus import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.LocalDateTime diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJob.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJob.kt similarity index 97% rename from src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJob.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJob.kt index 0aa0050a..9371ebbb 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJob.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJob.kt @@ -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.common.BaseEntity diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobRepository.kt similarity index 87% rename from src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobRepository.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobRepository.kt index b90533bc..cfa11eda 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobRepository.kt @@ -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.Lock @@ -48,7 +48,7 @@ interface ChargeEventJobRepository : JpaRepository { @Query( """ 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 """ ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobService.kt similarity index 98% rename from src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobService.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobService.kt index 9d66c595..8f0b3b9e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobService.kt @@ -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.ChargeRepository 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.PaymentGateway import kr.co.vividnext.sodalive.can.payment.PaymentStatus diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobWorker.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobWorker.kt similarity index 98% rename from src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobWorker.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobWorker.kt index e623e272..5c6a2e6d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobWorker.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobWorker.kt @@ -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.springframework.scheduling.annotation.Scheduled diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobServiceTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobServiceTest.kt similarity index 87% rename from src/test/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobServiceTest.kt rename to src/test/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobServiceTest.kt index 09ba4485..fa0f3fd9 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventJobServiceTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/admin/event/charge/AdminChargeEventJobServiceTest.kt @@ -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.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.Test import org.mockito.Mockito diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobServiceTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobServiceTest.kt similarity index 98% rename from src/test/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobServiceTest.kt rename to src/test/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobServiceTest.kt index f2828baa..fa954182 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobServiceTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobServiceTest.kt @@ -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.ChargeRepository diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobWorkerTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobWorkerTest.kt similarity index 99% rename from src/test/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobWorkerTest.kt rename to src/test/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobWorkerTest.kt index 336e9037..3fa5cef9 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventJobWorkerTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/can/charge/event/ChargeEventJobWorkerTest.kt @@ -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 org.junit.jupiter.api.Assertions.assertEquals