From 24dc521f83e800bd64fa2ba1ae631092a56067df Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 15 Jan 2025 12:29:06 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=B6=A9?= =?UTF-8?q?=EC=A0=84=EC=9D=B4=EB=B2=A4=ED=8A=B8=20-=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EB=AA=85=20=EB=B3=80=EA=B2=BD=20(admin/event=20->=20a?= =?UTF-8?q?dmin/event/charge)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/event/{ => charge}/AdminChargeEventController.kt | 6 ++---- .../admin/event/{ => charge}/AdminChargeEventRepository.kt | 4 ++-- .../admin/event/{ => charge}/AdminChargeEventService.kt | 2 +- .../sodalive/admin/event/{ => charge}/ChargeEvent.kt | 2 +- .../admin/event/{ => charge}/CreateChargeEventRequest.kt | 2 +- .../admin/event/{ => charge}/GetChargeEventListResponse.kt | 2 +- .../admin/event/{ => charge}/ModifyChargeEventRequest.kt | 2 +- .../sodalive/can/charge/event/ChargeEventRepository.kt | 4 ++-- 8 files changed, 11 insertions(+), 13 deletions(-) rename src/main/kotlin/kr/co/vividnext/sodalive/admin/event/{ => charge}/AdminChargeEventController.kt (87%) rename src/main/kotlin/kr/co/vividnext/sodalive/admin/event/{ => charge}/AdminChargeEventRepository.kt (84%) rename src/main/kotlin/kr/co/vividnext/sodalive/admin/event/{ => charge}/AdminChargeEventService.kt (98%) rename src/main/kotlin/kr/co/vividnext/sodalive/admin/event/{ => charge}/ChargeEvent.kt (86%) rename src/main/kotlin/kr/co/vividnext/sodalive/admin/event/{ => charge}/CreateChargeEventRequest.kt (77%) rename src/main/kotlin/kr/co/vividnext/sodalive/admin/event/{ => charge}/GetChargeEventListResponse.kt (80%) rename src/main/kotlin/kr/co/vividnext/sodalive/admin/event/{ => charge}/ModifyChargeEventRequest.kt (84%) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventController.kt similarity index 87% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventController.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventController.kt index 0502923..22452b7 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventController.kt @@ -1,4 +1,4 @@ -package kr.co.vividnext.sodalive.admin.event +package kr.co.vividnext.sodalive.admin.event.charge import kr.co.vividnext.sodalive.common.ApiResponse import org.springframework.security.access.prepost.PreAuthorize @@ -11,22 +11,20 @@ import org.springframework.web.bind.annotation.RestController @RestController @RequestMapping("/event/charge") +@PreAuthorize("hasRole('ADMIN')") class AdminChargeEventController(private val service: AdminChargeEventService) { @PostMapping - @PreAuthorize("hasRole('ADMIN')") fun createChargeEvent(@RequestBody request: CreateChargeEventRequest): ApiResponse { service.createChargeEvent(request) return ApiResponse.ok(null, "등록되었습니다.") } @PutMapping - @PreAuthorize("hasRole('ADMIN')") fun modifyChargeEvent(@RequestBody request: ModifyChargeEventRequest) = ApiResponse.ok( service.modifyChargeEvent(request), "수정되었습니다." ) @GetMapping("/list") - @PreAuthorize("hasRole('ADMIN')") fun getChargeEventList() = ApiResponse.ok(service.getChargeEventList()) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventRepository.kt similarity index 84% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventRepository.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventRepository.kt index 4cd02e4..d8dfa4e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventRepository.kt @@ -1,7 +1,7 @@ -package kr.co.vividnext.sodalive.admin.event +package kr.co.vividnext.sodalive.admin.event.charge import com.querydsl.jpa.impl.JPAQueryFactory -import kr.co.vividnext.sodalive.admin.event.QChargeEvent.chargeEvent +import kr.co.vividnext.sodalive.admin.event.charge.QChargeEvent.chargeEvent import org.springframework.data.jpa.repository.JpaRepository import org.springframework.stereotype.Repository diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventService.kt similarity index 98% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventService.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventService.kt index fac0957..27aad89 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/AdminChargeEventService.kt @@ -1,4 +1,4 @@ -package kr.co.vividnext.sodalive.admin.event +package kr.co.vividnext.sodalive.admin.event.charge import kr.co.vividnext.sodalive.common.SodaException import org.springframework.data.repository.findByIdOrNull diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/ChargeEvent.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/ChargeEvent.kt similarity index 86% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/ChargeEvent.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/ChargeEvent.kt index 2d93162..3c20aed 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/ChargeEvent.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/ChargeEvent.kt @@ -1,4 +1,4 @@ -package kr.co.vividnext.sodalive.admin.event +package kr.co.vividnext.sodalive.admin.event.charge import kr.co.vividnext.sodalive.common.BaseEntity import java.time.LocalDateTime diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/CreateChargeEventRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/CreateChargeEventRequest.kt similarity index 77% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/CreateChargeEventRequest.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/CreateChargeEventRequest.kt index 7e81f4e..e105ef8 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/CreateChargeEventRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/CreateChargeEventRequest.kt @@ -1,4 +1,4 @@ -package kr.co.vividnext.sodalive.admin.event +package kr.co.vividnext.sodalive.admin.event.charge data class CreateChargeEventRequest( val title: String, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/GetChargeEventListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/GetChargeEventListResponse.kt similarity index 80% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/GetChargeEventListResponse.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/GetChargeEventListResponse.kt index fbac78b..ee6ae16 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/GetChargeEventListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/GetChargeEventListResponse.kt @@ -1,4 +1,4 @@ -package kr.co.vividnext.sodalive.admin.event +package kr.co.vividnext.sodalive.admin.event.charge data class GetChargeEventListResponse( val id: Long, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/ModifyChargeEventRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/ModifyChargeEventRequest.kt similarity index 84% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/event/ModifyChargeEventRequest.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/ModifyChargeEventRequest.kt index 1086ae2..6d491f0 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/ModifyChargeEventRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/charge/ModifyChargeEventRequest.kt @@ -1,4 +1,4 @@ -package kr.co.vividnext.sodalive.admin.event +package kr.co.vividnext.sodalive.admin.event.charge data class ModifyChargeEventRequest( val id: Long, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventRepository.kt index 88a047b..c7b84fb 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventRepository.kt @@ -1,8 +1,8 @@ package kr.co.vividnext.sodalive.can.charge.event import com.querydsl.jpa.impl.JPAQueryFactory -import kr.co.vividnext.sodalive.admin.event.ChargeEvent -import kr.co.vividnext.sodalive.admin.event.QChargeEvent.chargeEvent +import kr.co.vividnext.sodalive.admin.event.charge.ChargeEvent +import kr.co.vividnext.sodalive.admin.event.charge.QChargeEvent.chargeEvent import kr.co.vividnext.sodalive.can.charge.QCharge.charge import kr.co.vividnext.sodalive.can.payment.PaymentStatus import kr.co.vividnext.sodalive.can.payment.QPayment.payment