From 987b30b7b8c1c63167e167abc0978c35301491ff Mon Sep 17 00:00:00 2001 From: pricelees Date: Sun, 28 Sep 2025 13:59:53 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Interceptor=20=EB=93=B1=20=EC=84=9C?= =?UTF-8?q?=EB=B9=84=EC=8A=A4=EC=97=90=EC=84=9C=20=EC=9D=B4=EB=8F=99?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=ED=83=80=EC=9E=85=EC=9D=80=20common=20->?= =?UTF-8?q?=20service=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sangdol/roomescape/admin/business/AdminService.kt | 2 +- .../main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt | 2 +- .../kotlin/com/sangdol/roomescape/auth/web/AuthController.kt | 2 +- .../com/sangdol/roomescape/common/types}/AuditingInfo.kt | 2 +- .../sangdol/roomescape/common/types}/CurrentUserContext.kt | 2 +- .../kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt | 2 +- .../com/sangdol/roomescape/payment/web/PaymentController.kt | 2 +- .../roomescape/reservation/business/ReservationService.kt | 2 +- .../com/sangdol/roomescape/reservation/docs/ReservationAPI.kt | 2 +- .../roomescape/reservation/web/ReservationController.kt | 2 +- .../sangdol/roomescape/schedule/business/ScheduleService.kt | 4 ++-- .../com/sangdol/roomescape/schedule/docs/ScheduleAPI.kt | 2 +- .../roomescape/schedule/web/AdminScheduleController.kt | 2 +- .../com/sangdol/roomescape/store/business/StoreService.kt | 2 +- .../kotlin/com/sangdol/roomescape/store/web/AdminStoreDto.kt | 2 +- .../com/sangdol/roomescape/theme/business/ThemeService.kt | 2 +- .../kotlin/com/sangdol/roomescape/theme/web/AdminThemeDto.kt | 2 +- .../com/sangdol/roomescape/user/business/UserService.kt | 2 +- .../main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt | 2 +- .../kotlin/com/sangdol/roomescape/user/web/UserController.kt | 2 +- .../com/sangdol/roomescape/schedule/AdminScheduleApiTest.kt | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) rename {common/types/src/main/kotlin/com/sangdol/common/types/audit => service/src/main/kotlin/com/sangdol/roomescape/common/types}/AuditingInfo.kt (88%) rename {common/types/src/main/kotlin/com/sangdol/common/types/web => service/src/main/kotlin/com/sangdol/roomescape/common/types}/CurrentUserContext.kt (62%) diff --git a/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt index 111be701..e59c22d2 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.admin.business -import com.sangdol.common.types.audit.Auditor +import com.sangdol.roomescape.common.types.Auditor import com.sangdol.roomescape.admin.business.dto.AdminLoginCredentials import com.sangdol.roomescape.admin.business.dto.toCredentials import com.sangdol.roomescape.admin.exception.AdminErrorCode diff --git a/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt index c191084f..65a2c016 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.auth.docs import com.sangdol.common.types.web.CommonApiResponse -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import com.sangdol.roomescape.auth.web.LoginRequest import com.sangdol.roomescape.auth.web.LoginSuccessResponse import com.sangdol.roomescape.auth.web.support.Public diff --git a/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt index 50f676f0..b335e36a 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt @@ -4,7 +4,7 @@ import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.business.AuthService import com.sangdol.roomescape.auth.docs.AuthAPI import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse import org.springframework.http.ResponseEntity diff --git a/common/types/src/main/kotlin/com/sangdol/common/types/audit/AuditingInfo.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/types/AuditingInfo.kt similarity index 88% rename from common/types/src/main/kotlin/com/sangdol/common/types/audit/AuditingInfo.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/types/AuditingInfo.kt index 88ea23d1..83693c60 100644 --- a/common/types/src/main/kotlin/com/sangdol/common/types/audit/AuditingInfo.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/types/AuditingInfo.kt @@ -1,4 +1,4 @@ -package com.sangdol.common.types.audit +package com.sangdol.roomescape.common.types import java.time.LocalDateTime diff --git a/common/types/src/main/kotlin/com/sangdol/common/types/web/CurrentUserContext.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/types/CurrentUserContext.kt similarity index 62% rename from common/types/src/main/kotlin/com/sangdol/common/types/web/CurrentUserContext.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/types/CurrentUserContext.kt index ac3fd35d..e7d9e684 100644 --- a/common/types/src/main/kotlin/com/sangdol/common/types/web/CurrentUserContext.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/types/CurrentUserContext.kt @@ -1,4 +1,4 @@ -package com.sangdol.common.types.web +package com.sangdol.roomescape.common.types data class CurrentUserContext( val id: Long, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt index 866813bf..171df140 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt @@ -3,7 +3,7 @@ package com.sangdol.roomescape.payment.docs import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.web.support.User import com.sangdol.roomescape.auth.web.support.UserOnly -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import com.sangdol.roomescape.payment.web.PaymentCancelRequest import com.sangdol.roomescape.payment.web.PaymentConfirmRequest import com.sangdol.roomescape.payment.web.PaymentCreateResponse diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt index 32851b96..f4830f20 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt @@ -2,7 +2,7 @@ package com.sangdol.roomescape.payment.web import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import com.sangdol.roomescape.payment.business.PaymentService import com.sangdol.roomescape.payment.docs.PaymentAPI import jakarta.validation.Valid diff --git a/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt index 2638c671..f26baa16 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.reservation.business import com.sangdol.common.persistence.IDGenerator -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import com.sangdol.roomescape.payment.business.PaymentService import com.sangdol.roomescape.payment.web.PaymentWithDetailResponse import com.sangdol.roomescape.reservation.exception.ReservationErrorCode diff --git a/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt index 22e4e2db..2d53eecf 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.reservation.docs import com.sangdol.common.types.web.CommonApiResponse -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import com.sangdol.roomescape.auth.web.support.User import com.sangdol.roomescape.auth.web.support.UserOnly import com.sangdol.roomescape.reservation.web.* diff --git a/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt index 5f9bd7cb..b218ea2b 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.reservation.web import com.sangdol.common.types.web.CommonApiResponse -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import com.sangdol.roomescape.auth.web.support.User import com.sangdol.roomescape.reservation.business.ReservationService import com.sangdol.roomescape.reservation.docs.ReservationAPI diff --git a/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleService.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleService.kt index f9fb6e99..3adfedcb 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleService.kt @@ -2,8 +2,8 @@ package com.sangdol.roomescape.schedule.business import ScheduleException import com.sangdol.common.persistence.IDGenerator -import com.sangdol.common.types.audit.AuditingInfo -import com.sangdol.common.types.audit.Auditor +import com.sangdol.roomescape.common.types.AuditingInfo +import com.sangdol.roomescape.common.types.Auditor import com.sangdol.roomescape.admin.business.AdminService import com.sangdol.roomescape.schedule.business.domain.ScheduleOverview import com.sangdol.roomescape.schedule.exception.ScheduleErrorCode diff --git a/service/src/main/kotlin/com/sangdol/roomescape/schedule/docs/ScheduleAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/docs/ScheduleAPI.kt index be8ca4c5..9e2c4ea7 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/schedule/docs/ScheduleAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/docs/ScheduleAPI.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.schedule.docs -import com.sangdol.common.types.audit.AuditingInfo +import com.sangdol.roomescape.common.types.AuditingInfo import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType import com.sangdol.roomescape.admin.infrastructure.persistence.Privilege diff --git a/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleController.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleController.kt index 14ed61b8..3c7b89d4 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleController.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.schedule.web -import com.sangdol.common.types.audit.AuditingInfo +import com.sangdol.roomescape.common.types.AuditingInfo import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.schedule.business.ScheduleService import com.sangdol.roomescape.schedule.docs.AdminScheduleAPI diff --git a/service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreService.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreService.kt index ba829e84..8dd3acc9 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreService.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.store.business import com.sangdol.common.persistence.IDGenerator -import com.sangdol.common.types.audit.AuditingInfo +import com.sangdol.roomescape.common.types.AuditingInfo import com.sangdol.roomescape.admin.business.AdminService import com.sangdol.roomescape.region.business.RegionService import com.sangdol.roomescape.store.exception.StoreErrorCode diff --git a/service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreDto.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreDto.kt index 2f60f2f2..193e719b 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreDto.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreDto.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.store.web -import com.sangdol.common.types.audit.AuditingInfo +import com.sangdol.roomescape.common.types.AuditingInfo import com.sangdol.roomescape.region.web.RegionInfoResponse import com.sangdol.roomescape.store.infrastructure.persistence.StoreEntity diff --git a/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt index ebf7c4d0..5cf3b4ea 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.theme.business import com.sangdol.common.persistence.IDGenerator -import com.sangdol.common.types.audit.AuditingInfo +import com.sangdol.roomescape.common.types.AuditingInfo import com.sangdol.roomescape.admin.business.AdminService import com.sangdol.roomescape.theme.exception.ThemeErrorCode import com.sangdol.roomescape.theme.exception.ThemeException diff --git a/service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeDto.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeDto.kt index 5f616075..94c5a195 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeDto.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeDto.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.theme.web -import com.sangdol.common.types.audit.AuditingInfo +import com.sangdol.roomescape.common.types.AuditingInfo import com.sangdol.roomescape.theme.infrastructure.persistence.Difficulty import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity diff --git a/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt index 618cdb0d..7aa00234 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.user.business import com.sangdol.common.persistence.IDGenerator -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import com.sangdol.roomescape.user.business.dto.UserLoginCredentials import com.sangdol.roomescape.user.business.dto.toCredentials import com.sangdol.roomescape.user.exception.UserErrorCode diff --git a/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt index e4e83252..6e3d116d 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt @@ -3,7 +3,7 @@ package com.sangdol.roomescape.user.docs import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.web.support.Public import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import com.sangdol.roomescape.user.web.UserContactResponse import com.sangdol.roomescape.user.web.UserCreateRequest import com.sangdol.roomescape.user.web.UserCreateResponse diff --git a/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt index a6469d9f..097830ee 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt @@ -2,7 +2,7 @@ package com.sangdol.roomescape.user.web import com.sangdol.common.types.web.CommonApiResponse import com.sangdol.roomescape.auth.web.support.User -import com.sangdol.common.types.web.CurrentUserContext +import com.sangdol.roomescape.common.types.CurrentUserContext import com.sangdol.roomescape.user.business.UserService import com.sangdol.roomescape.user.docs.UserAPI import jakarta.validation.Valid diff --git a/service/src/test/kotlin/com/sangdol/roomescape/schedule/AdminScheduleApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/schedule/AdminScheduleApiTest.kt index 3d1969fa..f51663dc 100644 --- a/service/src/test/kotlin/com/sangdol/roomescape/schedule/AdminScheduleApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/schedule/AdminScheduleApiTest.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.schedule -import com.sangdol.common.types.audit.Auditor +import com.sangdol.roomescape.common.types.Auditor import com.sangdol.common.types.web.HttpStatus import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType