From bcaffb67186c991a232d57ca8a79249490ba0429 Mon Sep 17 00:00:00 2001 From: pricelees Date: Sat, 27 Sep 2025 17:20:49 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=A9=94=EC=9D=B8=20=EC=84=9C?= =?UTF-8?q?=EB=B9=84=EC=8A=A4=20=EB=AA=A8=EB=93=88=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 113 ++++++------------ service/build.gradle.kts | 60 ++++++++++ .../roomescape/RoomescapeApplication.kt | 2 +- .../roomescape/admin/business/AdminService.kt | 16 +-- .../admin/exception/AdminException.kt | 6 +- .../infrastructure/persistence/AdminEntity.kt | 4 +- .../persistence/AdminRepository.kt | 2 +- .../roomescape/auth/business/AuthService.kt | 22 ++-- .../auth/business/LoginHistoryService.kt | 12 +- .../sangdol}/roomescape/auth/docs/AuthAPI.kt | 14 +-- .../auth/exception/AuthErrorCode.kt | 4 +- .../auth/exception/AuthException.kt | 4 +- .../auth/infrastructure/jwt/JwtUtils.kt | 6 +- .../persistence/LoginHistoryEntity.kt | 6 +- .../persistence/LoginHistoryRepository.kt | 2 +- .../roomescape/auth/web/AuthController.kt | 12 +- .../sangdol}/roomescape/auth/web/AuthDTO.kt | 6 +- .../auth/web/support/AuthAnnotations.kt | 6 +- .../auth/web/support/CookieUtils.kt | 2 +- .../support/interceptors/AdminInterceptor.kt | 24 ++-- .../support/interceptors/UserInterceptor.kt | 16 +-- .../support/resolver/UserContextResolver.kt | 14 +-- .../roomescape/common/config/JacksonConfig.kt | 2 +- .../roomescape/common/config/JpaConfig.kt | 4 +- .../roomescape/common/config/SwaggerConfig.kt | 15 +++ .../roomescape/common/config/TsidConfig.kt | 2 +- .../roomescape/common/config/WebMvcConfig.kt | 8 +- .../roomescape/common/dto/AuditDto.kt | 2 +- .../roomescape/common/dto/CommonAuth.kt | 16 +-- .../common/dto/response/CommonApiResponse.kt | 4 +- .../roomescape/common/entity/BaseEntity.kt | 2 +- .../common/exception/CommonErrorCode.kt | 2 +- .../roomescape/common/exception/ErrorCode.kt | 2 +- .../exception/ExceptionControllerAdvice.kt | 14 +-- .../common/exception/RoomescapeException.kt | 2 +- .../common/log/ApiLogMessageConverter.kt | 4 +- .../common/log/ControllerLoggingAspect.kt | 4 +- .../common/log/HttpRequestLoggingFilter.kt | 4 +- .../roomescape/common/log/LogConfiguration.kt | 2 +- .../MDCAwareSlowQueryListenerWithoutParams.kt | 2 +- .../common/log/ProxyDataSourceConfig.kt | 2 +- .../log/RoomescapeLogMaskingConverter.kt | 4 +- .../roomescape/common/util/DateUtils.kt | 2 +- .../roomescape/common/util/MDCUtils.kt | 2 +- .../common/util/TransactionExecutionUtil.kt | 6 +- .../payment/business/PaymentService.kt | 18 +-- .../payment/business/PaymentWriter.kt | 16 +-- .../roomescape/payment/docs/PaymentAPI.kt | 16 +-- .../payment/exception/PaymentErrorCode.kt | 4 +- .../payment/exception/PaymentException.kt | 4 +- .../infrastructure/client/PaymentConfig.kt | 2 +- .../client/PaymentProperties.kt | 2 +- .../infrastructure/client/TosspayCancelDTO.kt | 6 +- .../infrastructure/client/TosspayClient.kt | 6 +- .../client/TosspayConfirmDTO.kt | 16 +-- .../client/TosspayErrorResponse.kt | 2 +- .../infrastructure/common/PaymentTypes.kt | 6 +- .../persistence/CanceledPaymentEntity.kt | 4 +- .../persistence/CanceledPaymentRepository.kt | 2 +- .../persistence/PaymentDetailEntity.kt | 6 +- .../persistence/PaymentDetailRepository.kt | 2 +- .../persistence/PaymentEntity.kt | 10 +- .../persistence/PaymentRepository.kt | 2 +- .../payment/web/PaymentController.kt | 12 +- .../roomescape/payment/web/PaymentDTO.kt | 14 +-- .../region/business/RegionService.kt | 10 +- .../roomescape/region/docs/RegionAPI.kt | 12 +- .../region/exception/RegionException.kt | 6 +- .../persistence/RegionEntity.kt | 2 +- .../persistence/RegionRepository.kt | 2 +- .../roomescape/region/web/RegionController.kt | 8 +- .../roomescape/region/web/RegionDTO.kt | 2 +- .../business/ReservationService.kt | 34 +++--- .../business/ReservationValidator.kt | 14 +-- .../reservation/docs/ReservationAPI.kt | 14 +-- .../exception/ReservationErrorCode.kt | 4 +- .../exception/ReservationException.kt | 9 ++ .../persistence/CanceledReservationEntity.kt | 4 +- .../CanceledReservationRepository.kt | 2 +- .../persistence/ReservationEntity.kt | 4 +- .../persistence/ReservationRepository.kt | 2 +- .../reservation/web/ReservationController.kt | 12 +- .../reservation/web/ReservationDto.kt | 12 +- .../schedule/business/ScheduleService.kt | 24 ++-- .../schedule/business/ScheduleValidator.kt | 14 +-- .../business/domain/ScheduleOverview.kt | 6 +- .../roomescape/schedule/docs/ScheduleAPI.kt | 18 +-- .../schedule/exception/ScheduleErrorCode.kt | 4 +- .../schedule/exception/ScheduleException.kt | 4 +- .../persistence/ScheduleEntity.kt | 6 +- .../persistence/ScheduleRepository.kt | 8 +- .../schedule/web/AdminScheduleController.kt | 10 +- .../schedule/web/AdminScheduleDto.kt | 6 +- .../schedule/web/ScheduleController.kt | 10 +- .../roomescape/schedule/web/ScheduleDto.kt | 10 +- .../roomescape/store/business/StoreService.kt | 22 ++-- .../store/business/StoreValidator.kt | 12 +- .../roomescape/store/docs/StoreAPI.kt | 14 +-- .../store/exception/StoreException.kt | 6 +- .../infrastructure/persistence/StoreEntity.kt | 4 +- .../persistence/StoreRepository.kt | 6 +- .../store/web/AdminStoreController.kt | 8 +- .../roomescape/store/web/AdminStoreDto.kt | 8 +- .../roomescape/store/web/StoreController.kt | 8 +- .../sangdol}/roomescape/store/web/StoreDTO.kt | 4 +- .../roomescape/theme/business/ThemeService.kt | 20 ++-- .../theme/business/ThemeValidator.kt | 12 +- .../theme/business/domain/ThemeInfo.kt | 2 +- .../roomescape/theme/docs/ThemeApi.kt | 14 +-- .../theme/exception/ThemeErrorCode.kt | 4 +- .../theme/exception/ThemeException.kt | 4 +- .../infrastructure/persistence/ThemeEntity.kt | 4 +- .../persistence/ThemeRepository.kt | 4 +- .../theme/web/AdminThemeController.kt | 8 +- .../roomescape/theme/web/AdminThemeDto.kt | 8 +- .../roomescape/theme/web/ThemeController.kt | 8 +- .../sangdol}/roomescape/theme/web/ThemeDto.kt | 6 +- .../roomescape/user/business/UserService.kt | 24 ++-- .../roomescape/user/business/UserValidator.kt | 8 +- .../sangdol}/roomescape/user/docs/UserAPI.kt | 16 +-- .../user/exception/UserException.kt | 6 +- .../persistence/UserEntities.kt | 4 +- .../persistence/UserRepositories.kt | 2 +- .../roomescape/user/web/UserController.kt | 12 +- .../sangdol}/roomescape/user/web/UserDTO.kt | 6 +- .../main/resources/application-deploy.yaml | 0 .../main/resources/application-local.yaml | 0 .../src}/main/resources/application.yaml | 0 .../src}/main/resources/logback-deploy.xml | 2 +- .../src}/main/resources/logback-local.xml | 4 +- .../src}/main/resources/logback-spring.xml | 0 .../main/resources/schema/region-data.sql | 0 .../src}/main/resources/schema/schema-h2.sql | 0 .../main/resources/schema/schema-mysql.sql | 0 .../sangdol}/roomescape/auth/AuthApiTest.kt | 32 ++--- .../auth/FailOnSaveLoginHistoryTest.kt | 16 +-- .../sangdol}/roomescape/auth/JwtUtilsTest.kt | 12 +- .../common/config/JacksonConfigTest.kt | 2 +- .../common/log/ApiLogMessageConverterTest.kt | 6 +- ...AwareSlowQueryListenerWithoutParamsTest.kt | 2 +- .../log/RoomescapeLogMaskingConverterTest.kt | 2 +- .../roomescape/common/util/DateUtilsTest.kt | 2 +- .../roomescape/data/DefaultDataInitializer.kt | 42 +++---- .../roomescape/data/PopulationDataParser.kt | 13 +- .../roomescape/payment/PaymentAPITest.kt | 26 ++-- .../payment/SampleTosspayConstant.kt | 2 +- .../roomescape/payment/TosspayClientTest.kt | 14 +-- .../roomescape/region/RegionApiFailTest.kt | 10 +- .../roomescape/region/RegionApiSuccessTest.kt | 6 +- .../reservation/ReservationApiTest.kt | 40 +++---- .../schedule/AdminScheduleApiTest.kt | 28 ++--- .../roomescape/schedule/ScheduleApiTest.kt | 16 +-- .../roomescape/store/AdminStoreApiTest.kt | 22 ++-- .../sangdol}/roomescape/store/StoreApiTest.kt | 8 +- .../roomescape/supports/DummyInitializer.kt | 62 +++++----- .../sangdol}/roomescape/supports/Fixtures.kt | 46 +++---- .../roomescape/supports/KotestConfig.kt | 18 +-- .../roomescape/supports/RestAssuredUtils.kt | 6 +- .../roomescape/supports/TestAuthUtil.kt | 20 ++-- .../roomescape/supports/TestDatabaseUtil.kt | 2 +- .../sangdol}/roomescape/supports/TestUtil.kt | 2 +- .../roomescape/theme/AdminThemeApiTest.kt | 26 ++-- .../sangdol}/roomescape/theme/ThemeApiTest.kt | 23 ++-- .../sangdol}/roomescape/user/UserApiTest.kt | 26 ++-- .../resources/application-test-mysql.yaml | 0 .../src}/test/resources/application-test.yaml | 0 .../src}/test/resources/logback-test.xml | 0 .../roomescape/common/config/SwaggerConfig.kt | 78 ------------ .../exception/ReservationException.kt | 9 -- src/main/resources/login.http | 55 --------- src/main/resources/test.http | 4 - 171 files changed, 862 insertions(+), 969 deletions(-) create mode 100644 service/build.gradle.kts rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/RoomescapeApplication.kt (92%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/admin/business/AdminService.kt (78%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/admin/exception/AdminException.kt (72%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/admin/infrastructure/persistence/AdminEntity.kt (91%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/admin/infrastructure/persistence/AdminRepository.kt (73%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/business/AuthService.kt (84%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/business/LoginHistoryService.kt (85%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/docs/AuthAPI.kt (70%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/exception/AuthErrorCode.kt (89%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/exception/AuthException.kt (59%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/infrastructure/jwt/JwtUtils.kt (93%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt (77%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/infrastructure/persistence/LoginHistoryRepository.kt (77%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/web/AuthController.kt (76%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/web/AuthDTO.kt (82%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/web/support/AuthAnnotations.kt (71%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/web/support/CookieUtils.kt (85%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/web/support/interceptors/AdminInterceptor.kt (83%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/web/support/interceptors/UserInterceptor.kt (78%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/auth/web/support/resolver/UserContextResolver.kt (79%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/config/JacksonConfig.kt (98%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/config/JpaConfig.kt (83%) create mode 100644 service/src/main/kotlin/com/sangdol/roomescape/common/config/SwaggerConfig.kt rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/config/TsidConfig.kt (91%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/config/WebMvcConfig.kt (75%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/dto/AuditDto.kt (89%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/dto/CommonAuth.kt (72%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/dto/response/CommonApiResponse.kt (78%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/entity/BaseEntity.kt (96%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/exception/CommonErrorCode.kt (92%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/exception/ErrorCode.kt (75%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/exception/ExceptionControllerAdvice.kt (91%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/exception/RoomescapeException.kt (75%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/log/ApiLogMessageConverter.kt (96%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/log/ControllerLoggingAspect.kt (96%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/log/HttpRequestLoggingFilter.kt (92%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/log/LogConfiguration.kt (96%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParams.kt (96%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/log/ProxyDataSourceConfig.kt (97%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/log/RoomescapeLogMaskingConverter.kt (96%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/util/DateUtils.kt (86%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/util/MDCUtils.kt (92%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/common/util/TransactionExecutionUtil.kt (86%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/business/PaymentService.kt (90%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/business/PaymentWriter.kt (85%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/docs/PaymentAPI.kt (68%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/exception/PaymentErrorCode.kt (92%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/exception/PaymentException.kt (59%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/client/PaymentConfig.kt (96%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/client/PaymentProperties.kt (81%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/client/TosspayCancelDTO.kt (90%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/client/TosspayClient.kt (96%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt (84%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/client/TosspayErrorResponse.kt (57%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/common/PaymentTypes.kt (97%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt (80%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.kt (76%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/persistence/PaymentDetailEntity.kt (89%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/persistence/PaymentDetailRepository.kt (75%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/persistence/PaymentEntity.kt (67%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/infrastructure/persistence/PaymentRepository.kt (75%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/web/PaymentController.kt (73%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/payment/web/PaymentDTO.kt (89%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/region/business/RegionService.kt (91%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/region/docs/RegionAPI.kt (78%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/region/exception/RegionException.kt (81%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/region/infrastructure/persistence/RegionEntity.kt (86%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/region/infrastructure/persistence/RegionRepository.kt (95%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/region/web/RegionController.kt (86%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/region/web/RegionDTO.kt (91%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/business/ReservationService.kt (86%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/business/ReservationValidator.kt (74%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/docs/ReservationAPI.kt (83%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/exception/ReservationErrorCode.kt (87%) create mode 100644 service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationException.kt rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/infrastructure/persistence/CanceledReservationEntity.kt (80%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/infrastructure/persistence/CanceledReservationRepository.kt (68%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt (84%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt (78%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/web/ReservationController.kt (84%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/reservation/web/ReservationDto.kt (85%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/business/ScheduleService.kt (90%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/business/ScheduleValidator.kt (85%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/business/domain/ScheduleOverview.kt (75%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/docs/ScheduleAPI.kt (85%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/exception/ScheduleErrorCode.kt (88%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/exception/ScheduleException.kt (56%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/infrastructure/persistence/ScheduleEntity.kt (91%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/infrastructure/persistence/ScheduleRepository.kt (86%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/web/AdminScheduleController.kt (88%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/web/AdminScheduleDto.kt (86%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/web/ScheduleController.kt (77%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/schedule/web/ScheduleDto.kt (84%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/business/StoreService.kt (88%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/business/StoreValidator.kt (85%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/docs/StoreAPI.kt (85%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/exception/StoreException.kt (85%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/infrastructure/persistence/StoreEntity.kt (87%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/infrastructure/persistence/StoreRepository.kt (76%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/web/AdminStoreController.kt (86%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/web/AdminStoreDto.kt (79%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/web/StoreController.kt (83%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/store/web/StoreDTO.kt (84%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/business/ThemeService.kt (91%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/business/ThemeValidator.kt (92%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/business/domain/ThemeInfo.kt (86%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/docs/ThemeApi.kt (87%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/exception/ThemeErrorCode.kt (92%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/exception/ThemeException.kt (59%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/infrastructure/persistence/ThemeEntity.kt (92%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/infrastructure/persistence/ThemeRepository.kt (92%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/web/AdminThemeController.kt (90%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/web/AdminThemeDto.kt (93%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/web/ThemeController.kt (78%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/theme/web/ThemeDto.kt (89%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/user/business/UserService.kt (83%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/user/business/UserValidator.kt (80%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/user/docs/UserAPI.kt (65%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/user/exception/UserException.kt (79%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/user/infrastructure/persistence/UserEntities.kt (84%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/user/infrastructure/persistence/UserRepositories.kt (84%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/user/web/UserController.kt (71%) rename {src/main/kotlin => service/src/main/kotlin/com/sangdol}/roomescape/user/web/UserDTO.kt (83%) rename {src => service/src}/main/resources/application-deploy.yaml (100%) rename {src => service/src}/main/resources/application-local.yaml (100%) rename {src => service/src}/main/resources/application.yaml (100%) rename {src => service/src}/main/resources/logback-deploy.xml (97%) rename {src => service/src}/main/resources/logback-local.xml (82%) rename {src => service/src}/main/resources/logback-spring.xml (100%) rename {src => service/src}/main/resources/schema/region-data.sql (100%) rename {src => service/src}/main/resources/schema/schema-h2.sql (100%) rename {src => service/src}/main/resources/schema/schema-mysql.sql (100%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/auth/AuthApiTest.kt (89%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/auth/FailOnSaveLoginHistoryTest.kt (80%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/auth/JwtUtilsTest.kt (90%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/common/config/JacksonConfigTest.kt (98%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/common/log/ApiLogMessageConverterTest.kt (94%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParamsTest.kt (95%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/common/log/RoomescapeLogMaskingConverterTest.kt (98%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/common/util/DateUtilsTest.kt (90%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/data/DefaultDataInitializer.kt (95%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/data/PopulationDataParser.kt (95%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/payment/PaymentAPITest.kt (95%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/payment/SampleTosspayConstant.kt (99%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/payment/TosspayClientTest.kt (93%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/region/RegionApiFailTest.kt (83%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/region/RegionApiSuccessTest.kt (90%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/reservation/ReservationApiTest.kt (94%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/schedule/AdminScheduleApiTest.kt (96%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/schedule/ScheduleApiTest.kt (89%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/store/AdminStoreApiTest.kt (96%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/store/StoreApiTest.kt (94%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/supports/DummyInitializer.kt (74%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/supports/Fixtures.kt (86%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/supports/KotestConfig.kt (78%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/supports/RestAssuredUtils.kt (95%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/supports/TestAuthUtil.kt (86%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/supports/TestDatabaseUtil.kt (98%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/supports/TestUtil.kt (95%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/theme/AdminThemeApiTest.kt (97%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/theme/ThemeApiTest.kt (86%) rename {src/test/kotlin => service/src/test/kotlin/com/sangdol}/roomescape/user/UserApiTest.kt (91%) rename {src => service/src}/test/resources/application-test-mysql.yaml (100%) rename {src => service/src}/test/resources/application-test.yaml (100%) rename {src => service/src}/test/resources/logback-test.xml (100%) delete mode 100644 src/main/kotlin/roomescape/common/config/SwaggerConfig.kt delete mode 100644 src/main/kotlin/roomescape/reservation/exception/ReservationException.kt delete mode 100644 src/main/resources/login.http delete mode 100644 src/main/resources/test.http diff --git a/build.gradle.kts b/build.gradle.kts index c6a792f2..28b26eaf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,99 +1,56 @@ +import org.jetbrains.kotlin.gradle.plugin.KaptExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { val springBootVersion = "3.5.3" val kotlinVersion = "2.2.0" - id("org.springframework.boot") version springBootVersion - id("io.spring.dependency-management") version "1.1.7" - kotlin("jvm") version kotlinVersion - kotlin("plugin.spring") version kotlinVersion - kotlin("plugin.jpa") version kotlinVersion - kotlin("kapt") version kotlinVersion + id("io.spring.dependency-management") version "1.1.7" apply false + id("org.springframework.boot") version springBootVersion apply false + kotlin("jvm") version kotlinVersion apply false + kotlin("kapt") version kotlinVersion apply false + kotlin("plugin.spring") version kotlinVersion apply false + kotlin("plugin.jpa") version kotlinVersion apply false } group = "com.sangdol" version = "0.0.1-SNAPSHOT" -java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) +allprojects { + repositories { + mavenCentral() } } -tasks.jar { - enabled = false -} +subprojects { + apply(plugin = "org.jetbrains.kotlin.jvm") + apply(plugin = "org.jetbrains.kotlin.kapt") + apply(plugin = "io.spring.dependency-management") -kapt { - keepJavacAnnotationProcessors = true -} + extensions.configure { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } -repositories { - mavenCentral() -} + extensions.configure { + keepJavacAnnotationProcessors = true + } -dependencies { - // Spring - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springframework.boot:spring-boot-starter-data-jpa") - implementation("org.springframework.boot:spring-boot-starter-validation") + dependencies { + add("implementation", "io.github.oshai:kotlin-logging-jvm:7.0.3") + } - // API docs - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9") + tasks.withType { + useJUnitPlatform() + } - // DB - implementation("com.github.f4b6a3:tsid-creator:5.2.6") - runtimeOnly("com.h2database:h2") - runtimeOnly("com.mysql:mysql-connector-j") - - // Jwt - implementation("io.jsonwebtoken:jjwt:0.12.6") - - // Logging - implementation("io.github.oshai:kotlin-logging-jvm:7.0.3") - implementation("net.logstash.logback:logstash-logback-encoder:8.1") - implementation("com.github.loki4j:loki-logback-appender:2.0.0") - implementation("net.ttddyy.observation:datasource-micrometer-spring-boot:1.1.1") - - // Observability - implementation("org.springframework.boot:spring-boot-starter-actuator") - implementation("io.micrometer:micrometer-tracing-bridge-otel") - implementation("io.opentelemetry:opentelemetry-exporter-otlp") - runtimeOnly("io.micrometer:micrometer-registry-prometheus") - - // Kotlin - implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.3") - - // Test - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("io.mockk:mockk:1.14.4") - testImplementation("com.ninja-squad:springmockk:4.0.2") - - // Kotest - testImplementation("io.kotest:kotest-runner-junit5:5.9.1") - testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0") - - // RestAssured - testImplementation("io.rest-assured:rest-assured:5.5.5") - testImplementation("io.rest-assured:kotlin-extensions:5.5.5") - - // etc - implementation("org.apache.poi:poi-ooxml:5.2.3") -} - -tasks.withType { - useJUnitPlatform() -} - -tasks.withType { - compilerOptions { - freeCompilerArgs.addAll( - "-Xjsr305=strict", - "-Xannotation-default-target=param-property" - ) - jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + tasks.withType { + compilerOptions { + freeCompilerArgs.addAll( + "-Xjsr305=strict", + "-Xannotation-default-target=param-property" + ) + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + } } } diff --git a/service/build.gradle.kts b/service/build.gradle.kts new file mode 100644 index 00000000..db40bee3 --- /dev/null +++ b/service/build.gradle.kts @@ -0,0 +1,60 @@ +plugins { + id("org.springframework.boot") + kotlin("plugin.spring") + kotlin("plugin.jpa") +} + +dependencies { + // Spring + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-validation") + + // API docs + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9") + + // DB + implementation("com.github.f4b6a3:tsid-creator:5.2.6") + runtimeOnly("com.h2database:h2") + runtimeOnly("com.mysql:mysql-connector-j") + + // Jwt + implementation("io.jsonwebtoken:jjwt:0.12.6") + + // Logging + implementation("io.github.oshai:kotlin-logging-jvm:7.0.3") + implementation("net.logstash.logback:logstash-logback-encoder:8.1") + implementation("com.github.loki4j:loki-logback-appender:2.0.0") + implementation("net.ttddyy.observation:datasource-micrometer-spring-boot:1.1.1") + + // Observability + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("io.micrometer:micrometer-tracing-bridge-otel") + implementation("io.opentelemetry:opentelemetry-exporter-otlp") + runtimeOnly("io.micrometer:micrometer-registry-prometheus") + + // Kotlin + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.3") + + // Test + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("io.mockk:mockk:1.14.4") + testImplementation("com.ninja-squad:springmockk:4.0.2") + + // Kotest + testImplementation("io.kotest:kotest-runner-junit5:5.9.1") + testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0") + + // RestAssured + testImplementation("io.rest-assured:rest-assured:5.5.5") + testImplementation("io.rest-assured:kotlin-extensions:5.5.5") + + // etc + implementation("org.apache.poi:poi-ooxml:5.2.3") +} + +tasks.jar { + enabled = false +} diff --git a/src/main/kotlin/roomescape/RoomescapeApplication.kt b/service/src/main/kotlin/com/sangdol/roomescape/RoomescapeApplication.kt similarity index 92% rename from src/main/kotlin/roomescape/RoomescapeApplication.kt rename to service/src/main/kotlin/com/sangdol/roomescape/RoomescapeApplication.kt index aca20d20..0e420eda 100644 --- a/src/main/kotlin/roomescape/RoomescapeApplication.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/RoomescapeApplication.kt @@ -1,4 +1,4 @@ -package roomescape +package com.sangdol.roomescape import org.springframework.boot.Banner import org.springframework.boot.SpringApplication diff --git a/src/main/kotlin/roomescape/admin/business/AdminService.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt similarity index 78% rename from src/main/kotlin/roomescape/admin/business/AdminService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt index 96faa073..6e07188e 100644 --- a/src/main/kotlin/roomescape/admin/business/AdminService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt @@ -1,17 +1,17 @@ -package roomescape.admin.business +package com.sangdol.roomescape.admin.business import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.admin.exception.AdminErrorCode -import roomescape.admin.exception.AdminException -import roomescape.admin.infrastructure.persistence.AdminRepository -import roomescape.common.dto.AdminLoginCredentials -import roomescape.common.dto.AuditConstant -import roomescape.common.dto.OperatorInfo -import roomescape.common.dto.toCredentials +import com.sangdol.roomescape.admin.exception.AdminErrorCode +import com.sangdol.roomescape.admin.exception.AdminException +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminRepository +import com.sangdol.roomescape.common.dto.AdminLoginCredentials +import com.sangdol.roomescape.common.dto.AuditConstant +import com.sangdol.roomescape.common.dto.OperatorInfo +import com.sangdol.roomescape.common.dto.toCredentials private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/admin/exception/AdminException.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/exception/AdminException.kt similarity index 72% rename from src/main/kotlin/roomescape/admin/exception/AdminException.kt rename to service/src/main/kotlin/com/sangdol/roomescape/admin/exception/AdminException.kt index a9bfcc8c..5de62281 100644 --- a/src/main/kotlin/roomescape/admin/exception/AdminException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/exception/AdminException.kt @@ -1,8 +1,8 @@ -package roomescape.admin.exception +package com.sangdol.roomescape.admin.exception +import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.RoomescapeException import org.springframework.http.HttpStatus -import roomescape.common.exception.ErrorCode -import roomescape.common.exception.RoomescapeException class AdminException( override val errorCode: AdminErrorCode, diff --git a/src/main/kotlin/roomescape/admin/infrastructure/persistence/AdminEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/infrastructure/persistence/AdminEntity.kt similarity index 91% rename from src/main/kotlin/roomescape/admin/infrastructure/persistence/AdminEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/admin/infrastructure/persistence/AdminEntity.kt index 85387596..106775eb 100644 --- a/src/main/kotlin/roomescape/admin/infrastructure/persistence/AdminEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/infrastructure/persistence/AdminEntity.kt @@ -1,8 +1,8 @@ -package roomescape.admin.infrastructure.persistence +package com.sangdol.roomescape.admin.infrastructure.persistence import jakarta.persistence.* import org.springframework.data.jpa.domain.support.AuditingEntityListener -import roomescape.common.entity.AuditingBaseEntity +import com.sangdol.roomescape.common.entity.AuditingBaseEntity @Entity @Table(name = "admin") diff --git a/src/main/kotlin/roomescape/admin/infrastructure/persistence/AdminRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/infrastructure/persistence/AdminRepository.kt similarity index 73% rename from src/main/kotlin/roomescape/admin/infrastructure/persistence/AdminRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/admin/infrastructure/persistence/AdminRepository.kt index 7520c23c..e0c071fd 100644 --- a/src/main/kotlin/roomescape/admin/infrastructure/persistence/AdminRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/infrastructure/persistence/AdminRepository.kt @@ -1,4 +1,4 @@ -package roomescape.admin.infrastructure.persistence +package com.sangdol.roomescape.admin.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/roomescape/auth/business/AuthService.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/business/AuthService.kt similarity index 84% rename from src/main/kotlin/roomescape/auth/business/AuthService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/business/AuthService.kt index 5366af04..ff0ca22d 100644 --- a/src/main/kotlin/roomescape/auth/business/AuthService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/business/AuthService.kt @@ -1,19 +1,19 @@ -package roomescape.auth.business +package com.sangdol.roomescape.auth.business import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.admin.business.AdminService -import roomescape.auth.exception.AuthErrorCode -import roomescape.auth.exception.AuthException -import roomescape.auth.infrastructure.jwt.JwtUtils -import roomescape.auth.web.LoginContext -import roomescape.auth.web.LoginRequest -import roomescape.auth.web.LoginSuccessResponse -import roomescape.common.dto.LoginCredentials -import roomescape.common.dto.PrincipalType -import roomescape.user.business.UserService +import com.sangdol.roomescape.admin.business.AdminService +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.auth.exception.AuthException +import com.sangdol.roomescape.auth.infrastructure.jwt.JwtUtils +import com.sangdol.roomescape.auth.web.LoginContext +import com.sangdol.roomescape.auth.web.LoginRequest +import com.sangdol.roomescape.auth.web.LoginSuccessResponse +import com.sangdol.roomescape.common.dto.LoginCredentials +import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.user.business.UserService private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/auth/business/LoginHistoryService.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/business/LoginHistoryService.kt similarity index 85% rename from src/main/kotlin/roomescape/auth/business/LoginHistoryService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/business/LoginHistoryService.kt index af7a06dc..680c1a91 100644 --- a/src/main/kotlin/roomescape/auth/business/LoginHistoryService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/business/LoginHistoryService.kt @@ -1,4 +1,4 @@ -package roomescape.auth.business +package com.sangdol.roomescape.auth.business import com.github.f4b6a3.tsid.TsidFactory import io.github.oshai.kotlinlogging.KLogger @@ -6,11 +6,11 @@ import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Propagation import org.springframework.transaction.annotation.Transactional -import roomescape.auth.infrastructure.persistence.LoginHistoryEntity -import roomescape.auth.infrastructure.persistence.LoginHistoryRepository -import roomescape.auth.web.LoginContext -import roomescape.common.config.next -import roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.auth.infrastructure.persistence.LoginHistoryEntity +import com.sangdol.roomescape.auth.infrastructure.persistence.LoginHistoryRepository +import com.sangdol.roomescape.auth.web.LoginContext +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.common.dto.PrincipalType private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/auth/docs/AuthAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt similarity index 70% rename from src/main/kotlin/roomescape/auth/docs/AuthAPI.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt index 5571a169..593f7397 100644 --- a/src/main/kotlin/roomescape/auth/docs/AuthAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/docs/AuthAPI.kt @@ -1,4 +1,4 @@ -package roomescape.auth.docs +package com.sangdol.roomescape.auth.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse @@ -8,12 +8,12 @@ import jakarta.servlet.http.HttpServletResponse import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.RequestBody -import roomescape.auth.web.LoginRequest -import roomescape.auth.web.LoginSuccessResponse -import roomescape.auth.web.support.Public -import roomescape.auth.web.support.User -import roomescape.common.dto.CurrentUserContext -import roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.auth.web.LoginRequest +import com.sangdol.roomescape.auth.web.LoginSuccessResponse +import com.sangdol.roomescape.auth.web.support.Public +import com.sangdol.roomescape.auth.web.support.User +import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.common.dto.response.CommonApiResponse interface AuthAPI { diff --git a/src/main/kotlin/roomescape/auth/exception/AuthErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthErrorCode.kt similarity index 89% rename from src/main/kotlin/roomescape/auth/exception/AuthErrorCode.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthErrorCode.kt index 40781ac5..ee5f5f01 100644 --- a/src/main/kotlin/roomescape/auth/exception/AuthErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthErrorCode.kt @@ -1,7 +1,7 @@ -package roomescape.auth.exception +package com.sangdol.roomescape.auth.exception import org.springframework.http.HttpStatus -import roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.ErrorCode enum class AuthErrorCode( override val httpStatus: HttpStatus, diff --git a/src/main/kotlin/roomescape/auth/exception/AuthException.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthException.kt similarity index 59% rename from src/main/kotlin/roomescape/auth/exception/AuthException.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthException.kt index 83295bdf..07c26ac6 100644 --- a/src/main/kotlin/roomescape/auth/exception/AuthException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthException.kt @@ -1,6 +1,6 @@ -package roomescape.auth.exception +package com.sangdol.roomescape.auth.exception -import roomescape.common.exception.RoomescapeException +import com.sangdol.roomescape.common.exception.RoomescapeException class AuthException( override val errorCode: AuthErrorCode, diff --git a/src/main/kotlin/roomescape/auth/infrastructure/jwt/JwtUtils.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/jwt/JwtUtils.kt similarity index 93% rename from src/main/kotlin/roomescape/auth/infrastructure/jwt/JwtUtils.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/jwt/JwtUtils.kt index b68d612b..ba34b687 100644 --- a/src/main/kotlin/roomescape/auth/infrastructure/jwt/JwtUtils.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/jwt/JwtUtils.kt @@ -1,4 +1,4 @@ -package roomescape.auth.infrastructure.jwt +package com.sangdol.roomescape.auth.infrastructure.jwt import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -8,8 +8,8 @@ import io.jsonwebtoken.Jwts import io.jsonwebtoken.security.Keys import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component -import roomescape.auth.exception.AuthErrorCode -import roomescape.auth.exception.AuthException +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.auth.exception.AuthException import java.util.* import javax.crypto.SecretKey diff --git a/src/main/kotlin/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt similarity index 77% rename from src/main/kotlin/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt index 126e6a9e..8a64442f 100644 --- a/src/main/kotlin/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt @@ -1,10 +1,10 @@ -package roomescape.auth.infrastructure.persistence +package com.sangdol.roomescape.auth.infrastructure.persistence import jakarta.persistence.* import org.springframework.data.annotation.CreatedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener -import roomescape.common.dto.PrincipalType -import roomescape.common.entity.PersistableBaseEntity +import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.common.entity.PersistableBaseEntity import java.time.LocalDateTime @Entity diff --git a/src/main/kotlin/roomescape/auth/infrastructure/persistence/LoginHistoryRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryRepository.kt similarity index 77% rename from src/main/kotlin/roomescape/auth/infrastructure/persistence/LoginHistoryRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryRepository.kt index 8eef79a6..562d0eda 100644 --- a/src/main/kotlin/roomescape/auth/infrastructure/persistence/LoginHistoryRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryRepository.kt @@ -1,4 +1,4 @@ -package roomescape.auth.infrastructure.persistence +package com.sangdol.roomescape.auth.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/roomescape/auth/web/AuthController.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt similarity index 76% rename from src/main/kotlin/roomescape/auth/web/AuthController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt index 7e173128..d3325d2b 100644 --- a/src/main/kotlin/roomescape/auth/web/AuthController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthController.kt @@ -1,4 +1,4 @@ -package roomescape.auth.web +package com.sangdol.roomescape.auth.web import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse @@ -6,11 +6,11 @@ import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController -import roomescape.auth.business.AuthService -import roomescape.auth.docs.AuthAPI -import roomescape.auth.web.support.User -import roomescape.common.dto.CurrentUserContext -import roomescape.common.dto.response.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.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.common.dto.response.CommonApiResponse @RestController @RequestMapping("/auth") diff --git a/src/main/kotlin/roomescape/auth/web/AuthDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthDTO.kt similarity index 82% rename from src/main/kotlin/roomescape/auth/web/AuthDTO.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthDTO.kt index a1622c26..51ee0da3 100644 --- a/src/main/kotlin/roomescape/auth/web/AuthDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/AuthDTO.kt @@ -1,8 +1,8 @@ -package roomescape.auth.web +package com.sangdol.roomescape.auth.web import jakarta.servlet.http.HttpServletRequest -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.common.dto.PrincipalType data class LoginContext( val ipAddress: String, diff --git a/src/main/kotlin/roomescape/auth/web/support/AuthAnnotations.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/AuthAnnotations.kt similarity index 71% rename from src/main/kotlin/roomescape/auth/web/support/AuthAnnotations.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/AuthAnnotations.kt index 712f0b5e..1351aaa5 100644 --- a/src/main/kotlin/roomescape/auth/web/support/AuthAnnotations.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/AuthAnnotations.kt @@ -1,7 +1,7 @@ -package roomescape.auth.web.support +package com.sangdol.roomescape.auth.web.support -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.admin.infrastructure.persistence.Privilege +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.admin.infrastructure.persistence.Privilege @Target(AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) diff --git a/src/main/kotlin/roomescape/auth/web/support/CookieUtils.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/CookieUtils.kt similarity index 85% rename from src/main/kotlin/roomescape/auth/web/support/CookieUtils.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/CookieUtils.kt index 4b0b2b71..2ef93547 100644 --- a/src/main/kotlin/roomescape/auth/web/support/CookieUtils.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/CookieUtils.kt @@ -1,4 +1,4 @@ -package roomescape.auth.web.support +package com.sangdol.roomescape.auth.web.support import jakarta.servlet.http.HttpServletRequest diff --git a/src/main/kotlin/roomescape/auth/web/support/interceptors/AdminInterceptor.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/interceptors/AdminInterceptor.kt similarity index 83% rename from src/main/kotlin/roomescape/auth/web/support/interceptors/AdminInterceptor.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/interceptors/AdminInterceptor.kt index 4b521df0..7a72a113 100644 --- a/src/main/kotlin/roomescape/auth/web/support/interceptors/AdminInterceptor.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/interceptors/AdminInterceptor.kt @@ -1,4 +1,4 @@ -package roomescape.auth.web.support.interceptors +package com.sangdol.roomescape.auth.web.support.interceptors import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -7,17 +7,17 @@ import jakarta.servlet.http.HttpServletResponse import org.springframework.stereotype.Component import org.springframework.web.method.HandlerMethod import org.springframework.web.servlet.HandlerInterceptor -import roomescape.admin.infrastructure.persistence.AdminPermissionLevel -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.admin.infrastructure.persistence.Privilege -import roomescape.auth.business.CLAIM_ADMIN_TYPE_KEY -import roomescape.auth.business.CLAIM_PERMISSION_KEY -import roomescape.auth.exception.AuthErrorCode -import roomescape.auth.exception.AuthException -import roomescape.auth.infrastructure.jwt.JwtUtils -import roomescape.auth.web.support.AdminOnly -import roomescape.auth.web.support.accessToken -import roomescape.common.util.MdcPrincipalId +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.admin.infrastructure.persistence.Privilege +import com.sangdol.roomescape.auth.business.CLAIM_ADMIN_TYPE_KEY +import com.sangdol.roomescape.auth.business.CLAIM_PERMISSION_KEY +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.auth.exception.AuthException +import com.sangdol.roomescape.auth.infrastructure.jwt.JwtUtils +import com.sangdol.roomescape.auth.web.support.AdminOnly +import com.sangdol.roomescape.auth.web.support.accessToken +import com.sangdol.roomescape.common.util.MdcPrincipalId private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/auth/web/support/interceptors/UserInterceptor.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/interceptors/UserInterceptor.kt similarity index 78% rename from src/main/kotlin/roomescape/auth/web/support/interceptors/UserInterceptor.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/interceptors/UserInterceptor.kt index 4db11d08..aa581bc3 100644 --- a/src/main/kotlin/roomescape/auth/web/support/interceptors/UserInterceptor.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/interceptors/UserInterceptor.kt @@ -1,4 +1,4 @@ -package roomescape.auth.web.support.interceptors +package com.sangdol.roomescape.auth.web.support.interceptors import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -7,13 +7,13 @@ import jakarta.servlet.http.HttpServletResponse import org.springframework.stereotype.Component import org.springframework.web.method.HandlerMethod import org.springframework.web.servlet.HandlerInterceptor -import roomescape.auth.business.CLAIM_ADMIN_TYPE_KEY -import roomescape.auth.exception.AuthErrorCode -import roomescape.auth.exception.AuthException -import roomescape.auth.infrastructure.jwt.JwtUtils -import roomescape.auth.web.support.UserOnly -import roomescape.auth.web.support.accessToken -import roomescape.common.util.MdcPrincipalId +import com.sangdol.roomescape.auth.business.CLAIM_ADMIN_TYPE_KEY +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.auth.exception.AuthException +import com.sangdol.roomescape.auth.infrastructure.jwt.JwtUtils +import com.sangdol.roomescape.auth.web.support.UserOnly +import com.sangdol.roomescape.auth.web.support.accessToken +import com.sangdol.roomescape.common.util.MdcPrincipalId private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/auth/web/support/resolver/UserContextResolver.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/resolver/UserContextResolver.kt similarity index 79% rename from src/main/kotlin/roomescape/auth/web/support/resolver/UserContextResolver.kt rename to service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/resolver/UserContextResolver.kt index 7c731c5d..ea47d16b 100644 --- a/src/main/kotlin/roomescape/auth/web/support/resolver/UserContextResolver.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/web/support/resolver/UserContextResolver.kt @@ -1,4 +1,4 @@ -package roomescape.auth.web.support.resolver +package com.sangdol.roomescape.auth.web.support.resolver import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -9,12 +9,12 @@ import org.springframework.web.bind.support.WebDataBinderFactory import org.springframework.web.context.request.NativeWebRequest import org.springframework.web.method.support.HandlerMethodArgumentResolver import org.springframework.web.method.support.ModelAndViewContainer -import roomescape.auth.exception.AuthErrorCode -import roomescape.auth.exception.AuthException -import roomescape.auth.infrastructure.jwt.JwtUtils -import roomescape.auth.web.support.User -import roomescape.auth.web.support.accessToken -import roomescape.user.business.UserService +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.auth.exception.AuthException +import com.sangdol.roomescape.auth.infrastructure.jwt.JwtUtils +import com.sangdol.roomescape.auth.web.support.User +import com.sangdol.roomescape.auth.web.support.accessToken +import com.sangdol.roomescape.user.business.UserService private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/common/config/JacksonConfig.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/config/JacksonConfig.kt similarity index 98% rename from src/main/kotlin/roomescape/common/config/JacksonConfig.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/config/JacksonConfig.kt index 3550aed7..b5662a33 100644 --- a/src/main/kotlin/roomescape/common/config/JacksonConfig.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/config/JacksonConfig.kt @@ -1,4 +1,4 @@ -package roomescape.common.config +package com.sangdol.roomescape.common.config import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.databind.DeserializationFeature diff --git a/src/main/kotlin/roomescape/common/config/JpaConfig.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/config/JpaConfig.kt similarity index 83% rename from src/main/kotlin/roomescape/common/config/JpaConfig.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/config/JpaConfig.kt index 29a14094..a34c0251 100644 --- a/src/main/kotlin/roomescape/common/config/JpaConfig.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/config/JpaConfig.kt @@ -1,10 +1,10 @@ -package roomescape.common.config +package com.sangdol.roomescape.common.config import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.data.domain.AuditorAware import org.springframework.data.jpa.repository.config.EnableJpaAuditing -import roomescape.common.util.MdcPrincipalId +import com.sangdol.roomescape.common.util.MdcPrincipalId import java.util.* @Configuration diff --git a/service/src/main/kotlin/com/sangdol/roomescape/common/config/SwaggerConfig.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/config/SwaggerConfig.kt new file mode 100644 index 00000000..509a0192 --- /dev/null +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/config/SwaggerConfig.kt @@ -0,0 +1,15 @@ +package com.sangdol.roomescape.common.config + +import io.swagger.v3.oas.models.OpenAPI +import io.swagger.v3.oas.models.info.Info +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +@Configuration +class SwaggerConfig { + + @Bean + fun openAPI(): OpenAPI { + return OpenAPI() + } +} diff --git a/src/main/kotlin/roomescape/common/config/TsidConfig.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/config/TsidConfig.kt similarity index 91% rename from src/main/kotlin/roomescape/common/config/TsidConfig.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/config/TsidConfig.kt index ea84f02c..5561e6b7 100644 --- a/src/main/kotlin/roomescape/common/config/TsidConfig.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/config/TsidConfig.kt @@ -1,4 +1,4 @@ -package roomescape.common.config +package com.sangdol.roomescape.common.config import com.github.f4b6a3.tsid.TsidFactory import org.springframework.beans.factory.annotation.Value diff --git a/src/main/kotlin/roomescape/common/config/WebMvcConfig.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/config/WebMvcConfig.kt similarity index 75% rename from src/main/kotlin/roomescape/common/config/WebMvcConfig.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/config/WebMvcConfig.kt index 96eb747c..2bf615eb 100644 --- a/src/main/kotlin/roomescape/common/config/WebMvcConfig.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/config/WebMvcConfig.kt @@ -1,12 +1,12 @@ -package roomescape.common.config +package com.sangdol.roomescape.common.config import org.springframework.context.annotation.Configuration import org.springframework.web.method.support.HandlerMethodArgumentResolver import org.springframework.web.servlet.config.annotation.InterceptorRegistry import org.springframework.web.servlet.config.annotation.WebMvcConfigurer -import roomescape.auth.web.support.interceptors.AdminInterceptor -import roomescape.auth.web.support.interceptors.UserInterceptor -import roomescape.auth.web.support.resolver.UserContextResolver +import com.sangdol.roomescape.auth.web.support.interceptors.AdminInterceptor +import com.sangdol.roomescape.auth.web.support.interceptors.UserInterceptor +import com.sangdol.roomescape.auth.web.support.resolver.UserContextResolver @Configuration class WebMvcConfig( diff --git a/src/main/kotlin/roomescape/common/dto/AuditDto.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/dto/AuditDto.kt similarity index 89% rename from src/main/kotlin/roomescape/common/dto/AuditDto.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/dto/AuditDto.kt index e8c956e2..e52fdbe3 100644 --- a/src/main/kotlin/roomescape/common/dto/AuditDto.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/dto/AuditDto.kt @@ -1,4 +1,4 @@ -package roomescape.common.dto +package com.sangdol.roomescape.common.dto import java.time.LocalDateTime diff --git a/src/main/kotlin/roomescape/common/dto/CommonAuth.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/dto/CommonAuth.kt similarity index 72% rename from src/main/kotlin/roomescape/common/dto/CommonAuth.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/dto/CommonAuth.kt index 3d037d55..e6ff00cf 100644 --- a/src/main/kotlin/roomescape/common/dto/CommonAuth.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/dto/CommonAuth.kt @@ -1,12 +1,12 @@ -package roomescape.common.dto +package com.sangdol.roomescape.common.dto -import roomescape.admin.infrastructure.persistence.AdminEntity -import roomescape.admin.infrastructure.persistence.AdminPermissionLevel -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.auth.web.AdminLoginSuccessResponse -import roomescape.auth.web.LoginSuccessResponse -import roomescape.auth.web.UserLoginSuccessResponse -import roomescape.user.infrastructure.persistence.UserEntity +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminEntity +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.auth.web.AdminLoginSuccessResponse +import com.sangdol.roomescape.auth.web.LoginSuccessResponse +import com.sangdol.roomescape.auth.web.UserLoginSuccessResponse +import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity abstract class LoginCredentials { diff --git a/src/main/kotlin/roomescape/common/dto/response/CommonApiResponse.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/dto/response/CommonApiResponse.kt similarity index 78% rename from src/main/kotlin/roomescape/common/dto/response/CommonApiResponse.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/dto/response/CommonApiResponse.kt index 6f625907..e52f0804 100644 --- a/src/main/kotlin/roomescape/common/dto/response/CommonApiResponse.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/dto/response/CommonApiResponse.kt @@ -1,7 +1,7 @@ -package roomescape.common.dto.response +package com.sangdol.roomescape.common.dto.response import com.fasterxml.jackson.annotation.JsonInclude -import roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.ErrorCode @JsonInclude(JsonInclude.Include.NON_NULL) data class CommonApiResponse( diff --git a/src/main/kotlin/roomescape/common/entity/BaseEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/entity/BaseEntity.kt similarity index 96% rename from src/main/kotlin/roomescape/common/entity/BaseEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/entity/BaseEntity.kt index 707d2249..2d76c19c 100644 --- a/src/main/kotlin/roomescape/common/entity/BaseEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/entity/BaseEntity.kt @@ -1,4 +1,4 @@ -package roomescape.common.entity +package com.sangdol.roomescape.common.entity import jakarta.persistence.* import org.springframework.data.annotation.CreatedBy diff --git a/src/main/kotlin/roomescape/common/exception/CommonErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/CommonErrorCode.kt similarity index 92% rename from src/main/kotlin/roomescape/common/exception/CommonErrorCode.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/exception/CommonErrorCode.kt index 5711c7af..67f34d86 100644 --- a/src/main/kotlin/roomescape/common/exception/CommonErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/CommonErrorCode.kt @@ -1,4 +1,4 @@ -package roomescape.common.exception +package com.sangdol.roomescape.common.exception import org.springframework.http.HttpStatus diff --git a/src/main/kotlin/roomescape/common/exception/ErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/ErrorCode.kt similarity index 75% rename from src/main/kotlin/roomescape/common/exception/ErrorCode.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/exception/ErrorCode.kt index 1f08d3b5..7aa21c20 100644 --- a/src/main/kotlin/roomescape/common/exception/ErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/ErrorCode.kt @@ -1,4 +1,4 @@ -package roomescape.common.exception +package com.sangdol.roomescape.common.exception import org.springframework.http.HttpStatus diff --git a/src/main/kotlin/roomescape/common/exception/ExceptionControllerAdvice.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/ExceptionControllerAdvice.kt similarity index 91% rename from src/main/kotlin/roomescape/common/exception/ExceptionControllerAdvice.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/exception/ExceptionControllerAdvice.kt index b7f0d101..aff98040 100644 --- a/src/main/kotlin/roomescape/common/exception/ExceptionControllerAdvice.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/ExceptionControllerAdvice.kt @@ -1,4 +1,4 @@ -package roomescape.common.exception +package com.sangdol.roomescape.common.exception import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -10,12 +10,12 @@ import org.springframework.http.converter.HttpMessageNotReadableException import org.springframework.web.bind.MethodArgumentNotValidException import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.RestControllerAdvice -import roomescape.auth.exception.AuthException -import roomescape.common.dto.response.CommonErrorResponse -import roomescape.common.log.ApiLogMessageConverter -import roomescape.common.log.ConvertResponseMessageRequest -import roomescape.common.log.LogType -import roomescape.common.log.getEndpoint +import com.sangdol.roomescape.auth.exception.AuthException +import com.sangdol.roomescape.common.dto.response.CommonErrorResponse +import com.sangdol.roomescape.common.log.ApiLogMessageConverter +import com.sangdol.roomescape.common.log.ConvertResponseMessageRequest +import com.sangdol.roomescape.common.log.LogType +import com.sangdol.roomescape.common.log.getEndpoint private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/common/exception/RoomescapeException.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/RoomescapeException.kt similarity index 75% rename from src/main/kotlin/roomescape/common/exception/RoomescapeException.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/exception/RoomescapeException.kt index 4dc157ba..aeb024e5 100644 --- a/src/main/kotlin/roomescape/common/exception/RoomescapeException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/RoomescapeException.kt @@ -1,4 +1,4 @@ -package roomescape.common.exception +package com.sangdol.roomescape.common.exception open class RoomescapeException( open val errorCode: ErrorCode, diff --git a/src/main/kotlin/roomescape/common/log/ApiLogMessageConverter.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/log/ApiLogMessageConverter.kt similarity index 96% rename from src/main/kotlin/roomescape/common/log/ApiLogMessageConverter.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/log/ApiLogMessageConverter.kt index 8cf19eab..6ee68b21 100644 --- a/src/main/kotlin/roomescape/common/log/ApiLogMessageConverter.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/log/ApiLogMessageConverter.kt @@ -1,8 +1,8 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import com.fasterxml.jackson.databind.ObjectMapper import jakarta.servlet.http.HttpServletRequest -import roomescape.common.util.MdcPrincipalId +import com.sangdol.roomescape.common.util.MdcPrincipalId enum class LogType { INCOMING_HTTP_REQUEST, diff --git a/src/main/kotlin/roomescape/common/log/ControllerLoggingAspect.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/log/ControllerLoggingAspect.kt similarity index 96% rename from src/main/kotlin/roomescape/common/log/ControllerLoggingAspect.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/log/ControllerLoggingAspect.kt index a56c19de..c88b1abb 100644 --- a/src/main/kotlin/roomescape/common/log/ControllerLoggingAspect.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/log/ControllerLoggingAspect.kt @@ -1,4 +1,4 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -24,7 +24,7 @@ class ControllerLoggingAspect( private val messageConverter: ApiLogMessageConverter, ) { - @Pointcut("execution(* roomescape..web..*Controller*.*(..))") + @Pointcut("execution(* com.sangdol.roomescape..web..*Controller*.*(..))") fun allController() { } diff --git a/src/main/kotlin/roomescape/common/log/HttpRequestLoggingFilter.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/log/HttpRequestLoggingFilter.kt similarity index 92% rename from src/main/kotlin/roomescape/common/log/HttpRequestLoggingFilter.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/log/HttpRequestLoggingFilter.kt index 70442684..8fc8670a 100644 --- a/src/main/kotlin/roomescape/common/log/HttpRequestLoggingFilter.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/log/HttpRequestLoggingFilter.kt @@ -1,4 +1,4 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -9,7 +9,7 @@ import org.slf4j.MDC import org.springframework.web.filter.OncePerRequestFilter import org.springframework.web.util.ContentCachingRequestWrapper import org.springframework.web.util.ContentCachingResponseWrapper -import roomescape.common.util.MdcPrincipalId +import com.sangdol.roomescape.common.util.MdcPrincipalId private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/common/log/LogConfiguration.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/log/LogConfiguration.kt similarity index 96% rename from src/main/kotlin/roomescape/common/log/LogConfiguration.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/log/LogConfiguration.kt index 5905b7c6..bf20b06e 100644 --- a/src/main/kotlin/roomescape/common/log/LogConfiguration.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/log/LogConfiguration.kt @@ -1,4 +1,4 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import com.fasterxml.jackson.databind.ObjectMapper import org.springframework.boot.web.servlet.FilterRegistrationBean diff --git a/src/main/kotlin/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParams.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParams.kt similarity index 96% rename from src/main/kotlin/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParams.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParams.kt index bbc44024..a6e979c5 100644 --- a/src/main/kotlin/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParams.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParams.kt @@ -1,4 +1,4 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import net.ttddyy.dsproxy.ExecutionInfo import net.ttddyy.dsproxy.QueryInfo diff --git a/src/main/kotlin/roomescape/common/log/ProxyDataSourceConfig.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/log/ProxyDataSourceConfig.kt similarity index 97% rename from src/main/kotlin/roomescape/common/log/ProxyDataSourceConfig.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/log/ProxyDataSourceConfig.kt index b0300f54..e6c7f117 100644 --- a/src/main/kotlin/roomescape/common/log/ProxyDataSourceConfig.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/log/ProxyDataSourceConfig.kt @@ -1,4 +1,4 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import com.zaxxer.hikari.HikariDataSource import net.ttddyy.dsproxy.listener.logging.SLF4JLogLevel diff --git a/src/main/kotlin/roomescape/common/log/RoomescapeLogMaskingConverter.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverter.kt similarity index 96% rename from src/main/kotlin/roomescape/common/log/RoomescapeLogMaskingConverter.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverter.kt index 104eeba9..714cb70b 100644 --- a/src/main/kotlin/roomescape/common/log/RoomescapeLogMaskingConverter.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverter.kt @@ -1,4 +1,4 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import ch.qos.logback.classic.pattern.MessageConverter import ch.qos.logback.classic.spi.ILoggingEvent @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.databind.node.ObjectNode import com.fasterxml.jackson.databind.node.TextNode -import roomescape.common.config.JacksonConfig +import com.sangdol.roomescape.common.config.JacksonConfig private const val MASK: String = "****" private val SENSITIVE_KEYS = setOf("password", "accessToken", "phone") diff --git a/src/main/kotlin/roomescape/common/util/DateUtils.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/util/DateUtils.kt similarity index 86% rename from src/main/kotlin/roomescape/common/util/DateUtils.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/util/DateUtils.kt index 4ad16583..cf2b2ebf 100644 --- a/src/main/kotlin/roomescape/common/util/DateUtils.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/util/DateUtils.kt @@ -1,4 +1,4 @@ -package roomescape.common.util +package com.sangdol.roomescape.common.util import java.time.DayOfWeek import java.time.LocalDate diff --git a/src/main/kotlin/roomescape/common/util/MDCUtils.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/util/MDCUtils.kt similarity index 92% rename from src/main/kotlin/roomescape/common/util/MDCUtils.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/util/MDCUtils.kt index 6283c605..8aa50781 100644 --- a/src/main/kotlin/roomescape/common/util/MDCUtils.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/util/MDCUtils.kt @@ -1,4 +1,4 @@ -package roomescape.common.util +package com.sangdol.roomescape.common.util import org.slf4j.MDC import java.util.* diff --git a/src/main/kotlin/roomescape/common/util/TransactionExecutionUtil.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/util/TransactionExecutionUtil.kt similarity index 86% rename from src/main/kotlin/roomescape/common/util/TransactionExecutionUtil.kt rename to service/src/main/kotlin/com/sangdol/roomescape/common/util/TransactionExecutionUtil.kt index 28a980e5..d4428190 100644 --- a/src/main/kotlin/roomescape/common/util/TransactionExecutionUtil.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/util/TransactionExecutionUtil.kt @@ -1,4 +1,4 @@ -package roomescape.common.util +package com.sangdol.roomescape.common.util import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -6,8 +6,8 @@ import org.springframework.stereotype.Component import org.springframework.transaction.PlatformTransactionManager import org.springframework.transaction.TransactionDefinition import org.springframework.transaction.support.TransactionTemplate -import roomescape.common.exception.CommonErrorCode -import roomescape.common.exception.RoomescapeException +import com.sangdol.roomescape.common.exception.CommonErrorCode +import com.sangdol.roomescape.common.exception.RoomescapeException private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/payment/business/PaymentService.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentService.kt similarity index 90% rename from src/main/kotlin/roomescape/payment/business/PaymentService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentService.kt index 2d483898..126be6b0 100644 --- a/src/main/kotlin/roomescape/payment/business/PaymentService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentService.kt @@ -1,17 +1,17 @@ -package roomescape.payment.business +package com.sangdol.roomescape.payment.business import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.common.util.TransactionExecutionUtil -import roomescape.payment.exception.PaymentErrorCode -import roomescape.payment.exception.PaymentException -import roomescape.payment.infrastructure.client.PaymentClientCancelResponse -import roomescape.payment.infrastructure.client.PaymentClientConfirmResponse -import roomescape.payment.infrastructure.client.TosspayClient -import roomescape.payment.infrastructure.persistence.* -import roomescape.payment.web.* +import com.sangdol.roomescape.common.util.TransactionExecutionUtil +import com.sangdol.roomescape.payment.exception.PaymentErrorCode +import com.sangdol.roomescape.payment.exception.PaymentException +import com.sangdol.roomescape.payment.infrastructure.client.PaymentClientCancelResponse +import com.sangdol.roomescape.payment.infrastructure.client.PaymentClientConfirmResponse +import com.sangdol.roomescape.payment.infrastructure.client.TosspayClient +import com.sangdol.roomescape.payment.infrastructure.persistence.* +import com.sangdol.roomescape.payment.web.* private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/payment/business/PaymentWriter.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentWriter.kt similarity index 85% rename from src/main/kotlin/roomescape/payment/business/PaymentWriter.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentWriter.kt index 60a7473f..16ff6d59 100644 --- a/src/main/kotlin/roomescape/payment/business/PaymentWriter.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/business/PaymentWriter.kt @@ -1,16 +1,16 @@ -package roomescape.payment.business +package com.sangdol.roomescape.payment.business import com.github.f4b6a3.tsid.TsidFactory import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Component -import roomescape.common.config.next -import roomescape.payment.exception.PaymentErrorCode -import roomescape.payment.exception.PaymentException -import roomescape.payment.infrastructure.client.* -import roomescape.payment.infrastructure.common.PaymentMethod -import roomescape.payment.infrastructure.common.PaymentType -import roomescape.payment.infrastructure.persistence.* +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.payment.exception.PaymentErrorCode +import com.sangdol.roomescape.payment.exception.PaymentException +import com.sangdol.roomescape.payment.infrastructure.client.* +import com.sangdol.roomescape.payment.infrastructure.common.PaymentMethod +import com.sangdol.roomescape.payment.infrastructure.common.PaymentType +import com.sangdol.roomescape.payment.infrastructure.persistence.* import java.time.LocalDateTime private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/payment/docs/PaymentAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt similarity index 68% rename from src/main/kotlin/roomescape/payment/docs/PaymentAPI.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt index 708cec30..1e566ee1 100644 --- a/src/main/kotlin/roomescape/payment/docs/PaymentAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/docs/PaymentAPI.kt @@ -1,4 +1,4 @@ -package roomescape.payment.docs +package com.sangdol.roomescape.payment.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse @@ -7,13 +7,13 @@ import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestParam -import roomescape.auth.web.support.User -import roomescape.auth.web.support.UserOnly -import roomescape.common.dto.CurrentUserContext -import roomescape.common.dto.response.CommonApiResponse -import roomescape.payment.web.PaymentCancelRequest -import roomescape.payment.web.PaymentConfirmRequest -import roomescape.payment.web.PaymentCreateResponse +import com.sangdol.roomescape.auth.web.support.User +import com.sangdol.roomescape.auth.web.support.UserOnly +import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.payment.web.PaymentCancelRequest +import com.sangdol.roomescape.payment.web.PaymentConfirmRequest +import com.sangdol.roomescape.payment.web.PaymentCreateResponse interface PaymentAPI { diff --git a/src/main/kotlin/roomescape/payment/exception/PaymentErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentErrorCode.kt similarity index 92% rename from src/main/kotlin/roomescape/payment/exception/PaymentErrorCode.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentErrorCode.kt index 77188954..2c2676e1 100644 --- a/src/main/kotlin/roomescape/payment/exception/PaymentErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentErrorCode.kt @@ -1,7 +1,7 @@ -package roomescape.payment.exception +package com.sangdol.roomescape.payment.exception import org.springframework.http.HttpStatus -import roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.ErrorCode enum class PaymentErrorCode( override val httpStatus: HttpStatus, diff --git a/src/main/kotlin/roomescape/payment/exception/PaymentException.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentException.kt similarity index 59% rename from src/main/kotlin/roomescape/payment/exception/PaymentException.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentException.kt index 20ad4208..7bb10717 100644 --- a/src/main/kotlin/roomescape/payment/exception/PaymentException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentException.kt @@ -1,6 +1,6 @@ -package roomescape.payment.exception +package com.sangdol.roomescape.payment.exception -import roomescape.common.exception.RoomescapeException +import com.sangdol.roomescape.common.exception.RoomescapeException class PaymentException( override val errorCode: PaymentErrorCode, diff --git a/src/main/kotlin/roomescape/payment/infrastructure/client/PaymentConfig.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/PaymentConfig.kt similarity index 96% rename from src/main/kotlin/roomescape/payment/infrastructure/client/PaymentConfig.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/PaymentConfig.kt index ea8e2b18..231f6624 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/client/PaymentConfig.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/PaymentConfig.kt @@ -1,4 +1,4 @@ -package roomescape.payment.infrastructure.client +package com.sangdol.roomescape.payment.infrastructure.client import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder diff --git a/src/main/kotlin/roomescape/payment/infrastructure/client/PaymentProperties.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/PaymentProperties.kt similarity index 81% rename from src/main/kotlin/roomescape/payment/infrastructure/client/PaymentProperties.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/PaymentProperties.kt index 4b1873b8..52f8c729 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/client/PaymentProperties.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/PaymentProperties.kt @@ -1,4 +1,4 @@ -package roomescape.payment.infrastructure.client +package com.sangdol.roomescape.payment.infrastructure.client import org.springframework.boot.context.properties.ConfigurationProperties diff --git a/src/main/kotlin/roomescape/payment/infrastructure/client/TosspayCancelDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayCancelDTO.kt similarity index 90% rename from src/main/kotlin/roomescape/payment/infrastructure/client/TosspayCancelDTO.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayCancelDTO.kt index 551e7ae5..a4077b27 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/client/TosspayCancelDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayCancelDTO.kt @@ -1,11 +1,11 @@ -package roomescape.payment.infrastructure.client +package com.sangdol.roomescape.payment.infrastructure.client import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.databind.DeserializationContext import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import roomescape.payment.infrastructure.common.PaymentStatus -import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity +import com.sangdol.roomescape.payment.infrastructure.common.PaymentStatus +import com.sangdol.roomescape.payment.infrastructure.persistence.CanceledPaymentEntity import java.time.LocalDateTime import java.time.OffsetDateTime diff --git a/src/main/kotlin/roomescape/payment/infrastructure/client/TosspayClient.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayClient.kt similarity index 96% rename from src/main/kotlin/roomescape/payment/infrastructure/client/TosspayClient.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayClient.kt index 1a1fdb86..53c56a59 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/client/TosspayClient.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayClient.kt @@ -1,4 +1,4 @@ -package roomescape.payment.infrastructure.client +package com.sangdol.roomescape.payment.infrastructure.client import com.fasterxml.jackson.databind.ObjectMapper import io.github.oshai.kotlinlogging.KLogger @@ -10,8 +10,8 @@ import org.springframework.http.client.ClientHttpResponse import org.springframework.stereotype.Component import org.springframework.web.client.ResponseErrorHandler import org.springframework.web.client.RestClient -import roomescape.payment.exception.PaymentErrorCode -import roomescape.payment.exception.PaymentException +import com.sangdol.roomescape.payment.exception.PaymentErrorCode +import com.sangdol.roomescape.payment.exception.PaymentException import java.net.URI private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt similarity index 84% rename from src/main/kotlin/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt index ebe0ef20..ebcf0719 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayConfirmDTO.kt @@ -1,12 +1,12 @@ -package roomescape.payment.infrastructure.client +package com.sangdol.roomescape.payment.infrastructure.client -import roomescape.payment.exception.PaymentErrorCode -import roomescape.payment.exception.PaymentException -import roomescape.payment.infrastructure.common.* -import roomescape.payment.infrastructure.persistence.PaymentBankTransferDetailEntity -import roomescape.payment.infrastructure.persistence.PaymentCardDetailEntity -import roomescape.payment.infrastructure.persistence.PaymentEasypayPrepaidDetailEntity -import roomescape.payment.infrastructure.persistence.PaymentEntity +import com.sangdol.roomescape.payment.exception.PaymentErrorCode +import com.sangdol.roomescape.payment.exception.PaymentException +import com.sangdol.roomescape.payment.infrastructure.common.* +import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentBankTransferDetailEntity +import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentCardDetailEntity +import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentEasypayPrepaidDetailEntity +import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentEntity import java.time.OffsetDateTime data class PaymentClientConfirmResponse( diff --git a/src/main/kotlin/roomescape/payment/infrastructure/client/TosspayErrorResponse.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayErrorResponse.kt similarity index 57% rename from src/main/kotlin/roomescape/payment/infrastructure/client/TosspayErrorResponse.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayErrorResponse.kt index fbb20ccc..7a504395 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/client/TosspayErrorResponse.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayErrorResponse.kt @@ -1,4 +1,4 @@ -package roomescape.payment.infrastructure.client +package com.sangdol.roomescape.payment.infrastructure.client data class TosspayErrorResponse( val code: String, diff --git a/src/main/kotlin/roomescape/payment/infrastructure/common/PaymentTypes.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/common/PaymentTypes.kt similarity index 97% rename from src/main/kotlin/roomescape/payment/infrastructure/common/PaymentTypes.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/common/PaymentTypes.kt index 6ecabb80..44ef401f 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/common/PaymentTypes.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/common/PaymentTypes.kt @@ -1,10 +1,10 @@ -package roomescape.payment.infrastructure.common +package com.sangdol.roomescape.payment.infrastructure.common import com.fasterxml.jackson.annotation.JsonCreator import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging -import roomescape.payment.exception.PaymentErrorCode -import roomescape.payment.exception.PaymentException +import com.sangdol.roomescape.payment.exception.PaymentErrorCode +import com.sangdol.roomescape.payment.exception.PaymentException private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt similarity index 80% rename from src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt index f9085e7c..b5a92c3d 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt @@ -1,8 +1,8 @@ -package roomescape.payment.infrastructure.persistence +package com.sangdol.roomescape.payment.infrastructure.persistence import jakarta.persistence.Entity import jakarta.persistence.Table -import roomescape.common.entity.PersistableBaseEntity +import com.sangdol.roomescape.common.entity.PersistableBaseEntity import java.time.LocalDateTime import java.time.OffsetDateTime diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.kt similarity index 76% rename from src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.kt index 75028118..720ed28f 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.kt @@ -1,4 +1,4 @@ -package roomescape.payment.infrastructure.persistence +package com.sangdol.roomescape.payment.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentDetailEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentDetailEntity.kt similarity index 89% rename from src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentDetailEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentDetailEntity.kt index 807aaaf3..3039d052 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentDetailEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentDetailEntity.kt @@ -1,8 +1,8 @@ -package roomescape.payment.infrastructure.persistence +package com.sangdol.roomescape.payment.infrastructure.persistence import jakarta.persistence.* -import roomescape.common.entity.PersistableBaseEntity -import roomescape.payment.infrastructure.common.* +import com.sangdol.roomescape.common.entity.PersistableBaseEntity +import com.sangdol.roomescape.payment.infrastructure.common.* @Entity @Table(name = "payment_detail") diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentDetailRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentDetailRepository.kt similarity index 75% rename from src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentDetailRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentDetailRepository.kt index 0efd93ae..a53d5d15 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentDetailRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentDetailRepository.kt @@ -1,4 +1,4 @@ -package roomescape.payment.infrastructure.persistence +package com.sangdol.roomescape.payment.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentEntity.kt similarity index 67% rename from src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentEntity.kt index 748dad84..969dc52b 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentEntity.kt @@ -1,13 +1,13 @@ -package roomescape.payment.infrastructure.persistence +package com.sangdol.roomescape.payment.infrastructure.persistence import jakarta.persistence.Entity import jakarta.persistence.EnumType import jakarta.persistence.Enumerated import jakarta.persistence.Table -import roomescape.common.entity.PersistableBaseEntity -import roomescape.payment.infrastructure.common.PaymentMethod -import roomescape.payment.infrastructure.common.PaymentStatus -import roomescape.payment.infrastructure.common.PaymentType +import com.sangdol.roomescape.common.entity.PersistableBaseEntity +import com.sangdol.roomescape.payment.infrastructure.common.PaymentMethod +import com.sangdol.roomescape.payment.infrastructure.common.PaymentStatus +import com.sangdol.roomescape.payment.infrastructure.common.PaymentType import java.time.OffsetDateTime @Entity diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentRepository.kt similarity index 75% rename from src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentRepository.kt index 9b872d25..d90002f3 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentRepository.kt @@ -1,4 +1,4 @@ -package roomescape.payment.infrastructure.persistence +package com.sangdol.roomescape.payment.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/roomescape/payment/web/PaymentController.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt similarity index 73% rename from src/main/kotlin/roomescape/payment/web/PaymentController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt index 82082159..406c872a 100644 --- a/src/main/kotlin/roomescape/payment/web/PaymentController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentController.kt @@ -1,13 +1,13 @@ -package roomescape.payment.web +package com.sangdol.roomescape.payment.web import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import roomescape.auth.web.support.User -import roomescape.common.dto.CurrentUserContext -import roomescape.common.dto.response.CommonApiResponse -import roomescape.payment.business.PaymentService -import roomescape.payment.docs.PaymentAPI +import com.sangdol.roomescape.auth.web.support.User +import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.payment.business.PaymentService +import com.sangdol.roomescape.payment.docs.PaymentAPI @RestController @RequestMapping("/payments") diff --git a/src/main/kotlin/roomescape/payment/web/PaymentDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentDTO.kt similarity index 89% rename from src/main/kotlin/roomescape/payment/web/PaymentDTO.kt rename to service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentDTO.kt index 11a6af92..1e39f186 100644 --- a/src/main/kotlin/roomescape/payment/web/PaymentDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/web/PaymentDTO.kt @@ -1,11 +1,11 @@ -package roomescape.payment.web +package com.sangdol.roomescape.payment.web -import roomescape.payment.exception.PaymentErrorCode -import roomescape.payment.exception.PaymentException -import roomescape.payment.infrastructure.common.PaymentStatus -import roomescape.payment.infrastructure.common.PaymentType -import roomescape.payment.infrastructure.persistence.* -import roomescape.payment.web.PaymentDetailResponse.* +import com.sangdol.roomescape.payment.exception.PaymentErrorCode +import com.sangdol.roomescape.payment.exception.PaymentException +import com.sangdol.roomescape.payment.infrastructure.common.PaymentStatus +import com.sangdol.roomescape.payment.infrastructure.common.PaymentType +import com.sangdol.roomescape.payment.infrastructure.persistence.* +import com.sangdol.roomescape.payment.web.PaymentDetailResponse.* import java.time.LocalDateTime import java.time.OffsetDateTime diff --git a/src/main/kotlin/roomescape/region/business/RegionService.kt b/service/src/main/kotlin/com/sangdol/roomescape/region/business/RegionService.kt similarity index 91% rename from src/main/kotlin/roomescape/region/business/RegionService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/region/business/RegionService.kt index 25966644..de6f1111 100644 --- a/src/main/kotlin/roomescape/region/business/RegionService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/region/business/RegionService.kt @@ -1,13 +1,13 @@ -package roomescape.region.business +package com.sangdol.roomescape.region.business import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.region.exception.RegionErrorCode -import roomescape.region.exception.RegionException -import roomescape.region.infrastructure.persistence.RegionRepository -import roomescape.region.web.* +import com.sangdol.roomescape.region.exception.RegionErrorCode +import com.sangdol.roomescape.region.exception.RegionException +import com.sangdol.roomescape.region.infrastructure.persistence.RegionRepository +import com.sangdol.roomescape.region.web.* private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/region/docs/RegionAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/region/docs/RegionAPI.kt similarity index 78% rename from src/main/kotlin/roomescape/region/docs/RegionAPI.kt rename to service/src/main/kotlin/com/sangdol/roomescape/region/docs/RegionAPI.kt index b3486732..ce5a2cd9 100644 --- a/src/main/kotlin/roomescape/region/docs/RegionAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/region/docs/RegionAPI.kt @@ -1,15 +1,15 @@ -package roomescape.region.docs +package com.sangdol.roomescape.region.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse import io.swagger.v3.oas.annotations.responses.ApiResponses import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.RequestParam -import roomescape.auth.web.support.Public -import roomescape.common.dto.response.CommonApiResponse -import roomescape.region.web.RegionCodeResponse -import roomescape.region.web.SidoListResponse -import roomescape.region.web.SigunguListResponse +import com.sangdol.roomescape.auth.web.support.Public +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.region.web.RegionCodeResponse +import com.sangdol.roomescape.region.web.SidoListResponse +import com.sangdol.roomescape.region.web.SigunguListResponse interface RegionAPI { diff --git a/src/main/kotlin/roomescape/region/exception/RegionException.kt b/service/src/main/kotlin/com/sangdol/roomescape/region/exception/RegionException.kt similarity index 81% rename from src/main/kotlin/roomescape/region/exception/RegionException.kt rename to service/src/main/kotlin/com/sangdol/roomescape/region/exception/RegionException.kt index 9bee2e9a..41168e50 100644 --- a/src/main/kotlin/roomescape/region/exception/RegionException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/region/exception/RegionException.kt @@ -1,8 +1,8 @@ -package roomescape.region.exception +package com.sangdol.roomescape.region.exception import org.springframework.http.HttpStatus -import roomescape.common.exception.ErrorCode -import roomescape.common.exception.RoomescapeException +import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.RoomescapeException class RegionException( override val errorCode: RegionErrorCode, diff --git a/src/main/kotlin/roomescape/region/infrastructure/persistence/RegionEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/region/infrastructure/persistence/RegionEntity.kt similarity index 86% rename from src/main/kotlin/roomescape/region/infrastructure/persistence/RegionEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/region/infrastructure/persistence/RegionEntity.kt index 00d967a4..3b61291d 100644 --- a/src/main/kotlin/roomescape/region/infrastructure/persistence/RegionEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/region/infrastructure/persistence/RegionEntity.kt @@ -1,4 +1,4 @@ -package roomescape.region.infrastructure.persistence +package com.sangdol.roomescape.region.infrastructure.persistence import jakarta.persistence.Entity import jakarta.persistence.Id diff --git a/src/main/kotlin/roomescape/region/infrastructure/persistence/RegionRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/region/infrastructure/persistence/RegionRepository.kt similarity index 95% rename from src/main/kotlin/roomescape/region/infrastructure/persistence/RegionRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/region/infrastructure/persistence/RegionRepository.kt index 03b1f585..d9baa855 100644 --- a/src/main/kotlin/roomescape/region/infrastructure/persistence/RegionRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/region/infrastructure/persistence/RegionRepository.kt @@ -1,4 +1,4 @@ -package roomescape.region.infrastructure.persistence +package com.sangdol.roomescape.region.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Query diff --git a/src/main/kotlin/roomescape/region/web/RegionController.kt b/service/src/main/kotlin/com/sangdol/roomescape/region/web/RegionController.kt similarity index 86% rename from src/main/kotlin/roomescape/region/web/RegionController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/region/web/RegionController.kt index ea4d50c0..d8c6b1e2 100644 --- a/src/main/kotlin/roomescape/region/web/RegionController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/region/web/RegionController.kt @@ -1,13 +1,13 @@ -package roomescape.region.web +package com.sangdol.roomescape.region.web import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController -import roomescape.common.dto.response.CommonApiResponse -import roomescape.region.business.RegionService -import roomescape.region.docs.RegionAPI +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.region.business.RegionService +import com.sangdol.roomescape.region.docs.RegionAPI @RestController @RequestMapping("/regions") diff --git a/src/main/kotlin/roomescape/region/web/RegionDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/region/web/RegionDTO.kt similarity index 91% rename from src/main/kotlin/roomescape/region/web/RegionDTO.kt rename to service/src/main/kotlin/com/sangdol/roomescape/region/web/RegionDTO.kt index dee2523a..eccfb75a 100644 --- a/src/main/kotlin/roomescape/region/web/RegionDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/region/web/RegionDTO.kt @@ -1,4 +1,4 @@ -package roomescape.region.web +package com.sangdol.roomescape.region.web data class SidoResponse( val code: String, diff --git a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt similarity index 86% rename from src/main/kotlin/roomescape/reservation/business/ReservationService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt index 346ac043..4f7c1fd0 100644 --- a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationService.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.business +package com.sangdol.roomescape.reservation.business import com.github.f4b6a3.tsid.TsidFactory import io.github.oshai.kotlinlogging.KLogger @@ -6,23 +6,21 @@ import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.common.config.next -import roomescape.common.dto.CurrentUserContext -import roomescape.common.util.DateUtils -import roomescape.payment.business.PaymentService -import roomescape.payment.web.PaymentWithDetailResponse -import roomescape.reservation.exception.ReservationErrorCode -import roomescape.reservation.exception.ReservationException -import roomescape.reservation.infrastructure.persistence.* -import roomescape.reservation.web.* -import roomescape.schedule.business.ScheduleService -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.schedule.web.ScheduleOverviewResponse -import roomescape.schedule.web.ScheduleUpdateRequest -import roomescape.theme.business.ThemeService -import roomescape.user.business.UserService -import roomescape.user.web.UserContactResponse -import java.time.LocalDate +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.payment.business.PaymentService +import com.sangdol.roomescape.payment.web.PaymentWithDetailResponse +import com.sangdol.roomescape.reservation.exception.ReservationErrorCode +import com.sangdol.roomescape.reservation.exception.ReservationException +import com.sangdol.roomescape.reservation.infrastructure.persistence.* +import com.sangdol.roomescape.reservation.web.* +import com.sangdol.roomescape.schedule.business.ScheduleService +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.schedule.web.ScheduleOverviewResponse +import com.sangdol.roomescape.schedule.web.ScheduleUpdateRequest +import com.sangdol.roomescape.theme.business.ThemeService +import com.sangdol.roomescape.user.business.UserService +import com.sangdol.roomescape.user.web.UserContactResponse import java.time.LocalDateTime private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/reservation/business/ReservationValidator.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationValidator.kt similarity index 74% rename from src/main/kotlin/roomescape/reservation/business/ReservationValidator.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationValidator.kt index 9263adfa..28fdc5d6 100644 --- a/src/main/kotlin/roomescape/reservation/business/ReservationValidator.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/business/ReservationValidator.kt @@ -1,14 +1,14 @@ -package roomescape.reservation.business +package com.sangdol.roomescape.reservation.business import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Component -import roomescape.reservation.exception.ReservationErrorCode -import roomescape.reservation.exception.ReservationException -import roomescape.reservation.web.PendingReservationCreateRequest -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.schedule.web.ScheduleSummaryResponse -import roomescape.theme.web.ThemeInfoResponse +import com.sangdol.roomescape.reservation.exception.ReservationErrorCode +import com.sangdol.roomescape.reservation.exception.ReservationException +import com.sangdol.roomescape.reservation.web.PendingReservationCreateRequest +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.schedule.web.ScheduleSummaryResponse +import com.sangdol.roomescape.theme.web.ThemeInfoResponse private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt similarity index 83% rename from src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt index 7481e3e4..104559dd 100644 --- a/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/docs/ReservationAPI.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.docs +package com.sangdol.roomescape.reservation.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse @@ -7,13 +7,11 @@ import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.RequestBody -import org.springframework.web.bind.annotation.RequestParam -import roomescape.auth.web.support.Public -import roomescape.auth.web.support.User -import roomescape.auth.web.support.UserOnly -import roomescape.common.dto.CurrentUserContext -import roomescape.common.dto.response.CommonApiResponse -import roomescape.reservation.web.* +import com.sangdol.roomescape.auth.web.support.User +import com.sangdol.roomescape.auth.web.support.UserOnly +import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.reservation.web.* interface ReservationAPI { @Operation(summary = "결제 전 임시 예약 저장") diff --git a/src/main/kotlin/roomescape/reservation/exception/ReservationErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationErrorCode.kt similarity index 87% rename from src/main/kotlin/roomescape/reservation/exception/ReservationErrorCode.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationErrorCode.kt index 942b9984..9b502a46 100644 --- a/src/main/kotlin/roomescape/reservation/exception/ReservationErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationErrorCode.kt @@ -1,7 +1,7 @@ -package roomescape.reservation.exception +package com.sangdol.roomescape.reservation.exception import org.springframework.http.HttpStatus -import roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.ErrorCode enum class ReservationErrorCode( override val httpStatus: HttpStatus, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationException.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationException.kt new file mode 100644 index 00000000..3a25e7d2 --- /dev/null +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationException.kt @@ -0,0 +1,9 @@ +package com.sangdol.roomescape.reservation.exception + +import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.RoomescapeException + +class ReservationException( + override val errorCode: ErrorCode, + override val message: String = errorCode.message +) : RoomescapeException(errorCode, message) diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/CanceledReservationEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/CanceledReservationEntity.kt similarity index 80% rename from src/main/kotlin/roomescape/reservation/infrastructure/persistence/CanceledReservationEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/CanceledReservationEntity.kt index 84ac475e..ae71243f 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/CanceledReservationEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/CanceledReservationEntity.kt @@ -1,10 +1,10 @@ -package roomescape.reservation.infrastructure.persistence +package com.sangdol.roomescape.reservation.infrastructure.persistence import jakarta.persistence.Entity import jakarta.persistence.EnumType import jakarta.persistence.Enumerated import jakarta.persistence.Table -import roomescape.common.entity.PersistableBaseEntity +import com.sangdol.roomescape.common.entity.PersistableBaseEntity import java.time.LocalDateTime @Entity diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/CanceledReservationRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/CanceledReservationRepository.kt similarity index 68% rename from src/main/kotlin/roomescape/reservation/infrastructure/persistence/CanceledReservationRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/CanceledReservationRepository.kt index 5508bc11..2d1063c9 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/CanceledReservationRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/CanceledReservationRepository.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.infrastructure.persistence +package com.sangdol.roomescape.reservation.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt similarity index 84% rename from src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt index dfd87710..99fe9890 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt @@ -1,10 +1,10 @@ -package roomescape.reservation.infrastructure.persistence +package com.sangdol.roomescape.reservation.infrastructure.persistence import jakarta.persistence.Entity import jakarta.persistence.EnumType import jakarta.persistence.Enumerated import jakarta.persistence.Table -import roomescape.common.entity.AuditingBaseEntity +import com.sangdol.roomescape.common.entity.AuditingBaseEntity @Entity @Table(name = "reservation") diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt similarity index 78% rename from src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt index af90de13..e9dbdcde 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.infrastructure.persistence +package com.sangdol.roomescape.reservation.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/roomescape/reservation/web/ReservationController.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt similarity index 84% rename from src/main/kotlin/roomescape/reservation/web/ReservationController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt index 15105419..cc3c5642 100644 --- a/src/main/kotlin/roomescape/reservation/web/ReservationController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationController.kt @@ -1,13 +1,13 @@ -package roomescape.reservation.web +package com.sangdol.roomescape.reservation.web import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import roomescape.auth.web.support.User -import roomescape.common.dto.CurrentUserContext -import roomescape.common.dto.response.CommonApiResponse -import roomescape.reservation.business.ReservationService -import roomescape.reservation.docs.ReservationAPI +import com.sangdol.roomescape.auth.web.support.User +import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.reservation.business.ReservationService +import com.sangdol.roomescape.reservation.docs.ReservationAPI @RestController @RequestMapping("/reservations") diff --git a/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationDto.kt similarity index 85% rename from src/main/kotlin/roomescape/reservation/web/ReservationDto.kt rename to service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationDto.kt index 7990de1e..21b0ff88 100644 --- a/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/web/ReservationDto.kt @@ -1,11 +1,11 @@ -package roomescape.reservation.web +package com.sangdol.roomescape.reservation.web import jakarta.validation.constraints.NotEmpty -import roomescape.payment.web.PaymentWithDetailResponse -import roomescape.reservation.infrastructure.persistence.ReservationEntity -import roomescape.reservation.infrastructure.persistence.ReservationStatus -import roomescape.schedule.web.ScheduleOverviewResponse -import roomescape.user.web.UserContactResponse +import com.sangdol.roomescape.payment.web.PaymentWithDetailResponse +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationEntity +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationStatus +import com.sangdol.roomescape.schedule.web.ScheduleOverviewResponse +import com.sangdol.roomescape.user.web.UserContactResponse import java.time.LocalDate import java.time.LocalDateTime import java.time.LocalTime diff --git a/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleService.kt similarity index 90% rename from src/main/kotlin/roomescape/schedule/business/ScheduleService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleService.kt index e72f7c6d..8195a8eb 100644 --- a/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleService.kt @@ -1,4 +1,4 @@ -package roomescape.schedule.business +package com.sangdol.roomescape.schedule.business import ScheduleException import com.github.f4b6a3.tsid.TsidFactory @@ -7,17 +7,17 @@ import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.admin.business.AdminService -import roomescape.common.config.next -import roomescape.common.dto.AuditInfo -import roomescape.common.dto.OperatorInfo -import roomescape.schedule.business.domain.ScheduleOverview -import roomescape.schedule.exception.ScheduleErrorCode -import roomescape.schedule.infrastructure.persistence.ScheduleEntity -import roomescape.schedule.infrastructure.persistence.ScheduleEntityFactory -import roomescape.schedule.infrastructure.persistence.ScheduleRepository -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.schedule.web.* +import com.sangdol.roomescape.admin.business.AdminService +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.common.dto.AuditInfo +import com.sangdol.roomescape.common.dto.OperatorInfo +import com.sangdol.roomescape.schedule.business.domain.ScheduleOverview +import com.sangdol.roomescape.schedule.exception.ScheduleErrorCode +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntity +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntityFactory +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.schedule.web.* import java.time.LocalDate private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/schedule/business/ScheduleValidator.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleValidator.kt similarity index 85% rename from src/main/kotlin/roomescape/schedule/business/ScheduleValidator.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleValidator.kt index d04dede1..daab707d 100644 --- a/src/main/kotlin/roomescape/schedule/business/ScheduleValidator.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/ScheduleValidator.kt @@ -1,15 +1,15 @@ -package roomescape.schedule.business +package com.sangdol.roomescape.schedule.business import ScheduleException import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Component -import roomescape.schedule.exception.ScheduleErrorCode -import roomescape.schedule.infrastructure.persistence.ScheduleEntity -import roomescape.schedule.infrastructure.persistence.ScheduleRepository -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.schedule.web.ScheduleCreateRequest -import roomescape.schedule.web.ScheduleUpdateRequest +import com.sangdol.roomescape.schedule.exception.ScheduleErrorCode +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntity +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.schedule.web.ScheduleCreateRequest +import com.sangdol.roomescape.schedule.web.ScheduleUpdateRequest import java.time.LocalDate import java.time.LocalDateTime import java.time.LocalTime diff --git a/src/main/kotlin/roomescape/schedule/business/domain/ScheduleOverview.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/domain/ScheduleOverview.kt similarity index 75% rename from src/main/kotlin/roomescape/schedule/business/domain/ScheduleOverview.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/business/domain/ScheduleOverview.kt index de099149..311c3b20 100644 --- a/src/main/kotlin/roomescape/schedule/business/domain/ScheduleOverview.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/business/domain/ScheduleOverview.kt @@ -1,7 +1,7 @@ -package roomescape.schedule.business.domain +package com.sangdol.roomescape.schedule.business.domain -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.theme.infrastructure.persistence.Difficulty +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.theme.infrastructure.persistence.Difficulty import java.time.LocalDate import java.time.LocalTime diff --git a/src/main/kotlin/roomescape/schedule/docs/ScheduleAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/docs/ScheduleAPI.kt similarity index 85% rename from src/main/kotlin/roomescape/schedule/docs/ScheduleAPI.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/docs/ScheduleAPI.kt index 58141027..8858007b 100644 --- a/src/main/kotlin/roomescape/schedule/docs/ScheduleAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/docs/ScheduleAPI.kt @@ -1,4 +1,4 @@ -package roomescape.schedule.docs +package com.sangdol.roomescape.schedule.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse @@ -9,14 +9,14 @@ import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestParam -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.admin.infrastructure.persistence.Privilege -import roomescape.auth.web.support.AdminOnly -import roomescape.auth.web.support.Public -import roomescape.auth.web.support.UserOnly -import roomescape.common.dto.AuditInfo -import roomescape.common.dto.response.CommonApiResponse -import roomescape.schedule.web.* +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.admin.infrastructure.persistence.Privilege +import com.sangdol.roomescape.auth.web.support.AdminOnly +import com.sangdol.roomescape.auth.web.support.Public +import com.sangdol.roomescape.auth.web.support.UserOnly +import com.sangdol.roomescape.common.dto.AuditInfo +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.schedule.web.* import java.time.LocalDate interface AdminScheduleAPI { diff --git a/src/main/kotlin/roomescape/schedule/exception/ScheduleErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleErrorCode.kt similarity index 88% rename from src/main/kotlin/roomescape/schedule/exception/ScheduleErrorCode.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleErrorCode.kt index 696d6630..264055d8 100644 --- a/src/main/kotlin/roomescape/schedule/exception/ScheduleErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleErrorCode.kt @@ -1,7 +1,7 @@ -package roomescape.schedule.exception +package com.sangdol.roomescape.schedule.exception import org.springframework.http.HttpStatus -import roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.ErrorCode enum class ScheduleErrorCode( override val httpStatus: HttpStatus, diff --git a/src/main/kotlin/roomescape/schedule/exception/ScheduleException.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleException.kt similarity index 56% rename from src/main/kotlin/roomescape/schedule/exception/ScheduleException.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleException.kt index a9655a8f..a79df67c 100644 --- a/src/main/kotlin/roomescape/schedule/exception/ScheduleException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleException.kt @@ -1,5 +1,5 @@ -import roomescape.common.exception.ErrorCode -import roomescape.common.exception.RoomescapeException +import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.RoomescapeException class ScheduleException( override val errorCode: ErrorCode, diff --git a/src/main/kotlin/roomescape/schedule/infrastructure/persistence/ScheduleEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/infrastructure/persistence/ScheduleEntity.kt similarity index 91% rename from src/main/kotlin/roomescape/schedule/infrastructure/persistence/ScheduleEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/infrastructure/persistence/ScheduleEntity.kt index a8023d00..b6a2c984 100644 --- a/src/main/kotlin/roomescape/schedule/infrastructure/persistence/ScheduleEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/infrastructure/persistence/ScheduleEntity.kt @@ -1,12 +1,12 @@ -package roomescape.schedule.infrastructure.persistence +package com.sangdol.roomescape.schedule.infrastructure.persistence import jakarta.persistence.* import org.springframework.data.annotation.CreatedBy import org.springframework.data.annotation.CreatedDate import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener -import roomescape.common.entity.PersistableBaseEntity -import roomescape.common.util.MdcPrincipalId +import com.sangdol.roomescape.common.entity.PersistableBaseEntity +import com.sangdol.roomescape.common.util.MdcPrincipalId import java.time.LocalDate import java.time.LocalDateTime import java.time.LocalTime diff --git a/src/main/kotlin/roomescape/schedule/infrastructure/persistence/ScheduleRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/infrastructure/persistence/ScheduleRepository.kt similarity index 86% rename from src/main/kotlin/roomescape/schedule/infrastructure/persistence/ScheduleRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/infrastructure/persistence/ScheduleRepository.kt index 3189b1aa..82080181 100644 --- a/src/main/kotlin/roomescape/schedule/infrastructure/persistence/ScheduleRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/infrastructure/persistence/ScheduleRepository.kt @@ -1,8 +1,8 @@ -package roomescape.schedule.infrastructure.persistence +package com.sangdol.roomescape.schedule.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Query -import roomescape.schedule.business.domain.ScheduleOverview +import com.sangdol.roomescape.schedule.business.domain.ScheduleOverview import java.time.LocalDate import java.time.LocalTime @@ -26,7 +26,7 @@ interface ScheduleRepository : JpaRepository { @Query( """ SELECT - new roomescape.schedule.business.domain.ScheduleOverview( + new com.sangdol.roomescape.schedule.business.domain.ScheduleOverview( s._id, st._id, st.name, @@ -57,7 +57,7 @@ interface ScheduleRepository : JpaRepository { @Query( """ SELECT - new roomescape.schedule.business.domain.ScheduleOverview( + new com.sangdol.roomescape.schedule.business.domain.ScheduleOverview( s._id, st._id, st.name, diff --git a/src/main/kotlin/roomescape/schedule/web/AdminScheduleController.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleController.kt similarity index 88% rename from src/main/kotlin/roomescape/schedule/web/AdminScheduleController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleController.kt index 39b7c5b2..1d9a96e4 100644 --- a/src/main/kotlin/roomescape/schedule/web/AdminScheduleController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleController.kt @@ -1,13 +1,13 @@ -package roomescape.schedule.web +package com.sangdol.roomescape.schedule.web import jakarta.validation.Valid import org.springframework.format.annotation.DateTimeFormat import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import roomescape.common.dto.AuditInfo -import roomescape.common.dto.response.CommonApiResponse -import roomescape.schedule.business.ScheduleService -import roomescape.schedule.docs.AdminScheduleAPI +import com.sangdol.roomescape.common.dto.AuditInfo +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.schedule.business.ScheduleService +import com.sangdol.roomescape.schedule.docs.AdminScheduleAPI import java.time.LocalDate @RestController diff --git a/src/main/kotlin/roomescape/schedule/web/AdminScheduleDto.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleDto.kt similarity index 86% rename from src/main/kotlin/roomescape/schedule/web/AdminScheduleDto.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleDto.kt index 47d17915..fec62160 100644 --- a/src/main/kotlin/roomescape/schedule/web/AdminScheduleDto.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/AdminScheduleDto.kt @@ -1,7 +1,7 @@ -package roomescape.schedule.web +package com.sangdol.roomescape.schedule.web -import roomescape.schedule.business.domain.ScheduleOverview -import roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.schedule.business.domain.ScheduleOverview +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus import java.time.LocalDate import java.time.LocalTime diff --git a/src/main/kotlin/roomescape/schedule/web/ScheduleController.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/ScheduleController.kt similarity index 77% rename from src/main/kotlin/roomescape/schedule/web/ScheduleController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/web/ScheduleController.kt index a57d30f4..7f558d95 100644 --- a/src/main/kotlin/roomescape/schedule/web/ScheduleController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/ScheduleController.kt @@ -1,12 +1,12 @@ -package roomescape.schedule.web +package com.sangdol.roomescape.schedule.web import org.springframework.format.annotation.DateTimeFormat import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import roomescape.common.dto.response.CommonApiResponse -import roomescape.schedule.business.ScheduleService -import roomescape.schedule.docs.PublicScheduleAPI -import roomescape.schedule.docs.UserScheduleAPI +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.schedule.business.ScheduleService +import com.sangdol.roomescape.schedule.docs.PublicScheduleAPI +import com.sangdol.roomescape.schedule.docs.UserScheduleAPI import java.time.LocalDate @RestController diff --git a/src/main/kotlin/roomescape/schedule/web/ScheduleDto.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/ScheduleDto.kt similarity index 84% rename from src/main/kotlin/roomescape/schedule/web/ScheduleDto.kt rename to service/src/main/kotlin/com/sangdol/roomescape/schedule/web/ScheduleDto.kt index 10f4f03e..9085c299 100644 --- a/src/main/kotlin/roomescape/schedule/web/ScheduleDto.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/web/ScheduleDto.kt @@ -1,9 +1,9 @@ -package roomescape.schedule.web +package com.sangdol.roomescape.schedule.web -import roomescape.schedule.business.domain.ScheduleOverview -import roomescape.schedule.infrastructure.persistence.ScheduleEntity -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.theme.infrastructure.persistence.Difficulty +import com.sangdol.roomescape.schedule.business.domain.ScheduleOverview +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntity +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.theme.infrastructure.persistence.Difficulty import java.time.LocalDate import java.time.LocalTime diff --git a/src/main/kotlin/roomescape/store/business/StoreService.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreService.kt similarity index 88% rename from src/main/kotlin/roomescape/store/business/StoreService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreService.kt index 8cbaebc4..a95db5c4 100644 --- a/src/main/kotlin/roomescape/store/business/StoreService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreService.kt @@ -1,20 +1,20 @@ -package roomescape.store.business +package com.sangdol.roomescape.store.business import com.github.f4b6a3.tsid.TsidFactory import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.admin.business.AdminService -import roomescape.common.config.next -import roomescape.common.dto.AuditInfo -import roomescape.region.business.RegionService -import roomescape.store.exception.StoreErrorCode -import roomescape.store.exception.StoreException -import roomescape.store.infrastructure.persistence.StoreEntity -import roomescape.store.infrastructure.persistence.StoreRepository -import roomescape.store.infrastructure.persistence.StoreStatus -import roomescape.store.web.* +import com.sangdol.roomescape.admin.business.AdminService +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.common.dto.AuditInfo +import com.sangdol.roomescape.region.business.RegionService +import com.sangdol.roomescape.store.exception.StoreErrorCode +import com.sangdol.roomescape.store.exception.StoreException +import com.sangdol.roomescape.store.infrastructure.persistence.StoreEntity +import com.sangdol.roomescape.store.infrastructure.persistence.StoreRepository +import com.sangdol.roomescape.store.infrastructure.persistence.StoreStatus +import com.sangdol.roomescape.store.web.* private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/store/business/StoreValidator.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreValidator.kt similarity index 85% rename from src/main/kotlin/roomescape/store/business/StoreValidator.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreValidator.kt index 01ce5471..cd1f3f69 100644 --- a/src/main/kotlin/roomescape/store/business/StoreValidator.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/business/StoreValidator.kt @@ -1,13 +1,13 @@ -package roomescape.store.business +package com.sangdol.roomescape.store.business import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Component -import roomescape.store.exception.StoreErrorCode -import roomescape.store.exception.StoreException -import roomescape.store.infrastructure.persistence.StoreRepository -import roomescape.store.web.StoreRegisterRequest -import roomescape.store.web.StoreUpdateRequest +import com.sangdol.roomescape.store.exception.StoreErrorCode +import com.sangdol.roomescape.store.exception.StoreException +import com.sangdol.roomescape.store.infrastructure.persistence.StoreRepository +import com.sangdol.roomescape.store.web.StoreRegisterRequest +import com.sangdol.roomescape.store.web.StoreUpdateRequest private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/store/docs/StoreAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/docs/StoreAPI.kt similarity index 85% rename from src/main/kotlin/roomescape/store/docs/StoreAPI.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/docs/StoreAPI.kt index 3008582b..3c4ee9f2 100644 --- a/src/main/kotlin/roomescape/store/docs/StoreAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/docs/StoreAPI.kt @@ -1,4 +1,4 @@ -package roomescape.store.docs +package com.sangdol.roomescape.store.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse @@ -8,12 +8,12 @@ import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestParam -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.admin.infrastructure.persistence.Privilege -import roomescape.auth.web.support.AdminOnly -import roomescape.auth.web.support.Public -import roomescape.common.dto.response.CommonApiResponse -import roomescape.store.web.* +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.admin.infrastructure.persistence.Privilege +import com.sangdol.roomescape.auth.web.support.AdminOnly +import com.sangdol.roomescape.auth.web.support.Public +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.store.web.* interface AdminStoreAPI { @AdminOnly(type = AdminType.HQ, privilege = Privilege.READ_DETAIL) diff --git a/src/main/kotlin/roomescape/store/exception/StoreException.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/exception/StoreException.kt similarity index 85% rename from src/main/kotlin/roomescape/store/exception/StoreException.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/exception/StoreException.kt index 0416e6cc..6531d154 100644 --- a/src/main/kotlin/roomescape/store/exception/StoreException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/exception/StoreException.kt @@ -1,8 +1,8 @@ -package roomescape.store.exception +package com.sangdol.roomescape.store.exception import org.springframework.http.HttpStatus -import roomescape.common.exception.ErrorCode -import roomescape.common.exception.RoomescapeException +import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.RoomescapeException class StoreException( override val errorCode: StoreErrorCode, diff --git a/src/main/kotlin/roomescape/store/infrastructure/persistence/StoreEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/infrastructure/persistence/StoreEntity.kt similarity index 87% rename from src/main/kotlin/roomescape/store/infrastructure/persistence/StoreEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/infrastructure/persistence/StoreEntity.kt index d59ce007..27a97f6f 100644 --- a/src/main/kotlin/roomescape/store/infrastructure/persistence/StoreEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/infrastructure/persistence/StoreEntity.kt @@ -1,8 +1,8 @@ -package roomescape.store.infrastructure.persistence +package com.sangdol.roomescape.store.infrastructure.persistence import jakarta.persistence.* import org.springframework.data.jpa.domain.support.AuditingEntityListener -import roomescape.common.entity.AuditingBaseEntity +import com.sangdol.roomescape.common.entity.AuditingBaseEntity @Entity @EntityListeners(AuditingEntityListener::class) diff --git a/src/main/kotlin/roomescape/store/infrastructure/persistence/StoreRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/infrastructure/persistence/StoreRepository.kt similarity index 76% rename from src/main/kotlin/roomescape/store/infrastructure/persistence/StoreRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/infrastructure/persistence/StoreRepository.kt index eff522bf..efbfa350 100644 --- a/src/main/kotlin/roomescape/store/infrastructure/persistence/StoreRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/infrastructure/persistence/StoreRepository.kt @@ -1,4 +1,4 @@ -package roomescape.store.infrastructure.persistence +package com.sangdol.roomescape.store.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Query @@ -13,7 +13,7 @@ interface StoreRepository : JpaRepository { StoreEntity s WHERE s._id = :id - AND s.status = roomescape.store.infrastructure.persistence.StoreStatus.ACTIVE + AND s.status = com.sangdol.roomescape.store.infrastructure.persistence.StoreStatus.ACTIVE """ ) fun findActiveStoreById(id: Long): StoreEntity? @@ -25,7 +25,7 @@ interface StoreRepository : JpaRepository { FROM StoreEntity s WHERE - s.status = roomescape.store.infrastructure.persistence.StoreStatus.ACTIVE + s.status = com.sangdol.roomescape.store.infrastructure.persistence.StoreStatus.ACTIVE AND (:regionCode IS NULL OR s.regionCode LIKE :regionCode%) """ ) diff --git a/src/main/kotlin/roomescape/store/web/AdminStoreController.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreController.kt similarity index 86% rename from src/main/kotlin/roomescape/store/web/AdminStoreController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreController.kt index 4fd1d077..77b6f974 100644 --- a/src/main/kotlin/roomescape/store/web/AdminStoreController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreController.kt @@ -1,11 +1,11 @@ -package roomescape.store.web +package com.sangdol.roomescape.store.web import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import roomescape.common.dto.response.CommonApiResponse -import roomescape.store.business.StoreService -import roomescape.store.docs.AdminStoreAPI +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.store.business.StoreService +import com.sangdol.roomescape.store.docs.AdminStoreAPI @RestController @RequestMapping("/admin/stores") diff --git a/src/main/kotlin/roomescape/store/web/AdminStoreDto.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreDto.kt similarity index 79% rename from src/main/kotlin/roomescape/store/web/AdminStoreDto.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreDto.kt index 62003695..a20edc26 100644 --- a/src/main/kotlin/roomescape/store/web/AdminStoreDto.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/web/AdminStoreDto.kt @@ -1,8 +1,8 @@ -package roomescape.store.web +package com.sangdol.roomescape.store.web -import roomescape.common.dto.AuditInfo -import roomescape.region.web.RegionInfoResponse -import roomescape.store.infrastructure.persistence.StoreEntity +import com.sangdol.roomescape.common.dto.AuditInfo +import com.sangdol.roomescape.region.web.RegionInfoResponse +import com.sangdol.roomescape.store.infrastructure.persistence.StoreEntity data class StoreRegisterRequest( val name: String, diff --git a/src/main/kotlin/roomescape/store/web/StoreController.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/web/StoreController.kt similarity index 83% rename from src/main/kotlin/roomescape/store/web/StoreController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/web/StoreController.kt index 47a3937c..9eba1b54 100644 --- a/src/main/kotlin/roomescape/store/web/StoreController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/web/StoreController.kt @@ -1,13 +1,13 @@ -package roomescape.store.web +package com.sangdol.roomescape.store.web import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController -import roomescape.common.dto.response.CommonApiResponse -import roomescape.store.business.StoreService -import roomescape.store.docs.PublicStoreAPI +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.store.business.StoreService +import com.sangdol.roomescape.store.docs.PublicStoreAPI @RestController class StoreController( diff --git a/src/main/kotlin/roomescape/store/web/StoreDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/web/StoreDTO.kt similarity index 84% rename from src/main/kotlin/roomescape/store/web/StoreDTO.kt rename to service/src/main/kotlin/com/sangdol/roomescape/store/web/StoreDTO.kt index cad9201e..0e6e3934 100644 --- a/src/main/kotlin/roomescape/store/web/StoreDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/web/StoreDTO.kt @@ -1,6 +1,6 @@ -package roomescape.store.web +package com.sangdol.roomescape.store.web -import roomescape.store.infrastructure.persistence.StoreEntity +import com.sangdol.roomescape.store.infrastructure.persistence.StoreEntity data class SimpleStoreResponse( val id: Long, diff --git a/src/main/kotlin/roomescape/theme/business/ThemeService.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt similarity index 91% rename from src/main/kotlin/roomescape/theme/business/ThemeService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt index a290fa78..28770ace 100644 --- a/src/main/kotlin/roomescape/theme/business/ThemeService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt @@ -1,4 +1,4 @@ -package roomescape.theme.business +package com.sangdol.roomescape.theme.business import com.github.f4b6a3.tsid.TsidFactory import io.github.oshai.kotlinlogging.KLogger @@ -6,15 +6,15 @@ import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.admin.business.AdminService -import roomescape.common.config.next -import roomescape.common.dto.AuditInfo -import roomescape.common.util.DateUtils -import roomescape.theme.exception.ThemeErrorCode -import roomescape.theme.exception.ThemeException -import roomescape.theme.infrastructure.persistence.ThemeEntity -import roomescape.theme.infrastructure.persistence.ThemeRepository -import roomescape.theme.web.* +import com.sangdol.roomescape.admin.business.AdminService +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.common.dto.AuditInfo +import com.sangdol.roomescape.common.util.DateUtils +import com.sangdol.roomescape.theme.exception.ThemeErrorCode +import com.sangdol.roomescape.theme.exception.ThemeException +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeRepository +import com.sangdol.roomescape.theme.web.* import java.time.LocalDate private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/theme/business/ThemeValidator.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeValidator.kt similarity index 92% rename from src/main/kotlin/roomescape/theme/business/ThemeValidator.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeValidator.kt index 6de7e205..8d5b341f 100644 --- a/src/main/kotlin/roomescape/theme/business/ThemeValidator.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeValidator.kt @@ -1,13 +1,13 @@ -package roomescape.theme.business +package com.sangdol.roomescape.theme.business import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Component -import roomescape.theme.exception.ThemeErrorCode -import roomescape.theme.exception.ThemeException -import roomescape.theme.infrastructure.persistence.ThemeRepository -import roomescape.theme.web.ThemeCreateRequest -import roomescape.theme.web.ThemeUpdateRequest +import com.sangdol.roomescape.theme.exception.ThemeErrorCode +import com.sangdol.roomescape.theme.exception.ThemeException +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeRepository +import com.sangdol.roomescape.theme.web.ThemeCreateRequest +import com.sangdol.roomescape.theme.web.ThemeUpdateRequest private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/theme/business/domain/ThemeInfo.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/domain/ThemeInfo.kt similarity index 86% rename from src/main/kotlin/roomescape/theme/business/domain/ThemeInfo.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/business/domain/ThemeInfo.kt index 9406f6b4..cf69fdd0 100644 --- a/src/main/kotlin/roomescape/theme/business/domain/ThemeInfo.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/domain/ThemeInfo.kt @@ -1,4 +1,4 @@ -package roomescape.theme.business.domain +package com.sangdol.roomescape.theme.business.domain class ThemeInfo( val id: Long, diff --git a/src/main/kotlin/roomescape/theme/docs/ThemeApi.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/docs/ThemeApi.kt similarity index 87% rename from src/main/kotlin/roomescape/theme/docs/ThemeApi.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/docs/ThemeApi.kt index 82163cc6..6b5ffa2d 100644 --- a/src/main/kotlin/roomescape/theme/docs/ThemeApi.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/docs/ThemeApi.kt @@ -1,4 +1,4 @@ -package roomescape.theme.docs +package com.sangdol.roomescape.theme.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse @@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestParam -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.admin.infrastructure.persistence.Privilege -import roomescape.auth.web.support.AdminOnly -import roomescape.auth.web.support.Public -import roomescape.common.dto.response.CommonApiResponse -import roomescape.theme.web.* +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.admin.infrastructure.persistence.Privilege +import com.sangdol.roomescape.auth.web.support.AdminOnly +import com.sangdol.roomescape.auth.web.support.Public +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.theme.web.* interface AdminThemeAPI { @AdminOnly(type = AdminType.HQ, privilege = Privilege.READ_SUMMARY) diff --git a/src/main/kotlin/roomescape/theme/exception/ThemeErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeErrorCode.kt similarity index 92% rename from src/main/kotlin/roomescape/theme/exception/ThemeErrorCode.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeErrorCode.kt index fe0bc8c8..9210b958 100644 --- a/src/main/kotlin/roomescape/theme/exception/ThemeErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeErrorCode.kt @@ -1,7 +1,7 @@ -package roomescape.theme.exception +package com.sangdol.roomescape.theme.exception import org.springframework.http.HttpStatus -import roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.ErrorCode enum class ThemeErrorCode( override val httpStatus: HttpStatus, diff --git a/src/main/kotlin/roomescape/theme/exception/ThemeException.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeException.kt similarity index 59% rename from src/main/kotlin/roomescape/theme/exception/ThemeException.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeException.kt index 220a97c7..286cda16 100644 --- a/src/main/kotlin/roomescape/theme/exception/ThemeException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeException.kt @@ -1,6 +1,6 @@ -package roomescape.theme.exception +package com.sangdol.roomescape.theme.exception -import roomescape.common.exception.RoomescapeException +import com.sangdol.roomescape.common.exception.RoomescapeException class ThemeException( override val errorCode: ThemeErrorCode, diff --git a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/infrastructure/persistence/ThemeEntity.kt similarity index 92% rename from src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/infrastructure/persistence/ThemeEntity.kt index 989b9a64..7c99a10c 100644 --- a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/infrastructure/persistence/ThemeEntity.kt @@ -1,7 +1,7 @@ -package roomescape.theme.infrastructure.persistence +package com.sangdol.roomescape.theme.infrastructure.persistence import jakarta.persistence.* -import roomescape.common.entity.AuditingBaseEntity +import com.sangdol.roomescape.common.entity.AuditingBaseEntity @Entity @Table(name = "theme") diff --git a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeRepository.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/infrastructure/persistence/ThemeRepository.kt similarity index 92% rename from src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeRepository.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/infrastructure/persistence/ThemeRepository.kt index 29db0b47..644f84b6 100644 --- a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeRepository.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/infrastructure/persistence/ThemeRepository.kt @@ -1,8 +1,8 @@ -package roomescape.theme.infrastructure.persistence +package com.sangdol.roomescape.theme.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Query -import roomescape.theme.business.domain.ThemeInfo +import com.sangdol.roomescape.theme.business.domain.ThemeInfo import java.time.LocalDate interface ThemeRepository : JpaRepository { diff --git a/src/main/kotlin/roomescape/theme/web/AdminThemeController.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeController.kt similarity index 90% rename from src/main/kotlin/roomescape/theme/web/AdminThemeController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeController.kt index b79004a2..b9084e28 100644 --- a/src/main/kotlin/roomescape/theme/web/AdminThemeController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeController.kt @@ -1,11 +1,11 @@ -package roomescape.theme.web +package com.sangdol.roomescape.theme.web import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import roomescape.common.dto.response.CommonApiResponse -import roomescape.theme.business.ThemeService -import roomescape.theme.docs.AdminThemeAPI +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.theme.business.ThemeService +import com.sangdol.roomescape.theme.docs.AdminThemeAPI import java.net.URI @RestController diff --git a/src/main/kotlin/roomescape/theme/web/AdminThemeDto.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeDto.kt similarity index 93% rename from src/main/kotlin/roomescape/theme/web/AdminThemeDto.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeDto.kt index 9b6be3ac..a5ed2964 100644 --- a/src/main/kotlin/roomescape/theme/web/AdminThemeDto.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/AdminThemeDto.kt @@ -1,8 +1,8 @@ -package roomescape.theme.web +package com.sangdol.roomescape.theme.web -import roomescape.common.dto.AuditInfo -import roomescape.theme.infrastructure.persistence.Difficulty -import roomescape.theme.infrastructure.persistence.ThemeEntity +import com.sangdol.roomescape.common.dto.AuditInfo +import com.sangdol.roomescape.theme.infrastructure.persistence.Difficulty +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity // ======================================== // HQ Admin DTO (본사) diff --git a/src/main/kotlin/roomescape/theme/web/ThemeController.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/ThemeController.kt similarity index 78% rename from src/main/kotlin/roomescape/theme/web/ThemeController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/web/ThemeController.kt index 8d67ea28..b17082eb 100644 --- a/src/main/kotlin/roomescape/theme/web/ThemeController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/ThemeController.kt @@ -1,10 +1,10 @@ -package roomescape.theme.web +package com.sangdol.roomescape.theme.web import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import roomescape.common.dto.response.CommonApiResponse -import roomescape.theme.business.ThemeService -import roomescape.theme.docs.PublicThemeAPI +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.theme.business.ThemeService +import com.sangdol.roomescape.theme.docs.PublicThemeAPI @RestController @RequestMapping("/themes") diff --git a/src/main/kotlin/roomescape/theme/web/ThemeDto.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/ThemeDto.kt similarity index 89% rename from src/main/kotlin/roomescape/theme/web/ThemeDto.kt rename to service/src/main/kotlin/com/sangdol/roomescape/theme/web/ThemeDto.kt index 9befc770..cbe6f062 100644 --- a/src/main/kotlin/roomescape/theme/web/ThemeDto.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/web/ThemeDto.kt @@ -1,7 +1,7 @@ -package roomescape.theme.web +package com.sangdol.roomescape.theme.web -import roomescape.theme.business.domain.ThemeInfo -import roomescape.theme.infrastructure.persistence.ThemeEntity +import com.sangdol.roomescape.theme.business.domain.ThemeInfo +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity data class ThemeIdListRequest( val themeIds: List diff --git a/src/main/kotlin/roomescape/user/business/UserService.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt similarity index 83% rename from src/main/kotlin/roomescape/user/business/UserService.kt rename to service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt index 627cbc54..866ef7d6 100644 --- a/src/main/kotlin/roomescape/user/business/UserService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserService.kt @@ -1,4 +1,4 @@ -package roomescape.user.business +package com.sangdol.roomescape.user.business import com.github.f4b6a3.tsid.TsidFactory import io.github.oshai.kotlinlogging.KLogger @@ -6,17 +6,17 @@ import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.common.config.next -import roomescape.common.dto.CurrentUserContext -import roomescape.common.dto.UserLoginCredentials -import roomescape.common.dto.toCredentials -import roomescape.user.exception.UserErrorCode -import roomescape.user.exception.UserException -import roomescape.user.infrastructure.persistence.* -import roomescape.user.web.UserContactResponse -import roomescape.user.web.UserCreateRequest -import roomescape.user.web.UserCreateResponse -import roomescape.user.web.toEntity +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.common.dto.UserLoginCredentials +import com.sangdol.roomescape.common.dto.toCredentials +import com.sangdol.roomescape.user.exception.UserErrorCode +import com.sangdol.roomescape.user.exception.UserException +import com.sangdol.roomescape.user.infrastructure.persistence.* +import com.sangdol.roomescape.user.web.UserContactResponse +import com.sangdol.roomescape.user.web.UserCreateRequest +import com.sangdol.roomescape.user.web.UserCreateResponse +import com.sangdol.roomescape.user.web.toEntity private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/user/business/UserValidator.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserValidator.kt similarity index 80% rename from src/main/kotlin/roomescape/user/business/UserValidator.kt rename to service/src/main/kotlin/com/sangdol/roomescape/user/business/UserValidator.kt index 8e8d8cce..400ff17d 100644 --- a/src/main/kotlin/roomescape/user/business/UserValidator.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/business/UserValidator.kt @@ -1,11 +1,11 @@ -package roomescape.user.business +package com.sangdol.roomescape.user.business import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Component -import roomescape.user.exception.UserErrorCode -import roomescape.user.exception.UserException -import roomescape.user.infrastructure.persistence.UserRepository +import com.sangdol.roomescape.user.exception.UserErrorCode +import com.sangdol.roomescape.user.exception.UserException +import com.sangdol.roomescape.user.infrastructure.persistence.UserRepository private val log: KLogger = KotlinLogging.logger {} diff --git a/src/main/kotlin/roomescape/user/docs/UserAPI.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt similarity index 65% rename from src/main/kotlin/roomescape/user/docs/UserAPI.kt rename to service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt index e809296d..512d2c54 100644 --- a/src/main/kotlin/roomescape/user/docs/UserAPI.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/docs/UserAPI.kt @@ -1,4 +1,4 @@ -package roomescape.user.docs +package com.sangdol.roomescape.user.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse @@ -6,13 +6,13 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.RequestBody -import roomescape.auth.web.support.Public -import roomescape.auth.web.support.User -import roomescape.common.dto.CurrentUserContext -import roomescape.common.dto.response.CommonApiResponse -import roomescape.user.web.UserContactResponse -import roomescape.user.web.UserCreateRequest -import roomescape.user.web.UserCreateResponse +import com.sangdol.roomescape.auth.web.support.Public +import com.sangdol.roomescape.auth.web.support.User +import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.user.web.UserContactResponse +import com.sangdol.roomescape.user.web.UserCreateRequest +import com.sangdol.roomescape.user.web.UserCreateResponse interface UserAPI { diff --git a/src/main/kotlin/roomescape/user/exception/UserException.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/exception/UserException.kt similarity index 79% rename from src/main/kotlin/roomescape/user/exception/UserException.kt rename to service/src/main/kotlin/com/sangdol/roomescape/user/exception/UserException.kt index 5f44f515..4561b724 100644 --- a/src/main/kotlin/roomescape/user/exception/UserException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/exception/UserException.kt @@ -1,8 +1,8 @@ -package roomescape.user.exception +package com.sangdol.roomescape.user.exception import org.springframework.http.HttpStatus -import roomescape.common.exception.ErrorCode -import roomescape.common.exception.RoomescapeException +import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.exception.RoomescapeException class UserException( override val errorCode: UserErrorCode, diff --git a/src/main/kotlin/roomescape/user/infrastructure/persistence/UserEntities.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/infrastructure/persistence/UserEntities.kt similarity index 84% rename from src/main/kotlin/roomescape/user/infrastructure/persistence/UserEntities.kt rename to service/src/main/kotlin/com/sangdol/roomescape/user/infrastructure/persistence/UserEntities.kt index 420764a0..dfe78608 100644 --- a/src/main/kotlin/roomescape/user/infrastructure/persistence/UserEntities.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/infrastructure/persistence/UserEntities.kt @@ -1,7 +1,7 @@ -package roomescape.user.infrastructure.persistence +package com.sangdol.roomescape.user.infrastructure.persistence import jakarta.persistence.* -import roomescape.common.entity.AuditingBaseEntity +import com.sangdol.roomescape.common.entity.AuditingBaseEntity @Entity @Table(name = "users") diff --git a/src/main/kotlin/roomescape/user/infrastructure/persistence/UserRepositories.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/infrastructure/persistence/UserRepositories.kt similarity index 84% rename from src/main/kotlin/roomescape/user/infrastructure/persistence/UserRepositories.kt rename to service/src/main/kotlin/com/sangdol/roomescape/user/infrastructure/persistence/UserRepositories.kt index 8095a090..f10272a9 100644 --- a/src/main/kotlin/roomescape/user/infrastructure/persistence/UserRepositories.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/infrastructure/persistence/UserRepositories.kt @@ -1,4 +1,4 @@ -package roomescape.user.infrastructure.persistence +package com.sangdol.roomescape.user.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/kotlin/roomescape/user/web/UserController.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt similarity index 71% rename from src/main/kotlin/roomescape/user/web/UserController.kt rename to service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt index 759e349e..c7819ccd 100644 --- a/src/main/kotlin/roomescape/user/web/UserController.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserController.kt @@ -1,13 +1,13 @@ -package roomescape.user.web +package com.sangdol.roomescape.user.web import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import roomescape.auth.web.support.User -import roomescape.common.dto.CurrentUserContext -import roomescape.common.dto.response.CommonApiResponse -import roomescape.user.business.UserService -import roomescape.user.docs.UserAPI +import com.sangdol.roomescape.auth.web.support.User +import com.sangdol.roomescape.common.dto.CurrentUserContext +import com.sangdol.roomescape.common.dto.response.CommonApiResponse +import com.sangdol.roomescape.user.business.UserService +import com.sangdol.roomescape.user.docs.UserAPI @RestController @RequestMapping("/users") diff --git a/src/main/kotlin/roomescape/user/web/UserDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserDTO.kt similarity index 83% rename from src/main/kotlin/roomescape/user/web/UserDTO.kt rename to service/src/main/kotlin/com/sangdol/roomescape/user/web/UserDTO.kt index bf193d5d..4e300475 100644 --- a/src/main/kotlin/roomescape/user/web/UserDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/web/UserDTO.kt @@ -1,11 +1,11 @@ -package roomescape.user.web +package com.sangdol.roomescape.user.web import jakarta.validation.constraints.Email import jakarta.validation.constraints.NotEmpty import jakarta.validation.constraints.Pattern import jakarta.validation.constraints.Size -import roomescape.user.infrastructure.persistence.UserEntity -import roomescape.user.infrastructure.persistence.UserStatus +import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity +import com.sangdol.roomescape.user.infrastructure.persistence.UserStatus const val MIN_PASSWORD_LENGTH = 8 diff --git a/src/main/resources/application-deploy.yaml b/service/src/main/resources/application-deploy.yaml similarity index 100% rename from src/main/resources/application-deploy.yaml rename to service/src/main/resources/application-deploy.yaml diff --git a/src/main/resources/application-local.yaml b/service/src/main/resources/application-local.yaml similarity index 100% rename from src/main/resources/application-local.yaml rename to service/src/main/resources/application-local.yaml diff --git a/src/main/resources/application.yaml b/service/src/main/resources/application.yaml similarity index 100% rename from src/main/resources/application.yaml rename to service/src/main/resources/application.yaml diff --git a/src/main/resources/logback-deploy.xml b/service/src/main/resources/logback-deploy.xml similarity index 97% rename from src/main/resources/logback-deploy.xml rename to service/src/main/resources/logback-deploy.xml index 662eea5e..0334205c 100644 --- a/src/main/resources/logback-deploy.xml +++ b/service/src/main/resources/logback-deploy.xml @@ -1,7 +1,7 @@ + class="com.sangdol.roomescape.common.log.RoomescapeLogMaskingConverter"/> diff --git a/src/main/resources/logback-local.xml b/service/src/main/resources/logback-local.xml similarity index 82% rename from src/main/resources/logback-local.xml rename to service/src/main/resources/logback-local.xml index 0c6eadb5..1b32137d 100644 --- a/src/main/resources/logback-local.xml +++ b/service/src/main/resources/logback-local.xml @@ -1,7 +1,7 @@ + class="com.sangdol.roomescape.common.log.RoomescapeLogMaskingConverter"/> @@ -16,7 +16,7 @@ - + diff --git a/src/main/resources/logback-spring.xml b/service/src/main/resources/logback-spring.xml similarity index 100% rename from src/main/resources/logback-spring.xml rename to service/src/main/resources/logback-spring.xml diff --git a/src/main/resources/schema/region-data.sql b/service/src/main/resources/schema/region-data.sql similarity index 100% rename from src/main/resources/schema/region-data.sql rename to service/src/main/resources/schema/region-data.sql diff --git a/src/main/resources/schema/schema-h2.sql b/service/src/main/resources/schema/schema-h2.sql similarity index 100% rename from src/main/resources/schema/schema-h2.sql rename to service/src/main/resources/schema/schema-h2.sql diff --git a/src/main/resources/schema/schema-mysql.sql b/service/src/main/resources/schema/schema-mysql.sql similarity index 100% rename from src/main/resources/schema/schema-mysql.sql rename to service/src/main/resources/schema/schema-mysql.sql diff --git a/src/test/kotlin/roomescape/auth/AuthApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/auth/AuthApiTest.kt similarity index 89% rename from src/test/kotlin/roomescape/auth/AuthApiTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/auth/AuthApiTest.kt index bf585a6a..bface8e8 100644 --- a/src/test/kotlin/roomescape/auth/AuthApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/auth/AuthApiTest.kt @@ -1,4 +1,4 @@ -package roomescape.auth +package com.sangdol.roomescape.auth import com.ninjasquad.springmockk.SpykBean import io.kotest.assertions.assertSoftly @@ -9,21 +9,21 @@ import io.mockk.every import io.restassured.response.ValidatableResponse import org.hamcrest.CoreMatchers.equalTo import org.springframework.http.HttpStatus -import roomescape.admin.exception.AdminErrorCode -import roomescape.auth.business.CLAIM_ADMIN_TYPE_KEY -import roomescape.auth.business.CLAIM_PERMISSION_KEY -import roomescape.auth.business.CLAIM_STORE_ID_KEY -import roomescape.auth.exception.AuthErrorCode -import roomescape.auth.infrastructure.jwt.JwtUtils -import roomescape.auth.infrastructure.persistence.LoginHistoryRepository -import roomescape.auth.web.LoginRequest -import roomescape.common.dto.PrincipalType -import roomescape.supports.AdminFixture -import roomescape.supports.FunSpecSpringbootTest -import roomescape.supports.UserFixture -import roomescape.supports.runTest -import roomescape.user.exception.UserErrorCode -import roomescape.user.infrastructure.persistence.UserEntity +import com.sangdol.roomescape.admin.exception.AdminErrorCode +import com.sangdol.roomescape.auth.business.CLAIM_ADMIN_TYPE_KEY +import com.sangdol.roomescape.auth.business.CLAIM_PERMISSION_KEY +import com.sangdol.roomescape.auth.business.CLAIM_STORE_ID_KEY +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.auth.infrastructure.jwt.JwtUtils +import com.sangdol.roomescape.auth.infrastructure.persistence.LoginHistoryRepository +import com.sangdol.roomescape.auth.web.LoginRequest +import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.supports.AdminFixture +import com.sangdol.roomescape.supports.FunSpecSpringbootTest +import com.sangdol.roomescape.supports.UserFixture +import com.sangdol.roomescape.supports.runTest +import com.sangdol.roomescape.user.exception.UserErrorCode +import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity class AuthApiTest( @SpykBean private val jwtUtils: JwtUtils, diff --git a/src/test/kotlin/roomescape/auth/FailOnSaveLoginHistoryTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/auth/FailOnSaveLoginHistoryTest.kt similarity index 80% rename from src/test/kotlin/roomescape/auth/FailOnSaveLoginHistoryTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/auth/FailOnSaveLoginHistoryTest.kt index b4d1e724..92013b88 100644 --- a/src/test/kotlin/roomescape/auth/FailOnSaveLoginHistoryTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/auth/FailOnSaveLoginHistoryTest.kt @@ -1,16 +1,16 @@ -package roomescape.auth +package com.sangdol.roomescape.auth import com.ninjasquad.springmockk.MockkBean import io.mockk.clearMocks import io.mockk.every import org.springframework.http.HttpStatus -import roomescape.auth.infrastructure.persistence.LoginHistoryRepository -import roomescape.auth.web.LoginRequest -import roomescape.common.dto.PrincipalType -import roomescape.supports.AdminFixture -import roomescape.supports.FunSpecSpringbootTest -import roomescape.supports.UserFixture -import roomescape.supports.runTest +import com.sangdol.roomescape.auth.infrastructure.persistence.LoginHistoryRepository +import com.sangdol.roomescape.auth.web.LoginRequest +import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.supports.AdminFixture +import com.sangdol.roomescape.supports.FunSpecSpringbootTest +import com.sangdol.roomescape.supports.UserFixture +import com.sangdol.roomescape.supports.runTest class FailOnSaveLoginHistoryTest( @MockkBean private val loginHistoryRepository: LoginHistoryRepository diff --git a/src/test/kotlin/roomescape/auth/JwtUtilsTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/auth/JwtUtilsTest.kt similarity index 90% rename from src/test/kotlin/roomescape/auth/JwtUtilsTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/auth/JwtUtilsTest.kt index 28aff8ef..02415b46 100644 --- a/src/test/kotlin/roomescape/auth/JwtUtilsTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/auth/JwtUtilsTest.kt @@ -1,13 +1,13 @@ -package roomescape.auth +package com.sangdol.roomescape.auth import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe -import roomescape.auth.exception.AuthErrorCode -import roomescape.auth.exception.AuthException -import roomescape.auth.infrastructure.jwt.JwtUtils -import roomescape.common.config.next -import roomescape.supports.tsidFactory +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.auth.exception.AuthException +import com.sangdol.roomescape.auth.infrastructure.jwt.JwtUtils +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.supports.tsidFactory class JwtUtilsTest : FunSpec() { private val jwtUtils: JwtUtils = JwtUtils( diff --git a/src/test/kotlin/roomescape/common/config/JacksonConfigTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/common/config/JacksonConfigTest.kt similarity index 98% rename from src/test/kotlin/roomescape/common/config/JacksonConfigTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/common/config/JacksonConfigTest.kt index c4129dc2..8ebb7557 100644 --- a/src/test/kotlin/roomescape/common/config/JacksonConfigTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/common/config/JacksonConfigTest.kt @@ -1,4 +1,4 @@ -package roomescape.common.config +package com.sangdol.roomescape.common.config import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.InvalidFormatException diff --git a/src/test/kotlin/roomescape/common/log/ApiLogMessageConverterTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/common/log/ApiLogMessageConverterTest.kt similarity index 94% rename from src/test/kotlin/roomescape/common/log/ApiLogMessageConverterTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/common/log/ApiLogMessageConverterTest.kt index 1e0e4afb..c420d817 100644 --- a/src/test/kotlin/roomescape/common/log/ApiLogMessageConverterTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/common/log/ApiLogMessageConverterTest.kt @@ -1,4 +1,4 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import io.kotest.core.spec.style.StringSpec @@ -7,8 +7,8 @@ import io.mockk.every import io.mockk.mockk import jakarta.servlet.http.HttpServletRequest import org.slf4j.MDC -import roomescape.auth.exception.AuthErrorCode -import roomescape.auth.exception.AuthException +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.auth.exception.AuthException class ApiLogMessageConverterTest : StringSpec({ val converter = ApiLogMessageConverter(jacksonObjectMapper()) diff --git a/src/test/kotlin/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParamsTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParamsTest.kt similarity index 95% rename from src/test/kotlin/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParamsTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParamsTest.kt index ac224f63..488de01a 100644 --- a/src/test/kotlin/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParamsTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/common/log/MDCAwareSlowQueryListenerWithoutParamsTest.kt @@ -1,4 +1,4 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import io.kotest.assertions.assertSoftly import io.kotest.core.spec.style.StringSpec diff --git a/src/test/kotlin/roomescape/common/log/RoomescapeLogMaskingConverterTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverterTest.kt similarity index 98% rename from src/test/kotlin/roomescape/common/log/RoomescapeLogMaskingConverterTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverterTest.kt index b4ed4462..2db3f5f7 100644 --- a/src/test/kotlin/roomescape/common/log/RoomescapeLogMaskingConverterTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverterTest.kt @@ -1,4 +1,4 @@ -package roomescape.common.log +package com.sangdol.roomescape.common.log import ch.qos.logback.classic.spi.ILoggingEvent import io.kotest.assertions.assertSoftly diff --git a/src/test/kotlin/roomescape/common/util/DateUtilsTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/common/util/DateUtilsTest.kt similarity index 90% rename from src/test/kotlin/roomescape/common/util/DateUtilsTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/common/util/DateUtilsTest.kt index 30a2c6b3..4be655fc 100644 --- a/src/test/kotlin/roomescape/common/util/DateUtilsTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/common/util/DateUtilsTest.kt @@ -1,4 +1,4 @@ -package roomescape.common.util +package com.sangdol.roomescape.common.util import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe diff --git a/src/test/kotlin/roomescape/data/DefaultDataInitializer.kt b/service/src/test/kotlin/com/sangdol/roomescape/data/DefaultDataInitializer.kt similarity index 95% rename from src/test/kotlin/roomescape/data/DefaultDataInitializer.kt rename to service/src/test/kotlin/com/sangdol/roomescape/data/DefaultDataInitializer.kt index eed4c74d..06785315 100644 --- a/src/test/kotlin/roomescape/data/DefaultDataInitializer.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/data/DefaultDataInitializer.kt @@ -1,4 +1,4 @@ -package roomescape.data +package com.sangdol.roomescape.data import com.github.f4b6a3.tsid.TsidFactory import io.kotest.core.test.TestCaseOrder @@ -11,23 +11,23 @@ import kotlinx.coroutines.sync.Semaphore import org.springframework.beans.factory.annotation.Autowired import org.springframework.jdbc.core.JdbcTemplate import org.springframework.test.context.ActiveProfiles -import roomescape.admin.infrastructure.persistence.AdminEntity -import roomescape.admin.infrastructure.persistence.AdminPermissionLevel -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.common.config.next -import roomescape.common.util.TransactionExecutionUtil -import roomescape.payment.infrastructure.common.* -import roomescape.reservation.infrastructure.persistence.ReservationStatus -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.supports.AdminFixture -import roomescape.supports.FunSpecSpringbootTest -import roomescape.supports.randomPhoneNumber -import roomescape.supports.randomString -import roomescape.theme.infrastructure.persistence.Difficulty -import roomescape.user.business.SIGNUP -import roomescape.user.infrastructure.persistence.UserEntity -import roomescape.user.infrastructure.persistence.UserStatus -import roomescape.user.web.UserContactResponse +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminEntity +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.common.util.TransactionExecutionUtil +import com.sangdol.roomescape.payment.infrastructure.common.* +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationStatus +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.supports.AdminFixture +import com.sangdol.roomescape.supports.FunSpecSpringbootTest +import com.sangdol.roomescape.supports.randomPhoneNumber +import com.sangdol.roomescape.supports.randomString +import com.sangdol.roomescape.theme.infrastructure.persistence.Difficulty +import com.sangdol.roomescape.user.business.SIGNUP +import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity +import com.sangdol.roomescape.user.infrastructure.persistence.UserStatus +import com.sangdol.roomescape.user.web.UserContactResponse import java.sql.Timestamp import java.time.LocalDateTime import java.time.LocalTime @@ -532,12 +532,12 @@ class ReservationDataInitializer : AbstractDataInitializer() { val chunkSize = 10_000 val chunkedSchedules: List> = entityManager.createQuery( - "SELECT new roomescape.data.ScheduleWithThemeParticipants(s._id, t.minParticipants, t.maxParticipants) FROM ScheduleEntity s JOIN ThemeEntity t ON s.themeId = t.id WHERE s.status = :status", + "SELECT new com.sangdol.roomescape.data.ScheduleWithThemeParticipants(s._id, t.minParticipants, t.maxParticipants) FROM ScheduleEntity s JOIN ThemeEntity t ON s.themeId = t.id WHERE s.status = :status", ScheduleWithThemeParticipants::class.java ).setParameter("status", ScheduleStatus.RESERVED).resultList.chunked(chunkSize) val chunkedUsers: List> = entityManager.createQuery( - "SELECT new roomescape.user.web.UserContactResponse(u._id, u.name, u.phone) FROM UserEntity u", + "SELECT new com.sangdol.roomescape.user.web.UserContactResponse(u._id, u.name, u.phone) FROM UserEntity u", UserContactResponse::class.java ).resultList.chunked(chunkSize) @@ -682,7 +682,7 @@ class PaymentDataInitializer : AbstractDataInitializer() { test("기존 결제 데이터에 상세 정보(계좌이체, 카드, 간편결제) 데이터를 생성한다.") { val allPayments: List = entityManager.createQuery( - "SELECT new roomescape.data.PaymentWithMethods(pd._id, p.totalAmount, p.method) FROM PaymentEntity p JOIN PaymentDetailEntity pd ON p._id = pd.paymentId", + "SELECT new com.sangdol.roomescape.data.PaymentWithMethods(pd._id, p.totalAmount, p.method) FROM PaymentEntity p JOIN PaymentDetailEntity pd ON p._id = pd.paymentId", PaymentWithMethods::class.java ).resultList diff --git a/src/test/kotlin/roomescape/data/PopulationDataParser.kt b/service/src/test/kotlin/com/sangdol/roomescape/data/PopulationDataParser.kt similarity index 95% rename from src/test/kotlin/roomescape/data/PopulationDataParser.kt rename to service/src/test/kotlin/com/sangdol/roomescape/data/PopulationDataParser.kt index d511b234..c1582e31 100644 --- a/src/test/kotlin/roomescape/data/PopulationDataParser.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/data/PopulationDataParser.kt @@ -1,11 +1,12 @@ -package roomescape.data +package com.sangdol.roomescape.data import org.apache.poi.xssf.usermodel.XSSFWorkbook -import roomescape.common.config.next -import roomescape.store.infrastructure.persistence.StoreStatus -import roomescape.supports.randomPhoneNumber -import roomescape.supports.tsidFactory +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.store.infrastructure.persistence.StoreStatus +import com.sangdol.roomescape.supports.randomPhoneNumber +import com.sangdol.roomescape.supports.tsidFactory import java.io.File +import java.nio.file.Paths import java.time.LocalDateTime import java.time.ZoneId import java.time.format.DateTimeFormatter @@ -25,7 +26,7 @@ class PopulationDataSqlParser() { // 인구 데이터를 이용하여 지역 정보 SQL 파일로 변환하고, 추가로 $MIN_POPULATION_FOR_PER_STORE 이상의 시/군/구는 매장 데이터 생성을 위해 따로 분류한다. fun createParsedRegionPopulationFiles() { - val populationXlsx = XSSFWorkbook(File("data/population.xlsx")) + val populationXlsx = XSSFWorkbook(File("${BASE_DIR}/population.xlsx")) val sheet = populationXlsx.getSheetAt(0) val allRegion = mutableListOf>() val regionsMoreThanMinPopulation = mutableListOf>() diff --git a/src/test/kotlin/roomescape/payment/PaymentAPITest.kt b/service/src/test/kotlin/com/sangdol/roomescape/payment/PaymentAPITest.kt similarity index 95% rename from src/test/kotlin/roomescape/payment/PaymentAPITest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/payment/PaymentAPITest.kt index 2cdea8d4..f3fcccd3 100644 --- a/src/test/kotlin/roomescape/payment/PaymentAPITest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/payment/PaymentAPITest.kt @@ -1,4 +1,4 @@ -package roomescape.payment +package com.sangdol.roomescape.payment import com.ninjasquad.springmockk.MockkBean import io.kotest.matchers.shouldBe @@ -6,18 +6,18 @@ import io.mockk.every import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus -import roomescape.auth.exception.AuthErrorCode -import roomescape.payment.business.PaymentService -import roomescape.payment.exception.PaymentErrorCode -import roomescape.payment.infrastructure.client.CardDetail -import roomescape.payment.infrastructure.client.EasyPayDetail -import roomescape.payment.infrastructure.client.TosspayClient -import roomescape.payment.infrastructure.client.TransferDetail -import roomescape.payment.infrastructure.common.* -import roomescape.payment.infrastructure.persistence.* -import roomescape.payment.web.PaymentConfirmRequest -import roomescape.payment.web.PaymentCreateResponse -import roomescape.supports.* +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.payment.business.PaymentService +import com.sangdol.roomescape.payment.exception.PaymentErrorCode +import com.sangdol.roomescape.payment.infrastructure.client.CardDetail +import com.sangdol.roomescape.payment.infrastructure.client.EasyPayDetail +import com.sangdol.roomescape.payment.infrastructure.client.TosspayClient +import com.sangdol.roomescape.payment.infrastructure.client.TransferDetail +import com.sangdol.roomescape.payment.infrastructure.common.* +import com.sangdol.roomescape.payment.infrastructure.persistence.* +import com.sangdol.roomescape.payment.web.PaymentConfirmRequest +import com.sangdol.roomescape.payment.web.PaymentCreateResponse +import com.sangdol.roomescape.supports.* class PaymentAPITest( @MockkBean diff --git a/src/test/kotlin/roomescape/payment/SampleTosspayConstant.kt b/service/src/test/kotlin/com/sangdol/roomescape/payment/SampleTosspayConstant.kt similarity index 99% rename from src/test/kotlin/roomescape/payment/SampleTosspayConstant.kt rename to service/src/test/kotlin/com/sangdol/roomescape/payment/SampleTosspayConstant.kt index 07c4a2ad..aa1c8514 100644 --- a/src/test/kotlin/roomescape/payment/SampleTosspayConstant.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/payment/SampleTosspayConstant.kt @@ -1,4 +1,4 @@ -package roomescape.payment +package com.sangdol.roomescape.payment import java.time.OffsetDateTime diff --git a/src/test/kotlin/roomescape/payment/TosspayClientTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/payment/TosspayClientTest.kt similarity index 93% rename from src/test/kotlin/roomescape/payment/TosspayClientTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/payment/TosspayClientTest.kt index d0665a06..ece494e3 100644 --- a/src/test/kotlin/roomescape/payment/TosspayClientTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/payment/TosspayClientTest.kt @@ -1,4 +1,4 @@ -package roomescape.payment +package com.sangdol.roomescape.payment import com.ninjasquad.springmockk.MockkBean import io.kotest.assertions.assertSoftly @@ -16,12 +16,12 @@ import org.springframework.test.web.client.ResponseActions import org.springframework.test.web.client.match.MockRestRequestMatchers.* import org.springframework.test.web.client.response.MockRestResponseCreators.withStatus import org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess -import roomescape.payment.exception.PaymentErrorCode -import roomescape.payment.exception.PaymentException -import roomescape.payment.infrastructure.client.PaymentClientCancelResponse -import roomescape.payment.infrastructure.client.PaymentClientConfirmResponse -import roomescape.payment.infrastructure.client.TosspayClient -import roomescape.payment.infrastructure.common.PaymentStatus +import com.sangdol.roomescape.payment.exception.PaymentErrorCode +import com.sangdol.roomescape.payment.exception.PaymentException +import com.sangdol.roomescape.payment.infrastructure.client.PaymentClientCancelResponse +import com.sangdol.roomescape.payment.infrastructure.client.PaymentClientConfirmResponse +import com.sangdol.roomescape.payment.infrastructure.client.TosspayClient +import com.sangdol.roomescape.payment.infrastructure.common.PaymentStatus @RestClientTest(TosspayClient::class) @MockkBean(JpaMetamodelMappingContext::class) diff --git a/src/test/kotlin/roomescape/region/RegionApiFailTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/region/RegionApiFailTest.kt similarity index 83% rename from src/test/kotlin/roomescape/region/RegionApiFailTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/region/RegionApiFailTest.kt index 671ebf0d..1621aab9 100644 --- a/src/test/kotlin/roomescape/region/RegionApiFailTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/region/RegionApiFailTest.kt @@ -1,12 +1,12 @@ -package roomescape.region +package com.sangdol.roomescape.region import com.ninjasquad.springmockk.MockkBean import io.mockk.every import org.springframework.http.HttpMethod -import roomescape.region.exception.RegionErrorCode -import roomescape.region.infrastructure.persistence.RegionRepository -import roomescape.supports.FunSpecSpringbootTest -import roomescape.supports.runExceptionTest +import com.sangdol.roomescape.region.exception.RegionErrorCode +import com.sangdol.roomescape.region.infrastructure.persistence.RegionRepository +import com.sangdol.roomescape.supports.FunSpecSpringbootTest +import com.sangdol.roomescape.supports.runExceptionTest class RegionApiFailTest( @MockkBean private val regionRepository: RegionRepository diff --git a/src/test/kotlin/roomescape/region/RegionApiSuccessTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/region/RegionApiSuccessTest.kt similarity index 90% rename from src/test/kotlin/roomescape/region/RegionApiSuccessTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/region/RegionApiSuccessTest.kt index 53e34fe2..2875854b 100644 --- a/src/test/kotlin/roomescape/region/RegionApiSuccessTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/region/RegionApiSuccessTest.kt @@ -1,9 +1,9 @@ -package roomescape.region +package com.sangdol.roomescape.region import io.kotest.matchers.shouldBe import org.springframework.http.HttpStatus -import roomescape.supports.FunSpecSpringbootTest -import roomescape.supports.runTest +import com.sangdol.roomescape.supports.FunSpecSpringbootTest +import com.sangdol.roomescape.supports.runTest class RegionApiSuccessTest: FunSpecSpringbootTest() { init { diff --git a/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/reservation/ReservationApiTest.kt similarity index 94% rename from src/test/kotlin/roomescape/reservation/ReservationApiTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/reservation/ReservationApiTest.kt index 6f6d9f8a..52fde089 100644 --- a/src/test/kotlin/roomescape/reservation/ReservationApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/reservation/ReservationApiTest.kt @@ -1,4 +1,4 @@ -package roomescape.reservation +package com.sangdol.roomescape.reservation import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe @@ -6,25 +6,25 @@ import org.hamcrest.CoreMatchers.equalTo import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus -import roomescape.auth.exception.AuthErrorCode -import roomescape.common.exception.CommonErrorCode -import roomescape.payment.infrastructure.common.BankCode -import roomescape.payment.infrastructure.common.CardIssuerCode -import roomescape.payment.infrastructure.common.EasyPayCompanyCode -import roomescape.payment.infrastructure.persistence.PaymentDetailRepository -import roomescape.reservation.exception.ReservationErrorCode -import roomescape.reservation.infrastructure.persistence.CanceledReservationRepository -import roomescape.reservation.infrastructure.persistence.ReservationEntity -import roomescape.reservation.infrastructure.persistence.ReservationRepository -import roomescape.reservation.infrastructure.persistence.ReservationStatus -import roomescape.reservation.web.ReservationCancelRequest -import roomescape.reservation.web.ReservationOverviewResponse -import roomescape.schedule.infrastructure.persistence.ScheduleEntity -import roomescape.schedule.infrastructure.persistence.ScheduleRepository -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.supports.* -import roomescape.theme.infrastructure.persistence.ThemeEntity -import roomescape.theme.infrastructure.persistence.ThemeRepository +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.common.exception.CommonErrorCode +import com.sangdol.roomescape.payment.infrastructure.common.BankCode +import com.sangdol.roomescape.payment.infrastructure.common.CardIssuerCode +import com.sangdol.roomescape.payment.infrastructure.common.EasyPayCompanyCode +import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentDetailRepository +import com.sangdol.roomescape.reservation.exception.ReservationErrorCode +import com.sangdol.roomescape.reservation.infrastructure.persistence.CanceledReservationRepository +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationEntity +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationRepository +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationStatus +import com.sangdol.roomescape.reservation.web.ReservationCancelRequest +import com.sangdol.roomescape.reservation.web.ReservationOverviewResponse +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntity +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.supports.* +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeRepository import java.time.LocalDate import java.time.LocalTime diff --git a/src/test/kotlin/roomescape/schedule/AdminScheduleApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/schedule/AdminScheduleApiTest.kt similarity index 96% rename from src/test/kotlin/roomescape/schedule/AdminScheduleApiTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/schedule/AdminScheduleApiTest.kt index 3411c1fb..b16abad5 100644 --- a/src/test/kotlin/roomescape/schedule/AdminScheduleApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/schedule/AdminScheduleApiTest.kt @@ -1,4 +1,4 @@ -package roomescape.schedule +package com.sangdol.roomescape.schedule import io.kotest.assertions.assertSoftly import io.kotest.matchers.date.shouldBeBefore @@ -8,19 +8,19 @@ import org.hamcrest.CoreMatchers.equalTo import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus -import roomescape.admin.infrastructure.persistence.AdminPermissionLevel -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.auth.exception.AuthErrorCode -import roomescape.common.dto.AuditConstant -import roomescape.common.dto.OperatorInfo -import roomescape.schedule.exception.ScheduleErrorCode -import roomescape.schedule.infrastructure.persistence.ScheduleEntity -import roomescape.schedule.infrastructure.persistence.ScheduleRepository -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.schedule.web.AdminScheduleSummaryResponse -import roomescape.schedule.web.ScheduleUpdateRequest -import roomescape.store.infrastructure.persistence.StoreEntity -import roomescape.supports.* +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.common.dto.AuditConstant +import com.sangdol.roomescape.common.dto.OperatorInfo +import com.sangdol.roomescape.schedule.exception.ScheduleErrorCode +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntity +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.schedule.web.AdminScheduleSummaryResponse +import com.sangdol.roomescape.schedule.web.ScheduleUpdateRequest +import com.sangdol.roomescape.store.infrastructure.persistence.StoreEntity +import com.sangdol.roomescape.supports.* import java.time.LocalDate import java.time.LocalTime diff --git a/src/test/kotlin/roomescape/schedule/ScheduleApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/schedule/ScheduleApiTest.kt similarity index 89% rename from src/test/kotlin/roomescape/schedule/ScheduleApiTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/schedule/ScheduleApiTest.kt index 81cb6d85..a4bd3b84 100644 --- a/src/test/kotlin/roomescape/schedule/ScheduleApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/schedule/ScheduleApiTest.kt @@ -1,17 +1,17 @@ -package roomescape.schedule +package com.sangdol.roomescape.schedule import io.kotest.matchers.shouldBe import org.hamcrest.CoreMatchers.equalTo import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus -import roomescape.admin.infrastructure.persistence.AdminPermissionLevel -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.auth.exception.AuthErrorCode -import roomescape.schedule.exception.ScheduleErrorCode -import roomescape.schedule.infrastructure.persistence.ScheduleRepository -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.supports.* +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.schedule.exception.ScheduleErrorCode +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.supports.* import java.time.LocalDate import java.time.LocalTime diff --git a/src/test/kotlin/roomescape/store/AdminStoreApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/store/AdminStoreApiTest.kt similarity index 96% rename from src/test/kotlin/roomescape/store/AdminStoreApiTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/store/AdminStoreApiTest.kt index 2417311d..e8e85eec 100644 --- a/src/test/kotlin/roomescape/store/AdminStoreApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/store/AdminStoreApiTest.kt @@ -1,4 +1,4 @@ -package roomescape.store +package com.sangdol.roomescape.store import io.kotest.assertions.assertSoftly import io.kotest.matchers.date.shouldBeAfter @@ -6,16 +6,16 @@ import io.kotest.matchers.shouldBe import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus -import roomescape.admin.infrastructure.persistence.AdminEntity -import roomescape.admin.infrastructure.persistence.AdminPermissionLevel -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.auth.exception.AuthErrorCode -import roomescape.store.exception.StoreErrorCode -import roomescape.store.infrastructure.persistence.StoreEntity -import roomescape.store.infrastructure.persistence.StoreRepository -import roomescape.store.infrastructure.persistence.StoreStatus -import roomescape.store.web.StoreUpdateRequest -import roomescape.supports.* +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminEntity +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.store.exception.StoreErrorCode +import com.sangdol.roomescape.store.infrastructure.persistence.StoreEntity +import com.sangdol.roomescape.store.infrastructure.persistence.StoreRepository +import com.sangdol.roomescape.store.infrastructure.persistence.StoreStatus +import com.sangdol.roomescape.store.web.StoreUpdateRequest +import com.sangdol.roomescape.supports.* class AdminStoreApiTest( private val storeRepository: StoreRepository, diff --git a/src/test/kotlin/roomescape/store/StoreApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/store/StoreApiTest.kt similarity index 94% rename from src/test/kotlin/roomescape/store/StoreApiTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/store/StoreApiTest.kt index 006c94fc..f6580e6a 100644 --- a/src/test/kotlin/roomescape/store/StoreApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/store/StoreApiTest.kt @@ -1,11 +1,11 @@ -package roomescape.store +package com.sangdol.roomescape.store import org.hamcrest.CoreMatchers.equalTo import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus -import roomescape.store.exception.StoreErrorCode -import roomescape.store.infrastructure.persistence.StoreEntity -import roomescape.supports.* +import com.sangdol.roomescape.store.exception.StoreErrorCode +import com.sangdol.roomescape.store.infrastructure.persistence.StoreEntity +import com.sangdol.roomescape.supports.* class StoreApiTest: FunSpecSpringbootTest() { diff --git a/src/test/kotlin/roomescape/supports/DummyInitializer.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/DummyInitializer.kt similarity index 74% rename from src/test/kotlin/roomescape/supports/DummyInitializer.kt rename to service/src/test/kotlin/com/sangdol/roomescape/supports/DummyInitializer.kt index f4791b94..b90f7136 100644 --- a/src/test/kotlin/roomescape/supports/DummyInitializer.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/DummyInitializer.kt @@ -1,36 +1,36 @@ -package roomescape.supports +package com.sangdol.roomescape.supports import org.springframework.data.repository.findByIdOrNull -import roomescape.common.config.next -import roomescape.payment.business.PaymentWriter -import roomescape.payment.infrastructure.client.CardDetail -import roomescape.payment.infrastructure.client.EasyPayDetail -import roomescape.payment.infrastructure.client.TransferDetail -import roomescape.payment.infrastructure.common.PaymentMethod -import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity -import roomescape.payment.infrastructure.persistence.PaymentEntity -import roomescape.payment.infrastructure.persistence.PaymentRepository -import roomescape.payment.web.PaymentConfirmRequest -import roomescape.payment.web.PaymentWithDetailResponse -import roomescape.payment.web.toDetailResponse -import roomescape.payment.web.toPaymentDetailResponse -import roomescape.reservation.infrastructure.persistence.ReservationEntity -import roomescape.reservation.infrastructure.persistence.ReservationRepository -import roomescape.reservation.infrastructure.persistence.ReservationStatus -import roomescape.reservation.web.PendingReservationCreateRequest -import roomescape.reservation.web.toEntity -import roomescape.schedule.infrastructure.persistence.ScheduleEntity -import roomescape.schedule.infrastructure.persistence.ScheduleRepository -import roomescape.schedule.infrastructure.persistence.ScheduleStatus -import roomescape.schedule.web.ScheduleCreateRequest -import roomescape.store.infrastructure.persistence.StoreEntity -import roomescape.store.infrastructure.persistence.StoreRepository -import roomescape.store.infrastructure.persistence.StoreStatus -import roomescape.theme.infrastructure.persistence.ThemeEntity -import roomescape.theme.infrastructure.persistence.ThemeRepository -import roomescape.theme.web.ThemeCreateRequest -import roomescape.theme.web.toEntity -import roomescape.user.infrastructure.persistence.UserEntity +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.payment.business.PaymentWriter +import com.sangdol.roomescape.payment.infrastructure.client.CardDetail +import com.sangdol.roomescape.payment.infrastructure.client.EasyPayDetail +import com.sangdol.roomescape.payment.infrastructure.client.TransferDetail +import com.sangdol.roomescape.payment.infrastructure.common.PaymentMethod +import com.sangdol.roomescape.payment.infrastructure.persistence.CanceledPaymentEntity +import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentEntity +import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentRepository +import com.sangdol.roomescape.payment.web.PaymentConfirmRequest +import com.sangdol.roomescape.payment.web.PaymentWithDetailResponse +import com.sangdol.roomescape.payment.web.toDetailResponse +import com.sangdol.roomescape.payment.web.toPaymentDetailResponse +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationEntity +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationRepository +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationStatus +import com.sangdol.roomescape.reservation.web.PendingReservationCreateRequest +import com.sangdol.roomescape.reservation.web.toEntity +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntity +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleStatus +import com.sangdol.roomescape.schedule.web.ScheduleCreateRequest +import com.sangdol.roomescape.store.infrastructure.persistence.StoreEntity +import com.sangdol.roomescape.store.infrastructure.persistence.StoreRepository +import com.sangdol.roomescape.store.infrastructure.persistence.StoreStatus +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeRepository +import com.sangdol.roomescape.theme.web.ThemeCreateRequest +import com.sangdol.roomescape.theme.web.toEntity +import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity import java.time.LocalDateTime class DummyInitializer( diff --git a/src/test/kotlin/roomescape/supports/Fixtures.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/Fixtures.kt similarity index 86% rename from src/test/kotlin/roomescape/supports/Fixtures.kt rename to service/src/test/kotlin/com/sangdol/roomescape/supports/Fixtures.kt index ada73ea8..7389a643 100644 --- a/src/test/kotlin/roomescape/supports/Fixtures.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/Fixtures.kt @@ -1,28 +1,28 @@ -package roomescape.supports +package com.sangdol.roomescape.supports import com.github.f4b6a3.tsid.TsidFactory -import roomescape.admin.infrastructure.persistence.AdminEntity -import roomescape.admin.infrastructure.persistence.AdminPermissionLevel -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.common.config.next -import roomescape.payment.infrastructure.client.* -import roomescape.payment.infrastructure.common.* -import roomescape.payment.web.PaymentCancelRequest -import roomescape.payment.web.PaymentConfirmRequest -import roomescape.reservation.web.PendingReservationCreateRequest -import roomescape.schedule.infrastructure.persistence.ScheduleEntity -import roomescape.schedule.infrastructure.persistence.ScheduleEntityFactory -import roomescape.schedule.web.ScheduleCreateRequest -import roomescape.store.infrastructure.persistence.StoreEntity -import roomescape.store.infrastructure.persistence.StoreStatus -import roomescape.store.web.StoreRegisterRequest -import roomescape.theme.infrastructure.persistence.Difficulty -import roomescape.theme.infrastructure.persistence.ThemeEntity -import roomescape.theme.web.ThemeCreateRequest -import roomescape.user.infrastructure.persistence.UserEntity -import roomescape.user.infrastructure.persistence.UserStatus -import roomescape.user.web.MIN_PASSWORD_LENGTH -import roomescape.user.web.UserCreateRequest +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminEntity +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.payment.infrastructure.client.* +import com.sangdol.roomescape.payment.infrastructure.common.* +import com.sangdol.roomescape.payment.web.PaymentCancelRequest +import com.sangdol.roomescape.payment.web.PaymentConfirmRequest +import com.sangdol.roomescape.reservation.web.PendingReservationCreateRequest +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntity +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleEntityFactory +import com.sangdol.roomescape.schedule.web.ScheduleCreateRequest +import com.sangdol.roomescape.store.infrastructure.persistence.StoreEntity +import com.sangdol.roomescape.store.infrastructure.persistence.StoreStatus +import com.sangdol.roomescape.store.web.StoreRegisterRequest +import com.sangdol.roomescape.theme.infrastructure.persistence.Difficulty +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity +import com.sangdol.roomescape.theme.web.ThemeCreateRequest +import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity +import com.sangdol.roomescape.user.infrastructure.persistence.UserStatus +import com.sangdol.roomescape.user.web.MIN_PASSWORD_LENGTH +import com.sangdol.roomescape.user.web.UserCreateRequest import java.time.LocalDate import java.time.LocalTime import java.time.OffsetDateTime diff --git a/src/test/kotlin/roomescape/supports/KotestConfig.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/KotestConfig.kt similarity index 78% rename from src/test/kotlin/roomescape/supports/KotestConfig.kt rename to service/src/test/kotlin/com/sangdol/roomescape/supports/KotestConfig.kt index 284892ab..fbbe81b0 100644 --- a/src/test/kotlin/roomescape/supports/KotestConfig.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/KotestConfig.kt @@ -1,4 +1,4 @@ -package roomescape.supports +package com.sangdol.roomescape.supports import io.kotest.core.config.AbstractProjectConfig import io.kotest.core.spec.Spec @@ -13,14 +13,14 @@ import org.springframework.boot.test.web.server.LocalServerPort import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Import import org.springframework.test.context.ActiveProfiles -import roomescape.admin.infrastructure.persistence.AdminRepository -import roomescape.payment.business.PaymentWriter -import roomescape.payment.infrastructure.persistence.PaymentRepository -import roomescape.reservation.infrastructure.persistence.ReservationRepository -import roomescape.schedule.infrastructure.persistence.ScheduleRepository -import roomescape.store.infrastructure.persistence.StoreRepository -import roomescape.theme.infrastructure.persistence.ThemeRepository -import roomescape.user.infrastructure.persistence.UserRepository +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminRepository +import com.sangdol.roomescape.payment.business.PaymentWriter +import com.sangdol.roomescape.payment.infrastructure.persistence.PaymentRepository +import com.sangdol.roomescape.reservation.infrastructure.persistence.ReservationRepository +import com.sangdol.roomescape.schedule.infrastructure.persistence.ScheduleRepository +import com.sangdol.roomescape.store.infrastructure.persistence.StoreRepository +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeRepository +import com.sangdol.roomescape.user.infrastructure.persistence.UserRepository object KotestConfig : AbstractProjectConfig() { override fun extensions(): List = listOf(SpringExtension) diff --git a/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/RestAssuredUtils.kt similarity index 95% rename from src/test/kotlin/roomescape/supports/RestAssuredUtils.kt rename to service/src/test/kotlin/com/sangdol/roomescape/supports/RestAssuredUtils.kt index 689184d2..bf663229 100644 --- a/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/RestAssuredUtils.kt @@ -1,4 +1,4 @@ -package roomescape.supports +package com.sangdol.roomescape.supports import com.fasterxml.jackson.module.kotlin.convertValue import io.restassured.module.kotlin.extensions.Given @@ -10,8 +10,8 @@ import io.restassured.specification.RequestSpecification import org.hamcrest.CoreMatchers.equalTo import org.springframework.http.HttpMethod import org.springframework.http.MediaType -import roomescape.common.config.JacksonConfig -import roomescape.common.exception.ErrorCode +import com.sangdol.roomescape.common.config.JacksonConfig +import com.sangdol.roomescape.common.exception.ErrorCode fun runTest( token: String? = null, diff --git a/src/test/kotlin/roomescape/supports/TestAuthUtil.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/TestAuthUtil.kt similarity index 86% rename from src/test/kotlin/roomescape/supports/TestAuthUtil.kt rename to service/src/test/kotlin/com/sangdol/roomescape/supports/TestAuthUtil.kt index 67379374..b5a68bec 100644 --- a/src/test/kotlin/roomescape/supports/TestAuthUtil.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/TestAuthUtil.kt @@ -1,4 +1,4 @@ -package roomescape.supports +package com.sangdol.roomescape.supports import io.restassured.module.kotlin.extensions.Extract import io.restassured.module.kotlin.extensions.Given @@ -7,15 +7,15 @@ import io.restassured.module.kotlin.extensions.When import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpStatus import org.springframework.http.MediaType -import roomescape.admin.infrastructure.persistence.AdminEntity -import roomescape.admin.infrastructure.persistence.AdminRepository -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.auth.web.LoginRequest -import roomescape.common.dto.PrincipalType -import roomescape.store.infrastructure.persistence.StoreRepository -import roomescape.user.infrastructure.persistence.UserEntity -import roomescape.user.infrastructure.persistence.UserRepository -import roomescape.user.web.UserCreateRequest +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminEntity +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminRepository +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.auth.web.LoginRequest +import com.sangdol.roomescape.common.dto.PrincipalType +import com.sangdol.roomescape.store.infrastructure.persistence.StoreRepository +import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity +import com.sangdol.roomescape.user.infrastructure.persistence.UserRepository +import com.sangdol.roomescape.user.web.UserCreateRequest class TestAuthUtil( private val userRepository: UserRepository, diff --git a/src/test/kotlin/roomescape/supports/TestDatabaseUtil.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/TestDatabaseUtil.kt similarity index 98% rename from src/test/kotlin/roomescape/supports/TestDatabaseUtil.kt rename to service/src/test/kotlin/com/sangdol/roomescape/supports/TestDatabaseUtil.kt index 07c5591f..60e4d851 100644 --- a/src/test/kotlin/roomescape/supports/TestDatabaseUtil.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/TestDatabaseUtil.kt @@ -1,4 +1,4 @@ -package roomescape.supports +package com.sangdol.roomescape.supports import io.kotest.core.listeners.AfterSpecListener import io.kotest.core.listeners.AfterTestListener diff --git a/src/test/kotlin/roomescape/supports/TestUtil.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/TestUtil.kt similarity index 95% rename from src/test/kotlin/roomescape/supports/TestUtil.kt rename to service/src/test/kotlin/com/sangdol/roomescape/supports/TestUtil.kt index 8b5780e5..0e262845 100644 --- a/src/test/kotlin/roomescape/supports/TestUtil.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/TestUtil.kt @@ -1,4 +1,4 @@ -package roomescape.supports +package com.sangdol.roomescape.supports import kotlin.random.Random diff --git a/src/test/kotlin/roomescape/theme/AdminThemeApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/theme/AdminThemeApiTest.kt similarity index 97% rename from src/test/kotlin/roomescape/theme/AdminThemeApiTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/theme/AdminThemeApiTest.kt index 4663b0d9..72c10cd4 100644 --- a/src/test/kotlin/roomescape/theme/AdminThemeApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/theme/AdminThemeApiTest.kt @@ -1,4 +1,4 @@ -package roomescape.theme +package com.sangdol.roomescape.theme import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe @@ -6,18 +6,18 @@ import org.hamcrest.CoreMatchers.equalTo import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus -import roomescape.admin.infrastructure.persistence.AdminPermissionLevel -import roomescape.admin.infrastructure.persistence.AdminType -import roomescape.auth.exception.AuthErrorCode -import roomescape.supports.* -import roomescape.supports.ThemeFixture.createRequest -import roomescape.theme.business.MIN_DURATION -import roomescape.theme.business.MIN_PARTICIPANTS -import roomescape.theme.business.MIN_PRICE -import roomescape.theme.exception.ThemeErrorCode -import roomescape.theme.infrastructure.persistence.ThemeEntity -import roomescape.theme.infrastructure.persistence.ThemeRepository -import roomescape.theme.web.ThemeUpdateRequest +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.supports.* +import com.sangdol.roomescape.supports.ThemeFixture.createRequest +import com.sangdol.roomescape.theme.business.MIN_DURATION +import com.sangdol.roomescape.theme.business.MIN_PARTICIPANTS +import com.sangdol.roomescape.theme.business.MIN_PRICE +import com.sangdol.roomescape.theme.exception.ThemeErrorCode +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeRepository +import com.sangdol.roomescape.theme.web.ThemeUpdateRequest class AdminThemeApiTest( private val themeRepository: ThemeRepository diff --git a/src/test/kotlin/roomescape/theme/ThemeApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/theme/ThemeApiTest.kt similarity index 86% rename from src/test/kotlin/roomescape/theme/ThemeApiTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/theme/ThemeApiTest.kt index 1fe3e095..58d0446c 100644 --- a/src/test/kotlin/roomescape/theme/ThemeApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/theme/ThemeApiTest.kt @@ -1,18 +1,19 @@ -package roomescape.theme +package com.sangdol.roomescape.theme import io.kotest.matchers.collections.shouldContainInOrder import io.kotest.matchers.collections.shouldHaveSize import org.hamcrest.CoreMatchers.equalTo import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus -import roomescape.common.config.next -import roomescape.common.util.DateUtils -import roomescape.supports.* -import roomescape.theme.exception.ThemeErrorCode -import roomescape.theme.infrastructure.persistence.ThemeEntity -import roomescape.theme.infrastructure.persistence.ThemeRepository -import roomescape.theme.web.toEntity -import roomescape.user.infrastructure.persistence.UserEntity +import com.sangdol.roomescape.common.config.next +import com.sangdol.roomescape.common.util.DateUtils +import com.sangdol.roomescape.supports.* +import com.sangdol.roomescape.theme.exception.ThemeErrorCode +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity +import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeRepository +import com.sangdol.roomescape.theme.web.ThemeInfoResponse +import com.sangdol.roomescape.theme.web.toEntity +import com.sangdol.roomescape.user.infrastructure.persistence.UserEntity import java.time.LocalDate class ThemeApiTest( @@ -64,10 +65,10 @@ class ThemeApiTest( statusCode(HttpStatus.OK.value()) } ).also { res -> - val response: List> = res.extract().path("data.themes") + val response: List = ResponseParser.parseListResponse(res.extract().path("data.themes")) response shouldHaveSize expectedResult.size - response.map { it["id"] as Long }.shouldContainInOrder(expectedResult) + response.map { it.id }.shouldContainInOrder(expectedResult) } } } diff --git a/src/test/kotlin/roomescape/user/UserApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/user/UserApiTest.kt similarity index 91% rename from src/test/kotlin/roomescape/user/UserApiTest.kt rename to service/src/test/kotlin/com/sangdol/roomescape/user/UserApiTest.kt index 371426ff..cfe2703d 100644 --- a/src/test/kotlin/roomescape/user/UserApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/user/UserApiTest.kt @@ -1,4 +1,4 @@ -package roomescape.user +package com.sangdol.roomescape.user import com.ninjasquad.springmockk.SpykBean import io.kotest.assertions.assertSoftly @@ -13,18 +13,18 @@ import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus import org.springframework.http.MediaType -import roomescape.auth.exception.AuthErrorCode -import roomescape.auth.infrastructure.jwt.JwtUtils -import roomescape.common.exception.CommonErrorCode -import roomescape.supports.FunSpecSpringbootTest -import roomescape.supports.UserFixture -import roomescape.supports.runExceptionTest -import roomescape.supports.runTest -import roomescape.user.business.SIGNUP -import roomescape.user.exception.UserErrorCode -import roomescape.user.infrastructure.persistence.* -import roomescape.user.web.MIN_PASSWORD_LENGTH -import roomescape.user.web.UserCreateRequest +import com.sangdol.roomescape.auth.exception.AuthErrorCode +import com.sangdol.roomescape.auth.infrastructure.jwt.JwtUtils +import com.sangdol.roomescape.common.exception.CommonErrorCode +import com.sangdol.roomescape.supports.FunSpecSpringbootTest +import com.sangdol.roomescape.supports.UserFixture +import com.sangdol.roomescape.supports.runExceptionTest +import com.sangdol.roomescape.supports.runTest +import com.sangdol.roomescape.user.business.SIGNUP +import com.sangdol.roomescape.user.exception.UserErrorCode +import com.sangdol.roomescape.user.infrastructure.persistence.* +import com.sangdol.roomescape.user.web.MIN_PASSWORD_LENGTH +import com.sangdol.roomescape.user.web.UserCreateRequest class UserApiTest( private val userRepository: UserRepository, diff --git a/src/test/resources/application-test-mysql.yaml b/service/src/test/resources/application-test-mysql.yaml similarity index 100% rename from src/test/resources/application-test-mysql.yaml rename to service/src/test/resources/application-test-mysql.yaml diff --git a/src/test/resources/application-test.yaml b/service/src/test/resources/application-test.yaml similarity index 100% rename from src/test/resources/application-test.yaml rename to service/src/test/resources/application-test.yaml diff --git a/src/test/resources/logback-test.xml b/service/src/test/resources/logback-test.xml similarity index 100% rename from src/test/resources/logback-test.xml rename to service/src/test/resources/logback-test.xml diff --git a/src/main/kotlin/roomescape/common/config/SwaggerConfig.kt b/src/main/kotlin/roomescape/common/config/SwaggerConfig.kt deleted file mode 100644 index 90fc7c5c..00000000 --- a/src/main/kotlin/roomescape/common/config/SwaggerConfig.kt +++ /dev/null @@ -1,78 +0,0 @@ -package roomescape.common.config - -import io.swagger.v3.oas.models.OpenAPI -import io.swagger.v3.oas.models.info.Info -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration - -@Configuration -class SwaggerConfig { - - @Bean - fun openAPI(): OpenAPI { - return OpenAPI().info(apiInfo()) - } - - private fun apiInfo(): Info { - return Info() - .title("방탈출 예약 API 문서") - .description( - """ - ## API 테스트는 '1. 인증 / 인가 API' 의 '/login' 을 통해 로그인 후 사용해주세요. - - ### 테스트시 로그인 가능한 계정 정보 - - - 아래의 JSON 형태의 데이터를 그대로 복사한 뒤 'POST /login' 의 Request Body 에 넣어서 사용해주세요. - - - **관리자**: - { - "email": "a@a.a", - "password": "a" - } - - - - **회원**: - - - 1번 회원 - { - "email": "1@1.1", - "password": "1" - } - - - 2번 회원 - { - "email": "2@2.2", - "password": "2" - } - - - 3번 회원 - { - "email": "3@3.3", - "password": "3" - } - - - 4번 회원 - { - "email": "4@4.4", - "password": "4" - } - - ### 테스트시 사용할 수 있는 파라미터 정보 - - **themeId**: 1(테스트1), 2(테스트2), 3(테스트3), 4(테스트4) - - - **timeId**: 1(15:00), 2(16:00), 3(17:00), 4(18:00) - - - **memberId**: 1(어드민), 2(회원1), 3(회원2), 4(회원3), 5(회원4) - - - **reservationId**: - - 1 ~ 6: 예약 및 결제 완료 상태 - - - 7: 예약은 승인되었으나, 결제 대기 상태 - - - 8 ~ 10: 예약 대기 상태 - - """.trimIndent() - ) - .version("1.0.0") - } -} diff --git a/src/main/kotlin/roomescape/reservation/exception/ReservationException.kt b/src/main/kotlin/roomescape/reservation/exception/ReservationException.kt deleted file mode 100644 index 3d1f82f2..00000000 --- a/src/main/kotlin/roomescape/reservation/exception/ReservationException.kt +++ /dev/null @@ -1,9 +0,0 @@ -package roomescape.reservation.exception - -import roomescape.common.exception.ErrorCode -import roomescape.common.exception.RoomescapeException - -class ReservationException( - override val errorCode: ErrorCode, - override val message: String = errorCode.message -) : RoomescapeException(errorCode, message) diff --git a/src/main/resources/login.http b/src/main/resources/login.http deleted file mode 100644 index f73232b6..00000000 --- a/src/main/resources/login.http +++ /dev/null @@ -1,55 +0,0 @@ -POST http://localhost:8080/login?key=value&key1=value1 -Content-Type: application/json - -{ - "email": "a@a.a", - "password": "a" -} - -> {% - const accessToken = response.body.data.accessToken; - client.global.set("token", accessToken); -%} - -### - -GET http://localhost:8080/reservations -Accept: application/json -Authorization: Bearer {{token}} - -### - -DELETE http://localhost:8080/reservations/57 -Accept: application/json -Authorization: Bearer {{token}} - -### - -POST http://localhost:8080/reservations/admin -Authorization: Bearer {{token}} -Content-Type: application/json - -{ - "date": "2026-10-01", - "timeId": 1, - "themeId": 1, - "memberId": 3 -} - -### - -POST http://localhost:8080/reservations/admin -Authorization: Bearer {{token}} -Content-Type: application/json - -{ - "date": "2023-10-01", - "timeId": 1, - "themeId": 1, - "memberId": 3 -} - -### - -GET http://localhost:8080/reservations-mine -Accept: application/json diff --git a/src/main/resources/test.http b/src/main/resources/test.http deleted file mode 100644 index 193be221..00000000 --- a/src/main/resources/test.http +++ /dev/null @@ -1,4 +0,0 @@ -### GET request to example server -POST localhost:8080/savetest - -### \ No newline at end of file