From e6ff3f4b9a046f592ead6a07256e1dcb1e994383 Mon Sep 17 00:00:00 2001 From: CHAN <150508884+zerochani@users.noreply.github.com> Date: Mon, 30 Mar 2026 22:58:21 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[REFACTOR]:=20=EC=84=A4=EC=A0=95=ED=99=98?= =?UTF-8?q?=EA=B2=BD=20=ED=8C=8C=EC=9D=BC=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + src/main/resources/application-local.yml | 23 ++++---- src/main/resources/application-prod.yml | 75 ++++++++++++++++++++++++ src/main/resources/application.yml | 15 ----- src/test/resources/application-test.yml | 50 +++++++++++++++- src/test/resources/application.yml | 53 ----------------- 6 files changed, 136 insertions(+), 82 deletions(-) create mode 100644 src/main/resources/application-prod.yml delete mode 100644 src/main/resources/application.yml delete mode 100644 src/test/resources/application.yml diff --git a/.gitignore b/.gitignore index a0b80340..ddc7ab30 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,5 @@ build.gradle src/main/resources/static/payment-test.html src/main/resources/static/payment-success.html + +.env \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 922e8e1b..57feea69 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,20 +2,19 @@ server: port: 8080 profile: local - spring: config: activate: on-profile: local datasource: - url: jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&zeroDateTimeBehavior=convertToNull - username: ${DB_USERNAME} - password: ${DB_PASSWORD} + url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eatsfine_local}?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&zeroDateTimeBehavior=convertToNull + username: ${DB_USERNAME:user} + password: ${DB_PASSWORD:password} driver-class-name: com.mysql.cj.jdbc.Driver data: redis: - host: ${REDIS_HOST} - port: ${REDIS_PORT} + host: ${REDIS_HOST:localhost} + port: ${REDIS_PORT:6379} jpa: hibernate: ddl-auto: update @@ -57,17 +56,19 @@ spring: user-info-uri: https://kapi.kakao.com/v2/user/me user-name-attribute: id - payment: toss: - widget-secret-key: test_gsk_docs_OaPz8L5KdmQXkzRz3y47BMw6 + widget-secret-key: ${TOSS_WIDGET_SECRET_KEY} cloud: aws: - region: ap-northeast-2 + region: ${AWS_REGION} s3: - bucket: eatsfine-images - base-url: https://eatsfine-images.s3.ap-northeast-2.amazonaws.com + bucket: ${AWS_S3_BUCKET} + base-url: ${AWS_S3_BASE_URL} + +api: + service-key: ${BIZ_API_KEY} jwt: secret: ${SECRET_KEY} diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 00000000..d6abe23f --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,75 @@ +server: + forward-headers-strategy: native + profile: prod + +spring: + config: + activate: + on-profile: prod + datasource: + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + driver-class-name: com.mysql.cj.jdbc.Driver + data: + redis: + host: ${REDIS_HOST} + port: ${REDIS_PORT:6379} + security: + oauth2: + client: + registration: + google: + client-id: ${GOOGLE_CLIENT_ID} + client-secret: ${GOOGLE_CLIENT_SECRET} + scope: + - email + - profile + redirect-uri: "https://eatsfine.co.kr/login/oauth2/code/google" + authorization-grant-type: authorization_code + kakao: + client-id: ${KAKAO_CLIENT_ID} + client-secret: ${KAKAO_CLIENT_SECRET} + scope: + - profile_nickname + - profile_image + - account_email + redirect-uri: "https://eatsfine.co.kr/login/oauth2/code/kakao" + authorization-grant-type: authorization_code + client-authentication-method: client_secret_post + client-name: Kakao + provider: kakao + provider: + google: + authorization-uri: https://accounts.google.com/o/oauth2/auth + token-uri: https://oauth2.googleapis.com/token + user-info-uri: https://www.googleapis.com/oauth2/v3/userinfo + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + jpa: + hibernate: + ddl-auto: update + show-sql: true + properties: + hibernate: + format_sql: true + +payment: + toss: + widget-secret-key: ${TOSS_WIDGET_SECRET_KEY} + +cloud: + aws: + region: ${AWS_REGION} + s3: + bucket: ${AWS_S3_BUCKET} + base-url: ${AWS_S3_BASE_URL} + +api: + service-key: ${BIZ_API_KEY} + +jwt: + secret: ${SECRET_KEY} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index 48e46706..00000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1,15 +0,0 @@ -spring: - application: - name: Eatsfine - profiles: - active: local - -cloud: - aws: - region: ${AWS_REGION} - s3: - bucket: ${AWS_S3_BUCKET} - base-url: ${AWS_S3_BASE_URL} - -api: - service-key: ${BIZ_API_KEY} diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml index addc3347..f653ea00 100644 --- a/src/test/resources/application-test.yml +++ b/src/test/resources/application-test.yml @@ -3,6 +3,50 @@ server: profile: test spring: - config: - activate: - on-profile: test \ No newline at end of file + datasource: + url: jdbc:h2:mem:testdb;MODE=MySQL + driver-class-name: org.h2.Driver + username: + password: + jpa: + hibernate: + ddl-auto: create-drop + show-sql: true + properties: + hibernate: + format_sql: true + dialect: org.hibernate.dialect.H2Dialect + security: + oauth2: + client: + registration: + kakao: + client-id: test-client-id + client-secret: test-client-secret + redirect-uri: http://localhost:8080/login/oauth2/code/kakao + authorization-grant-type: authorization_code + scope: profile_nickname, account_email + client-name: Kakao + provider: + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + +jwt: + secret: test_secret_key_for_jwt_properties_validation_must_be_long_enough + +payment: + toss: + widget-secret-key: test_sk_sample_key_for_testing + +cloud: + aws: + region: test-region + s3: + bucket: test-bucket + base-url: https://test-bucket.s3.test-region.amazonaws.com + +api: + service-key: dummy-test-key diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml deleted file mode 100644 index 9289b42a..00000000 --- a/src/test/resources/application.yml +++ /dev/null @@ -1,53 +0,0 @@ -server: - profile: test - -spring: - datasource: - url: jdbc:h2:mem:testdb;MODE=MySQL - driver-class-name: org.h2.Driver - username: - password: - jpa: - hibernate: - ddl-auto: create-drop - show-sql: true - properties: - hibernate: - format_sql: true - dialect: org.hibernate.dialect.H2Dialect - security: - oauth2: - client: - registration: - kakao: - client-id: test-client-id - client-secret: test-client-secret - redirect-uri: http://localhost:8080/login/oauth2/code/kakao - authorization-grant-type: authorization_code - scope: profile_nickname, account_email - client-name: Kakao - provider: - kakao: - authorization-uri: https://kauth.kakao.com/oauth/authorize - token-uri: https://kauth.kakao.com/oauth/token - user-info-uri: https://kapi.kakao.com/v2/user/me - user-name-attribute: id - -jwt: - secret: test_secret_key_for_jwt_properties_validation_must_be_long_enough - -payment: - toss: - widget-secret-key: test_sk_sample_key_for_testing - -cloud: - aws: - region: test-region - s3: - bucket: test-bucket - base-url: https://test-bucket.s3.test-region.amazonaws.com - -api: - service-key: dummy-test-key - - From 0cf24d2324a6c859b5f4f5422909feeaf65d4e75 Mon Sep 17 00:00:00 2001 From: CHAN <150508884+zerochani@users.noreply.github.com> Date: Tue, 31 Mar 2026 21:34:44 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[REFACTOR]=20=EC=A4=91=EB=B3=B5=20=EB=A3=A8?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=95=EC=86=8C=20=EB=B0=8F=20DTO/Service/Global?= =?UTF-8?q?=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{eatsfine => }/EatsfineApplication.java | 2 +- .../booking/controller/BookingController.java | 28 ++++---- .../booking/converter/BookingConverter.java | 10 +-- .../dto/request/BookingRequestDTO.java | 2 +- .../dto/response/BookingResponseDTO.java | 4 +- .../domain/booking/entity/Booking.java | 28 ++++---- .../booking/entity/mapping/BookingMenu.java | 6 +- .../booking/entity/mapping/BookingTable.java | 6 +- .../domain/booking/enums/BookingStatus.java | 2 +- .../booking/exception/BookingException.java | 10 +++ .../booking/repository/BookingRepository.java | 24 +++---- .../service/BookingCommandService.java | 6 +- .../service/BookingCommandServiceImpl.java | 66 +++++++++---------- .../booking/service/BookingQueryService.java | 8 +-- .../service/BookingQueryServiceImpl.java | 56 ++++++++-------- .../booking/service/BookingScheduler.java | 8 +-- .../booking/status/BookingErrorStatus.java | 6 +- .../booking/status/BookingSuccessStatus.java | 6 +- .../controller/BusinessHoursController.java | 14 ++-- .../converter/BusinessHoursConverter.java | 8 +-- .../dto/request}/BusinessHoursReqDto.java | 2 +- .../dto/response}/BusinessHoursResDto.java | 2 +- .../businesshours/entity/BusinessHours.java | 6 +- .../exception/BusinessHoursException.java | 10 +++ .../repository/BusinessHoursRepository.java | 6 +- .../service/BusinessHoursCommandService.java | 6 +- .../BusinessHoursCommandServiceImpl.java | 32 ++++----- .../service/BusinessHoursScheduler.java | 10 +-- .../status/BusinessHoursErrorStatus.java | 10 +-- .../status/BusinessHoursSuccessStatus.java | 6 +- .../validator/BreakTimeValidator.java | 6 +- .../validator/BusinessHoursValidator.java | 8 +-- .../dto/request}/BusinessNumberReqDto.java | 2 +- .../dto/response}/BusinessNumberResDto.java | 2 +- .../exception/BusinessNumberException.java | 11 ++++ .../status/BusinessNumberErrorStatus.java | 6 +- .../validator/BusinessNumberValidator.java | 2 +- .../MockBusinessNumberValidator.java | 2 +- .../RealBusinessNumberValidator.java | 8 +-- .../image/exception/ImageException.java | 11 ++++ .../domain/image/status/ImageErrorStatus.java | 6 +- .../inquiry/controller/InquiryController.java | 10 +-- .../dto/request}/InquiryRequestDTO.java | 4 +- .../dto/response}/InquiryResponseDTO.java | 4 +- .../domain/inquiry/entity/Inquiry.java | 8 +-- .../domain/inquiry/enums/InquiryStatus.java | 2 +- .../domain/inquiry/enums/InquiryType.java | 2 +- .../inquiry/repository/InquiryRepository.java | 4 +- .../inquiry/service/InquiryService.java | 8 +++ .../inquiry/service/InquiryServiceImpl.java | 10 +-- .../menu/controller/MenuController.java | 16 ++--- .../domain/menu/converter/MenuConverter.java | 6 +- .../menu/dto/request}/MenuReqDto.java | 4 +- .../menu/dto/response}/MenuResDto.java | 4 +- .../domain/menu/entity/Menu.java | 8 +-- .../domain/menu/enums/MenuCategory.java | 2 +- .../domain/menu/exception/MenuException.java | 10 +++ .../menu/repository/MenuRepository.java | 4 +- .../menu/service/MenuCommandService.java | 6 +- .../menu/service/MenuCommandServiceImpl.java | 34 +++++----- .../domain/menu/service/MenuQueryService.java | 7 ++ .../menu/service/MenuQueryServiceImpl.java | 16 ++--- .../domain/menu/status/MenuErrorStatus.java | 6 +- .../domain/menu/status/MenuSuccessStatus.java | 6 +- .../payment/controller/PaymentController.java | 12 ++-- .../controller/PaymentWebhookController.java | 10 +-- .../dto/request/PaymentConfirmDTO.java | 2 +- .../dto/request/PaymentRequestDTO.java | 2 +- .../dto/request/PaymentWebhookDTO.java | 2 +- .../dto/response/PaymentResponseDTO.java | 2 +- .../dto/response/TossPaymentResponse.java | 2 +- .../domain/payment/entity/Payment.java | 16 ++--- .../domain/payment/enums/PaymentMethod.java | 2 +- .../domain/payment/enums/PaymentProvider.java | 2 +- .../domain/payment/enums/PaymentStatus.java | 2 +- .../domain/payment/enums/PaymentType.java | 2 +- .../payment/exception/PaymentException.java | 11 ++++ .../payment/repository/PaymentRepository.java | 6 +- .../payment/service/PaymentService.java | 38 +++++------ .../payment/service/TossPaymentService.java | 12 ++-- .../payment/status/PaymentErrorStatus.java | 6 +- .../domain/region/entity/Region.java | 2 +- .../region/exception/RegionException.java | 10 +++ .../region/repository/RegionRepository.java | 4 +- .../region/status/RegionErrorStatus.java | 10 +-- .../region/status/RegionSuccessStatus.java | 10 +-- .../store/condition/StoreSearchCondition.java | 6 +- .../store/controller/StoreController.java | 18 ++--- .../store/converter/StoreConverter.java | 10 +-- .../dto/projection/StoreSearchResult.java | 8 +++ .../store/dto/request}/StoreReqDto.java | 10 +-- .../store/dto/response}/StoreResDto.java | 8 +-- .../domain/store/entity/Store.java | 34 +++++----- .../domain/store/enums/Category.java | 2 +- .../domain/store/enums/DepositRate.java | 2 +- .../domain/store/enums/StoreSortType.java | 2 +- .../store/exception/StoreException.java | 10 +++ .../store/repository/StoreRepository.java | 6 +- .../repository/StoreRepositoryCustom.java | 8 +-- .../store/repository/StoreRepositoryImpl.java | 12 ++-- .../store/service/StoreCommandService.java | 6 +- .../service/StoreCommandServiceImpl.java | 46 ++++++------- .../store/service/StoreQueryService.java | 12 ++-- .../store/service/StoreQueryServiceImpl.java | 36 +++++----- .../domain/store/status/StoreErrorStatus.java | 6 +- .../store/status/StoreSuccessStatus.java | 6 +- .../store/validator/StoreValidator.java | 10 +-- .../controller/StoreTableController.java | 28 ++++---- .../controller/StoreTableControllerDocs.java | 10 +-- .../converter/StoreTableConverter.java | 10 +-- .../dto/request}/StoreTableReqDto.java | 4 +- .../dto/response}/StoreTableResDto.java | 6 +- .../domain/storetable/entity/StoreTable.java | 8 +-- .../domain/storetable/enums/SeatsType.java | 2 +- .../exception/StoreTableException.java | 10 +++ .../status/StoreTableErrorStatus.java | 6 +- .../status/StoreTableSuccessStatus.java | 6 +- .../repository/StoreTableRepository.java | 6 +- .../service/StoreTableCommandService.java | 6 +- .../service/StoreTableCommandServiceImpl.java | 44 ++++++------- .../service/StoreTableQueryService.java | 4 +- .../service/StoreTableQueryServiceImpl.java | 38 +++++------ .../storetable/util/SlotCalculator.java | 18 ++--- .../validator/StoreTableValidator.java | 12 ++-- .../controller/TableBlockController.java | 14 ++-- .../controller/TableBlockControllerDocs.java | 8 +-- .../converter/TableBlockConverter.java | 8 +-- .../dto/request}/TableBlockReqDto.java | 4 +- .../dto/response}/TableBlockResDto.java | 4 +- .../domain/tableblock/entity/TableBlock.java | 6 +- .../domain/tableblock/enums/SlotStatus.java | 2 +- .../exception/TableBlockException.java | 10 +++ .../status/TableBlockErrorStatus.java | 6 +- .../status/TableBlockSuccessStatus.java | 6 +- .../repository/TableBlockRepository.java | 6 +- .../service/TableBlockCommandService.java | 8 +++ .../service/TableBlockCommandServiceImpl.java | 44 ++++++------- .../validator/TableBlockValidator.java | 10 +-- .../controller/TableImageController.java | 14 ++-- .../converter/TableImageConverter.java | 4 +- .../dto/response}/TableImageResDto.java | 2 +- .../domain/tableimage/entity/TableImage.java | 6 +- .../repository/TableImageRepository.java | 6 +- .../service/TableImageCommandService.java | 4 +- .../service/TableImageCommandServiceImpl.java | 26 ++++---- .../service/TableImageQueryService.java | 7 ++ .../service/TableImageQueryServiceImpl.java | 22 +++---- .../status/TableImageSuccessStatus.java | 6 +- .../controller/TableLayoutController.java | 16 ++--- .../controller/TableLayoutControllerDocs.java | 8 +-- .../converter/TableLayoutConverter.java | 8 +-- .../dto/request}/TableLayoutReqDto.java | 2 +- .../dto/response}/TableLayoutResDto.java | 4 +- .../tablelayout}/entity/TableLayout.java | 8 +-- .../exception/TableLayoutException.java | 10 +++ .../status/TableLayoutErrorStatus.java | 6 +- .../status/TableLayoutSuccessStatus.java | 6 +- .../repository/TableLayoutRepository.java | 4 +- .../service/TableLayoutCommandService.java | 8 +++ .../TableLayoutCommandServiceImpl.java | 26 ++++---- .../service/TableLayoutQueryService.java | 7 ++ .../service/TableLayoutQueryServiceImpl.java | 16 ++--- .../domain/term/entity/Term.java | 6 +- .../term/repository/TermRepository.java | 4 +- .../user/controller/AuthController.java | 20 +++--- .../user/controller/UserController.java | 24 +++---- .../domain/user/converter/UserConverter.java | 14 ++-- .../user/dto/request/UserRequestDto.java | 4 +- .../user/dto/response/UserResponseDto.java | 2 +- .../domain/user/entity/User.java | 10 +-- .../com/eatsfine/domain/user/enums/Grade.java | 4 ++ .../domain/user/enums/Role.java | 2 +- .../domain/user/enums/SocialType.java | 2 +- .../domain/user/exception/AuthException.java | 11 ++++ .../domain/user/exception/UserException.java | 10 +++ .../handler/CustomOAuth2FailureHandler.java | 2 +- .../handler/CustomOAuth2SuccessHandler.java | 22 +++---- .../user/repository/UserRepository.java | 6 +- .../user/service/auth}/AuthTokenService.java | 4 +- .../service/auth}/AuthTokenServiceImpl.java | 14 ++-- .../oauth}/CustomOAuth2MemberServiceImpl.java | 4 +- .../service/oauth/Oauth2MemberService.java | 8 +++ .../oauth}/Oauth2MemberServiceImpl.java | 14 ++-- .../user/service/user}/UserService.java | 6 +- .../user/service/user}/UserServiceImpl.java | 38 +++++------ .../domain/user/status/AuthErrorStatus.java | 6 +- .../domain/user/status/UserErrorStatus.java | 6 +- .../domain/user/status/UserSuccessStatus.java | 8 +-- .../booking/exception/BookingException.java | 10 --- .../exception/BusinessHoursException.java | 10 --- .../exception/BusinessNumberException.java | 11 ---- .../image/exception/ImageException.java | 11 ---- .../inquiry/service/InquiryService.java | 8 --- .../domain/menu/exception/MenuException.java | 10 --- .../domain/menu/service/MenuQueryService.java | 7 -- .../payment/exception/PaymentException.java | 11 ---- .../region/exception/RegionException.java | 10 --- .../dto/projection/StoreSearchResult.java | 8 --- .../store/exception/StoreException.java | 10 --- .../exception/StoreTableException.java | 10 --- .../exception/TableLayoutException.java | 10 --- .../service/TableLayoutCommandService.java | 8 --- .../service/TableLayoutQueryService.java | 7 -- .../exception/TableBlockException.java | 10 --- .../service/TableBlockCommandService.java | 8 --- .../service/TableImageQueryService.java | 7 -- .../eatsfine/domain/user/enums/Grade.java | 4 -- .../domain/user/exception/AuthException.java | 11 ---- .../domain/user/exception/UserException.java | 10 --- .../oauthService/Oauth2MemberService.java | 8 --- .../global/annotation/CurrentUser.java | 2 +- .../apipayload}/ApiResponse.java | 8 +-- .../apipayload}/code/BaseCode.java | 2 +- .../apipayload}/code/BaseErrorCode.java | 2 +- .../apipayload}/code/ErrorReasonDto.java | 2 +- .../apipayload}/code/ReasonDto.java | 2 +- .../apipayload}/code/status/ErrorStatus.java | 6 +- .../code/status/SuccessStatus.java | 6 +- .../exception/GeneralException.java | 4 +- .../handler/GeneralExceptionAdvice.java | 12 ++-- .../global/auth/AuthCookieProvider.java | 2 +- .../auth/CustomAccessDeniedHandler.java | 2 +- .../auth/CustomAuthenticationEntryPoint.java | 2 +- ...eOAuth2AuthorizationRequestRepository.java | 2 +- .../global/auth/UserDetailsServiceImpl.java | 6 +- .../global/common/BaseEntity.java | 2 +- .../global/config/DeployProperties.java | 2 +- .../global/config/JpaAuditConfig.java | 2 +- .../global/config/QueryDslConfig.java | 2 +- .../global/config/RestClientConfig.java | 2 +- .../global/config/S3Config.java | 2 +- .../global/config/SecurityConfig.java | 16 ++--- .../global/config/SwaggerConfig.java | 2 +- .../global/config/TossPaymentConfig.java | 2 +- .../config/jwt/JwtAuthenticationFilter.java | 2 +- .../global/config/jwt/JwtTokenProvider.java | 14 ++-- .../global/config/properties/Constants.java | 2 +- .../config/properties/JwtProperties.java | 2 +- .../global/controller/HealthController.java | 4 +- .../{eatsfine => }/global/s3/S3Service.java | 6 +- .../validator/annotation/PasswordMatch.java | 4 +- .../valid/PasswordMatchValidator.java | 4 +- .../EatsfineApplicationTests.java | 4 +- .../controller/HealthControllerTest.java | 12 ++-- .../controller/InquiryControllerTest.java | 18 ++--- 245 files changed, 1128 insertions(+), 1124 deletions(-) rename src/main/java/com/eatsfine/{eatsfine => }/EatsfineApplication.java (94%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/controller/BookingController.java (83%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/converter/BookingConverter.java (75%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/dto/request/BookingRequestDTO.java (97%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/dto/response/BookingResponseDTO.java (96%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/entity/Booking.java (80%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/entity/mapping/BookingMenu.java (76%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/entity/mapping/BookingTable.java (72%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/enums/BookingStatus.java (61%) create mode 100644 src/main/java/com/eatsfine/domain/booking/exception/BookingException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/repository/BookingRepository.java (85%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/service/BookingCommandService.java (77%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/service/BookingCommandServiceImpl.java (81%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/service/BookingQueryService.java (68%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/service/BookingQueryServiceImpl.java (86%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/service/BookingScheduler.java (85%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/status/BookingErrorStatus.java (92%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/booking/status/BookingSuccessStatus.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/controller/BusinessHoursController.java (83%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/converter/BusinessHoursConverter.java (88%) rename src/main/java/com/eatsfine/{eatsfine/domain/businesshours/dto => domain/businesshours/dto/request}/BusinessHoursReqDto.java (97%) rename src/main/java/com/eatsfine/{eatsfine/domain/businesshours/dto => domain/businesshours/dto/response}/BusinessHoursResDto.java (95%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/entity/BusinessHours.java (94%) create mode 100644 src/main/java/com/eatsfine/domain/businesshours/exception/BusinessHoursException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/repository/BusinessHoursRepository.java (70%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/service/BusinessHoursCommandService.java (69%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/service/BusinessHoursCommandServiceImpl.java (77%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/service/BusinessHoursScheduler.java (86%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/status/BusinessHoursErrorStatus.java (84%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/status/BusinessHoursSuccessStatus.java (86%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/validator/BreakTimeValidator.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businesshours/validator/BusinessHoursValidator.java (88%) rename src/main/java/com/eatsfine/{eatsfine/domain/businessnumber/dto => domain/businessnumber/dto/request}/BusinessNumberReqDto.java (94%) rename src/main/java/com/eatsfine/{eatsfine/domain/businessnumber/dto => domain/businessnumber/dto/response}/BusinessNumberResDto.java (91%) create mode 100644 src/main/java/com/eatsfine/domain/businessnumber/exception/BusinessNumberException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/businessnumber/status/BusinessNumberErrorStatus.java (84%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businessnumber/validator/BusinessNumberValidator.java (68%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businessnumber/validator/MockBusinessNumberValidator.java (84%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/businessnumber/validator/RealBusinessNumberValidator.java (91%) create mode 100644 src/main/java/com/eatsfine/domain/image/exception/ImageException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/image/status/ImageErrorStatus.java (89%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/inquiry/controller/InquiryController.java (77%) rename src/main/java/com/eatsfine/{eatsfine/domain/inquiry/dto => domain/inquiry/dto/request}/InquiryRequestDTO.java (88%) rename src/main/java/com/eatsfine/{eatsfine/domain/inquiry/dto => domain/inquiry/dto/response}/InquiryResponseDTO.java (81%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/inquiry/entity/Inquiry.java (83%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/inquiry/enums/InquiryStatus.java (80%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/inquiry/enums/InquiryType.java (87%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/inquiry/repository/InquiryRepository.java (54%) create mode 100644 src/main/java/com/eatsfine/domain/inquiry/service/InquiryService.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/inquiry/service/InquiryServiceImpl.java (72%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/controller/MenuController.java (90%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/converter/MenuConverter.java (90%) rename src/main/java/com/eatsfine/{eatsfine/domain/menu/dto => domain/menu/dto/request}/MenuReqDto.java (94%) rename src/main/java/com/eatsfine/{eatsfine/domain/menu/dto => domain/menu/dto/response}/MenuResDto.java (93%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/entity/Menu.java (90%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/enums/MenuCategory.java (83%) create mode 100644 src/main/java/com/eatsfine/domain/menu/exception/MenuException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/repository/MenuRepository.java (66%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/service/MenuCommandService.java (81%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/service/MenuCommandServiceImpl.java (91%) create mode 100644 src/main/java/com/eatsfine/domain/menu/service/MenuQueryService.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/service/MenuQueryServiceImpl.java (73%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/status/MenuErrorStatus.java (82%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/menu/status/MenuSuccessStatus.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/controller/PaymentController.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/controller/PaymentWebhookController.java (89%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/dto/request/PaymentConfirmDTO.java (81%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/dto/request/PaymentRequestDTO.java (83%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/dto/request/PaymentWebhookDTO.java (93%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/dto/response/PaymentResponseDTO.java (96%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/dto/response/TossPaymentResponse.java (94%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/entity/Payment.java (83%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/enums/PaymentMethod.java (78%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/enums/PaymentProvider.java (80%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/enums/PaymentStatus.java (84%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/enums/PaymentType.java (79%) create mode 100644 src/main/java/com/eatsfine/domain/payment/exception/PaymentException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/repository/PaymentRepository.java (75%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/service/PaymentService.java (92%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/service/TossPaymentService.java (85%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/payment/status/PaymentErrorStatus.java (86%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/region/entity/Region.java (92%) create mode 100644 src/main/java/com/eatsfine/domain/region/exception/RegionException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/region/repository/RegionRepository.java (69%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/region/status/RegionErrorStatus.java (69%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/region/status/RegionSuccessStatus.java (69%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/condition/StoreSearchCondition.java (85%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/controller/StoreController.java (89%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/converter/StoreConverter.java (94%) create mode 100644 src/main/java/com/eatsfine/domain/store/dto/projection/StoreSearchResult.java rename src/main/java/com/eatsfine/{eatsfine/domain/store/dto => domain/store/dto/request}/StoreReqDto.java (88%) rename src/main/java/com/eatsfine/{eatsfine/domain/store/dto => domain/store/dto/response}/StoreResDto.java (94%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/entity/Store.java (84%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/enums/Category.java (61%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/enums/DepositRate.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/enums/StoreSortType.java (69%) create mode 100644 src/main/java/com/eatsfine/domain/store/exception/StoreException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/repository/StoreRepository.java (80%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/repository/StoreRepositoryCustom.java (63%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/repository/StoreRepositoryImpl.java (92%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/service/StoreCommandService.java (71%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/service/StoreCommandServiceImpl.java (78%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/service/StoreQueryService.java (55%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/service/StoreQueryServiceImpl.java (85%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/status/StoreErrorStatus.java (87%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/status/StoreSuccessStatus.java (90%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/store/validator/StoreValidator.java (66%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/controller/StoreTableController.java (87%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/controller/StoreTableControllerDocs.java (98%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/converter/StoreTableConverter.java (93%) rename src/main/java/com/eatsfine/{eatsfine/domain/storetable/dto/req => domain/storetable/dto/request}/StoreTableReqDto.java (94%) rename src/main/java/com/eatsfine/{eatsfine/domain/storetable/dto/res => domain/storetable/dto/response}/StoreTableResDto.java (93%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/entity/StoreTable.java (91%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/enums/SeatsType.java (82%) create mode 100644 src/main/java/com/eatsfine/domain/storetable/exception/StoreTableException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/exception/status/StoreTableErrorStatus.java (91%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/exception/status/StoreTableSuccessStatus.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/repository/StoreTableRepository.java (85%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/service/StoreTableCommandService.java (79%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/service/StoreTableCommandServiceImpl.java (89%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/service/StoreTableQueryService.java (69%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/service/StoreTableQueryServiceImpl.java (72%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/util/SlotCalculator.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/storetable/validator/StoreTableValidator.java (86%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/controller/TableBlockController.java (69%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/controller/TableBlockControllerDocs.java (87%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/converter/TableBlockConverter.java (68%) rename src/main/java/com/eatsfine/{eatsfine/domain/tableblock/dto/req => domain/tableblock/dto/request}/TableBlockReqDto.java (84%) rename src/main/java/com/eatsfine/{eatsfine/domain/tableblock/dto/res => domain/tableblock/dto/response}/TableBlockResDto.java (84%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/entity/TableBlock.java (80%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/enums/SlotStatus.java (60%) create mode 100644 src/main/java/com/eatsfine/domain/tableblock/exception/TableBlockException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/exception/status/TableBlockErrorStatus.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/exception/status/TableBlockSuccessStatus.java (82%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/repository/TableBlockRepository.java (71%) create mode 100644 src/main/java/com/eatsfine/domain/tableblock/service/TableBlockCommandService.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/service/TableBlockCommandServiceImpl.java (67%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableblock/validator/TableBlockValidator.java (80%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableimage/controller/TableImageController.java (84%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableimage/converter/TableImageConverter.java (89%) rename src/main/java/com/eatsfine/{eatsfine/domain/tableimage/dto => domain/tableimage/dto/response}/TableImageResDto.java (93%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableimage/entity/TableImage.java (80%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableimage/repository/TableImageRepository.java (75%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableimage/service/TableImageCommandService.java (74%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableimage/service/TableImageCommandServiceImpl.java (73%) create mode 100644 src/main/java/com/eatsfine/domain/tableimage/service/TableImageQueryService.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableimage/service/TableImageQueryServiceImpl.java (65%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/tableimage/status/TableImageSuccessStatus.java (87%) rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout => domain/tablelayout}/controller/TableLayoutController.java (73%) rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout => domain/tablelayout}/controller/TableLayoutControllerDocs.java (91%) rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout => domain/tablelayout}/converter/TableLayoutConverter.java (85%) rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout/dto/req => domain/tablelayout/dto/request}/TableLayoutReqDto.java (93%) rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout/dto/res => domain/tablelayout/dto/response}/TableLayoutResDto.java (85%) rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout => domain/tablelayout}/entity/TableLayout.java (89%) create mode 100644 src/main/java/com/eatsfine/domain/tablelayout/exception/TableLayoutException.java rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout => domain/tablelayout}/exception/status/TableLayoutErrorStatus.java (85%) rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout => domain/tablelayout}/exception/status/TableLayoutSuccessStatus.java (84%) rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout => domain/tablelayout}/repository/TableLayoutRepository.java (65%) create mode 100644 src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutCommandService.java rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout => domain/tablelayout}/service/TableLayoutCommandServiceImpl.java (74%) create mode 100644 src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutQueryService.java rename src/main/java/com/eatsfine/{eatsfine/domain/table_layout => domain/tablelayout}/service/TableLayoutQueryServiceImpl.java (60%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/term/entity/Term.java (82%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/term/repository/TermRepository.java (64%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/controller/AuthController.java (80%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/controller/UserController.java (91%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/converter/UserConverter.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/dto/request/UserRequestDto.java (97%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/dto/response/UserResponseDto.java (97%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/entity/User.java (90%) create mode 100644 src/main/java/com/eatsfine/domain/user/enums/Grade.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/enums/Role.java (51%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/enums/SocialType.java (50%) create mode 100644 src/main/java/com/eatsfine/domain/user/exception/AuthException.java create mode 100644 src/main/java/com/eatsfine/domain/user/exception/UserException.java rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/exception/handler/CustomOAuth2FailureHandler.java (95%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/exception/handler/CustomOAuth2SuccessHandler.java (91%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/repository/UserRepository.java (66%) rename src/main/java/com/eatsfine/{eatsfine/domain/user/service/authService => domain/user/service/auth}/AuthTokenService.java (59%) rename src/main/java/com/eatsfine/{eatsfine/domain/user/service/authService => domain/user/service/auth}/AuthTokenServiceImpl.java (89%) rename src/main/java/com/eatsfine/{eatsfine/domain/user/service/oauthService => domain/user/service/oauth}/CustomOAuth2MemberServiceImpl.java (95%) create mode 100644 src/main/java/com/eatsfine/domain/user/service/oauth/Oauth2MemberService.java rename src/main/java/com/eatsfine/{eatsfine/domain/user/service/oauthService => domain/user/service/oauth}/Oauth2MemberServiceImpl.java (82%) rename src/main/java/com/eatsfine/{eatsfine/domain/user/service/userService => domain/user/service/user}/UserService.java (83%) rename src/main/java/com/eatsfine/{eatsfine/domain/user/service/userService => domain/user/service/user}/UserServiceImpl.java (90%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/status/AuthErrorStatus.java (91%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/status/UserErrorStatus.java (89%) rename src/main/java/com/eatsfine/{eatsfine => }/domain/user/status/UserSuccessStatus.java (77%) delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/booking/exception/BookingException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/businesshours/exception/BusinessHoursException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/businessnumber/exception/BusinessNumberException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/image/exception/ImageException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/inquiry/service/InquiryService.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/menu/exception/MenuException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuQueryService.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/payment/exception/PaymentException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/region/exception/RegionException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/store/dto/projection/StoreSearchResult.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/store/exception/StoreException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/StoreTableException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/TableLayoutException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutCommandService.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutQueryService.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/TableBlockException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/tableblock/service/TableBlockCommandService.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryService.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/user/enums/Grade.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/user/exception/AuthException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/user/exception/UserException.java delete mode 100644 src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/Oauth2MemberService.java rename src/main/java/com/eatsfine/{eatsfine => }/global/annotation/CurrentUser.java (89%) rename src/main/java/com/eatsfine/{eatsfine/global/apiPayload => global/apipayload}/ApiResponse.java (83%) rename src/main/java/com/eatsfine/{eatsfine/global/apiPayload => global/apipayload}/code/BaseCode.java (63%) rename src/main/java/com/eatsfine/{eatsfine/global/apiPayload => global/apipayload}/code/BaseErrorCode.java (67%) rename src/main/java/com/eatsfine/{eatsfine/global/apiPayload => global/apipayload}/code/ErrorReasonDto.java (83%) rename src/main/java/com/eatsfine/{eatsfine/global/apiPayload => global/apipayload}/code/ReasonDto.java (83%) rename src/main/java/com/eatsfine/{eatsfine/global/apiPayload => global/apipayload}/code/status/ErrorStatus.java (86%) rename src/main/java/com/eatsfine/{eatsfine/global/apiPayload => global/apipayload}/code/status/SuccessStatus.java (81%) rename src/main/java/com/eatsfine/{eatsfine/global/apiPayload => global/apipayload}/exception/GeneralException.java (59%) rename src/main/java/com/eatsfine/{eatsfine/global/apiPayload => global/apipayload}/handler/GeneralExceptionAdvice.java (91%) rename src/main/java/com/eatsfine/{eatsfine => }/global/auth/AuthCookieProvider.java (96%) rename src/main/java/com/eatsfine/{eatsfine => }/global/auth/CustomAccessDeniedHandler.java (95%) rename src/main/java/com/eatsfine/{eatsfine => }/global/auth/CustomAuthenticationEntryPoint.java (94%) rename src/main/java/com/eatsfine/{eatsfine => }/global/auth/HttpCookieOAuth2AuthorizationRequestRepository.java (99%) rename src/main/java/com/eatsfine/{eatsfine => }/global/auth/UserDetailsServiceImpl.java (85%) rename src/main/java/com/eatsfine/{eatsfine => }/global/common/BaseEntity.java (93%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/DeployProperties.java (79%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/JpaAuditConfig.java (81%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/QueryDslConfig.java (92%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/RestClientConfig.java (94%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/S3Config.java (90%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/SecurityConfig.java (92%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/SwaggerConfig.java (97%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/TossPaymentConfig.java (94%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/jwt/JwtAuthenticationFilter.java (98%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/jwt/JwtTokenProvider.java (90%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/properties/Constants.java (73%) rename src/main/java/com/eatsfine/{eatsfine => }/global/config/properties/JwtProperties.java (88%) rename src/main/java/com/eatsfine/{eatsfine => }/global/controller/HealthController.java (83%) rename src/main/java/com/eatsfine/{eatsfine => }/global/s3/S3Service.java (94%) rename src/main/java/com/eatsfine/{eatsfine => }/global/validator/annotation/PasswordMatch.java (80%) rename src/main/java/com/eatsfine/{eatsfine => }/global/validator/valid/PasswordMatchValidator.java (93%) rename src/test/java/com/eatsfine/{eatsfine => }/EatsfineApplicationTests.java (65%) rename src/test/java/com/eatsfine/{eatsfine => }/controller/HealthControllerTest.java (88%) rename src/test/java/com/eatsfine/{eatsfine => }/domain/inquiry/controller/InquiryControllerTest.java (92%) diff --git a/src/main/java/com/eatsfine/eatsfine/EatsfineApplication.java b/src/main/java/com/eatsfine/EatsfineApplication.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/EatsfineApplication.java rename to src/main/java/com/eatsfine/EatsfineApplication.java index db8d1e32..4786124d 100644 --- a/src/main/java/com/eatsfine/eatsfine/EatsfineApplication.java +++ b/src/main/java/com/eatsfine/EatsfineApplication.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine; +package com.eatsfine; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/controller/BookingController.java b/src/main/java/com/eatsfine/domain/booking/controller/BookingController.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/controller/BookingController.java rename to src/main/java/com/eatsfine/domain/booking/controller/BookingController.java index 99ec84d2..3aedd85c 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/controller/BookingController.java +++ b/src/main/java/com/eatsfine/domain/booking/controller/BookingController.java @@ -1,14 +1,14 @@ -package com.eatsfine.eatsfine.domain.booking.controller; - -import com.eatsfine.eatsfine.domain.booking.dto.request.BookingRequestDTO; -import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO; -import com.eatsfine.eatsfine.domain.booking.service.BookingCommandService; -import com.eatsfine.eatsfine.domain.booking.service.BookingQueryService; -import com.eatsfine.eatsfine.domain.booking.status.BookingSuccessStatus; -import com.eatsfine.eatsfine.domain.user.exception.UserException; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +package com.eatsfine.domain.booking.controller; + +import com.eatsfine.domain.booking.dto.request.BookingRequestDTO; +import com.eatsfine.domain.booking.dto.response.BookingResponseDTO; +import com.eatsfine.domain.booking.service.BookingCommandService; +import com.eatsfine.domain.booking.service.BookingQueryService; +import com.eatsfine.domain.booking.status.BookingSuccessStatus; +import com.eatsfine.domain.user.exception.UserException; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.status.UserErrorStatus; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -63,7 +63,7 @@ public ApiResponse createBooking( ) { String email = user.getUsername(); - com.eatsfine.eatsfine.domain.user.entity.User userEntity = userRepository.findByEmail(email) + com.eatsfine.domain.user.entity.User userEntity = userRepository.findByEmail(email) .orElseThrow(() -> new UserException(UserErrorStatus.MEMBER_NOT_FOUND)); return ApiResponse.onSuccess(bookingCommandService.createBooking(userEntity.getId(), storeId, dto)); @@ -91,7 +91,7 @@ public ApiResponse cancelBooking( @AuthenticationPrincipal User user ) { String email = user.getUsername(); - com.eatsfine.eatsfine.domain.user.entity.User userEntity = userRepository.findByEmail(email) + com.eatsfine.domain.user.entity.User userEntity = userRepository.findByEmail(email) .orElseThrow(() -> new UserException(UserErrorStatus.MEMBER_NOT_FOUND)); return ApiResponse.of(BookingSuccessStatus._BOOKING_CANCELED, @@ -108,7 +108,7 @@ public ApiResponse getMyBookings( @AuthenticationPrincipal User user ) { String email = user.getUsername(); - com.eatsfine.eatsfine.domain.user.entity.User userEntity = userRepository.findByEmail(email) + com.eatsfine.domain.user.entity.User userEntity = userRepository.findByEmail(email) .orElseThrow(() -> new UserException(UserErrorStatus.MEMBER_NOT_FOUND)); // 서비스 호출 시 page - 1을 넘겨서 0-based index로 맞춰줍니다. diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/converter/BookingConverter.java b/src/main/java/com/eatsfine/domain/booking/converter/BookingConverter.java similarity index 75% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/converter/BookingConverter.java rename to src/main/java/com/eatsfine/domain/booking/converter/BookingConverter.java index a3107088..2e34c62a 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/converter/BookingConverter.java +++ b/src/main/java/com/eatsfine/domain/booking/converter/BookingConverter.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.booking.converter; +package com.eatsfine.domain.booking.converter; -import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO; -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.payment.dto.response.PaymentResponseDTO; -import com.eatsfine.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.booking.dto.response.BookingResponseDTO; +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.payment.dto.response.PaymentResponseDTO; +import com.eatsfine.domain.store.entity.Store; import java.math.BigDecimal; import java.util.List; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/dto/request/BookingRequestDTO.java b/src/main/java/com/eatsfine/domain/booking/dto/request/BookingRequestDTO.java similarity index 97% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/dto/request/BookingRequestDTO.java rename to src/main/java/com/eatsfine/domain/booking/dto/request/BookingRequestDTO.java index b8d6af51..c4bf1f67 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/dto/request/BookingRequestDTO.java +++ b/src/main/java/com/eatsfine/domain/booking/dto/request/BookingRequestDTO.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.booking.dto.request; +package com.eatsfine.domain.booking.dto.request; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/dto/response/BookingResponseDTO.java b/src/main/java/com/eatsfine/domain/booking/dto/response/BookingResponseDTO.java similarity index 96% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/dto/response/BookingResponseDTO.java rename to src/main/java/com/eatsfine/domain/booking/dto/response/BookingResponseDTO.java index 5ad81b13..6d18a05d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/dto/response/BookingResponseDTO.java +++ b/src/main/java/com/eatsfine/domain/booking/dto/response/BookingResponseDTO.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.booking.dto.response; +package com.eatsfine.domain.booking.dto.response; -import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus; +import com.eatsfine.domain.booking.enums.BookingStatus; import lombok.Builder; import java.math.BigDecimal; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/entity/Booking.java b/src/main/java/com/eatsfine/domain/booking/entity/Booking.java similarity index 80% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/entity/Booking.java rename to src/main/java/com/eatsfine/domain/booking/entity/Booking.java index 791b47c5..e6b0d941 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/entity/Booking.java +++ b/src/main/java/com/eatsfine/domain/booking/entity/Booking.java @@ -1,17 +1,17 @@ -package com.eatsfine.eatsfine.domain.booking.entity; - -import com.eatsfine.eatsfine.domain.booking.entity.mapping.BookingMenu; -import com.eatsfine.eatsfine.domain.booking.entity.mapping.BookingTable; -import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus; -import com.eatsfine.eatsfine.domain.payment.entity.Payment; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentStatus; -import com.eatsfine.eatsfine.domain.payment.exception.PaymentException; -import com.eatsfine.eatsfine.domain.payment.status.PaymentErrorStatus; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.user.entity.User; - -import com.eatsfine.eatsfine.global.common.BaseEntity; +package com.eatsfine.domain.booking.entity; + +import com.eatsfine.domain.booking.entity.mapping.BookingMenu; +import com.eatsfine.domain.booking.entity.mapping.BookingTable; +import com.eatsfine.domain.booking.enums.BookingStatus; +import com.eatsfine.domain.payment.entity.Payment; +import com.eatsfine.domain.payment.enums.PaymentStatus; +import com.eatsfine.domain.payment.exception.PaymentException; +import com.eatsfine.domain.payment.status.PaymentErrorStatus; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.user.entity.User; + +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/entity/mapping/BookingMenu.java b/src/main/java/com/eatsfine/domain/booking/entity/mapping/BookingMenu.java similarity index 76% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/entity/mapping/BookingMenu.java rename to src/main/java/com/eatsfine/domain/booking/entity/mapping/BookingMenu.java index aefc0374..7c66aef4 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/entity/mapping/BookingMenu.java +++ b/src/main/java/com/eatsfine/domain/booking/entity/mapping/BookingMenu.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.booking.entity.mapping; +package com.eatsfine.domain.booking.entity.mapping; -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.menu.entity.Menu; +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.menu.entity.Menu; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/entity/mapping/BookingTable.java b/src/main/java/com/eatsfine/domain/booking/entity/mapping/BookingTable.java similarity index 72% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/entity/mapping/BookingTable.java rename to src/main/java/com/eatsfine/domain/booking/entity/mapping/BookingTable.java index 86ad5055..1505257d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/entity/mapping/BookingTable.java +++ b/src/main/java/com/eatsfine/domain/booking/entity/mapping/BookingTable.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.booking.entity.mapping; +package com.eatsfine.domain.booking.entity.mapping; -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.storetable.entity.StoreTable; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/enums/BookingStatus.java b/src/main/java/com/eatsfine/domain/booking/enums/BookingStatus.java similarity index 61% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/enums/BookingStatus.java rename to src/main/java/com/eatsfine/domain/booking/enums/BookingStatus.java index c0a94af6..8917810a 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/enums/BookingStatus.java +++ b/src/main/java/com/eatsfine/domain/booking/enums/BookingStatus.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.booking.enums; +package com.eatsfine.domain.booking.enums; public enum BookingStatus { diff --git a/src/main/java/com/eatsfine/domain/booking/exception/BookingException.java b/src/main/java/com/eatsfine/domain/booking/exception/BookingException.java new file mode 100644 index 00000000..edc0d551 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/booking/exception/BookingException.java @@ -0,0 +1,10 @@ +package com.eatsfine.domain.booking.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class BookingException extends GeneralException { + public BookingException(BaseErrorCode code) { + super(code); + } +} \ No newline at end of file diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java b/src/main/java/com/eatsfine/domain/booking/repository/BookingRepository.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java rename to src/main/java/com/eatsfine/domain/booking/repository/BookingRepository.java index 524d31e0..7f4caa6a 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java +++ b/src/main/java/com/eatsfine/domain/booking/repository/BookingRepository.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.booking.repository; +package com.eatsfine.domain.booking.repository; -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.booking.enums.BookingStatus; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.user.entity.User; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.query.Param; @@ -87,7 +87,7 @@ List findActiveBookingsByTableAndDate( */ @Query("select max(b.bookingDate) from Booking b " + "where b.store.id = :storeId " + - "and b.status IN (com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.PENDING) " + + "and b.status IN (com.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, com.eatsfine.domain.booking.enums.BookingStatus.PENDING) " + "and b.bookingDate >= CURRENT_DATE " + "and (" + " (b.bookingTime >= :breakStart and b.bookingTime < :breakEnd) " + // 1. 브레이크 타임 내 시작 @@ -117,16 +117,16 @@ List findTableIdsWithFutureBookings( ); @Query("select count(b) from Booking b " + "where b.store = :store " + - "and b.status in (com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, " + - "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.PENDING, " + - "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.COMPLETED)") + "and b.status in (com.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, " + + "com.eatsfine.domain.booking.enums.BookingStatus.PENDING, " + + "com.eatsfine.domain.booking.enums.BookingStatus.COMPLETED)") Long countActiveBookings(@Param("store") Store store); @Query("select b.store.id, count(b) from Booking b " + "where b.store in :stores " + - "and b.status in (com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, " + - "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.PENDING, " + - "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.COMPLETED) " + + "and b.status in (com.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, " + + "com.eatsfine.domain.booking.enums.BookingStatus.PENDING, " + + "com.eatsfine.domain.booking.enums.BookingStatus.COMPLETED) " + "group by b.store.id") List countActiveBookingsByStores(@Param("stores") List stores); } diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingCommandService.java b/src/main/java/com/eatsfine/domain/booking/service/BookingCommandService.java similarity index 77% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingCommandService.java rename to src/main/java/com/eatsfine/domain/booking/service/BookingCommandService.java index f09e50be..e8418b9f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingCommandService.java +++ b/src/main/java/com/eatsfine/domain/booking/service/BookingCommandService.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.booking.service; +package com.eatsfine.domain.booking.service; -import com.eatsfine.eatsfine.domain.booking.dto.request.BookingRequestDTO; -import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO; +import com.eatsfine.domain.booking.dto.request.BookingRequestDTO; +import com.eatsfine.domain.booking.dto.response.BookingResponseDTO; import jakarta.validation.Valid; import org.springframework.security.core.userdetails.User; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingCommandServiceImpl.java b/src/main/java/com/eatsfine/domain/booking/service/BookingCommandServiceImpl.java similarity index 81% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingCommandServiceImpl.java rename to src/main/java/com/eatsfine/domain/booking/service/BookingCommandServiceImpl.java index 71a25198..1e16c8b8 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingCommandServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/booking/service/BookingCommandServiceImpl.java @@ -1,36 +1,36 @@ -package com.eatsfine.eatsfine.domain.booking.service; - -import com.eatsfine.eatsfine.domain.booking.converter.BookingConverter; -import com.eatsfine.eatsfine.domain.booking.dto.request.BookingRequestDTO; -import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO; -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.booking.entity.mapping.BookingMenu; -import com.eatsfine.eatsfine.domain.booking.entity.mapping.BookingTable; -import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus; -import com.eatsfine.eatsfine.domain.booking.exception.BookingException; -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; -import com.eatsfine.eatsfine.domain.booking.status.BookingErrorStatus; -import com.eatsfine.eatsfine.domain.menu.entity.Menu; -import com.eatsfine.eatsfine.domain.menu.repository.MenuRepository; -import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentRequestDTO; -import com.eatsfine.eatsfine.domain.payment.dto.response.PaymentResponseDTO; -import com.eatsfine.eatsfine.domain.payment.entity.Payment; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentStatus; -import com.eatsfine.eatsfine.domain.payment.exception.PaymentException; -import com.eatsfine.eatsfine.domain.payment.service.PaymentService; -import com.eatsfine.eatsfine.domain.payment.status.PaymentErrorStatus; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; -import com.eatsfine.eatsfine.domain.storetable.repository.StoreTableRepository; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.exception.UserException; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus; +package com.eatsfine.domain.booking.service; + +import com.eatsfine.domain.booking.converter.BookingConverter; +import com.eatsfine.domain.booking.dto.request.BookingRequestDTO; +import com.eatsfine.domain.booking.dto.response.BookingResponseDTO; +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.booking.entity.mapping.BookingMenu; +import com.eatsfine.domain.booking.entity.mapping.BookingTable; +import com.eatsfine.domain.booking.enums.BookingStatus; +import com.eatsfine.domain.booking.exception.BookingException; +import com.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.booking.status.BookingErrorStatus; +import com.eatsfine.domain.menu.entity.Menu; +import com.eatsfine.domain.menu.repository.MenuRepository; +import com.eatsfine.domain.payment.dto.request.PaymentRequestDTO; +import com.eatsfine.domain.payment.dto.response.PaymentResponseDTO; +import com.eatsfine.domain.payment.entity.Payment; +import com.eatsfine.domain.payment.enums.PaymentStatus; +import com.eatsfine.domain.payment.exception.PaymentException; +import com.eatsfine.domain.payment.service.PaymentService; +import com.eatsfine.domain.payment.status.PaymentErrorStatus; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; +import com.eatsfine.domain.storetable.repository.StoreTableRepository; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.exception.UserException; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.status.UserErrorStatus; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingQueryService.java b/src/main/java/com/eatsfine/domain/booking/service/BookingQueryService.java similarity index 68% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingQueryService.java rename to src/main/java/com/eatsfine/domain/booking/service/BookingQueryService.java index 380c134b..452e7f97 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingQueryService.java +++ b/src/main/java/com/eatsfine/domain/booking/service/BookingQueryService.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.booking.service; +package com.eatsfine.domain.booking.service; -import com.eatsfine.eatsfine.domain.booking.dto.request.BookingRequestDTO; -import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO; -import com.eatsfine.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.booking.dto.request.BookingRequestDTO; +import com.eatsfine.domain.booking.dto.response.BookingResponseDTO; +import com.eatsfine.domain.user.entity.User; import java.time.LocalDate; import java.time.LocalTime; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingQueryServiceImpl.java b/src/main/java/com/eatsfine/domain/booking/service/BookingQueryServiceImpl.java similarity index 86% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingQueryServiceImpl.java rename to src/main/java/com/eatsfine/domain/booking/service/BookingQueryServiceImpl.java index 9c9eaa01..0ce80b61 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingQueryServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/booking/service/BookingQueryServiceImpl.java @@ -1,30 +1,30 @@ -package com.eatsfine.eatsfine.domain.booking.service; - -import com.eatsfine.eatsfine.domain.booking.dto.request.BookingRequestDTO; -import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO; -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus; -import com.eatsfine.eatsfine.domain.booking.exception.BookingException; -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; -import com.eatsfine.eatsfine.domain.booking.status.BookingErrorStatus; -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.businesshours.exception.BusinessHoursException; -import com.eatsfine.eatsfine.domain.businesshours.repository.BusinessHoursRepository; -import com.eatsfine.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; -import com.eatsfine.eatsfine.domain.payment.entity.Payment; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentStatus; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.storetable.repository.StoreTableRepository; -import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout; -import com.eatsfine.eatsfine.domain.table_layout.repository.TableLayoutRepository; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.exception.UserException; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus; +package com.eatsfine.domain.booking.service; + +import com.eatsfine.domain.booking.dto.request.BookingRequestDTO; +import com.eatsfine.domain.booking.dto.response.BookingResponseDTO; +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.booking.enums.BookingStatus; +import com.eatsfine.domain.booking.exception.BookingException; +import com.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.booking.status.BookingErrorStatus; +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.businesshours.exception.BusinessHoursException; +import com.eatsfine.domain.businesshours.repository.BusinessHoursRepository; +import com.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; +import com.eatsfine.domain.payment.entity.Payment; +import com.eatsfine.domain.payment.enums.PaymentStatus; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.storetable.repository.StoreTableRepository; +import com.eatsfine.domain.tablelayout.entity.TableLayout; +import com.eatsfine.domain.tablelayout.repository.TableLayoutRepository; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.exception.UserException; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.status.UserErrorStatus; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -174,7 +174,7 @@ public BookingResponseDTO.AvailableTableListDTO getAvailableTables(Long storeId, public BookingResponseDTO.BookingPreviewListDTO getBookingList(Long userId, String status, Integer page) { PageRequest pageRequest = PageRequest.of(page, 10, Sort.by("bookingDate").descending()); - com.eatsfine.eatsfine.domain.user.entity.User user = userRepository.findById(userId) + com.eatsfine.domain.user.entity.User user = userRepository.findById(userId) .orElseThrow(() -> new UserException(UserErrorStatus.MEMBER_NOT_FOUND)); Page bookingPage; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingScheduler.java b/src/main/java/com/eatsfine/domain/booking/service/BookingScheduler.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingScheduler.java rename to src/main/java/com/eatsfine/domain/booking/service/BookingScheduler.java index 73b69ec4..5d7ece75 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingScheduler.java +++ b/src/main/java/com/eatsfine/domain/booking/service/BookingScheduler.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.booking.service; +package com.eatsfine.domain.booking.service; -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus; -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.booking.enums.BookingStatus; +import com.eatsfine.domain.booking.repository.BookingRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/status/BookingErrorStatus.java b/src/main/java/com/eatsfine/domain/booking/status/BookingErrorStatus.java similarity index 92% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/status/BookingErrorStatus.java rename to src/main/java/com/eatsfine/domain/booking/status/BookingErrorStatus.java index 6d06b92e..7a88879d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/status/BookingErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/booking/status/BookingErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.booking.status; +package com.eatsfine.domain.booking.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/status/BookingSuccessStatus.java b/src/main/java/com/eatsfine/domain/booking/status/BookingSuccessStatus.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/booking/status/BookingSuccessStatus.java rename to src/main/java/com/eatsfine/domain/booking/status/BookingSuccessStatus.java index 0454cec3..aa531efb 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/status/BookingSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/booking/status/BookingSuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.booking.status; +package com.eatsfine.domain.booking.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/controller/BusinessHoursController.java b/src/main/java/com/eatsfine/domain/businesshours/controller/BusinessHoursController.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/controller/BusinessHoursController.java rename to src/main/java/com/eatsfine/domain/businesshours/controller/BusinessHoursController.java index 0d298e7a..dbddb8a8 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/controller/BusinessHoursController.java +++ b/src/main/java/com/eatsfine/domain/businesshours/controller/BusinessHoursController.java @@ -1,11 +1,11 @@ -package com.eatsfine.eatsfine.domain.businesshours.controller; +package com.eatsfine.domain.businesshours.controller; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursReqDto; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursResDto; -import com.eatsfine.eatsfine.domain.businesshours.service.BusinessHoursCommandService; -import com.eatsfine.eatsfine.domain.businesshours.status.BusinessHoursSuccessStatus; -import com.eatsfine.eatsfine.global.annotation.CurrentUser; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.domain.businesshours.dto.request.BusinessHoursReqDto; +import com.eatsfine.domain.businesshours.dto.response.BusinessHoursResDto; +import com.eatsfine.domain.businesshours.service.BusinessHoursCommandService; +import com.eatsfine.domain.businesshours.status.BusinessHoursSuccessStatus; +import com.eatsfine.global.annotation.CurrentUser; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/converter/BusinessHoursConverter.java b/src/main/java/com/eatsfine/domain/businesshours/converter/BusinessHoursConverter.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/converter/BusinessHoursConverter.java rename to src/main/java/com/eatsfine/domain/businesshours/converter/BusinessHoursConverter.java index e930ce55..c7ffdb8a 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/converter/BusinessHoursConverter.java +++ b/src/main/java/com/eatsfine/domain/businesshours/converter/BusinessHoursConverter.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.businesshours.converter; +package com.eatsfine.domain.businesshours.converter; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursReqDto; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursResDto; -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.businesshours.dto.request.BusinessHoursReqDto; +import com.eatsfine.domain.businesshours.dto.response.BusinessHoursResDto; +import com.eatsfine.domain.businesshours.entity.BusinessHours; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/dto/BusinessHoursReqDto.java b/src/main/java/com/eatsfine/domain/businesshours/dto/request/BusinessHoursReqDto.java similarity index 97% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/dto/BusinessHoursReqDto.java rename to src/main/java/com/eatsfine/domain/businesshours/dto/request/BusinessHoursReqDto.java index 7d796e78..a6e971ab 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/dto/BusinessHoursReqDto.java +++ b/src/main/java/com/eatsfine/domain/businesshours/dto/request/BusinessHoursReqDto.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.businesshours.dto; +package com.eatsfine.domain.businesshours.dto.request; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/dto/BusinessHoursResDto.java b/src/main/java/com/eatsfine/domain/businesshours/dto/response/BusinessHoursResDto.java similarity index 95% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/dto/BusinessHoursResDto.java rename to src/main/java/com/eatsfine/domain/businesshours/dto/response/BusinessHoursResDto.java index 954b0091..389dd27d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/dto/BusinessHoursResDto.java +++ b/src/main/java/com/eatsfine/domain/businesshours/dto/response/BusinessHoursResDto.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.businesshours.dto; +package com.eatsfine.domain.businesshours.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/entity/BusinessHours.java b/src/main/java/com/eatsfine/domain/businesshours/entity/BusinessHours.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/entity/BusinessHours.java rename to src/main/java/com/eatsfine/domain/businesshours/entity/BusinessHours.java index 6a0444d3..62045040 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/entity/BusinessHours.java +++ b/src/main/java/com/eatsfine/domain/businesshours/entity/BusinessHours.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.businesshours.entity; +package com.eatsfine.domain.businesshours.entity; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.global.common.BaseEntity; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/eatsfine/domain/businesshours/exception/BusinessHoursException.java b/src/main/java/com/eatsfine/domain/businesshours/exception/BusinessHoursException.java new file mode 100644 index 00000000..21fab4ad --- /dev/null +++ b/src/main/java/com/eatsfine/domain/businesshours/exception/BusinessHoursException.java @@ -0,0 +1,10 @@ +package com.eatsfine.domain.businesshours.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class BusinessHoursException extends GeneralException { + public BusinessHoursException(BaseErrorCode code){ + super(code); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/repository/BusinessHoursRepository.java b/src/main/java/com/eatsfine/domain/businesshours/repository/BusinessHoursRepository.java similarity index 70% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/repository/BusinessHoursRepository.java rename to src/main/java/com/eatsfine/domain/businesshours/repository/BusinessHoursRepository.java index 4388a264..0454750a 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/repository/BusinessHoursRepository.java +++ b/src/main/java/com/eatsfine/domain/businesshours/repository/BusinessHoursRepository.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.businesshours.repository; +package com.eatsfine.domain.businesshours.repository; -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.store.entity.Store; import org.springframework.data.jpa.repository.JpaRepository; import java.time.DayOfWeek; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursCommandService.java b/src/main/java/com/eatsfine/domain/businesshours/service/BusinessHoursCommandService.java similarity index 69% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursCommandService.java rename to src/main/java/com/eatsfine/domain/businesshours/service/BusinessHoursCommandService.java index 664748d8..26163fe2 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursCommandService.java +++ b/src/main/java/com/eatsfine/domain/businesshours/service/BusinessHoursCommandService.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.businesshours.service; +package com.eatsfine.domain.businesshours.service; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursReqDto; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursResDto; +import com.eatsfine.domain.businesshours.dto.request.BusinessHoursReqDto; +import com.eatsfine.domain.businesshours.dto.response.BusinessHoursResDto; public interface BusinessHoursCommandService { BusinessHoursResDto.UpdateBusinessHoursDto updateBusinessHours( diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursCommandServiceImpl.java b/src/main/java/com/eatsfine/domain/businesshours/service/BusinessHoursCommandServiceImpl.java similarity index 77% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursCommandServiceImpl.java rename to src/main/java/com/eatsfine/domain/businesshours/service/BusinessHoursCommandServiceImpl.java index b547f049..53519af8 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursCommandServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/businesshours/service/BusinessHoursCommandServiceImpl.java @@ -1,19 +1,19 @@ -package com.eatsfine.eatsfine.domain.businesshours.service; - -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; -import com.eatsfine.eatsfine.domain.businesshours.converter.BusinessHoursConverter; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursReqDto; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursResDto; -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.businesshours.exception.BusinessHoursException; -import com.eatsfine.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; -import com.eatsfine.eatsfine.domain.businesshours.validator.BreakTimeValidator; -import com.eatsfine.eatsfine.domain.businesshours.validator.BusinessHoursValidator; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; +package com.eatsfine.domain.businesshours.service; + +import com.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.businesshours.converter.BusinessHoursConverter; +import com.eatsfine.domain.businesshours.dto.request.BusinessHoursReqDto; +import com.eatsfine.domain.businesshours.dto.response.BusinessHoursResDto; +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.businesshours.exception.BusinessHoursException; +import com.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; +import com.eatsfine.domain.businesshours.validator.BreakTimeValidator; +import com.eatsfine.domain.businesshours.validator.BusinessHoursValidator; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.validator.StoreValidator; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursScheduler.java b/src/main/java/com/eatsfine/domain/businesshours/service/BusinessHoursScheduler.java similarity index 86% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursScheduler.java rename to src/main/java/com/eatsfine/domain/businesshours/service/BusinessHoursScheduler.java index 08186465..5f57ca19 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursScheduler.java +++ b/src/main/java/com/eatsfine/domain/businesshours/service/BusinessHoursScheduler.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.businesshours.service; +package com.eatsfine.domain.businesshours.service; -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.businesshours.exception.BusinessHoursException; -import com.eatsfine.eatsfine.domain.businesshours.repository.BusinessHoursRepository; -import com.eatsfine.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.businesshours.exception.BusinessHoursException; +import com.eatsfine.domain.businesshours.repository.BusinessHoursRepository; +import com.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/status/BusinessHoursErrorStatus.java b/src/main/java/com/eatsfine/domain/businesshours/status/BusinessHoursErrorStatus.java similarity index 84% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/status/BusinessHoursErrorStatus.java rename to src/main/java/com/eatsfine/domain/businesshours/status/BusinessHoursErrorStatus.java index e9d67787..1bad15ca 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/status/BusinessHoursErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/businesshours/status/BusinessHoursErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.businesshours.status; +package com.eatsfine.domain.businesshours.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -30,7 +30,7 @@ public enum BusinessHoursErrorStatus implements BaseErrorCode { @Override public ErrorReasonDto getReason() { - return com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto.builder() + return com.eatsfine.global.apipayload.code.ErrorReasonDto.builder() .isSuccess(false) .code(code) .message(message) @@ -39,7 +39,7 @@ public ErrorReasonDto getReason() { @Override public ErrorReasonDto getReasonHttpStatus() { - return com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto.builder() + return com.eatsfine.global.apipayload.code.ErrorReasonDto.builder() .httpStatus(httpStatus) .isSuccess(false) .code(code) diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/status/BusinessHoursSuccessStatus.java b/src/main/java/com/eatsfine/domain/businesshours/status/BusinessHoursSuccessStatus.java similarity index 86% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/status/BusinessHoursSuccessStatus.java rename to src/main/java/com/eatsfine/domain/businesshours/status/BusinessHoursSuccessStatus.java index 1a1b14bd..412ea131 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/status/BusinessHoursSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/businesshours/status/BusinessHoursSuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.businesshours.status; +package com.eatsfine.domain.businesshours.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/validator/BreakTimeValidator.java b/src/main/java/com/eatsfine/domain/businesshours/validator/BreakTimeValidator.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/validator/BreakTimeValidator.java rename to src/main/java/com/eatsfine/domain/businesshours/validator/BreakTimeValidator.java index 14b19068..5567c6fd 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/validator/BreakTimeValidator.java +++ b/src/main/java/com/eatsfine/domain/businesshours/validator/BreakTimeValidator.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.businesshours.validator; +package com.eatsfine.domain.businesshours.validator; -import com.eatsfine.eatsfine.domain.businesshours.exception.BusinessHoursException; -import com.eatsfine.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; +import com.eatsfine.domain.businesshours.exception.BusinessHoursException; +import com.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; import java.time.LocalTime; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/validator/BusinessHoursValidator.java b/src/main/java/com/eatsfine/domain/businesshours/validator/BusinessHoursValidator.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/businesshours/validator/BusinessHoursValidator.java rename to src/main/java/com/eatsfine/domain/businesshours/validator/BusinessHoursValidator.java index d930be43..44453903 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/validator/BusinessHoursValidator.java +++ b/src/main/java/com/eatsfine/domain/businesshours/validator/BusinessHoursValidator.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.businesshours.validator; +package com.eatsfine.domain.businesshours.validator; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursReqDto; -import com.eatsfine.eatsfine.domain.businesshours.exception.BusinessHoursException; -import com.eatsfine.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; +import com.eatsfine.domain.businesshours.dto.request.BusinessHoursReqDto; +import com.eatsfine.domain.businesshours.exception.BusinessHoursException; +import com.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; import java.time.DayOfWeek; import java.util.HashSet; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/dto/BusinessNumberReqDto.java b/src/main/java/com/eatsfine/domain/businessnumber/dto/request/BusinessNumberReqDto.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/domain/businessnumber/dto/BusinessNumberReqDto.java rename to src/main/java/com/eatsfine/domain/businessnumber/dto/request/BusinessNumberReqDto.java index 98207d56..6c794919 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/dto/BusinessNumberReqDto.java +++ b/src/main/java/com/eatsfine/domain/businessnumber/dto/request/BusinessNumberReqDto.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.businessnumber.dto; +package com.eatsfine.domain.businessnumber.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/dto/BusinessNumberResDto.java b/src/main/java/com/eatsfine/domain/businessnumber/dto/response/BusinessNumberResDto.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/domain/businessnumber/dto/BusinessNumberResDto.java rename to src/main/java/com/eatsfine/domain/businessnumber/dto/response/BusinessNumberResDto.java index 973bb521..b63daec8 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/dto/BusinessNumberResDto.java +++ b/src/main/java/com/eatsfine/domain/businessnumber/dto/response/BusinessNumberResDto.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.businessnumber.dto; +package com.eatsfine.domain.businessnumber.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; diff --git a/src/main/java/com/eatsfine/domain/businessnumber/exception/BusinessNumberException.java b/src/main/java/com/eatsfine/domain/businessnumber/exception/BusinessNumberException.java new file mode 100644 index 00000000..24ccf450 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/businessnumber/exception/BusinessNumberException.java @@ -0,0 +1,11 @@ +package com.eatsfine.domain.businessnumber.exception; + + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class BusinessNumberException extends GeneralException { + public BusinessNumberException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/status/BusinessNumberErrorStatus.java b/src/main/java/com/eatsfine/domain/businessnumber/status/BusinessNumberErrorStatus.java similarity index 84% rename from src/main/java/com/eatsfine/eatsfine/domain/businessnumber/status/BusinessNumberErrorStatus.java rename to src/main/java/com/eatsfine/domain/businessnumber/status/BusinessNumberErrorStatus.java index 3ebf7288..6d493263 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/status/BusinessNumberErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/businessnumber/status/BusinessNumberErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.businessnumber.status; +package com.eatsfine.domain.businessnumber.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/validator/BusinessNumberValidator.java b/src/main/java/com/eatsfine/domain/businessnumber/validator/BusinessNumberValidator.java similarity index 68% rename from src/main/java/com/eatsfine/eatsfine/domain/businessnumber/validator/BusinessNumberValidator.java rename to src/main/java/com/eatsfine/domain/businessnumber/validator/BusinessNumberValidator.java index 782f27bd..81f7ba81 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/validator/BusinessNumberValidator.java +++ b/src/main/java/com/eatsfine/domain/businessnumber/validator/BusinessNumberValidator.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.businessnumber.validator; +package com.eatsfine.domain.businessnumber.validator; public interface BusinessNumberValidator { diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/validator/MockBusinessNumberValidator.java b/src/main/java/com/eatsfine/domain/businessnumber/validator/MockBusinessNumberValidator.java similarity index 84% rename from src/main/java/com/eatsfine/eatsfine/domain/businessnumber/validator/MockBusinessNumberValidator.java rename to src/main/java/com/eatsfine/domain/businessnumber/validator/MockBusinessNumberValidator.java index b115d5d2..de74f09f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/validator/MockBusinessNumberValidator.java +++ b/src/main/java/com/eatsfine/domain/businessnumber/validator/MockBusinessNumberValidator.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.businessnumber.validator; +package com.eatsfine.domain.businessnumber.validator; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/validator/RealBusinessNumberValidator.java b/src/main/java/com/eatsfine/domain/businessnumber/validator/RealBusinessNumberValidator.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/domain/businessnumber/validator/RealBusinessNumberValidator.java rename to src/main/java/com/eatsfine/domain/businessnumber/validator/RealBusinessNumberValidator.java index 0d5f7f80..1e949192 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/validator/RealBusinessNumberValidator.java +++ b/src/main/java/com/eatsfine/domain/businessnumber/validator/RealBusinessNumberValidator.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.businessnumber.validator; +package com.eatsfine.domain.businessnumber.validator; -import com.eatsfine.eatsfine.domain.businessnumber.dto.BusinessNumberResDto; -import com.eatsfine.eatsfine.domain.businessnumber.exception.BusinessNumberException; -import com.eatsfine.eatsfine.domain.businessnumber.status.BusinessNumberErrorStatus; +import com.eatsfine.domain.businessnumber.dto.response.BusinessNumberResDto; +import com.eatsfine.domain.businessnumber.exception.BusinessNumberException; +import com.eatsfine.domain.businessnumber.status.BusinessNumberErrorStatus; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/eatsfine/domain/image/exception/ImageException.java b/src/main/java/com/eatsfine/domain/image/exception/ImageException.java new file mode 100644 index 00000000..ca074a2c --- /dev/null +++ b/src/main/java/com/eatsfine/domain/image/exception/ImageException.java @@ -0,0 +1,11 @@ +package com.eatsfine.domain.image.exception; + + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class ImageException extends GeneralException { + public ImageException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/image/status/ImageErrorStatus.java b/src/main/java/com/eatsfine/domain/image/status/ImageErrorStatus.java similarity index 89% rename from src/main/java/com/eatsfine/eatsfine/domain/image/status/ImageErrorStatus.java rename to src/main/java/com/eatsfine/domain/image/status/ImageErrorStatus.java index a024e442..8a90fe1e 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/image/status/ImageErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/image/status/ImageErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.image.status; +package com.eatsfine.domain.image.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/controller/InquiryController.java b/src/main/java/com/eatsfine/domain/inquiry/controller/InquiryController.java similarity index 77% rename from src/main/java/com/eatsfine/eatsfine/domain/inquiry/controller/InquiryController.java rename to src/main/java/com/eatsfine/domain/inquiry/controller/InquiryController.java index dad03a6f..d5a9de07 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/controller/InquiryController.java +++ b/src/main/java/com/eatsfine/domain/inquiry/controller/InquiryController.java @@ -1,10 +1,10 @@ -package com.eatsfine.eatsfine.domain.inquiry.controller; +package com.eatsfine.domain.inquiry.controller; -import com.eatsfine.eatsfine.domain.inquiry.dto.InquiryRequestDTO; -import com.eatsfine.eatsfine.domain.inquiry.dto.InquiryResponseDTO; -import com.eatsfine.eatsfine.domain.inquiry.service.InquiryService; +import com.eatsfine.domain.inquiry.dto.request.InquiryRequestDTO; +import com.eatsfine.domain.inquiry.dto.response.InquiryResponseDTO; +import com.eatsfine.domain.inquiry.service.InquiryService; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/dto/InquiryRequestDTO.java b/src/main/java/com/eatsfine/domain/inquiry/dto/request/InquiryRequestDTO.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/inquiry/dto/InquiryRequestDTO.java rename to src/main/java/com/eatsfine/domain/inquiry/dto/request/InquiryRequestDTO.java index 8d3d15fd..97b83e39 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/dto/InquiryRequestDTO.java +++ b/src/main/java/com/eatsfine/domain/inquiry/dto/request/InquiryRequestDTO.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.inquiry.dto; +package com.eatsfine.domain.inquiry.dto.request; -import com.eatsfine.eatsfine.domain.inquiry.enums.InquiryType; +import com.eatsfine.domain.inquiry.enums.InquiryType; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/dto/InquiryResponseDTO.java b/src/main/java/com/eatsfine/domain/inquiry/dto/response/InquiryResponseDTO.java similarity index 81% rename from src/main/java/com/eatsfine/eatsfine/domain/inquiry/dto/InquiryResponseDTO.java rename to src/main/java/com/eatsfine/domain/inquiry/dto/response/InquiryResponseDTO.java index f87b9cf5..aacf3e56 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/dto/InquiryResponseDTO.java +++ b/src/main/java/com/eatsfine/domain/inquiry/dto/response/InquiryResponseDTO.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.inquiry.dto; +package com.eatsfine.domain.inquiry.dto.response; -import com.eatsfine.eatsfine.domain.inquiry.entity.Inquiry; +import com.eatsfine.domain.inquiry.entity.Inquiry; import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/entity/Inquiry.java b/src/main/java/com/eatsfine/domain/inquiry/entity/Inquiry.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/domain/inquiry/entity/Inquiry.java rename to src/main/java/com/eatsfine/domain/inquiry/entity/Inquiry.java index 69338765..7310f862 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/entity/Inquiry.java +++ b/src/main/java/com/eatsfine/domain/inquiry/entity/Inquiry.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.inquiry.entity; +package com.eatsfine.domain.inquiry.entity; -import com.eatsfine.eatsfine.domain.inquiry.enums.InquiryStatus; -import com.eatsfine.eatsfine.domain.inquiry.enums.InquiryType; -import com.eatsfine.eatsfine.global.common.BaseEntity; +import com.eatsfine.domain.inquiry.enums.InquiryStatus; +import com.eatsfine.domain.inquiry.enums.InquiryType; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/enums/InquiryStatus.java b/src/main/java/com/eatsfine/domain/inquiry/enums/InquiryStatus.java similarity index 80% rename from src/main/java/com/eatsfine/eatsfine/domain/inquiry/enums/InquiryStatus.java rename to src/main/java/com/eatsfine/domain/inquiry/enums/InquiryStatus.java index 42421c7d..7a5ffb3f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/enums/InquiryStatus.java +++ b/src/main/java/com/eatsfine/domain/inquiry/enums/InquiryStatus.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.inquiry.enums; +package com.eatsfine.domain.inquiry.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/enums/InquiryType.java b/src/main/java/com/eatsfine/domain/inquiry/enums/InquiryType.java similarity index 87% rename from src/main/java/com/eatsfine/eatsfine/domain/inquiry/enums/InquiryType.java rename to src/main/java/com/eatsfine/domain/inquiry/enums/InquiryType.java index 0fc36c42..827dd89c 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/enums/InquiryType.java +++ b/src/main/java/com/eatsfine/domain/inquiry/enums/InquiryType.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.inquiry.enums; +package com.eatsfine.domain.inquiry.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/repository/InquiryRepository.java b/src/main/java/com/eatsfine/domain/inquiry/repository/InquiryRepository.java similarity index 54% rename from src/main/java/com/eatsfine/eatsfine/domain/inquiry/repository/InquiryRepository.java rename to src/main/java/com/eatsfine/domain/inquiry/repository/InquiryRepository.java index 590cc0d2..604be6c2 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/repository/InquiryRepository.java +++ b/src/main/java/com/eatsfine/domain/inquiry/repository/InquiryRepository.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.inquiry.repository; +package com.eatsfine.domain.inquiry.repository; -import com.eatsfine.eatsfine.domain.inquiry.entity.Inquiry; +import com.eatsfine.domain.inquiry.entity.Inquiry; import org.springframework.data.jpa.repository.JpaRepository; public interface InquiryRepository extends JpaRepository { diff --git a/src/main/java/com/eatsfine/domain/inquiry/service/InquiryService.java b/src/main/java/com/eatsfine/domain/inquiry/service/InquiryService.java new file mode 100644 index 00000000..9d7e9ae3 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/inquiry/service/InquiryService.java @@ -0,0 +1,8 @@ +package com.eatsfine.domain.inquiry.service; + +import com.eatsfine.domain.inquiry.dto.request.InquiryRequestDTO; +import com.eatsfine.domain.inquiry.dto.response.InquiryResponseDTO; + +public interface InquiryService { + InquiryResponseDTO registerInquiry(InquiryRequestDTO request); +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/service/InquiryServiceImpl.java b/src/main/java/com/eatsfine/domain/inquiry/service/InquiryServiceImpl.java similarity index 72% rename from src/main/java/com/eatsfine/eatsfine/domain/inquiry/service/InquiryServiceImpl.java rename to src/main/java/com/eatsfine/domain/inquiry/service/InquiryServiceImpl.java index c083a6e4..0b8e3c89 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/service/InquiryServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/inquiry/service/InquiryServiceImpl.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.inquiry.service; +package com.eatsfine.domain.inquiry.service; -import com.eatsfine.eatsfine.domain.inquiry.dto.InquiryRequestDTO; -import com.eatsfine.eatsfine.domain.inquiry.dto.InquiryResponseDTO; -import com.eatsfine.eatsfine.domain.inquiry.entity.Inquiry; -import com.eatsfine.eatsfine.domain.inquiry.repository.InquiryRepository; +import com.eatsfine.domain.inquiry.dto.request.InquiryRequestDTO; +import com.eatsfine.domain.inquiry.dto.response.InquiryResponseDTO; +import com.eatsfine.domain.inquiry.entity.Inquiry; +import com.eatsfine.domain.inquiry.repository.InquiryRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/controller/MenuController.java b/src/main/java/com/eatsfine/domain/menu/controller/MenuController.java similarity index 90% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/controller/MenuController.java rename to src/main/java/com/eatsfine/domain/menu/controller/MenuController.java index 9a1c4042..5fa7c908 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/controller/MenuController.java +++ b/src/main/java/com/eatsfine/domain/menu/controller/MenuController.java @@ -1,12 +1,12 @@ -package com.eatsfine.eatsfine.domain.menu.controller; +package com.eatsfine.domain.menu.controller; -import com.eatsfine.eatsfine.domain.menu.dto.MenuReqDto; -import com.eatsfine.eatsfine.domain.menu.dto.MenuResDto; -import com.eatsfine.eatsfine.domain.menu.service.MenuCommandService; -import com.eatsfine.eatsfine.domain.menu.service.MenuQueryService; -import com.eatsfine.eatsfine.domain.menu.status.MenuSuccessStatus; -import com.eatsfine.eatsfine.global.annotation.CurrentUser; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.domain.menu.dto.request.MenuReqDto; +import com.eatsfine.domain.menu.dto.response.MenuResDto; +import com.eatsfine.domain.menu.service.MenuCommandService; +import com.eatsfine.domain.menu.service.MenuQueryService; +import com.eatsfine.domain.menu.status.MenuSuccessStatus; +import com.eatsfine.global.annotation.CurrentUser; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/converter/MenuConverter.java b/src/main/java/com/eatsfine/domain/menu/converter/MenuConverter.java similarity index 90% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/converter/MenuConverter.java rename to src/main/java/com/eatsfine/domain/menu/converter/MenuConverter.java index 702c318b..7d8b4ef1 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/converter/MenuConverter.java +++ b/src/main/java/com/eatsfine/domain/menu/converter/MenuConverter.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.menu.converter; +package com.eatsfine.domain.menu.converter; -import com.eatsfine.eatsfine.domain.menu.dto.MenuResDto; -import com.eatsfine.eatsfine.domain.menu.entity.Menu; +import com.eatsfine.domain.menu.dto.response.MenuResDto; +import com.eatsfine.domain.menu.entity.Menu; import java.util.List; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/dto/MenuReqDto.java b/src/main/java/com/eatsfine/domain/menu/dto/request/MenuReqDto.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/dto/MenuReqDto.java rename to src/main/java/com/eatsfine/domain/menu/dto/request/MenuReqDto.java index bd733fad..737e6f47 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/dto/MenuReqDto.java +++ b/src/main/java/com/eatsfine/domain/menu/dto/request/MenuReqDto.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.menu.dto; +package com.eatsfine.domain.menu.dto.request; -import com.eatsfine.eatsfine.domain.menu.enums.MenuCategory; +import com.eatsfine.domain.menu.enums.MenuCategory; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/dto/MenuResDto.java b/src/main/java/com/eatsfine/domain/menu/dto/response/MenuResDto.java similarity index 93% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/dto/MenuResDto.java rename to src/main/java/com/eatsfine/domain/menu/dto/response/MenuResDto.java index 0a8b419c..855e834f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/dto/MenuResDto.java +++ b/src/main/java/com/eatsfine/domain/menu/dto/response/MenuResDto.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.menu.dto; +package com.eatsfine.domain.menu.dto.response; -import com.eatsfine.eatsfine.domain.menu.enums.MenuCategory; +import com.eatsfine.domain.menu.enums.MenuCategory; import lombok.Builder; import java.math.BigDecimal; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/entity/Menu.java b/src/main/java/com/eatsfine/domain/menu/entity/Menu.java similarity index 90% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/entity/Menu.java rename to src/main/java/com/eatsfine/domain/menu/entity/Menu.java index 3c38e435..da4f53e2 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/entity/Menu.java +++ b/src/main/java/com/eatsfine/domain/menu/entity/Menu.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.menu.entity; +package com.eatsfine.domain.menu.entity; -import com.eatsfine.eatsfine.domain.menu.enums.MenuCategory; -import com.eatsfine.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.menu.enums.MenuCategory; +import com.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.global.common.BaseEntity; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.SQLDelete; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/enums/MenuCategory.java b/src/main/java/com/eatsfine/domain/menu/enums/MenuCategory.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/enums/MenuCategory.java rename to src/main/java/com/eatsfine/domain/menu/enums/MenuCategory.java index 576bde1b..2ffaa8fd 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/enums/MenuCategory.java +++ b/src/main/java/com/eatsfine/domain/menu/enums/MenuCategory.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.menu.enums; +package com.eatsfine.domain.menu.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/eatsfine/domain/menu/exception/MenuException.java b/src/main/java/com/eatsfine/domain/menu/exception/MenuException.java new file mode 100644 index 00000000..3f15deac --- /dev/null +++ b/src/main/java/com/eatsfine/domain/menu/exception/MenuException.java @@ -0,0 +1,10 @@ +package com.eatsfine.domain.menu.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class MenuException extends GeneralException { + public MenuException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/repository/MenuRepository.java b/src/main/java/com/eatsfine/domain/menu/repository/MenuRepository.java similarity index 66% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/repository/MenuRepository.java rename to src/main/java/com/eatsfine/domain/menu/repository/MenuRepository.java index 80c6562c..f38f5736 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/repository/MenuRepository.java +++ b/src/main/java/com/eatsfine/domain/menu/repository/MenuRepository.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.menu.repository; +package com.eatsfine.domain.menu.repository; -import com.eatsfine.eatsfine.domain.menu.entity.Menu; +import com.eatsfine.domain.menu.entity.Menu; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuCommandService.java b/src/main/java/com/eatsfine/domain/menu/service/MenuCommandService.java similarity index 81% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuCommandService.java rename to src/main/java/com/eatsfine/domain/menu/service/MenuCommandService.java index 1ef1ed93..d4f5a573 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuCommandService.java +++ b/src/main/java/com/eatsfine/domain/menu/service/MenuCommandService.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.menu.service; +package com.eatsfine.domain.menu.service; -import com.eatsfine.eatsfine.domain.menu.dto.MenuReqDto; -import com.eatsfine.eatsfine.domain.menu.dto.MenuResDto; +import com.eatsfine.domain.menu.dto.request.MenuReqDto; +import com.eatsfine.domain.menu.dto.response.MenuResDto; import org.springframework.web.multipart.MultipartFile; public interface MenuCommandService { diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuCommandServiceImpl.java b/src/main/java/com/eatsfine/domain/menu/service/MenuCommandServiceImpl.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuCommandServiceImpl.java rename to src/main/java/com/eatsfine/domain/menu/service/MenuCommandServiceImpl.java index 55699911..0c5db08a 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuCommandServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/menu/service/MenuCommandServiceImpl.java @@ -1,20 +1,20 @@ -package com.eatsfine.eatsfine.domain.menu.service; - -import com.eatsfine.eatsfine.domain.image.exception.ImageException; -import com.eatsfine.eatsfine.domain.image.status.ImageErrorStatus; -import com.eatsfine.eatsfine.domain.menu.converter.MenuConverter; -import com.eatsfine.eatsfine.domain.menu.dto.MenuReqDto; -import com.eatsfine.eatsfine.domain.menu.dto.MenuResDto; -import com.eatsfine.eatsfine.domain.menu.entity.Menu; -import com.eatsfine.eatsfine.domain.menu.exception.MenuException; -import com.eatsfine.eatsfine.domain.menu.repository.MenuRepository; -import com.eatsfine.eatsfine.domain.menu.status.MenuErrorStatus; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.global.s3.S3Service; +package com.eatsfine.domain.menu.service; + +import com.eatsfine.domain.image.exception.ImageException; +import com.eatsfine.domain.image.status.ImageErrorStatus; +import com.eatsfine.domain.menu.converter.MenuConverter; +import com.eatsfine.domain.menu.dto.request.MenuReqDto; +import com.eatsfine.domain.menu.dto.response.MenuResDto; +import com.eatsfine.domain.menu.entity.Menu; +import com.eatsfine.domain.menu.exception.MenuException; +import com.eatsfine.domain.menu.repository.MenuRepository; +import com.eatsfine.domain.menu.status.MenuErrorStatus; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.global.s3.S3Service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.hibernate.Transaction; diff --git a/src/main/java/com/eatsfine/domain/menu/service/MenuQueryService.java b/src/main/java/com/eatsfine/domain/menu/service/MenuQueryService.java new file mode 100644 index 00000000..0ed13ba1 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/menu/service/MenuQueryService.java @@ -0,0 +1,7 @@ +package com.eatsfine.domain.menu.service; + +import com.eatsfine.domain.menu.dto.response.MenuResDto; + +public interface MenuQueryService { + MenuResDto.MenuListDto getMenus(Long storeId); +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuQueryServiceImpl.java b/src/main/java/com/eatsfine/domain/menu/service/MenuQueryServiceImpl.java similarity index 73% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuQueryServiceImpl.java rename to src/main/java/com/eatsfine/domain/menu/service/MenuQueryServiceImpl.java index ddb0e546..d25ea6dc 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuQueryServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/menu/service/MenuQueryServiceImpl.java @@ -1,12 +1,12 @@ -package com.eatsfine.eatsfine.domain.menu.service; +package com.eatsfine.domain.menu.service; -import com.eatsfine.eatsfine.domain.menu.dto.MenuResDto; -import com.eatsfine.eatsfine.domain.store.dto.StoreResDto; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.global.s3.S3Service; +import com.eatsfine.domain.menu.dto.response.MenuResDto; +import com.eatsfine.domain.store.dto.response.StoreResDto; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.global.s3.S3Service; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/status/MenuErrorStatus.java b/src/main/java/com/eatsfine/domain/menu/status/MenuErrorStatus.java similarity index 82% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/status/MenuErrorStatus.java rename to src/main/java/com/eatsfine/domain/menu/status/MenuErrorStatus.java index b467af0a..0f8a38e9 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/status/MenuErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/menu/status/MenuErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.menu.status; +package com.eatsfine.domain.menu.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/status/MenuSuccessStatus.java b/src/main/java/com/eatsfine/domain/menu/status/MenuSuccessStatus.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/menu/status/MenuSuccessStatus.java rename to src/main/java/com/eatsfine/domain/menu/status/MenuSuccessStatus.java index 1a696bef..e1b9800c 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/status/MenuSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/menu/status/MenuSuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.menu.status; +package com.eatsfine.domain.menu.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/controller/PaymentController.java b/src/main/java/com/eatsfine/domain/payment/controller/PaymentController.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/controller/PaymentController.java rename to src/main/java/com/eatsfine/domain/payment/controller/PaymentController.java index f50e17a1..d0ede593 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/controller/PaymentController.java +++ b/src/main/java/com/eatsfine/domain/payment/controller/PaymentController.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.payment.controller; -import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentConfirmDTO; -import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentRequestDTO; -import com.eatsfine.eatsfine.domain.payment.dto.response.PaymentResponseDTO; -import com.eatsfine.eatsfine.domain.payment.service.PaymentService; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +package com.eatsfine.domain.payment.controller; +import com.eatsfine.domain.payment.dto.request.PaymentConfirmDTO; +import com.eatsfine.domain.payment.dto.request.PaymentRequestDTO; +import com.eatsfine.domain.payment.dto.response.PaymentResponseDTO; +import com.eatsfine.domain.payment.service.PaymentService; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/controller/PaymentWebhookController.java b/src/main/java/com/eatsfine/domain/payment/controller/PaymentWebhookController.java similarity index 89% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/controller/PaymentWebhookController.java rename to src/main/java/com/eatsfine/domain/payment/controller/PaymentWebhookController.java index 4aec3c4d..4bf99c37 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/controller/PaymentWebhookController.java +++ b/src/main/java/com/eatsfine/domain/payment/controller/PaymentWebhookController.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.payment.controller; +package com.eatsfine.domain.payment.controller; -import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentWebhookDTO; -import com.eatsfine.eatsfine.domain.payment.exception.PaymentException; -import com.eatsfine.eatsfine.domain.payment.service.PaymentService; +import com.eatsfine.domain.payment.dto.request.PaymentWebhookDTO; +import com.eatsfine.domain.payment.exception.PaymentException; +import com.eatsfine.domain.payment.service.PaymentService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -27,7 +27,7 @@ public class PaymentWebhookController { private final PaymentService paymentService; - private final com.eatsfine.eatsfine.domain.payment.service.TossPaymentService tossPaymentService; + private final com.eatsfine.domain.payment.service.TossPaymentService tossPaymentService; private final ObjectMapper objectMapper; private final Validator validator; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentConfirmDTO.java b/src/main/java/com/eatsfine/domain/payment/dto/request/PaymentConfirmDTO.java similarity index 81% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentConfirmDTO.java rename to src/main/java/com/eatsfine/domain/payment/dto/request/PaymentConfirmDTO.java index 9c936a68..952b0249 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentConfirmDTO.java +++ b/src/main/java/com/eatsfine/domain/payment/dto/request/PaymentConfirmDTO.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.payment.dto.request; +package com.eatsfine.domain.payment.dto.request; import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentRequestDTO.java b/src/main/java/com/eatsfine/domain/payment/dto/request/PaymentRequestDTO.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentRequestDTO.java rename to src/main/java/com/eatsfine/domain/payment/dto/request/PaymentRequestDTO.java index 12929ef0..0c2dc599 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentRequestDTO.java +++ b/src/main/java/com/eatsfine/domain/payment/dto/request/PaymentRequestDTO.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.payment.dto.request; +package com.eatsfine.domain.payment.dto.request; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentWebhookDTO.java b/src/main/java/com/eatsfine/domain/payment/dto/request/PaymentWebhookDTO.java similarity index 93% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentWebhookDTO.java rename to src/main/java/com/eatsfine/domain/payment/dto/request/PaymentWebhookDTO.java index b9077367..df945612 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentWebhookDTO.java +++ b/src/main/java/com/eatsfine/domain/payment/dto/request/PaymentWebhookDTO.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.payment.dto.request; +package com.eatsfine.domain.payment.dto.request; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import jakarta.validation.Valid; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/response/PaymentResponseDTO.java b/src/main/java/com/eatsfine/domain/payment/dto/response/PaymentResponseDTO.java similarity index 96% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/dto/response/PaymentResponseDTO.java rename to src/main/java/com/eatsfine/domain/payment/dto/response/PaymentResponseDTO.java index 8c690061..c2a412d4 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/response/PaymentResponseDTO.java +++ b/src/main/java/com/eatsfine/domain/payment/dto/response/PaymentResponseDTO.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.payment.dto.response; +package com.eatsfine.domain.payment.dto.response; import java.math.BigDecimal; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/response/TossPaymentResponse.java b/src/main/java/com/eatsfine/domain/payment/dto/response/TossPaymentResponse.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/dto/response/TossPaymentResponse.java rename to src/main/java/com/eatsfine/domain/payment/dto/response/TossPaymentResponse.java index bc6fc4ec..cac102e5 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/dto/response/TossPaymentResponse.java +++ b/src/main/java/com/eatsfine/domain/payment/dto/response/TossPaymentResponse.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.payment.dto.response; +package com.eatsfine.domain.payment.dto.response; import java.time.OffsetDateTime; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/entity/Payment.java b/src/main/java/com/eatsfine/domain/payment/entity/Payment.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/entity/Payment.java rename to src/main/java/com/eatsfine/domain/payment/entity/Payment.java index 1bd5a61e..81bf86ae 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/entity/Payment.java +++ b/src/main/java/com/eatsfine/domain/payment/entity/Payment.java @@ -1,11 +1,11 @@ -package com.eatsfine.eatsfine.domain.payment.entity; - -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentMethod; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentProvider; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentStatus; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentType; -import com.eatsfine.eatsfine.global.common.BaseEntity; +package com.eatsfine.domain.payment.entity; + +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.payment.enums.PaymentMethod; +import com.eatsfine.domain.payment.enums.PaymentProvider; +import com.eatsfine.domain.payment.enums.PaymentStatus; +import com.eatsfine.domain.payment.enums.PaymentType; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentMethod.java b/src/main/java/com/eatsfine/domain/payment/enums/PaymentMethod.java similarity index 78% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentMethod.java rename to src/main/java/com/eatsfine/domain/payment/enums/PaymentMethod.java index 62f47c77..5617ab9e 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentMethod.java +++ b/src/main/java/com/eatsfine/domain/payment/enums/PaymentMethod.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.payment.enums; +package com.eatsfine.domain.payment.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentProvider.java b/src/main/java/com/eatsfine/domain/payment/enums/PaymentProvider.java similarity index 80% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentProvider.java rename to src/main/java/com/eatsfine/domain/payment/enums/PaymentProvider.java index 7782c614..f7de5154 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentProvider.java +++ b/src/main/java/com/eatsfine/domain/payment/enums/PaymentProvider.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.payment.enums; +package com.eatsfine.domain.payment.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentStatus.java b/src/main/java/com/eatsfine/domain/payment/enums/PaymentStatus.java similarity index 84% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentStatus.java rename to src/main/java/com/eatsfine/domain/payment/enums/PaymentStatus.java index a2a1ae3b..e00aa91f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentStatus.java +++ b/src/main/java/com/eatsfine/domain/payment/enums/PaymentStatus.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.payment.enums; +package com.eatsfine.domain.payment.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentType.java b/src/main/java/com/eatsfine/domain/payment/enums/PaymentType.java similarity index 79% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentType.java rename to src/main/java/com/eatsfine/domain/payment/enums/PaymentType.java index 38afc12f..8d2de095 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentType.java +++ b/src/main/java/com/eatsfine/domain/payment/enums/PaymentType.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.payment.enums; +package com.eatsfine.domain.payment.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/domain/payment/exception/PaymentException.java b/src/main/java/com/eatsfine/domain/payment/exception/PaymentException.java new file mode 100644 index 00000000..2d2b112c --- /dev/null +++ b/src/main/java/com/eatsfine/domain/payment/exception/PaymentException.java @@ -0,0 +1,11 @@ +package com.eatsfine.domain.payment.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class PaymentException extends GeneralException { + + public PaymentException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/repository/PaymentRepository.java b/src/main/java/com/eatsfine/domain/payment/repository/PaymentRepository.java similarity index 75% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/repository/PaymentRepository.java rename to src/main/java/com/eatsfine/domain/payment/repository/PaymentRepository.java index 91cf70b6..7439aab9 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/repository/PaymentRepository.java +++ b/src/main/java/com/eatsfine/domain/payment/repository/PaymentRepository.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.payment.repository; +package com.eatsfine.domain.payment.repository; -import com.eatsfine.eatsfine.domain.payment.entity.Payment; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentStatus; +import com.eatsfine.domain.payment.entity.Payment; +import com.eatsfine.domain.payment.enums.PaymentStatus; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/service/PaymentService.java b/src/main/java/com/eatsfine/domain/payment/service/PaymentService.java similarity index 92% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/service/PaymentService.java rename to src/main/java/com/eatsfine/domain/payment/service/PaymentService.java index 1a9bbf44..91123075 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/service/PaymentService.java +++ b/src/main/java/com/eatsfine/domain/payment/service/PaymentService.java @@ -1,22 +1,22 @@ -package com.eatsfine.eatsfine.domain.payment.service; - -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; -import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentWebhookDTO; -import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentConfirmDTO; -import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentRequestDTO; -import com.eatsfine.eatsfine.domain.payment.dto.response.PaymentResponseDTO; -import com.eatsfine.eatsfine.domain.payment.dto.response.TossPaymentResponse; -import com.eatsfine.eatsfine.domain.payment.entity.Payment; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentMethod; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentProvider; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentStatus; -import com.eatsfine.eatsfine.domain.payment.enums.PaymentType; -import com.eatsfine.eatsfine.domain.payment.repository.PaymentRepository; -import com.eatsfine.eatsfine.domain.payment.exception.PaymentException; -import com.eatsfine.eatsfine.domain.payment.status.PaymentErrorStatus; -import com.eatsfine.eatsfine.global.apiPayload.code.status.ErrorStatus; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; +package com.eatsfine.domain.payment.service; + +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.payment.dto.request.PaymentWebhookDTO; +import com.eatsfine.domain.payment.dto.request.PaymentConfirmDTO; +import com.eatsfine.domain.payment.dto.request.PaymentRequestDTO; +import com.eatsfine.domain.payment.dto.response.PaymentResponseDTO; +import com.eatsfine.domain.payment.dto.response.TossPaymentResponse; +import com.eatsfine.domain.payment.entity.Payment; +import com.eatsfine.domain.payment.enums.PaymentMethod; +import com.eatsfine.domain.payment.enums.PaymentProvider; +import com.eatsfine.domain.payment.enums.PaymentStatus; +import com.eatsfine.domain.payment.enums.PaymentType; +import com.eatsfine.domain.payment.repository.PaymentRepository; +import com.eatsfine.domain.payment.exception.PaymentException; +import com.eatsfine.domain.payment.status.PaymentErrorStatus; +import com.eatsfine.global.apipayload.code.status.ErrorStatus; +import com.eatsfine.global.apipayload.exception.GeneralException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/service/TossPaymentService.java b/src/main/java/com/eatsfine/domain/payment/service/TossPaymentService.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/service/TossPaymentService.java rename to src/main/java/com/eatsfine/domain/payment/service/TossPaymentService.java index de69dedb..5020351f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/service/TossPaymentService.java +++ b/src/main/java/com/eatsfine/domain/payment/service/TossPaymentService.java @@ -1,10 +1,10 @@ -package com.eatsfine.eatsfine.domain.payment.service; +package com.eatsfine.domain.payment.service; -import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentConfirmDTO; -import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentRequestDTO; -import com.eatsfine.eatsfine.domain.payment.dto.response.TossPaymentResponse; -import com.eatsfine.eatsfine.global.apiPayload.code.status.ErrorStatus; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; +import com.eatsfine.domain.payment.dto.request.PaymentConfirmDTO; +import com.eatsfine.domain.payment.dto.request.PaymentRequestDTO; +import com.eatsfine.domain.payment.dto.response.TossPaymentResponse; +import com.eatsfine.global.apipayload.code.status.ErrorStatus; +import com.eatsfine.global.apipayload.exception.GeneralException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/status/PaymentErrorStatus.java b/src/main/java/com/eatsfine/domain/payment/status/PaymentErrorStatus.java similarity index 86% rename from src/main/java/com/eatsfine/eatsfine/domain/payment/status/PaymentErrorStatus.java rename to src/main/java/com/eatsfine/domain/payment/status/PaymentErrorStatus.java index e6dddaa8..f8a3520b 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/status/PaymentErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/payment/status/PaymentErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.payment.status; +package com.eatsfine.domain.payment.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/region/entity/Region.java b/src/main/java/com/eatsfine/domain/region/entity/Region.java similarity index 92% rename from src/main/java/com/eatsfine/eatsfine/domain/region/entity/Region.java rename to src/main/java/com/eatsfine/domain/region/entity/Region.java index daf5ea13..ab6a8209 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/region/entity/Region.java +++ b/src/main/java/com/eatsfine/domain/region/entity/Region.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.region.entity; +package com.eatsfine.domain.region.entity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/eatsfine/domain/region/exception/RegionException.java b/src/main/java/com/eatsfine/domain/region/exception/RegionException.java new file mode 100644 index 00000000..f690ce9a --- /dev/null +++ b/src/main/java/com/eatsfine/domain/region/exception/RegionException.java @@ -0,0 +1,10 @@ +package com.eatsfine.domain.region.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class RegionException extends GeneralException { + public RegionException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/region/repository/RegionRepository.java b/src/main/java/com/eatsfine/domain/region/repository/RegionRepository.java similarity index 69% rename from src/main/java/com/eatsfine/eatsfine/domain/region/repository/RegionRepository.java rename to src/main/java/com/eatsfine/domain/region/repository/RegionRepository.java index 027dc032..9590f849 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/region/repository/RegionRepository.java +++ b/src/main/java/com/eatsfine/domain/region/repository/RegionRepository.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.region.repository; +package com.eatsfine.domain.region.repository; -import com.eatsfine.eatsfine.domain.region.entity.Region; +import com.eatsfine.domain.region.entity.Region; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/region/status/RegionErrorStatus.java b/src/main/java/com/eatsfine/domain/region/status/RegionErrorStatus.java similarity index 69% rename from src/main/java/com/eatsfine/eatsfine/domain/region/status/RegionErrorStatus.java rename to src/main/java/com/eatsfine/domain/region/status/RegionErrorStatus.java index 36766aed..cac21d91 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/region/status/RegionErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/region/status/RegionErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.region.status; +package com.eatsfine.domain.region.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @@ -20,7 +20,7 @@ public enum RegionErrorStatus implements BaseErrorCode { @Override public ErrorReasonDto getReason() { - return com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto.builder() + return com.eatsfine.global.apipayload.code.ErrorReasonDto.builder() .isSuccess(false) .code(code) .message(message) @@ -29,7 +29,7 @@ public ErrorReasonDto getReason() { @Override public ErrorReasonDto getReasonHttpStatus() { - return com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto.builder() + return com.eatsfine.global.apipayload.code.ErrorReasonDto.builder() .httpStatus(httpStatus) .isSuccess(false) .code(code) diff --git a/src/main/java/com/eatsfine/eatsfine/domain/region/status/RegionSuccessStatus.java b/src/main/java/com/eatsfine/domain/region/status/RegionSuccessStatus.java similarity index 69% rename from src/main/java/com/eatsfine/eatsfine/domain/region/status/RegionSuccessStatus.java rename to src/main/java/com/eatsfine/domain/region/status/RegionSuccessStatus.java index 7a935b78..6b01b474 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/region/status/RegionSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/region/status/RegionSuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.region.status; +package com.eatsfine.domain.region.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @@ -21,7 +21,7 @@ public enum RegionSuccessStatus implements BaseErrorCode { @Override public ErrorReasonDto getReason() { - return com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto.builder() + return com.eatsfine.global.apipayload.code.ErrorReasonDto.builder() .isSuccess(false) .code(code) .message(message) @@ -30,7 +30,7 @@ public ErrorReasonDto getReason() { @Override public ErrorReasonDto getReasonHttpStatus() { - return com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto.builder() + return com.eatsfine.global.apipayload.code.ErrorReasonDto.builder() .httpStatus(httpStatus) .isSuccess(false) .code(code) diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/condition/StoreSearchCondition.java b/src/main/java/com/eatsfine/domain/store/condition/StoreSearchCondition.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/domain/store/condition/StoreSearchCondition.java rename to src/main/java/com/eatsfine/domain/store/condition/StoreSearchCondition.java index 0ba46a5e..378be6dd 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/condition/StoreSearchCondition.java +++ b/src/main/java/com/eatsfine/domain/store/condition/StoreSearchCondition.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.store.condition; +package com.eatsfine.domain.store.condition; -import com.eatsfine.eatsfine.domain.store.enums.Category; -import com.eatsfine.eatsfine.domain.store.enums.StoreSortType; +import com.eatsfine.domain.store.enums.Category; +import com.eatsfine.domain.store.enums.StoreSortType; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/controller/StoreController.java b/src/main/java/com/eatsfine/domain/store/controller/StoreController.java similarity index 89% rename from src/main/java/com/eatsfine/eatsfine/domain/store/controller/StoreController.java rename to src/main/java/com/eatsfine/domain/store/controller/StoreController.java index 36d90d0f..4f0e0d44 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/controller/StoreController.java +++ b/src/main/java/com/eatsfine/domain/store/controller/StoreController.java @@ -1,13 +1,13 @@ -package com.eatsfine.eatsfine.domain.store.controller; +package com.eatsfine.domain.store.controller; -import com.eatsfine.eatsfine.domain.store.condition.StoreSearchCondition; -import com.eatsfine.eatsfine.domain.store.dto.StoreReqDto; -import com.eatsfine.eatsfine.domain.store.dto.StoreResDto; -import com.eatsfine.eatsfine.domain.store.service.StoreCommandService; -import com.eatsfine.eatsfine.domain.store.service.StoreQueryService; -import com.eatsfine.eatsfine.domain.store.status.StoreSuccessStatus; -import com.eatsfine.eatsfine.global.annotation.CurrentUser; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.domain.store.condition.StoreSearchCondition; +import com.eatsfine.domain.store.dto.request.StoreReqDto; +import com.eatsfine.domain.store.dto.response.StoreResDto; +import com.eatsfine.domain.store.service.StoreCommandService; +import com.eatsfine.domain.store.service.StoreQueryService; +import com.eatsfine.domain.store.status.StoreSuccessStatus; +import com.eatsfine.global.annotation.CurrentUser; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/converter/StoreConverter.java b/src/main/java/com/eatsfine/domain/store/converter/StoreConverter.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/domain/store/converter/StoreConverter.java rename to src/main/java/com/eatsfine/domain/store/converter/StoreConverter.java index 9ab93534..ad477166 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/converter/StoreConverter.java +++ b/src/main/java/com/eatsfine/domain/store/converter/StoreConverter.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.store.converter; +package com.eatsfine.domain.store.converter; -import com.eatsfine.eatsfine.domain.businesshours.converter.BusinessHoursConverter; -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.store.dto.StoreResDto; -import com.eatsfine.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.businesshours.converter.BusinessHoursConverter; +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.store.dto.response.StoreResDto; +import com.eatsfine.domain.store.entity.Store; import java.util.List; diff --git a/src/main/java/com/eatsfine/domain/store/dto/projection/StoreSearchResult.java b/src/main/java/com/eatsfine/domain/store/dto/projection/StoreSearchResult.java new file mode 100644 index 00000000..4b05d0fb --- /dev/null +++ b/src/main/java/com/eatsfine/domain/store/dto/projection/StoreSearchResult.java @@ -0,0 +1,8 @@ +package com.eatsfine.domain.store.dto.projection; + +import com.eatsfine.domain.store.entity.Store; + +public record StoreSearchResult( + Store store, + Double distance +) {} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreReqDto.java b/src/main/java/com/eatsfine/domain/store/dto/request/StoreReqDto.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreReqDto.java rename to src/main/java/com/eatsfine/domain/store/dto/request/StoreReqDto.java index 70e513c4..35445c63 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreReqDto.java +++ b/src/main/java/com/eatsfine/domain/store/dto/request/StoreReqDto.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.store.dto; +package com.eatsfine.domain.store.dto.request; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursReqDto; -import com.eatsfine.eatsfine.domain.businessnumber.dto.BusinessNumberReqDto; -import com.eatsfine.eatsfine.domain.store.enums.Category; -import com.eatsfine.eatsfine.domain.store.enums.DepositRate; +import com.eatsfine.domain.businesshours.dto.request.BusinessHoursReqDto; +import com.eatsfine.domain.businessnumber.dto.request.BusinessNumberReqDto; +import com.eatsfine.domain.store.enums.Category; +import com.eatsfine.domain.store.enums.DepositRate; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreResDto.java b/src/main/java/com/eatsfine/domain/store/dto/response/StoreResDto.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreResDto.java rename to src/main/java/com/eatsfine/domain/store/dto/response/StoreResDto.java index 7a83b358..ff47585d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreResDto.java +++ b/src/main/java/com/eatsfine/domain/store/dto/response/StoreResDto.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.store.dto; +package com.eatsfine.domain.store.dto.response; -import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursResDto; -import com.eatsfine.eatsfine.domain.store.enums.Category; -import com.eatsfine.eatsfine.domain.store.enums.DepositRate; +import com.eatsfine.domain.businesshours.dto.response.BusinessHoursResDto; +import com.eatsfine.domain.store.enums.Category; +import com.eatsfine.domain.store.enums.DepositRate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/entity/Store.java b/src/main/java/com/eatsfine/domain/store/entity/Store.java similarity index 84% rename from src/main/java/com/eatsfine/eatsfine/domain/store/entity/Store.java rename to src/main/java/com/eatsfine/domain/store/entity/Store.java index 40f2bef7..cc87071f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/entity/Store.java +++ b/src/main/java/com/eatsfine/domain/store/entity/Store.java @@ -1,20 +1,20 @@ -package com.eatsfine.eatsfine.domain.store.entity; - -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.businesshours.exception.BusinessHoursException; -import com.eatsfine.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; -import com.eatsfine.eatsfine.domain.menu.entity.Menu; -import com.eatsfine.eatsfine.domain.region.entity.Region; -import com.eatsfine.eatsfine.domain.store.dto.StoreReqDto; -import com.eatsfine.eatsfine.domain.store.enums.Category; -import com.eatsfine.eatsfine.domain.store.enums.DepositRate; -import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout; -import com.eatsfine.eatsfine.domain.tableimage.entity.TableImage; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.global.apiPayload.code.status.ErrorStatus; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -import com.eatsfine.eatsfine.global.common.BaseEntity; +package com.eatsfine.domain.store.entity; + +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.businesshours.exception.BusinessHoursException; +import com.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus; +import com.eatsfine.domain.menu.entity.Menu; +import com.eatsfine.domain.region.entity.Region; +import com.eatsfine.domain.store.dto.request.StoreReqDto; +import com.eatsfine.domain.store.enums.Category; +import com.eatsfine.domain.store.enums.DepositRate; +import com.eatsfine.domain.tablelayout.entity.TableLayout; +import com.eatsfine.domain.tableimage.entity.TableImage; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.global.apipayload.code.status.ErrorStatus; +import com.eatsfine.global.apipayload.exception.GeneralException; + +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.BatchSize; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/enums/Category.java b/src/main/java/com/eatsfine/domain/store/enums/Category.java similarity index 61% rename from src/main/java/com/eatsfine/eatsfine/domain/store/enums/Category.java rename to src/main/java/com/eatsfine/domain/store/enums/Category.java index 04a1b943..094e37b2 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/enums/Category.java +++ b/src/main/java/com/eatsfine/domain/store/enums/Category.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.store.enums; +package com.eatsfine.domain.store.enums; public enum Category { KOREAN, CHINESE, JAPANESE, WESTERN, ITALIAN, CAFE diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/enums/DepositRate.java b/src/main/java/com/eatsfine/domain/store/enums/DepositRate.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/store/enums/DepositRate.java rename to src/main/java/com/eatsfine/domain/store/enums/DepositRate.java index ffc38bb9..93a10396 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/enums/DepositRate.java +++ b/src/main/java/com/eatsfine/domain/store/enums/DepositRate.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.store.enums; +package com.eatsfine.domain.store.enums; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/enums/StoreSortType.java b/src/main/java/com/eatsfine/domain/store/enums/StoreSortType.java similarity index 69% rename from src/main/java/com/eatsfine/eatsfine/domain/store/enums/StoreSortType.java rename to src/main/java/com/eatsfine/domain/store/enums/StoreSortType.java index c9852a9c..fe89ad75 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/enums/StoreSortType.java +++ b/src/main/java/com/eatsfine/domain/store/enums/StoreSortType.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.store.enums; +package com.eatsfine.domain.store.enums; // REVIEW_COUNT는 추후 리뷰 도메인 구현 시 추가 public enum StoreSortType { diff --git a/src/main/java/com/eatsfine/domain/store/exception/StoreException.java b/src/main/java/com/eatsfine/domain/store/exception/StoreException.java new file mode 100644 index 00000000..3fc1e1db --- /dev/null +++ b/src/main/java/com/eatsfine/domain/store/exception/StoreException.java @@ -0,0 +1,10 @@ +package com.eatsfine.domain.store.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class StoreException extends GeneralException { + public StoreException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepository.java b/src/main/java/com/eatsfine/domain/store/repository/StoreRepository.java similarity index 80% rename from src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepository.java rename to src/main/java/com/eatsfine/domain/store/repository/StoreRepository.java index 193429d9..d30ea91d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepository.java +++ b/src/main/java/com/eatsfine/domain/store/repository/StoreRepository.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.store.repository; +package com.eatsfine.domain.store.repository; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepositoryCustom.java b/src/main/java/com/eatsfine/domain/store/repository/StoreRepositoryCustom.java similarity index 63% rename from src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepositoryCustom.java rename to src/main/java/com/eatsfine/domain/store/repository/StoreRepositoryCustom.java index 906c5445..6f08c27a 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepositoryCustom.java +++ b/src/main/java/com/eatsfine/domain/store/repository/StoreRepositoryCustom.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.store.repository; +package com.eatsfine.domain.store.repository; -import com.eatsfine.eatsfine.domain.store.dto.projection.StoreSearchResult; -import com.eatsfine.eatsfine.domain.store.enums.Category; -import com.eatsfine.eatsfine.domain.store.enums.StoreSortType; +import com.eatsfine.domain.store.dto.projection.StoreSearchResult; +import com.eatsfine.domain.store.enums.Category; +import com.eatsfine.domain.store.enums.StoreSortType; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepositoryImpl.java b/src/main/java/com/eatsfine/domain/store/repository/StoreRepositoryImpl.java similarity index 92% rename from src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepositoryImpl.java rename to src/main/java/com/eatsfine/domain/store/repository/StoreRepositoryImpl.java index 34e6d4f0..835bafae 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepositoryImpl.java +++ b/src/main/java/com/eatsfine/domain/store/repository/StoreRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.eatsfine.eatsfine.domain.store.repository; +package com.eatsfine.domain.store.repository; -import com.eatsfine.eatsfine.domain.region.entity.QRegion; -import com.eatsfine.eatsfine.domain.store.dto.projection.StoreSearchResult; -import com.eatsfine.eatsfine.domain.store.entity.QStore; -import com.eatsfine.eatsfine.domain.store.enums.Category; -import com.eatsfine.eatsfine.domain.store.enums.StoreSortType; +import com.eatsfine.domain.region.entity.QRegion; +import com.eatsfine.domain.store.dto.projection.StoreSearchResult; +import com.eatsfine.domain.store.entity.QStore; +import com.eatsfine.domain.store.enums.Category; +import com.eatsfine.domain.store.enums.StoreSortType; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.Projections; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreCommandService.java b/src/main/java/com/eatsfine/domain/store/service/StoreCommandService.java similarity index 71% rename from src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreCommandService.java rename to src/main/java/com/eatsfine/domain/store/service/StoreCommandService.java index 6d1cae27..65d013c3 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreCommandService.java +++ b/src/main/java/com/eatsfine/domain/store/service/StoreCommandService.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.store.service; +package com.eatsfine.domain.store.service; -import com.eatsfine.eatsfine.domain.store.dto.StoreReqDto; -import com.eatsfine.eatsfine.domain.store.dto.StoreResDto; +import com.eatsfine.domain.store.dto.request.StoreReqDto; +import com.eatsfine.domain.store.dto.response.StoreResDto; import org.springframework.web.multipart.MultipartFile; public interface StoreCommandService { diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreCommandServiceImpl.java b/src/main/java/com/eatsfine/domain/store/service/StoreCommandServiceImpl.java similarity index 78% rename from src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreCommandServiceImpl.java rename to src/main/java/com/eatsfine/domain/store/service/StoreCommandServiceImpl.java index a6afc3e7..10872184 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreCommandServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/store/service/StoreCommandServiceImpl.java @@ -1,25 +1,25 @@ -package com.eatsfine.eatsfine.domain.store.service; - -import com.eatsfine.eatsfine.domain.businesshours.converter.BusinessHoursConverter; -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.businesshours.validator.BusinessHoursValidator; -import com.eatsfine.eatsfine.domain.businessnumber.validator.BusinessNumberValidator; -import com.eatsfine.eatsfine.domain.image.exception.ImageException; -import com.eatsfine.eatsfine.domain.image.status.ImageErrorStatus; -import com.eatsfine.eatsfine.domain.region.entity.Region; -import com.eatsfine.eatsfine.domain.region.repository.RegionRepository; -import com.eatsfine.eatsfine.domain.region.status.RegionErrorStatus; -import com.eatsfine.eatsfine.domain.store.converter.StoreConverter; -import com.eatsfine.eatsfine.domain.store.dto.StoreReqDto; -import com.eatsfine.eatsfine.domain.store.dto.StoreResDto; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.exception.UserException; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus; +package com.eatsfine.domain.store.service; + +import com.eatsfine.domain.businesshours.converter.BusinessHoursConverter; +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.businesshours.validator.BusinessHoursValidator; +import com.eatsfine.domain.businessnumber.validator.BusinessNumberValidator; +import com.eatsfine.domain.image.exception.ImageException; +import com.eatsfine.domain.image.status.ImageErrorStatus; +import com.eatsfine.domain.region.entity.Region; +import com.eatsfine.domain.region.repository.RegionRepository; +import com.eatsfine.domain.region.status.RegionErrorStatus; +import com.eatsfine.domain.store.converter.StoreConverter; +import com.eatsfine.domain.store.dto.request.StoreReqDto; +import com.eatsfine.domain.store.dto.response.StoreResDto; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.exception.UserException; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.status.UserErrorStatus; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.List; -import com.eatsfine.eatsfine.global.s3.S3Service; +import com.eatsfine.global.s3.S3Service; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryService.java b/src/main/java/com/eatsfine/domain/store/service/StoreQueryService.java similarity index 55% rename from src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryService.java rename to src/main/java/com/eatsfine/domain/store/service/StoreQueryService.java index 264db283..07851ea9 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryService.java +++ b/src/main/java/com/eatsfine/domain/store/service/StoreQueryService.java @@ -1,10 +1,10 @@ -package com.eatsfine.eatsfine.domain.store.service; +package com.eatsfine.domain.store.service; -import com.eatsfine.eatsfine.domain.store.condition.StoreSearchCondition; -import com.eatsfine.eatsfine.domain.store.dto.StoreResDto; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.enums.Category; -import com.eatsfine.eatsfine.domain.store.enums.StoreSortType; +import com.eatsfine.domain.store.condition.StoreSearchCondition; +import com.eatsfine.domain.store.dto.response.StoreResDto; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.enums.Category; +import com.eatsfine.domain.store.enums.StoreSortType; import java.time.LocalDateTime; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryServiceImpl.java b/src/main/java/com/eatsfine/domain/store/service/StoreQueryServiceImpl.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryServiceImpl.java rename to src/main/java/com/eatsfine/domain/store/service/StoreQueryServiceImpl.java index 5c07d026..b7a9cf7d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/store/service/StoreQueryServiceImpl.java @@ -1,20 +1,20 @@ -package com.eatsfine.eatsfine.domain.store.service; - -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; -import com.eatsfine.eatsfine.domain.store.condition.StoreSearchCondition; -import com.eatsfine.eatsfine.domain.store.converter.StoreConverter; -import com.eatsfine.eatsfine.domain.store.dto.StoreResDto; -import com.eatsfine.eatsfine.domain.store.dto.projection.StoreSearchResult; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.exception.UserException; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus; -import com.eatsfine.eatsfine.global.s3.S3Service; +package com.eatsfine.domain.store.service; + +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.store.condition.StoreSearchCondition; +import com.eatsfine.domain.store.converter.StoreConverter; +import com.eatsfine.domain.store.dto.response.StoreResDto; +import com.eatsfine.domain.store.dto.projection.StoreSearchResult; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.exception.UserException; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.status.UserErrorStatus; +import com.eatsfine.global.s3.S3Service; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -83,7 +83,7 @@ public StoreResDto.StoreDetailDto getStoreDetail(Long storeId) { List tableImageUrls = store.getTableImages().stream() .sorted(java.util.Comparator - .comparingInt(com.eatsfine.eatsfine.domain.tableimage.entity.TableImage::getImageOrder)) + .comparingInt(com.eatsfine.domain.tableimage.entity.TableImage::getImageOrder)) .map(ti -> s3Service.toUrl(ti.getTableImageKey())) .toList(); diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreErrorStatus.java b/src/main/java/com/eatsfine/domain/store/status/StoreErrorStatus.java similarity index 87% rename from src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreErrorStatus.java rename to src/main/java/com/eatsfine/domain/store/status/StoreErrorStatus.java index 19205d2f..d538ecbb 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/store/status/StoreErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.store.status; +package com.eatsfine.domain.store.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreSuccessStatus.java b/src/main/java/com/eatsfine/domain/store/status/StoreSuccessStatus.java similarity index 90% rename from src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreSuccessStatus.java rename to src/main/java/com/eatsfine/domain/store/status/StoreSuccessStatus.java index 95431628..6c3ca1d9 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/store/status/StoreSuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.store.status; +package com.eatsfine.domain.store.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/validator/StoreValidator.java b/src/main/java/com/eatsfine/domain/store/validator/StoreValidator.java similarity index 66% rename from src/main/java/com/eatsfine/eatsfine/domain/store/validator/StoreValidator.java rename to src/main/java/com/eatsfine/domain/store/validator/StoreValidator.java index 5d0e3aee..b59ee565 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/validator/StoreValidator.java +++ b/src/main/java/com/eatsfine/domain/store/validator/StoreValidator.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.store.validator; +package com.eatsfine.domain.store.validator; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/controller/StoreTableController.java b/src/main/java/com/eatsfine/domain/storetable/controller/StoreTableController.java similarity index 87% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/controller/StoreTableController.java rename to src/main/java/com/eatsfine/domain/storetable/controller/StoreTableController.java index 6c37e76b..9ec4c68d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/controller/StoreTableController.java +++ b/src/main/java/com/eatsfine/domain/storetable/controller/StoreTableController.java @@ -1,17 +1,17 @@ -package com.eatsfine.eatsfine.domain.storetable.controller; - -import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO; -import com.eatsfine.eatsfine.domain.booking.service.BookingCommandService; -import com.eatsfine.eatsfine.domain.booking.service.BookingQueryService; -import com.eatsfine.eatsfine.domain.booking.status.BookingSuccessStatus; -import com.eatsfine.eatsfine.domain.storetable.dto.req.StoreTableReqDto; -import com.eatsfine.eatsfine.domain.storetable.dto.res.StoreTableResDto; -import com.eatsfine.eatsfine.domain.storetable.exception.status.StoreTableSuccessStatus; -import com.eatsfine.eatsfine.domain.storetable.service.StoreTableCommandService; -import com.eatsfine.eatsfine.domain.storetable.service.StoreTableQueryService; -import com.eatsfine.eatsfine.domain.tableimage.status.TableImageSuccessStatus; -import com.eatsfine.eatsfine.global.annotation.CurrentUser; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +package com.eatsfine.domain.storetable.controller; + +import com.eatsfine.domain.booking.dto.response.BookingResponseDTO; +import com.eatsfine.domain.booking.service.BookingCommandService; +import com.eatsfine.domain.booking.service.BookingQueryService; +import com.eatsfine.domain.booking.status.BookingSuccessStatus; +import com.eatsfine.domain.storetable.dto.request.StoreTableReqDto; +import com.eatsfine.domain.storetable.dto.response.StoreTableResDto; +import com.eatsfine.domain.storetable.exception.status.StoreTableSuccessStatus; +import com.eatsfine.domain.storetable.service.StoreTableCommandService; +import com.eatsfine.domain.storetable.service.StoreTableQueryService; +import com.eatsfine.domain.tableimage.status.TableImageSuccessStatus; +import com.eatsfine.global.annotation.CurrentUser; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/controller/StoreTableControllerDocs.java b/src/main/java/com/eatsfine/domain/storetable/controller/StoreTableControllerDocs.java similarity index 98% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/controller/StoreTableControllerDocs.java rename to src/main/java/com/eatsfine/domain/storetable/controller/StoreTableControllerDocs.java index 5bb26e63..75bbbcbd 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/controller/StoreTableControllerDocs.java +++ b/src/main/java/com/eatsfine/domain/storetable/controller/StoreTableControllerDocs.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.storetable.controller; +package com.eatsfine.domain.storetable.controller; -import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO; -import com.eatsfine.eatsfine.domain.storetable.dto.req.StoreTableReqDto; -import com.eatsfine.eatsfine.domain.storetable.dto.res.StoreTableResDto; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.domain.booking.dto.response.BookingResponseDTO; +import com.eatsfine.domain.storetable.dto.request.StoreTableReqDto; +import com.eatsfine.domain.storetable.dto.response.StoreTableResDto; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/converter/StoreTableConverter.java b/src/main/java/com/eatsfine/domain/storetable/converter/StoreTableConverter.java similarity index 93% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/converter/StoreTableConverter.java rename to src/main/java/com/eatsfine/domain/storetable/converter/StoreTableConverter.java index b7e8a515..8d978089 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/converter/StoreTableConverter.java +++ b/src/main/java/com/eatsfine/domain/storetable/converter/StoreTableConverter.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.storetable.converter; +package com.eatsfine.domain.storetable.converter; -import com.eatsfine.eatsfine.domain.storetable.dto.req.StoreTableReqDto; -import com.eatsfine.eatsfine.domain.storetable.dto.res.StoreTableResDto; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.storetable.util.SlotCalculator; +import com.eatsfine.domain.storetable.dto.request.StoreTableReqDto; +import com.eatsfine.domain.storetable.dto.response.StoreTableResDto; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.storetable.util.SlotCalculator; import java.time.LocalDate; import java.time.LocalTime; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/dto/req/StoreTableReqDto.java b/src/main/java/com/eatsfine/domain/storetable/dto/request/StoreTableReqDto.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/dto/req/StoreTableReqDto.java rename to src/main/java/com/eatsfine/domain/storetable/dto/request/StoreTableReqDto.java index c10b2649..e80116e4 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/dto/req/StoreTableReqDto.java +++ b/src/main/java/com/eatsfine/domain/storetable/dto/request/StoreTableReqDto.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.storetable.dto.req; +package com.eatsfine.domain.storetable.dto.request; -import com.eatsfine.eatsfine.domain.storetable.enums.SeatsType; +import com.eatsfine.domain.storetable.enums.SeatsType; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/dto/res/StoreTableResDto.java b/src/main/java/com/eatsfine/domain/storetable/dto/response/StoreTableResDto.java similarity index 93% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/dto/res/StoreTableResDto.java rename to src/main/java/com/eatsfine/domain/storetable/dto/response/StoreTableResDto.java index aa5ef295..4675247f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/dto/res/StoreTableResDto.java +++ b/src/main/java/com/eatsfine/domain/storetable/dto/response/StoreTableResDto.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.storetable.dto.res; +package com.eatsfine.domain.storetable.dto.response; -import com.eatsfine.eatsfine.domain.storetable.enums.SeatsType; -import com.eatsfine.eatsfine.domain.tableblock.enums.SlotStatus; +import com.eatsfine.domain.storetable.enums.SeatsType; +import com.eatsfine.domain.tableblock.enums.SlotStatus; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Builder; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/entity/StoreTable.java b/src/main/java/com/eatsfine/domain/storetable/entity/StoreTable.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/entity/StoreTable.java rename to src/main/java/com/eatsfine/domain/storetable/entity/StoreTable.java index 79c96c61..60a61fd6 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/entity/StoreTable.java +++ b/src/main/java/com/eatsfine/domain/storetable/entity/StoreTable.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.storetable.entity; +package com.eatsfine.domain.storetable.entity; -import com.eatsfine.eatsfine.domain.storetable.enums.SeatsType; -import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout; +import com.eatsfine.domain.storetable.enums.SeatsType; +import com.eatsfine.domain.tablelayout.entity.TableLayout; -import com.eatsfine.eatsfine.global.common.BaseEntity; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.SQLDelete; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/enums/SeatsType.java b/src/main/java/com/eatsfine/domain/storetable/enums/SeatsType.java similarity index 82% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/enums/SeatsType.java rename to src/main/java/com/eatsfine/domain/storetable/enums/SeatsType.java index eb7ab733..3edff2f1 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/enums/SeatsType.java +++ b/src/main/java/com/eatsfine/domain/storetable/enums/SeatsType.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.storetable.enums; +package com.eatsfine.domain.storetable.enums; public enum SeatsType { GENERAL("일반석"), diff --git a/src/main/java/com/eatsfine/domain/storetable/exception/StoreTableException.java b/src/main/java/com/eatsfine/domain/storetable/exception/StoreTableException.java new file mode 100644 index 00000000..96c8bf29 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/storetable/exception/StoreTableException.java @@ -0,0 +1,10 @@ +package com.eatsfine.domain.storetable.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class StoreTableException extends GeneralException { + public StoreTableException(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/status/StoreTableErrorStatus.java b/src/main/java/com/eatsfine/domain/storetable/exception/status/StoreTableErrorStatus.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/status/StoreTableErrorStatus.java rename to src/main/java/com/eatsfine/domain/storetable/exception/status/StoreTableErrorStatus.java index d916cc99..161f9d76 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/status/StoreTableErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/storetable/exception/status/StoreTableErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.storetable.exception.status; +package com.eatsfine.domain.storetable.exception.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/status/StoreTableSuccessStatus.java b/src/main/java/com/eatsfine/domain/storetable/exception/status/StoreTableSuccessStatus.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/status/StoreTableSuccessStatus.java rename to src/main/java/com/eatsfine/domain/storetable/exception/status/StoreTableSuccessStatus.java index 125ed5cd..4d2b452a 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/status/StoreTableSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/storetable/exception/status/StoreTableSuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.storetable.exception.status; +package com.eatsfine.domain.storetable.exception.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/repository/StoreTableRepository.java b/src/main/java/com/eatsfine/domain/storetable/repository/StoreTableRepository.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/repository/StoreTableRepository.java rename to src/main/java/com/eatsfine/domain/storetable/repository/StoreTableRepository.java index ebf68d78..2bb4fada 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/repository/StoreTableRepository.java +++ b/src/main/java/com/eatsfine/domain/storetable/repository/StoreTableRepository.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.storetable.repository; +package com.eatsfine.domain.storetable.repository; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.tablelayout.entity.TableLayout; import jakarta.persistence.LockModeType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Lock; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableCommandService.java b/src/main/java/com/eatsfine/domain/storetable/service/StoreTableCommandService.java similarity index 79% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableCommandService.java rename to src/main/java/com/eatsfine/domain/storetable/service/StoreTableCommandService.java index a37bb837..4f8abc7c 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableCommandService.java +++ b/src/main/java/com/eatsfine/domain/storetable/service/StoreTableCommandService.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.storetable.service; +package com.eatsfine.domain.storetable.service; -import com.eatsfine.eatsfine.domain.storetable.dto.req.StoreTableReqDto; -import com.eatsfine.eatsfine.domain.storetable.dto.res.StoreTableResDto; +import com.eatsfine.domain.storetable.dto.request.StoreTableReqDto; +import com.eatsfine.domain.storetable.dto.response.StoreTableResDto; import org.springframework.web.multipart.MultipartFile; public interface StoreTableCommandService { diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableCommandServiceImpl.java b/src/main/java/com/eatsfine/domain/storetable/service/StoreTableCommandServiceImpl.java similarity index 89% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableCommandServiceImpl.java rename to src/main/java/com/eatsfine/domain/storetable/service/StoreTableCommandServiceImpl.java index 9a82d5de..d775005d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableCommandServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/storetable/service/StoreTableCommandServiceImpl.java @@ -1,25 +1,25 @@ -package com.eatsfine.eatsfine.domain.storetable.service; - -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; -import com.eatsfine.eatsfine.domain.image.exception.ImageException; -import com.eatsfine.eatsfine.domain.image.status.ImageErrorStatus; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.domain.storetable.converter.StoreTableConverter; -import com.eatsfine.eatsfine.domain.storetable.dto.req.StoreTableReqDto; -import com.eatsfine.eatsfine.domain.storetable.dto.res.StoreTableResDto; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.storetable.exception.StoreTableException; -import com.eatsfine.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; -import com.eatsfine.eatsfine.domain.storetable.repository.StoreTableRepository; -import com.eatsfine.eatsfine.domain.storetable.validator.StoreTableValidator; -import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout; -import com.eatsfine.eatsfine.domain.table_layout.exception.TableLayoutException; -import com.eatsfine.eatsfine.domain.table_layout.exception.status.TableLayoutErrorStatus; -import com.eatsfine.eatsfine.domain.table_layout.repository.TableLayoutRepository; -import com.eatsfine.eatsfine.global.s3.S3Service; +package com.eatsfine.domain.storetable.service; + +import com.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.image.exception.ImageException; +import com.eatsfine.domain.image.status.ImageErrorStatus; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.domain.storetable.converter.StoreTableConverter; +import com.eatsfine.domain.storetable.dto.request.StoreTableReqDto; +import com.eatsfine.domain.storetable.dto.response.StoreTableResDto; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.storetable.exception.StoreTableException; +import com.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; +import com.eatsfine.domain.storetable.repository.StoreTableRepository; +import com.eatsfine.domain.storetable.validator.StoreTableValidator; +import com.eatsfine.domain.tablelayout.entity.TableLayout; +import com.eatsfine.domain.tablelayout.exception.TableLayoutException; +import com.eatsfine.domain.tablelayout.exception.status.TableLayoutErrorStatus; +import com.eatsfine.domain.tablelayout.repository.TableLayoutRepository; +import com.eatsfine.global.s3.S3Service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableQueryService.java b/src/main/java/com/eatsfine/domain/storetable/service/StoreTableQueryService.java similarity index 69% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableQueryService.java rename to src/main/java/com/eatsfine/domain/storetable/service/StoreTableQueryService.java index 16b40890..b0ed16d8 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableQueryService.java +++ b/src/main/java/com/eatsfine/domain/storetable/service/StoreTableQueryService.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.storetable.service; +package com.eatsfine.domain.storetable.service; -import com.eatsfine.eatsfine.domain.storetable.dto.res.StoreTableResDto; +import com.eatsfine.domain.storetable.dto.response.StoreTableResDto; import java.time.LocalDate; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableQueryServiceImpl.java b/src/main/java/com/eatsfine/domain/storetable/service/StoreTableQueryServiceImpl.java similarity index 72% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableQueryServiceImpl.java rename to src/main/java/com/eatsfine/domain/storetable/service/StoreTableQueryServiceImpl.java index 113b66d9..dad09f3b 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/service/StoreTableQueryServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/storetable/service/StoreTableQueryServiceImpl.java @@ -1,22 +1,22 @@ -package com.eatsfine.eatsfine.domain.storetable.service; - -import com.eatsfine.eatsfine.domain.booking.entity.Booking; -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.domain.storetable.converter.StoreTableConverter; -import com.eatsfine.eatsfine.domain.storetable.dto.res.StoreTableResDto; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.storetable.exception.StoreTableException; -import com.eatsfine.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; -import com.eatsfine.eatsfine.domain.storetable.repository.StoreTableRepository; -import com.eatsfine.eatsfine.domain.storetable.util.SlotCalculator; -import com.eatsfine.eatsfine.domain.storetable.validator.StoreTableValidator; -import com.eatsfine.eatsfine.domain.tableblock.entity.TableBlock; -import com.eatsfine.eatsfine.domain.tableblock.repository.TableBlockRepository; -import com.eatsfine.eatsfine.global.s3.S3Service; +package com.eatsfine.domain.storetable.service; + +import com.eatsfine.domain.booking.entity.Booking; +import com.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.domain.storetable.converter.StoreTableConverter; +import com.eatsfine.domain.storetable.dto.response.StoreTableResDto; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.storetable.exception.StoreTableException; +import com.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; +import com.eatsfine.domain.storetable.repository.StoreTableRepository; +import com.eatsfine.domain.storetable.util.SlotCalculator; +import com.eatsfine.domain.storetable.validator.StoreTableValidator; +import com.eatsfine.domain.tableblock.entity.TableBlock; +import com.eatsfine.domain.tableblock.repository.TableBlockRepository; +import com.eatsfine.global.s3.S3Service; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/util/SlotCalculator.java b/src/main/java/com/eatsfine/domain/storetable/util/SlotCalculator.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/util/SlotCalculator.java rename to src/main/java/com/eatsfine/domain/storetable/util/SlotCalculator.java index 8c372ac8..e0a3f813 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/util/SlotCalculator.java +++ b/src/main/java/com/eatsfine/domain/storetable/util/SlotCalculator.java @@ -1,12 +1,12 @@ -package com.eatsfine.eatsfine.domain.storetable.util; - -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.storetable.exception.StoreTableException; -import com.eatsfine.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; -import com.eatsfine.eatsfine.domain.tableblock.entity.TableBlock; -import com.eatsfine.eatsfine.domain.tableblock.enums.SlotStatus; +package com.eatsfine.domain.storetable.util; + +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.storetable.exception.StoreTableException; +import com.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; +import com.eatsfine.domain.tableblock.entity.TableBlock; +import com.eatsfine.domain.tableblock.enums.SlotStatus; import java.time.DayOfWeek; import java.time.LocalDate; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/validator/StoreTableValidator.java b/src/main/java/com/eatsfine/domain/storetable/validator/StoreTableValidator.java similarity index 86% rename from src/main/java/com/eatsfine/eatsfine/domain/storetable/validator/StoreTableValidator.java rename to src/main/java/com/eatsfine/domain/storetable/validator/StoreTableValidator.java index 7c4ec079..249ffb2a 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/validator/StoreTableValidator.java +++ b/src/main/java/com/eatsfine/domain/storetable/validator/StoreTableValidator.java @@ -1,10 +1,10 @@ -package com.eatsfine.eatsfine.domain.storetable.validator; +package com.eatsfine.domain.storetable.validator; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.storetable.exception.StoreTableException; -import com.eatsfine.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; -import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.storetable.exception.StoreTableException; +import com.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; +import com.eatsfine.domain.tablelayout.entity.TableLayout; import java.util.List; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/controller/TableBlockController.java b/src/main/java/com/eatsfine/domain/tableblock/controller/TableBlockController.java similarity index 69% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/controller/TableBlockController.java rename to src/main/java/com/eatsfine/domain/tableblock/controller/TableBlockController.java index b98e34a2..12c0ae22 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/controller/TableBlockController.java +++ b/src/main/java/com/eatsfine/domain/tableblock/controller/TableBlockController.java @@ -1,11 +1,11 @@ -package com.eatsfine.eatsfine.domain.tableblock.controller; +package com.eatsfine.domain.tableblock.controller; -import com.eatsfine.eatsfine.domain.tableblock.dto.req.TableBlockReqDto; -import com.eatsfine.eatsfine.domain.tableblock.dto.res.TableBlockResDto; -import com.eatsfine.eatsfine.domain.tableblock.exception.status.TableBlockSuccessStatus; -import com.eatsfine.eatsfine.domain.tableblock.service.TableBlockCommandService; -import com.eatsfine.eatsfine.global.annotation.CurrentUser; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.domain.tableblock.dto.request.TableBlockReqDto; +import com.eatsfine.domain.tableblock.dto.response.TableBlockResDto; +import com.eatsfine.domain.tableblock.exception.status.TableBlockSuccessStatus; +import com.eatsfine.domain.tableblock.service.TableBlockCommandService; +import com.eatsfine.global.annotation.CurrentUser; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/controller/TableBlockControllerDocs.java b/src/main/java/com/eatsfine/domain/tableblock/controller/TableBlockControllerDocs.java similarity index 87% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/controller/TableBlockControllerDocs.java rename to src/main/java/com/eatsfine/domain/tableblock/controller/TableBlockControllerDocs.java index 0d7052ac..acd24a80 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/controller/TableBlockControllerDocs.java +++ b/src/main/java/com/eatsfine/domain/tableblock/controller/TableBlockControllerDocs.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.tableblock.controller; +package com.eatsfine.domain.tableblock.controller; -import com.eatsfine.eatsfine.domain.tableblock.dto.req.TableBlockReqDto; -import com.eatsfine.eatsfine.domain.tableblock.dto.res.TableBlockResDto; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.domain.tableblock.dto.request.TableBlockReqDto; +import com.eatsfine.domain.tableblock.dto.response.TableBlockResDto; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponses; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/converter/TableBlockConverter.java b/src/main/java/com/eatsfine/domain/tableblock/converter/TableBlockConverter.java similarity index 68% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/converter/TableBlockConverter.java rename to src/main/java/com/eatsfine/domain/tableblock/converter/TableBlockConverter.java index 9b9b327a..18127a22 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/converter/TableBlockConverter.java +++ b/src/main/java/com/eatsfine/domain/tableblock/converter/TableBlockConverter.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.tableblock.converter; +package com.eatsfine.domain.tableblock.converter; -import com.eatsfine.eatsfine.domain.tableblock.dto.res.TableBlockResDto; -import com.eatsfine.eatsfine.domain.tableblock.entity.TableBlock; -import com.eatsfine.eatsfine.domain.tableblock.enums.SlotStatus; +import com.eatsfine.domain.tableblock.dto.response.TableBlockResDto; +import com.eatsfine.domain.tableblock.entity.TableBlock; +import com.eatsfine.domain.tableblock.enums.SlotStatus; public class TableBlockConverter { public static TableBlockResDto.SlotStatusUpdateDto toSlotStatusUpdateDto(TableBlock tableBlock, SlotStatus status) { diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/dto/req/TableBlockReqDto.java b/src/main/java/com/eatsfine/domain/tableblock/dto/request/TableBlockReqDto.java similarity index 84% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/dto/req/TableBlockReqDto.java rename to src/main/java/com/eatsfine/domain/tableblock/dto/request/TableBlockReqDto.java index 8cde0dd4..c4d92237 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/dto/req/TableBlockReqDto.java +++ b/src/main/java/com/eatsfine/domain/tableblock/dto/request/TableBlockReqDto.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.tableblock.dto.req; +package com.eatsfine.domain.tableblock.dto.request; -import com.eatsfine.eatsfine.domain.tableblock.enums.SlotStatus; +import com.eatsfine.domain.tableblock.enums.SlotStatus; import com.fasterxml.jackson.annotation.JsonFormat; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/dto/res/TableBlockResDto.java b/src/main/java/com/eatsfine/domain/tableblock/dto/response/TableBlockResDto.java similarity index 84% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/dto/res/TableBlockResDto.java rename to src/main/java/com/eatsfine/domain/tableblock/dto/response/TableBlockResDto.java index 3fd1cf95..bf4f05c8 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/dto/res/TableBlockResDto.java +++ b/src/main/java/com/eatsfine/domain/tableblock/dto/response/TableBlockResDto.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.tableblock.dto.res; +package com.eatsfine.domain.tableblock.dto.response; -import com.eatsfine.eatsfine.domain.tableblock.enums.SlotStatus; +import com.eatsfine.domain.tableblock.enums.SlotStatus; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Builder; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/entity/TableBlock.java b/src/main/java/com/eatsfine/domain/tableblock/entity/TableBlock.java similarity index 80% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/entity/TableBlock.java rename to src/main/java/com/eatsfine/domain/tableblock/entity/TableBlock.java index 0c50b23f..fe821926 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/entity/TableBlock.java +++ b/src/main/java/com/eatsfine/domain/tableblock/entity/TableBlock.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.tableblock.entity; +package com.eatsfine.domain.tableblock.entity; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.global.common.BaseEntity; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/enums/SlotStatus.java b/src/main/java/com/eatsfine/domain/tableblock/enums/SlotStatus.java similarity index 60% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/enums/SlotStatus.java rename to src/main/java/com/eatsfine/domain/tableblock/enums/SlotStatus.java index 9b35d668..d090d56d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/enums/SlotStatus.java +++ b/src/main/java/com/eatsfine/domain/tableblock/enums/SlotStatus.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.tableblock.enums; +package com.eatsfine.domain.tableblock.enums; public enum SlotStatus { AVAILABLE, diff --git a/src/main/java/com/eatsfine/domain/tableblock/exception/TableBlockException.java b/src/main/java/com/eatsfine/domain/tableblock/exception/TableBlockException.java new file mode 100644 index 00000000..75a0ee74 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/tableblock/exception/TableBlockException.java @@ -0,0 +1,10 @@ +package com.eatsfine.domain.tableblock.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class TableBlockException extends GeneralException { + public TableBlockException(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/status/TableBlockErrorStatus.java b/src/main/java/com/eatsfine/domain/tableblock/exception/status/TableBlockErrorStatus.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/status/TableBlockErrorStatus.java rename to src/main/java/com/eatsfine/domain/tableblock/exception/status/TableBlockErrorStatus.java index d2b6daa0..a4488630 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/status/TableBlockErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/tableblock/exception/status/TableBlockErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.tableblock.exception.status; +package com.eatsfine.domain.tableblock.exception.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/status/TableBlockSuccessStatus.java b/src/main/java/com/eatsfine/domain/tableblock/exception/status/TableBlockSuccessStatus.java similarity index 82% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/status/TableBlockSuccessStatus.java rename to src/main/java/com/eatsfine/domain/tableblock/exception/status/TableBlockSuccessStatus.java index 216caa41..8d027c3b 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/status/TableBlockSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/tableblock/exception/status/TableBlockSuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.tableblock.exception.status; +package com.eatsfine.domain.tableblock.exception.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/repository/TableBlockRepository.java b/src/main/java/com/eatsfine/domain/tableblock/repository/TableBlockRepository.java similarity index 71% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/repository/TableBlockRepository.java rename to src/main/java/com/eatsfine/domain/tableblock/repository/TableBlockRepository.java index 4aca3a2e..e6599a00 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/repository/TableBlockRepository.java +++ b/src/main/java/com/eatsfine/domain/tableblock/repository/TableBlockRepository.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.tableblock.repository; +package com.eatsfine.domain.tableblock.repository; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.tableblock.entity.TableBlock; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.tableblock.entity.TableBlock; import org.springframework.data.jpa.repository.JpaRepository; import java.time.LocalDate; diff --git a/src/main/java/com/eatsfine/domain/tableblock/service/TableBlockCommandService.java b/src/main/java/com/eatsfine/domain/tableblock/service/TableBlockCommandService.java new file mode 100644 index 00000000..67b40c17 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/tableblock/service/TableBlockCommandService.java @@ -0,0 +1,8 @@ +package com.eatsfine.domain.tableblock.service; + +import com.eatsfine.domain.tableblock.dto.request.TableBlockReqDto; +import com.eatsfine.domain.tableblock.dto.response.TableBlockResDto; + +public interface TableBlockCommandService { + TableBlockResDto.SlotStatusUpdateDto updateSlotStatus(Long storeId, Long tableId, TableBlockReqDto.SlotStatusUpdateDto dto, String email); +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/service/TableBlockCommandServiceImpl.java b/src/main/java/com/eatsfine/domain/tableblock/service/TableBlockCommandServiceImpl.java similarity index 67% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/service/TableBlockCommandServiceImpl.java rename to src/main/java/com/eatsfine/domain/tableblock/service/TableBlockCommandServiceImpl.java index 5a454e16..844b5648 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/service/TableBlockCommandServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/tableblock/service/TableBlockCommandServiceImpl.java @@ -1,25 +1,25 @@ -package com.eatsfine.eatsfine.domain.tableblock.service; - -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.storetable.exception.StoreTableException; -import com.eatsfine.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; -import com.eatsfine.eatsfine.domain.storetable.repository.StoreTableRepository; -import com.eatsfine.eatsfine.domain.storetable.validator.StoreTableValidator; -import com.eatsfine.eatsfine.domain.tableblock.converter.TableBlockConverter; -import com.eatsfine.eatsfine.domain.tableblock.dto.req.TableBlockReqDto; -import com.eatsfine.eatsfine.domain.tableblock.dto.res.TableBlockResDto; -import com.eatsfine.eatsfine.domain.tableblock.entity.TableBlock; -import com.eatsfine.eatsfine.domain.tableblock.enums.SlotStatus; -import com.eatsfine.eatsfine.domain.tableblock.exception.TableBlockException; -import com.eatsfine.eatsfine.domain.tableblock.exception.status.TableBlockErrorStatus; -import com.eatsfine.eatsfine.domain.tableblock.repository.TableBlockRepository; -import com.eatsfine.eatsfine.domain.tableblock.validator.TableBlockValidator; +package com.eatsfine.domain.tableblock.service; + +import com.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.storetable.exception.StoreTableException; +import com.eatsfine.domain.storetable.exception.status.StoreTableErrorStatus; +import com.eatsfine.domain.storetable.repository.StoreTableRepository; +import com.eatsfine.domain.storetable.validator.StoreTableValidator; +import com.eatsfine.domain.tableblock.converter.TableBlockConverter; +import com.eatsfine.domain.tableblock.dto.request.TableBlockReqDto; +import com.eatsfine.domain.tableblock.dto.response.TableBlockResDto; +import com.eatsfine.domain.tableblock.entity.TableBlock; +import com.eatsfine.domain.tableblock.enums.SlotStatus; +import com.eatsfine.domain.tableblock.exception.TableBlockException; +import com.eatsfine.domain.tableblock.exception.status.TableBlockErrorStatus; +import com.eatsfine.domain.tableblock.repository.TableBlockRepository; +import com.eatsfine.domain.tableblock.validator.TableBlockValidator; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/validator/TableBlockValidator.java b/src/main/java/com/eatsfine/domain/tableblock/validator/TableBlockValidator.java similarity index 80% rename from src/main/java/com/eatsfine/eatsfine/domain/tableblock/validator/TableBlockValidator.java rename to src/main/java/com/eatsfine/domain/tableblock/validator/TableBlockValidator.java index 7cd1d593..9e251976 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/validator/TableBlockValidator.java +++ b/src/main/java/com/eatsfine/domain/tableblock/validator/TableBlockValidator.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.tableblock.validator; +package com.eatsfine.domain.tableblock.validator; -import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.tableblock.exception.TableBlockException; -import com.eatsfine.eatsfine.domain.tableblock.exception.status.TableBlockErrorStatus; +import com.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.tableblock.exception.TableBlockException; +import com.eatsfine.domain.tableblock.exception.status.TableBlockErrorStatus; import java.time.DayOfWeek; import java.time.LocalDate; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/controller/TableImageController.java b/src/main/java/com/eatsfine/domain/tableimage/controller/TableImageController.java similarity index 84% rename from src/main/java/com/eatsfine/eatsfine/domain/tableimage/controller/TableImageController.java rename to src/main/java/com/eatsfine/domain/tableimage/controller/TableImageController.java index d82901d1..8ac23633 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/controller/TableImageController.java +++ b/src/main/java/com/eatsfine/domain/tableimage/controller/TableImageController.java @@ -1,11 +1,11 @@ -package com.eatsfine.eatsfine.domain.tableimage.controller; +package com.eatsfine.domain.tableimage.controller; -import com.eatsfine.eatsfine.domain.tableimage.dto.TableImageResDto; -import com.eatsfine.eatsfine.domain.tableimage.service.TableImageCommandService; -import com.eatsfine.eatsfine.domain.tableimage.service.TableImageQueryService; -import com.eatsfine.eatsfine.domain.tableimage.status.TableImageSuccessStatus; -import com.eatsfine.eatsfine.global.annotation.CurrentUser; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.domain.tableimage.dto.response.TableImageResDto; +import com.eatsfine.domain.tableimage.service.TableImageCommandService; +import com.eatsfine.domain.tableimage.service.TableImageQueryService; +import com.eatsfine.domain.tableimage.status.TableImageSuccessStatus; +import com.eatsfine.global.annotation.CurrentUser; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/converter/TableImageConverter.java b/src/main/java/com/eatsfine/domain/tableimage/converter/TableImageConverter.java similarity index 89% rename from src/main/java/com/eatsfine/eatsfine/domain/tableimage/converter/TableImageConverter.java rename to src/main/java/com/eatsfine/domain/tableimage/converter/TableImageConverter.java index c2428480..921540e5 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/converter/TableImageConverter.java +++ b/src/main/java/com/eatsfine/domain/tableimage/converter/TableImageConverter.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.tableimage.converter; +package com.eatsfine.domain.tableimage.converter; -import com.eatsfine.eatsfine.domain.tableimage.dto.TableImageResDto; +import com.eatsfine.domain.tableimage.dto.response.TableImageResDto; import java.util.List; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/dto/TableImageResDto.java b/src/main/java/com/eatsfine/domain/tableimage/dto/response/TableImageResDto.java similarity index 93% rename from src/main/java/com/eatsfine/eatsfine/domain/tableimage/dto/TableImageResDto.java rename to src/main/java/com/eatsfine/domain/tableimage/dto/response/TableImageResDto.java index fb012542..81c0c33f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/dto/TableImageResDto.java +++ b/src/main/java/com/eatsfine/domain/tableimage/dto/response/TableImageResDto.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.tableimage.dto; +package com.eatsfine.domain.tableimage.dto.response; import lombok.Builder; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/entity/TableImage.java b/src/main/java/com/eatsfine/domain/tableimage/entity/TableImage.java similarity index 80% rename from src/main/java/com/eatsfine/eatsfine/domain/tableimage/entity/TableImage.java rename to src/main/java/com/eatsfine/domain/tableimage/entity/TableImage.java index eea650e1..e2124274 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/entity/TableImage.java +++ b/src/main/java/com/eatsfine/domain/tableimage/entity/TableImage.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.tableimage.entity; +package com.eatsfine.domain.tableimage.entity; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.global.common.BaseEntity; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/repository/TableImageRepository.java b/src/main/java/com/eatsfine/domain/tableimage/repository/TableImageRepository.java similarity index 75% rename from src/main/java/com/eatsfine/eatsfine/domain/tableimage/repository/TableImageRepository.java rename to src/main/java/com/eatsfine/domain/tableimage/repository/TableImageRepository.java index 414733be..f3dc70df 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/repository/TableImageRepository.java +++ b/src/main/java/com/eatsfine/domain/tableimage/repository/TableImageRepository.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.tableimage.repository; +package com.eatsfine.domain.tableimage.repository; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.tableimage.entity.TableImage; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.tableimage.entity.TableImage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageCommandService.java b/src/main/java/com/eatsfine/domain/tableimage/service/TableImageCommandService.java similarity index 74% rename from src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageCommandService.java rename to src/main/java/com/eatsfine/domain/tableimage/service/TableImageCommandService.java index 2077aa5c..790da4cb 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageCommandService.java +++ b/src/main/java/com/eatsfine/domain/tableimage/service/TableImageCommandService.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.tableimage.service; +package com.eatsfine.domain.tableimage.service; -import com.eatsfine.eatsfine.domain.tableimage.dto.TableImageResDto; +import com.eatsfine.domain.tableimage.dto.response.TableImageResDto; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageCommandServiceImpl.java b/src/main/java/com/eatsfine/domain/tableimage/service/TableImageCommandServiceImpl.java similarity index 73% rename from src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageCommandServiceImpl.java rename to src/main/java/com/eatsfine/domain/tableimage/service/TableImageCommandServiceImpl.java index a62e3084..340a691b 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageCommandServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/tableimage/service/TableImageCommandServiceImpl.java @@ -1,17 +1,17 @@ -package com.eatsfine.eatsfine.domain.tableimage.service; +package com.eatsfine.domain.tableimage.service; -import com.eatsfine.eatsfine.domain.image.exception.ImageException; -import com.eatsfine.eatsfine.domain.image.status.ImageErrorStatus; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.domain.tableimage.converter.TableImageConverter; -import com.eatsfine.eatsfine.domain.tableimage.dto.TableImageResDto; -import com.eatsfine.eatsfine.domain.tableimage.entity.TableImage; -import com.eatsfine.eatsfine.domain.tableimage.repository.TableImageRepository; -import com.eatsfine.eatsfine.global.s3.S3Service; +import com.eatsfine.domain.image.exception.ImageException; +import com.eatsfine.domain.image.status.ImageErrorStatus; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.domain.tableimage.converter.TableImageConverter; +import com.eatsfine.domain.tableimage.dto.response.TableImageResDto; +import com.eatsfine.domain.tableimage.entity.TableImage; +import com.eatsfine.domain.tableimage.repository.TableImageRepository; +import com.eatsfine.global.s3.S3Service; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/domain/tableimage/service/TableImageQueryService.java b/src/main/java/com/eatsfine/domain/tableimage/service/TableImageQueryService.java new file mode 100644 index 00000000..04d3d58b --- /dev/null +++ b/src/main/java/com/eatsfine/domain/tableimage/service/TableImageQueryService.java @@ -0,0 +1,7 @@ +package com.eatsfine.domain.tableimage.service; + +import com.eatsfine.domain.tableimage.dto.response.TableImageResDto; + +public interface TableImageQueryService { + TableImageResDto.GetTableImageDto getTableImage(Long storeId); +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java b/src/main/java/com/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java similarity index 65% rename from src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java rename to src/main/java/com/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java index 8e9fe7e4..edd20d2c 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java @@ -1,14 +1,14 @@ -package com.eatsfine.eatsfine.domain.tableimage.service; - -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.tableimage.converter.TableImageConverter; -import com.eatsfine.eatsfine.domain.tableimage.dto.TableImageResDto; -import com.eatsfine.eatsfine.domain.tableimage.entity.TableImage; -import com.eatsfine.eatsfine.domain.tableimage.repository.TableImageRepository; -import com.eatsfine.eatsfine.global.s3.S3Service; +package com.eatsfine.domain.tableimage.service; + +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.tableimage.converter.TableImageConverter; +import com.eatsfine.domain.tableimage.dto.response.TableImageResDto; +import com.eatsfine.domain.tableimage.entity.TableImage; +import com.eatsfine.domain.tableimage.repository.TableImageRepository; +import com.eatsfine.global.s3.S3Service; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/status/TableImageSuccessStatus.java b/src/main/java/com/eatsfine/domain/tableimage/status/TableImageSuccessStatus.java similarity index 87% rename from src/main/java/com/eatsfine/eatsfine/domain/tableimage/status/TableImageSuccessStatus.java rename to src/main/java/com/eatsfine/domain/tableimage/status/TableImageSuccessStatus.java index 058f30bb..e1f66ab4 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/status/TableImageSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/tableimage/status/TableImageSuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.tableimage.status; +package com.eatsfine.domain.tableimage.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/controller/TableLayoutController.java b/src/main/java/com/eatsfine/domain/tablelayout/controller/TableLayoutController.java similarity index 73% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/controller/TableLayoutController.java rename to src/main/java/com/eatsfine/domain/tablelayout/controller/TableLayoutController.java index 7b666b43..6560e27f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/controller/TableLayoutController.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/controller/TableLayoutController.java @@ -1,12 +1,12 @@ -package com.eatsfine.eatsfine.domain.table_layout.controller; +package com.eatsfine.domain.tablelayout.controller; -import com.eatsfine.eatsfine.domain.table_layout.dto.req.TableLayoutReqDto; -import com.eatsfine.eatsfine.domain.table_layout.dto.res.TableLayoutResDto; -import com.eatsfine.eatsfine.domain.table_layout.exception.status.TableLayoutSuccessStatus; -import com.eatsfine.eatsfine.domain.table_layout.service.TableLayoutCommandService; -import com.eatsfine.eatsfine.domain.table_layout.service.TableLayoutQueryService; -import com.eatsfine.eatsfine.global.annotation.CurrentUser; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.domain.tablelayout.dto.request.TableLayoutReqDto; +import com.eatsfine.domain.tablelayout.dto.response.TableLayoutResDto; +import com.eatsfine.domain.tablelayout.exception.status.TableLayoutSuccessStatus; +import com.eatsfine.domain.tablelayout.service.TableLayoutCommandService; +import com.eatsfine.domain.tablelayout.service.TableLayoutQueryService; +import com.eatsfine.global.annotation.CurrentUser; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/controller/TableLayoutControllerDocs.java b/src/main/java/com/eatsfine/domain/tablelayout/controller/TableLayoutControllerDocs.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/controller/TableLayoutControllerDocs.java rename to src/main/java/com/eatsfine/domain/tablelayout/controller/TableLayoutControllerDocs.java index d95f3e9f..f0d3d232 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/controller/TableLayoutControllerDocs.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/controller/TableLayoutControllerDocs.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.table_layout.controller; +package com.eatsfine.domain.tablelayout.controller; -import com.eatsfine.eatsfine.domain.table_layout.dto.req.TableLayoutReqDto; -import com.eatsfine.eatsfine.domain.table_layout.dto.res.TableLayoutResDto; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; +import com.eatsfine.domain.tablelayout.dto.request.TableLayoutReqDto; +import com.eatsfine.domain.tablelayout.dto.response.TableLayoutResDto; +import com.eatsfine.global.apipayload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.parameters.RequestBody; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/converter/TableLayoutConverter.java b/src/main/java/com/eatsfine/domain/tablelayout/converter/TableLayoutConverter.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/converter/TableLayoutConverter.java rename to src/main/java/com/eatsfine/domain/tablelayout/converter/TableLayoutConverter.java index 1dc63043..7f0df015 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/converter/TableLayoutConverter.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/converter/TableLayoutConverter.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.table_layout.converter; +package com.eatsfine.domain.tablelayout.converter; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.table_layout.dto.res.TableLayoutResDto; -import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.tablelayout.dto.response.TableLayoutResDto; +import com.eatsfine.domain.tablelayout.entity.TableLayout; public class TableLayoutConverter { // TableLayout Entity를 생성 응답 DTO로 변환 diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/dto/req/TableLayoutReqDto.java b/src/main/java/com/eatsfine/domain/tablelayout/dto/request/TableLayoutReqDto.java similarity index 93% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/dto/req/TableLayoutReqDto.java rename to src/main/java/com/eatsfine/domain/tablelayout/dto/request/TableLayoutReqDto.java index 1acda582..8b6dcb7f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/dto/req/TableLayoutReqDto.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/dto/request/TableLayoutReqDto.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.table_layout.dto.req; +package com.eatsfine.domain.tablelayout.dto.request; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/dto/res/TableLayoutResDto.java b/src/main/java/com/eatsfine/domain/tablelayout/dto/response/TableLayoutResDto.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/dto/res/TableLayoutResDto.java rename to src/main/java/com/eatsfine/domain/tablelayout/dto/response/TableLayoutResDto.java index 1e1a4a09..18e776f6 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/dto/res/TableLayoutResDto.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/dto/response/TableLayoutResDto.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.table_layout.dto.res; +package com.eatsfine.domain.tablelayout.dto.response; -import com.eatsfine.eatsfine.domain.storetable.enums.SeatsType; +import com.eatsfine.domain.storetable.enums.SeatsType; import lombok.Builder; import java.util.List; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/entity/TableLayout.java b/src/main/java/com/eatsfine/domain/tablelayout/entity/TableLayout.java similarity index 89% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/entity/TableLayout.java rename to src/main/java/com/eatsfine/domain/tablelayout/entity/TableLayout.java index 6cffad8b..a4284da1 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/entity/TableLayout.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/entity/TableLayout.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.table_layout.entity; +package com.eatsfine.domain.tablelayout.entity; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.global.common.BaseEntity; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.SQLDelete; diff --git a/src/main/java/com/eatsfine/domain/tablelayout/exception/TableLayoutException.java b/src/main/java/com/eatsfine/domain/tablelayout/exception/TableLayoutException.java new file mode 100644 index 00000000..47360d6e --- /dev/null +++ b/src/main/java/com/eatsfine/domain/tablelayout/exception/TableLayoutException.java @@ -0,0 +1,10 @@ +package com.eatsfine.domain.tablelayout.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class TableLayoutException extends GeneralException { + public TableLayoutException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/status/TableLayoutErrorStatus.java b/src/main/java/com/eatsfine/domain/tablelayout/exception/status/TableLayoutErrorStatus.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/status/TableLayoutErrorStatus.java rename to src/main/java/com/eatsfine/domain/tablelayout/exception/status/TableLayoutErrorStatus.java index a532af0f..61f3fa36 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/status/TableLayoutErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/exception/status/TableLayoutErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.table_layout.exception.status; +package com.eatsfine.domain.tablelayout.exception.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/status/TableLayoutSuccessStatus.java b/src/main/java/com/eatsfine/domain/tablelayout/exception/status/TableLayoutSuccessStatus.java similarity index 84% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/status/TableLayoutSuccessStatus.java rename to src/main/java/com/eatsfine/domain/tablelayout/exception/status/TableLayoutSuccessStatus.java index beb03ef0..7bba6b49 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/status/TableLayoutSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/exception/status/TableLayoutSuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.table_layout.exception.status; +package com.eatsfine.domain.tablelayout.exception.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/repository/TableLayoutRepository.java b/src/main/java/com/eatsfine/domain/tablelayout/repository/TableLayoutRepository.java similarity index 65% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/repository/TableLayoutRepository.java rename to src/main/java/com/eatsfine/domain/tablelayout/repository/TableLayoutRepository.java index cea0265d..59fa3812 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/repository/TableLayoutRepository.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/repository/TableLayoutRepository.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.table_layout.repository; +package com.eatsfine.domain.tablelayout.repository; -import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout; +import com.eatsfine.domain.tablelayout.entity.TableLayout; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutCommandService.java b/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutCommandService.java new file mode 100644 index 00000000..71491a03 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutCommandService.java @@ -0,0 +1,8 @@ +package com.eatsfine.domain.tablelayout.service; + +import com.eatsfine.domain.tablelayout.dto.request.TableLayoutReqDto; +import com.eatsfine.domain.tablelayout.dto.response.TableLayoutResDto; + +public interface TableLayoutCommandService { + TableLayoutResDto.LayoutDetailDto createLayout(Long storeId, TableLayoutReqDto.LayoutCreateDto dto, String email); +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutCommandServiceImpl.java b/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutCommandServiceImpl.java similarity index 74% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutCommandServiceImpl.java rename to src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutCommandServiceImpl.java index f676b6e1..efd9bf9f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutCommandServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutCommandServiceImpl.java @@ -1,16 +1,16 @@ -package com.eatsfine.eatsfine.domain.table_layout.service; - -import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; -import com.eatsfine.eatsfine.domain.store.entity.Store; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable; -import com.eatsfine.eatsfine.domain.table_layout.converter.TableLayoutConverter; -import com.eatsfine.eatsfine.domain.table_layout.dto.req.TableLayoutReqDto; -import com.eatsfine.eatsfine.domain.table_layout.dto.res.TableLayoutResDto; -import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout; -import com.eatsfine.eatsfine.domain.table_layout.exception.TableLayoutException; -import com.eatsfine.eatsfine.domain.table_layout.exception.status.TableLayoutErrorStatus; -import com.eatsfine.eatsfine.domain.table_layout.repository.TableLayoutRepository; +package com.eatsfine.domain.tablelayout.service; + +import com.eatsfine.domain.booking.repository.BookingRepository; +import com.eatsfine.domain.store.entity.Store; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.domain.storetable.entity.StoreTable; +import com.eatsfine.domain.tablelayout.converter.TableLayoutConverter; +import com.eatsfine.domain.tablelayout.dto.request.TableLayoutReqDto; +import com.eatsfine.domain.tablelayout.dto.response.TableLayoutResDto; +import com.eatsfine.domain.tablelayout.entity.TableLayout; +import com.eatsfine.domain.tablelayout.exception.TableLayoutException; +import com.eatsfine.domain.tablelayout.exception.status.TableLayoutErrorStatus; +import com.eatsfine.domain.tablelayout.repository.TableLayoutRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutQueryService.java b/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutQueryService.java new file mode 100644 index 00000000..4ae63c15 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutQueryService.java @@ -0,0 +1,7 @@ +package com.eatsfine.domain.tablelayout.service; + +import com.eatsfine.domain.tablelayout.dto.response.TableLayoutResDto; + +public interface TableLayoutQueryService { + TableLayoutResDto.LayoutDetailDto getActiveLayout(Long storeId, String email); +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutQueryServiceImpl.java b/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutQueryServiceImpl.java similarity index 60% rename from src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutQueryServiceImpl.java rename to src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutQueryServiceImpl.java index 811bd3b2..2227d854 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutQueryServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/tablelayout/service/TableLayoutQueryServiceImpl.java @@ -1,12 +1,12 @@ -package com.eatsfine.eatsfine.domain.table_layout.service; +package com.eatsfine.domain.tablelayout.service; -import com.eatsfine.eatsfine.domain.store.exception.StoreException; -import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; -import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; -import com.eatsfine.eatsfine.domain.store.validator.StoreValidator; -import com.eatsfine.eatsfine.domain.table_layout.converter.TableLayoutConverter; -import com.eatsfine.eatsfine.domain.table_layout.dto.res.TableLayoutResDto; -import com.eatsfine.eatsfine.domain.table_layout.repository.TableLayoutRepository; +import com.eatsfine.domain.store.exception.StoreException; +import com.eatsfine.domain.store.repository.StoreRepository; +import com.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.domain.store.validator.StoreValidator; +import com.eatsfine.domain.tablelayout.converter.TableLayoutConverter; +import com.eatsfine.domain.tablelayout.dto.response.TableLayoutResDto; +import com.eatsfine.domain.tablelayout.repository.TableLayoutRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/term/entity/Term.java b/src/main/java/com/eatsfine/domain/term/entity/Term.java similarity index 82% rename from src/main/java/com/eatsfine/eatsfine/domain/term/entity/Term.java rename to src/main/java/com/eatsfine/domain/term/entity/Term.java index c2352400..51b845d1 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/term/entity/Term.java +++ b/src/main/java/com/eatsfine/domain/term/entity/Term.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.term.entity; +package com.eatsfine.domain.term.entity; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.global.common.BaseEntity; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/term/repository/TermRepository.java b/src/main/java/com/eatsfine/domain/term/repository/TermRepository.java similarity index 64% rename from src/main/java/com/eatsfine/eatsfine/domain/term/repository/TermRepository.java rename to src/main/java/com/eatsfine/domain/term/repository/TermRepository.java index 1c1c8d7f..6ef5bc72 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/term/repository/TermRepository.java +++ b/src/main/java/com/eatsfine/domain/term/repository/TermRepository.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.term.repository; +package com.eatsfine.domain.term.repository; -import com.eatsfine.eatsfine.domain.term.entity.Term; +import com.eatsfine.domain.term.entity.Term; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/controller/AuthController.java b/src/main/java/com/eatsfine/domain/user/controller/AuthController.java similarity index 80% rename from src/main/java/com/eatsfine/eatsfine/domain/user/controller/AuthController.java rename to src/main/java/com/eatsfine/domain/user/controller/AuthController.java index df8060ba..62417314 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/controller/AuthController.java +++ b/src/main/java/com/eatsfine/domain/user/controller/AuthController.java @@ -1,14 +1,14 @@ -package com.eatsfine.eatsfine.domain.user.controller; +package com.eatsfine.domain.user.controller; -import com.eatsfine.eatsfine.domain.user.dto.response.UserResponseDto; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.exception.AuthException; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.service.authService.AuthTokenService; -import com.eatsfine.eatsfine.domain.user.status.AuthErrorStatus; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; -import com.eatsfine.eatsfine.global.auth.AuthCookieProvider; -import com.eatsfine.eatsfine.global.config.jwt.JwtTokenProvider; +import com.eatsfine.domain.user.dto.response.UserResponseDto; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.exception.AuthException; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.service.auth.AuthTokenService; +import com.eatsfine.domain.user.status.AuthErrorStatus; +import com.eatsfine.global.apipayload.ApiResponse; +import com.eatsfine.global.auth.AuthCookieProvider; +import com.eatsfine.global.config.jwt.JwtTokenProvider; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/controller/UserController.java b/src/main/java/com/eatsfine/domain/user/controller/UserController.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/domain/user/controller/UserController.java rename to src/main/java/com/eatsfine/domain/user/controller/UserController.java index c4f22889..a5031f6d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/controller/UserController.java +++ b/src/main/java/com/eatsfine/domain/user/controller/UserController.java @@ -1,15 +1,15 @@ -package com.eatsfine.eatsfine.domain.user.controller; - - -import com.eatsfine.eatsfine.domain.user.dto.request.UserRequestDto; -import com.eatsfine.eatsfine.domain.user.dto.response.UserResponseDto; -import com.eatsfine.eatsfine.domain.user.exception.AuthException; -import com.eatsfine.eatsfine.domain.user.service.userService.UserService; -import com.eatsfine.eatsfine.domain.user.status.AuthErrorStatus; -import com.eatsfine.eatsfine.domain.user.status.UserSuccessStatus; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; -import com.eatsfine.eatsfine.global.auth.AuthCookieProvider; -import com.eatsfine.eatsfine.global.config.jwt.JwtTokenProvider; +package com.eatsfine.domain.user.controller; + + +import com.eatsfine.domain.user.dto.request.UserRequestDto; +import com.eatsfine.domain.user.dto.response.UserResponseDto; +import com.eatsfine.domain.user.exception.AuthException; +import com.eatsfine.domain.user.service.user.UserService; +import com.eatsfine.domain.user.status.AuthErrorStatus; +import com.eatsfine.domain.user.status.UserSuccessStatus; +import com.eatsfine.global.apipayload.ApiResponse; +import com.eatsfine.global.auth.AuthCookieProvider; +import com.eatsfine.global.config.jwt.JwtTokenProvider; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/converter/UserConverter.java b/src/main/java/com/eatsfine/domain/user/converter/UserConverter.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/domain/user/converter/UserConverter.java rename to src/main/java/com/eatsfine/domain/user/converter/UserConverter.java index 0f1d6ebe..bacf1cf8 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/converter/UserConverter.java +++ b/src/main/java/com/eatsfine/domain/user/converter/UserConverter.java @@ -1,13 +1,13 @@ -package com.eatsfine.eatsfine.domain.user.converter; +package com.eatsfine.domain.user.converter; -import com.eatsfine.eatsfine.domain.term.entity.Term; -import com.eatsfine.eatsfine.domain.user.dto.request.UserRequestDto; -import com.eatsfine.eatsfine.domain.user.dto.response.UserResponseDto; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.enums.SocialType; +import com.eatsfine.domain.term.entity.Term; +import com.eatsfine.domain.user.dto.request.UserRequestDto; +import com.eatsfine.domain.user.dto.response.UserResponseDto; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.enums.SocialType; import java.time.LocalDateTime; -import static com.eatsfine.eatsfine.domain.user.enums.Role.ROLE_CUSTOMER; +import static com.eatsfine.domain.user.enums.Role.ROLE_CUSTOMER; public class UserConverter { diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/dto/request/UserRequestDto.java b/src/main/java/com/eatsfine/domain/user/dto/request/UserRequestDto.java similarity index 97% rename from src/main/java/com/eatsfine/eatsfine/domain/user/dto/request/UserRequestDto.java rename to src/main/java/com/eatsfine/domain/user/dto/request/UserRequestDto.java index 65357478..461f9956 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/dto/request/UserRequestDto.java +++ b/src/main/java/com/eatsfine/domain/user/dto/request/UserRequestDto.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.user.dto.request; +package com.eatsfine.domain.user.dto.request; -import com.eatsfine.eatsfine.global.validator.annotation.PasswordMatch; +import com.eatsfine.global.validator.annotation.PasswordMatch; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.*; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/dto/response/UserResponseDto.java b/src/main/java/com/eatsfine/domain/user/dto/response/UserResponseDto.java similarity index 97% rename from src/main/java/com/eatsfine/eatsfine/domain/user/dto/response/UserResponseDto.java rename to src/main/java/com/eatsfine/domain/user/dto/response/UserResponseDto.java index 5562d60e..1a4656af 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/dto/response/UserResponseDto.java +++ b/src/main/java/com/eatsfine/domain/user/dto/response/UserResponseDto.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.user.dto.response; +package com.eatsfine.domain.user.dto.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/entity/User.java b/src/main/java/com/eatsfine/domain/user/entity/User.java similarity index 90% rename from src/main/java/com/eatsfine/eatsfine/domain/user/entity/User.java rename to src/main/java/com/eatsfine/domain/user/entity/User.java index e232c147..ab77e189 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/entity/User.java +++ b/src/main/java/com/eatsfine/domain/user/entity/User.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.user.entity; +package com.eatsfine.domain.user.entity; -import com.eatsfine.eatsfine.domain.term.entity.Term; -import com.eatsfine.eatsfine.domain.user.enums.Role; -import com.eatsfine.eatsfine.domain.user.enums.SocialType; -import com.eatsfine.eatsfine.global.common.BaseEntity; +import com.eatsfine.domain.term.entity.Term; +import com.eatsfine.domain.user.enums.Role; +import com.eatsfine.domain.user.enums.SocialType; +import com.eatsfine.global.common.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/eatsfine/domain/user/enums/Grade.java b/src/main/java/com/eatsfine/domain/user/enums/Grade.java new file mode 100644 index 00000000..b18994fb --- /dev/null +++ b/src/main/java/com/eatsfine/domain/user/enums/Grade.java @@ -0,0 +1,4 @@ +package com.eatsfine.domain.user.enums; + +public enum Grade { +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/enums/Role.java b/src/main/java/com/eatsfine/domain/user/enums/Role.java similarity index 51% rename from src/main/java/com/eatsfine/eatsfine/domain/user/enums/Role.java rename to src/main/java/com/eatsfine/domain/user/enums/Role.java index 857808c1..af942e84 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/enums/Role.java +++ b/src/main/java/com/eatsfine/domain/user/enums/Role.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.user.enums; +package com.eatsfine.domain.user.enums; public enum Role { ROLE_CUSTOMER, ROLE_OWNER diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/enums/SocialType.java b/src/main/java/com/eatsfine/domain/user/enums/SocialType.java similarity index 50% rename from src/main/java/com/eatsfine/eatsfine/domain/user/enums/SocialType.java rename to src/main/java/com/eatsfine/domain/user/enums/SocialType.java index c9dd89ce..e37b2348 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/enums/SocialType.java +++ b/src/main/java/com/eatsfine/domain/user/enums/SocialType.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.user.enums; +package com.eatsfine.domain.user.enums; public enum SocialType { KAKAO, diff --git a/src/main/java/com/eatsfine/domain/user/exception/AuthException.java b/src/main/java/com/eatsfine/domain/user/exception/AuthException.java new file mode 100644 index 00000000..42128ab6 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/user/exception/AuthException.java @@ -0,0 +1,11 @@ +package com.eatsfine.domain.user.exception; + + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class AuthException extends GeneralException { + public AuthException(BaseErrorCode code) { + super(code); + } +} \ No newline at end of file diff --git a/src/main/java/com/eatsfine/domain/user/exception/UserException.java b/src/main/java/com/eatsfine/domain/user/exception/UserException.java new file mode 100644 index 00000000..3e28f0f0 --- /dev/null +++ b/src/main/java/com/eatsfine/domain/user/exception/UserException.java @@ -0,0 +1,10 @@ +package com.eatsfine.domain.user.exception; + +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.exception.GeneralException; + +public class UserException extends GeneralException { + public UserException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/exception/handler/CustomOAuth2FailureHandler.java b/src/main/java/com/eatsfine/domain/user/exception/handler/CustomOAuth2FailureHandler.java similarity index 95% rename from src/main/java/com/eatsfine/eatsfine/domain/user/exception/handler/CustomOAuth2FailureHandler.java rename to src/main/java/com/eatsfine/domain/user/exception/handler/CustomOAuth2FailureHandler.java index 3e8f1c31..c33b0279 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/exception/handler/CustomOAuth2FailureHandler.java +++ b/src/main/java/com/eatsfine/domain/user/exception/handler/CustomOAuth2FailureHandler.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.domain.user.exception.handler; +package com.eatsfine.domain.user.exception.handler; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/exception/handler/CustomOAuth2SuccessHandler.java b/src/main/java/com/eatsfine/domain/user/exception/handler/CustomOAuth2SuccessHandler.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/domain/user/exception/handler/CustomOAuth2SuccessHandler.java rename to src/main/java/com/eatsfine/domain/user/exception/handler/CustomOAuth2SuccessHandler.java index 6f48d0e7..7076223d 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/exception/handler/CustomOAuth2SuccessHandler.java +++ b/src/main/java/com/eatsfine/domain/user/exception/handler/CustomOAuth2SuccessHandler.java @@ -1,14 +1,14 @@ -package com.eatsfine.eatsfine.domain.user.exception.handler; - -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.enums.SocialType; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.status.AuthErrorStatus; -import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; -import com.eatsfine.eatsfine.global.auth.AuthCookieProvider; -import com.eatsfine.eatsfine.global.config.jwt.JwtTokenProvider; +package com.eatsfine.domain.user.exception.handler; + +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.enums.SocialType; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.status.AuthErrorStatus; +import com.eatsfine.domain.user.status.UserErrorStatus; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; +import com.eatsfine.global.auth.AuthCookieProvider; +import com.eatsfine.global.config.jwt.JwtTokenProvider; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/repository/UserRepository.java b/src/main/java/com/eatsfine/domain/user/repository/UserRepository.java similarity index 66% rename from src/main/java/com/eatsfine/eatsfine/domain/user/repository/UserRepository.java rename to src/main/java/com/eatsfine/domain/user/repository/UserRepository.java index 12bca8a5..52ad05fd 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/repository/UserRepository.java +++ b/src/main/java/com/eatsfine/domain/user/repository/UserRepository.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.user.repository; +package com.eatsfine.domain.user.repository; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.enums.SocialType; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.enums.SocialType; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/service/authService/AuthTokenService.java b/src/main/java/com/eatsfine/domain/user/service/auth/AuthTokenService.java similarity index 59% rename from src/main/java/com/eatsfine/eatsfine/domain/user/service/authService/AuthTokenService.java rename to src/main/java/com/eatsfine/domain/user/service/auth/AuthTokenService.java index d7e2e479..a340e07f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/service/authService/AuthTokenService.java +++ b/src/main/java/com/eatsfine/domain/user/service/auth/AuthTokenService.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.user.service.authService; +package com.eatsfine.domain.user.service.auth; -import com.eatsfine.eatsfine.domain.user.enums.Role; +import com.eatsfine.domain.user.enums.Role; public interface AuthTokenService { diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/service/authService/AuthTokenServiceImpl.java b/src/main/java/com/eatsfine/domain/user/service/auth/AuthTokenServiceImpl.java similarity index 89% rename from src/main/java/com/eatsfine/eatsfine/domain/user/service/authService/AuthTokenServiceImpl.java rename to src/main/java/com/eatsfine/domain/user/service/auth/AuthTokenServiceImpl.java index e0715a3d..364cbf66 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/service/authService/AuthTokenServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/user/service/auth/AuthTokenServiceImpl.java @@ -1,12 +1,12 @@ -package com.eatsfine.eatsfine.domain.user.service.authService; +package com.eatsfine.domain.user.service.auth; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.enums.Role; -import com.eatsfine.eatsfine.domain.user.exception.AuthException; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.status.AuthErrorStatus; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.enums.Role; +import com.eatsfine.domain.user.exception.AuthException; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.status.AuthErrorStatus; -import com.eatsfine.eatsfine.global.config.jwt.JwtTokenProvider; +import com.eatsfine.global.config.jwt.JwtTokenProvider; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/CustomOAuth2MemberServiceImpl.java b/src/main/java/com/eatsfine/domain/user/service/oauth/CustomOAuth2MemberServiceImpl.java similarity index 95% rename from src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/CustomOAuth2MemberServiceImpl.java rename to src/main/java/com/eatsfine/domain/user/service/oauth/CustomOAuth2MemberServiceImpl.java index 4f50597d..07503319 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/CustomOAuth2MemberServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/user/service/oauth/CustomOAuth2MemberServiceImpl.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.domain.user.service.oauthService; +package com.eatsfine.domain.user.service.oauth; -import com.eatsfine.eatsfine.domain.user.enums.SocialType; +import com.eatsfine.domain.user.enums.SocialType; import lombok.RequiredArgsConstructor; import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; diff --git a/src/main/java/com/eatsfine/domain/user/service/oauth/Oauth2MemberService.java b/src/main/java/com/eatsfine/domain/user/service/oauth/Oauth2MemberService.java new file mode 100644 index 00000000..2f70bc6f --- /dev/null +++ b/src/main/java/com/eatsfine/domain/user/service/oauth/Oauth2MemberService.java @@ -0,0 +1,8 @@ +package com.eatsfine.domain.user.service.oauth; + +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.enums.SocialType; + +public interface Oauth2MemberService { + User findOrCreateOauthUser(SocialType socialType, String socialId, String email, String nickName); +} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/Oauth2MemberServiceImpl.java b/src/main/java/com/eatsfine/domain/user/service/oauth/Oauth2MemberServiceImpl.java similarity index 82% rename from src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/Oauth2MemberServiceImpl.java rename to src/main/java/com/eatsfine/domain/user/service/oauth/Oauth2MemberServiceImpl.java index fff0a0f0..17ffdbfd 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/Oauth2MemberServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/user/service/oauth/Oauth2MemberServiceImpl.java @@ -1,12 +1,12 @@ -package com.eatsfine.eatsfine.domain.user.service.oauthService; +package com.eatsfine.domain.user.service.oauth; -import com.eatsfine.eatsfine.domain.user.converter.UserConverter; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.enums.SocialType; -import com.eatsfine.eatsfine.domain.user.exception.AuthException; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.status.AuthErrorStatus; +import com.eatsfine.domain.user.converter.UserConverter; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.enums.SocialType; +import com.eatsfine.domain.user.exception.AuthException; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.status.AuthErrorStatus; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/service/userService/UserService.java b/src/main/java/com/eatsfine/domain/user/service/user/UserService.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/domain/user/service/userService/UserService.java rename to src/main/java/com/eatsfine/domain/user/service/user/UserService.java index 60c1f88b..91c34639 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/service/userService/UserService.java +++ b/src/main/java/com/eatsfine/domain/user/service/user/UserService.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.user.service.userService; +package com.eatsfine.domain.user.service.user; -import com.eatsfine.eatsfine.domain.user.dto.request.UserRequestDto; -import com.eatsfine.eatsfine.domain.user.dto.response.UserResponseDto; +import com.eatsfine.domain.user.dto.request.UserRequestDto; +import com.eatsfine.domain.user.dto.response.UserResponseDto; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/service/userService/UserServiceImpl.java b/src/main/java/com/eatsfine/domain/user/service/user/UserServiceImpl.java similarity index 90% rename from src/main/java/com/eatsfine/eatsfine/domain/user/service/userService/UserServiceImpl.java rename to src/main/java/com/eatsfine/domain/user/service/user/UserServiceImpl.java index 6e411bd2..9a9c3df1 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/service/userService/UserServiceImpl.java +++ b/src/main/java/com/eatsfine/domain/user/service/user/UserServiceImpl.java @@ -1,22 +1,22 @@ -package com.eatsfine.eatsfine.domain.user.service.userService; - - -import com.eatsfine.eatsfine.domain.businessnumber.validator.BusinessNumberValidator; -import com.eatsfine.eatsfine.domain.image.exception.ImageException; -import com.eatsfine.eatsfine.domain.image.status.ImageErrorStatus; -import com.eatsfine.eatsfine.domain.term.repository.TermRepository; -import com.eatsfine.eatsfine.domain.user.converter.UserConverter; -import com.eatsfine.eatsfine.domain.user.dto.request.UserRequestDto; -import com.eatsfine.eatsfine.domain.user.dto.response.UserResponseDto; -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.enums.Role; -import com.eatsfine.eatsfine.domain.user.exception.AuthException; -import com.eatsfine.eatsfine.domain.user.exception.UserException; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; -import com.eatsfine.eatsfine.domain.user.status.AuthErrorStatus; -import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus; -import com.eatsfine.eatsfine.global.config.jwt.JwtTokenProvider; -import com.eatsfine.eatsfine.global.s3.S3Service; +package com.eatsfine.domain.user.service.user; + + +import com.eatsfine.domain.businessnumber.validator.BusinessNumberValidator; +import com.eatsfine.domain.image.exception.ImageException; +import com.eatsfine.domain.image.status.ImageErrorStatus; +import com.eatsfine.domain.term.repository.TermRepository; +import com.eatsfine.domain.user.converter.UserConverter; +import com.eatsfine.domain.user.dto.request.UserRequestDto; +import com.eatsfine.domain.user.dto.response.UserResponseDto; +import com.eatsfine.domain.user.entity.User; +import com.eatsfine.domain.user.enums.Role; +import com.eatsfine.domain.user.exception.AuthException; +import com.eatsfine.domain.user.exception.UserException; +import com.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.status.AuthErrorStatus; +import com.eatsfine.domain.user.status.UserErrorStatus; +import com.eatsfine.global.config.jwt.JwtTokenProvider; +import com.eatsfine.global.s3.S3Service; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/status/AuthErrorStatus.java b/src/main/java/com/eatsfine/domain/user/status/AuthErrorStatus.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/domain/user/status/AuthErrorStatus.java rename to src/main/java/com/eatsfine/domain/user/status/AuthErrorStatus.java index 32b6790b..b7a3704e 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/status/AuthErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/user/status/AuthErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.user.status; +package com.eatsfine.domain.user.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/status/UserErrorStatus.java b/src/main/java/com/eatsfine/domain/user/status/UserErrorStatus.java similarity index 89% rename from src/main/java/com/eatsfine/eatsfine/domain/user/status/UserErrorStatus.java rename to src/main/java/com/eatsfine/domain/user/status/UserErrorStatus.java index a4c8b147..ba23b3df 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/status/UserErrorStatus.java +++ b/src/main/java/com/eatsfine/domain/user/status/UserErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.domain.user.status; +package com.eatsfine.domain.user.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/status/UserSuccessStatus.java b/src/main/java/com/eatsfine/domain/user/status/UserSuccessStatus.java similarity index 77% rename from src/main/java/com/eatsfine/eatsfine/domain/user/status/UserSuccessStatus.java rename to src/main/java/com/eatsfine/domain/user/status/UserSuccessStatus.java index f9f4ee55..b388b997 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/status/UserSuccessStatus.java +++ b/src/main/java/com/eatsfine/domain/user/status/UserSuccessStatus.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.domain.user.status; +package com.eatsfine.domain.user.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/exception/BookingException.java b/src/main/java/com/eatsfine/eatsfine/domain/booking/exception/BookingException.java deleted file mode 100644 index ddde48dc..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/exception/BookingException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatsfine.eatsfine.domain.booking.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class BookingException extends GeneralException { - public BookingException(BaseErrorCode code) { - super(code); - } -} \ No newline at end of file diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/exception/BusinessHoursException.java b/src/main/java/com/eatsfine/eatsfine/domain/businesshours/exception/BusinessHoursException.java deleted file mode 100644 index 63f869f7..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/businesshours/exception/BusinessHoursException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatsfine.eatsfine.domain.businesshours.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class BusinessHoursException extends GeneralException { - public BusinessHoursException(BaseErrorCode code){ - super(code); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/exception/BusinessNumberException.java b/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/exception/BusinessNumberException.java deleted file mode 100644 index f2ffb33a..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/businessnumber/exception/BusinessNumberException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.eatsfine.eatsfine.domain.businessnumber.exception; - - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class BusinessNumberException extends GeneralException { - public BusinessNumberException(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/image/exception/ImageException.java b/src/main/java/com/eatsfine/eatsfine/domain/image/exception/ImageException.java deleted file mode 100644 index 3f704010..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/image/exception/ImageException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.eatsfine.eatsfine.domain.image.exception; - - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class ImageException extends GeneralException { - public ImageException(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/service/InquiryService.java b/src/main/java/com/eatsfine/eatsfine/domain/inquiry/service/InquiryService.java deleted file mode 100644 index 8d8a01e3..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/inquiry/service/InquiryService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.eatsfine.eatsfine.domain.inquiry.service; - -import com.eatsfine.eatsfine.domain.inquiry.dto.InquiryRequestDTO; -import com.eatsfine.eatsfine.domain.inquiry.dto.InquiryResponseDTO; - -public interface InquiryService { - InquiryResponseDTO registerInquiry(InquiryRequestDTO request); -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/exception/MenuException.java b/src/main/java/com/eatsfine/eatsfine/domain/menu/exception/MenuException.java deleted file mode 100644 index c84882ff..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/exception/MenuException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatsfine.eatsfine.domain.menu.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class MenuException extends GeneralException { - public MenuException(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuQueryService.java b/src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuQueryService.java deleted file mode 100644 index f5c80cb7..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/menu/service/MenuQueryService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.eatsfine.eatsfine.domain.menu.service; - -import com.eatsfine.eatsfine.domain.menu.dto.MenuResDto; - -public interface MenuQueryService { - MenuResDto.MenuListDto getMenus(Long storeId); -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/payment/exception/PaymentException.java b/src/main/java/com/eatsfine/eatsfine/domain/payment/exception/PaymentException.java deleted file mode 100644 index c6d2580c..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/payment/exception/PaymentException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.eatsfine.eatsfine.domain.payment.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class PaymentException extends GeneralException { - - public PaymentException(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/region/exception/RegionException.java b/src/main/java/com/eatsfine/eatsfine/domain/region/exception/RegionException.java deleted file mode 100644 index 00636c22..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/region/exception/RegionException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatsfine.eatsfine.domain.region.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class RegionException extends GeneralException { - public RegionException(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/dto/projection/StoreSearchResult.java b/src/main/java/com/eatsfine/eatsfine/domain/store/dto/projection/StoreSearchResult.java deleted file mode 100644 index c134473d..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/dto/projection/StoreSearchResult.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.eatsfine.eatsfine.domain.store.dto.projection; - -import com.eatsfine.eatsfine.domain.store.entity.Store; - -public record StoreSearchResult( - Store store, - Double distance -) {} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/exception/StoreException.java b/src/main/java/com/eatsfine/eatsfine/domain/store/exception/StoreException.java deleted file mode 100644 index 1dc33a31..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/exception/StoreException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatsfine.eatsfine.domain.store.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class StoreException extends GeneralException { - public StoreException(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/StoreTableException.java b/src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/StoreTableException.java deleted file mode 100644 index ce07af04..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/storetable/exception/StoreTableException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatsfine.eatsfine.domain.storetable.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class StoreTableException extends GeneralException { - public StoreTableException(BaseErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/TableLayoutException.java b/src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/TableLayoutException.java deleted file mode 100644 index ee893b50..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/exception/TableLayoutException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatsfine.eatsfine.domain.table_layout.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class TableLayoutException extends GeneralException { - public TableLayoutException(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutCommandService.java b/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutCommandService.java deleted file mode 100644 index 28e4cc37..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutCommandService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.eatsfine.eatsfine.domain.table_layout.service; - -import com.eatsfine.eatsfine.domain.table_layout.dto.req.TableLayoutReqDto; -import com.eatsfine.eatsfine.domain.table_layout.dto.res.TableLayoutResDto; - -public interface TableLayoutCommandService { - TableLayoutResDto.LayoutDetailDto createLayout(Long storeId, TableLayoutReqDto.LayoutCreateDto dto, String email); -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutQueryService.java b/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutQueryService.java deleted file mode 100644 index ec97f7eb..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/table_layout/service/TableLayoutQueryService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.eatsfine.eatsfine.domain.table_layout.service; - -import com.eatsfine.eatsfine.domain.table_layout.dto.res.TableLayoutResDto; - -public interface TableLayoutQueryService { - TableLayoutResDto.LayoutDetailDto getActiveLayout(Long storeId, String email); -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/TableBlockException.java b/src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/TableBlockException.java deleted file mode 100644 index 29510160..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/exception/TableBlockException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatsfine.eatsfine.domain.tableblock.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class TableBlockException extends GeneralException { - public TableBlockException(BaseErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/service/TableBlockCommandService.java b/src/main/java/com/eatsfine/eatsfine/domain/tableblock/service/TableBlockCommandService.java deleted file mode 100644 index 6a902332..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableblock/service/TableBlockCommandService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.eatsfine.eatsfine.domain.tableblock.service; - -import com.eatsfine.eatsfine.domain.tableblock.dto.req.TableBlockReqDto; -import com.eatsfine.eatsfine.domain.tableblock.dto.res.TableBlockResDto; - -public interface TableBlockCommandService { - TableBlockResDto.SlotStatusUpdateDto updateSlotStatus(Long storeId, Long tableId, TableBlockReqDto.SlotStatusUpdateDto dto, String email); -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryService.java b/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryService.java deleted file mode 100644 index 52a0602e..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.eatsfine.eatsfine.domain.tableimage.service; - -import com.eatsfine.eatsfine.domain.tableimage.dto.TableImageResDto; - -public interface TableImageQueryService { - TableImageResDto.GetTableImageDto getTableImage(Long storeId); -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/enums/Grade.java b/src/main/java/com/eatsfine/eatsfine/domain/user/enums/Grade.java deleted file mode 100644 index 6f0b61c3..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/enums/Grade.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.eatsfine.eatsfine.domain.user.enums; - -public enum Grade { -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/exception/AuthException.java b/src/main/java/com/eatsfine/eatsfine/domain/user/exception/AuthException.java deleted file mode 100644 index ae9ec968..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/exception/AuthException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.eatsfine.eatsfine.domain.user.exception; - - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class AuthException extends GeneralException { - public AuthException(BaseErrorCode code) { - super(code); - } -} \ No newline at end of file diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/exception/UserException.java b/src/main/java/com/eatsfine/eatsfine/domain/user/exception/UserException.java deleted file mode 100644 index 114cce1f..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/exception/UserException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatsfine.eatsfine.domain.user.exception; - -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; - -public class UserException extends GeneralException { - public UserException(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/Oauth2MemberService.java b/src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/Oauth2MemberService.java deleted file mode 100644 index d4f1f115..00000000 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/service/oauthService/Oauth2MemberService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.eatsfine.eatsfine.domain.user.service.oauthService; - -import com.eatsfine.eatsfine.domain.user.entity.User; -import com.eatsfine.eatsfine.domain.user.enums.SocialType; - -public interface Oauth2MemberService { - User findOrCreateOauthUser(SocialType socialType, String socialId, String email, String nickName); -} diff --git a/src/main/java/com/eatsfine/eatsfine/global/annotation/CurrentUser.java b/src/main/java/com/eatsfine/global/annotation/CurrentUser.java similarity index 89% rename from src/main/java/com/eatsfine/eatsfine/global/annotation/CurrentUser.java rename to src/main/java/com/eatsfine/global/annotation/CurrentUser.java index 2304a3d0..b041bd88 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/annotation/CurrentUser.java +++ b/src/main/java/com/eatsfine/global/annotation/CurrentUser.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.annotation; +package com.eatsfine.global.annotation; import org.springframework.security.core.annotation.AuthenticationPrincipal; diff --git a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/ApiResponse.java b/src/main/java/com/eatsfine/global/apipayload/ApiResponse.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/global/apiPayload/ApiResponse.java rename to src/main/java/com/eatsfine/global/apipayload/ApiResponse.java index 2292bc40..fc7bcf6e 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/ApiResponse.java +++ b/src/main/java/com/eatsfine/global/apipayload/ApiResponse.java @@ -1,8 +1,8 @@ -package com.eatsfine.eatsfine.global.apiPayload; +package com.eatsfine.global.apipayload; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.status.SuccessStatus; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.status.SuccessStatus; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/BaseCode.java b/src/main/java/com/eatsfine/global/apipayload/code/BaseCode.java similarity index 63% rename from src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/BaseCode.java rename to src/main/java/com/eatsfine/global/apipayload/code/BaseCode.java index 8337fc82..0b867559 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/BaseCode.java +++ b/src/main/java/com/eatsfine/global/apipayload/code/BaseCode.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.apiPayload.code; +package com.eatsfine.global.apipayload.code; public interface BaseCode { ReasonDto getReason(); diff --git a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/BaseErrorCode.java b/src/main/java/com/eatsfine/global/apipayload/code/BaseErrorCode.java similarity index 67% rename from src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/BaseErrorCode.java rename to src/main/java/com/eatsfine/global/apipayload/code/BaseErrorCode.java index 54abe0d2..0735899d 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/BaseErrorCode.java +++ b/src/main/java/com/eatsfine/global/apipayload/code/BaseErrorCode.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.apiPayload.code; +package com.eatsfine.global.apipayload.code; public interface BaseErrorCode { ErrorReasonDto getReason(); diff --git a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/ErrorReasonDto.java b/src/main/java/com/eatsfine/global/apipayload/code/ErrorReasonDto.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/ErrorReasonDto.java rename to src/main/java/com/eatsfine/global/apipayload/code/ErrorReasonDto.java index f0a45b5e..0ebb5bdf 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/ErrorReasonDto.java +++ b/src/main/java/com/eatsfine/global/apipayload/code/ErrorReasonDto.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.apiPayload.code; +package com.eatsfine.global.apipayload.code; import lombok.Builder; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/ReasonDto.java b/src/main/java/com/eatsfine/global/apipayload/code/ReasonDto.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/ReasonDto.java rename to src/main/java/com/eatsfine/global/apipayload/code/ReasonDto.java index 745c799b..ed5207ac 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/ReasonDto.java +++ b/src/main/java/com/eatsfine/global/apipayload/code/ReasonDto.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.apiPayload.code; +package com.eatsfine.global.apipayload.code; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/status/ErrorStatus.java b/src/main/java/com/eatsfine/global/apipayload/code/status/ErrorStatus.java similarity index 86% rename from src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/status/ErrorStatus.java rename to src/main/java/com/eatsfine/global/apipayload/code/status/ErrorStatus.java index 86129966..2a6b2179 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/status/ErrorStatus.java +++ b/src/main/java/com/eatsfine/global/apipayload/code/status/ErrorStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.global.apiPayload.code.status; +package com.eatsfine.global.apipayload.code.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ErrorReasonDto; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.ErrorReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/status/SuccessStatus.java b/src/main/java/com/eatsfine/global/apipayload/code/status/SuccessStatus.java similarity index 81% rename from src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/status/SuccessStatus.java rename to src/main/java/com/eatsfine/global/apipayload/code/status/SuccessStatus.java index 71a8567d..55688e6b 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/status/SuccessStatus.java +++ b/src/main/java/com/eatsfine/global/apipayload/code/status/SuccessStatus.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.global.apiPayload.code.status; +package com.eatsfine.global.apipayload.code.status; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseCode; -import com.eatsfine.eatsfine.global.apiPayload.code.ReasonDto; +import com.eatsfine.global.apipayload.code.BaseCode; +import com.eatsfine.global.apipayload.code.ReasonDto; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/exception/GeneralException.java b/src/main/java/com/eatsfine/global/apipayload/exception/GeneralException.java similarity index 59% rename from src/main/java/com/eatsfine/eatsfine/global/apiPayload/exception/GeneralException.java rename to src/main/java/com/eatsfine/global/apipayload/exception/GeneralException.java index c9aa0d2f..e8cc28b5 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/exception/GeneralException.java +++ b/src/main/java/com/eatsfine/global/apipayload/exception/GeneralException.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.global.apiPayload.exception; +package com.eatsfine.global.apipayload.exception; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.BaseErrorCode; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/handler/GeneralExceptionAdvice.java b/src/main/java/com/eatsfine/global/apipayload/handler/GeneralExceptionAdvice.java similarity index 91% rename from src/main/java/com/eatsfine/eatsfine/global/apiPayload/handler/GeneralExceptionAdvice.java rename to src/main/java/com/eatsfine/global/apipayload/handler/GeneralExceptionAdvice.java index f7ccd570..9d72bafe 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/apiPayload/handler/GeneralExceptionAdvice.java +++ b/src/main/java/com/eatsfine/global/apipayload/handler/GeneralExceptionAdvice.java @@ -1,10 +1,10 @@ -package com.eatsfine.eatsfine.global.apiPayload.handler; +package com.eatsfine.global.apipayload.handler; -import com.eatsfine.eatsfine.domain.user.status.AuthErrorStatus; -import com.eatsfine.eatsfine.global.apiPayload.ApiResponse; -import com.eatsfine.eatsfine.global.apiPayload.code.BaseErrorCode; -import com.eatsfine.eatsfine.global.apiPayload.code.status.ErrorStatus; -import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException; +import com.eatsfine.domain.user.status.AuthErrorStatus; +import com.eatsfine.global.apipayload.ApiResponse; +import com.eatsfine.global.apipayload.code.BaseErrorCode; +import com.eatsfine.global.apipayload.code.status.ErrorStatus; +import com.eatsfine.global.apipayload.exception.GeneralException; import jakarta.validation.ConstraintViolationException; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/eatsfine/eatsfine/global/auth/AuthCookieProvider.java b/src/main/java/com/eatsfine/global/auth/AuthCookieProvider.java similarity index 96% rename from src/main/java/com/eatsfine/eatsfine/global/auth/AuthCookieProvider.java rename to src/main/java/com/eatsfine/global/auth/AuthCookieProvider.java index 087bc510..a4097d15 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/auth/AuthCookieProvider.java +++ b/src/main/java/com/eatsfine/global/auth/AuthCookieProvider.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.auth; +package com.eatsfine.global.auth; import org.springframework.http.ResponseCookie; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/eatsfine/eatsfine/global/auth/CustomAccessDeniedHandler.java b/src/main/java/com/eatsfine/global/auth/CustomAccessDeniedHandler.java similarity index 95% rename from src/main/java/com/eatsfine/eatsfine/global/auth/CustomAccessDeniedHandler.java rename to src/main/java/com/eatsfine/global/auth/CustomAccessDeniedHandler.java index 8c4ea21b..fb762345 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/auth/CustomAccessDeniedHandler.java +++ b/src/main/java/com/eatsfine/global/auth/CustomAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.auth; +package com.eatsfine.global.auth; import jakarta.servlet.ServletException; diff --git a/src/main/java/com/eatsfine/eatsfine/global/auth/CustomAuthenticationEntryPoint.java b/src/main/java/com/eatsfine/global/auth/CustomAuthenticationEntryPoint.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/global/auth/CustomAuthenticationEntryPoint.java rename to src/main/java/com/eatsfine/global/auth/CustomAuthenticationEntryPoint.java index b9ee691d..44610679 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/auth/CustomAuthenticationEntryPoint.java +++ b/src/main/java/com/eatsfine/global/auth/CustomAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.auth; +package com.eatsfine.global.auth; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/eatsfine/eatsfine/global/auth/HttpCookieOAuth2AuthorizationRequestRepository.java b/src/main/java/com/eatsfine/global/auth/HttpCookieOAuth2AuthorizationRequestRepository.java similarity index 99% rename from src/main/java/com/eatsfine/eatsfine/global/auth/HttpCookieOAuth2AuthorizationRequestRepository.java rename to src/main/java/com/eatsfine/global/auth/HttpCookieOAuth2AuthorizationRequestRepository.java index 8b725a4a..ba16ea99 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/auth/HttpCookieOAuth2AuthorizationRequestRepository.java +++ b/src/main/java/com/eatsfine/global/auth/HttpCookieOAuth2AuthorizationRequestRepository.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.auth; +package com.eatsfine.global.auth; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/eatsfine/eatsfine/global/auth/UserDetailsServiceImpl.java b/src/main/java/com/eatsfine/global/auth/UserDetailsServiceImpl.java similarity index 85% rename from src/main/java/com/eatsfine/eatsfine/global/auth/UserDetailsServiceImpl.java rename to src/main/java/com/eatsfine/global/auth/UserDetailsServiceImpl.java index c15046a6..66b5bc71 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/auth/UserDetailsServiceImpl.java +++ b/src/main/java/com/eatsfine/global/auth/UserDetailsServiceImpl.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.global.auth; +package com.eatsfine.global.auth; -import com.eatsfine.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.domain.user.repository.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; @@ -18,7 +18,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { @Override public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { - com.eatsfine.eatsfine.domain.user.entity.User user = userRepository.findByEmail(email) + com.eatsfine.domain.user.entity.User user = userRepository.findByEmail(email) .orElseThrow(() -> new UsernameNotFoundException("해당 사용자를 찾을 수 없습니다: " + email)); String password = user.getPassword(); diff --git a/src/main/java/com/eatsfine/eatsfine/global/common/BaseEntity.java b/src/main/java/com/eatsfine/global/common/BaseEntity.java similarity index 93% rename from src/main/java/com/eatsfine/eatsfine/global/common/BaseEntity.java rename to src/main/java/com/eatsfine/global/common/BaseEntity.java index 5ecf6ad1..344e5164 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/common/BaseEntity.java +++ b/src/main/java/com/eatsfine/global/common/BaseEntity.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.common; +package com.eatsfine.global.common; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/DeployProperties.java b/src/main/java/com/eatsfine/global/config/DeployProperties.java similarity index 79% rename from src/main/java/com/eatsfine/eatsfine/global/config/DeployProperties.java rename to src/main/java/com/eatsfine/global/config/DeployProperties.java index 5df6a9a0..e5804fe2 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/DeployProperties.java +++ b/src/main/java/com/eatsfine/global/config/DeployProperties.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config; +package com.eatsfine.global.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/JpaAuditConfig.java b/src/main/java/com/eatsfine/global/config/JpaAuditConfig.java similarity index 81% rename from src/main/java/com/eatsfine/eatsfine/global/config/JpaAuditConfig.java rename to src/main/java/com/eatsfine/global/config/JpaAuditConfig.java index c8e07b1d..d9a11423 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/JpaAuditConfig.java +++ b/src/main/java/com/eatsfine/global/config/JpaAuditConfig.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config; +package com.eatsfine.global.config; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/QueryDslConfig.java b/src/main/java/com/eatsfine/global/config/QueryDslConfig.java similarity index 92% rename from src/main/java/com/eatsfine/eatsfine/global/config/QueryDslConfig.java rename to src/main/java/com/eatsfine/global/config/QueryDslConfig.java index 36826d0d..a4fea711 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/QueryDslConfig.java +++ b/src/main/java/com/eatsfine/global/config/QueryDslConfig.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config; +package com.eatsfine.global.config; import com.querydsl.jpa.impl.JPAQueryFactory; import jakarta.persistence.EntityManager; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/RestClientConfig.java b/src/main/java/com/eatsfine/global/config/RestClientConfig.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/global/config/RestClientConfig.java rename to src/main/java/com/eatsfine/global/config/RestClientConfig.java index b90fb5e4..d4e9cf22 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/RestClientConfig.java +++ b/src/main/java/com/eatsfine/global/config/RestClientConfig.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config; +package com.eatsfine.global.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/S3Config.java b/src/main/java/com/eatsfine/global/config/S3Config.java similarity index 90% rename from src/main/java/com/eatsfine/eatsfine/global/config/S3Config.java rename to src/main/java/com/eatsfine/global/config/S3Config.java index b8c5c145..40cd4cce 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/S3Config.java +++ b/src/main/java/com/eatsfine/global/config/S3Config.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config; +package com.eatsfine.global.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/SecurityConfig.java b/src/main/java/com/eatsfine/global/config/SecurityConfig.java similarity index 92% rename from src/main/java/com/eatsfine/eatsfine/global/config/SecurityConfig.java rename to src/main/java/com/eatsfine/global/config/SecurityConfig.java index 03e7150e..c125b18b 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/SecurityConfig.java +++ b/src/main/java/com/eatsfine/global/config/SecurityConfig.java @@ -1,13 +1,13 @@ -package com.eatsfine.eatsfine.global.config; +package com.eatsfine.global.config; -import com.eatsfine.eatsfine.domain.user.exception.handler.CustomOAuth2FailureHandler; -import com.eatsfine.eatsfine.domain.user.exception.handler.CustomOAuth2SuccessHandler; -import com.eatsfine.eatsfine.domain.user.service.oauthService.CustomOAuth2MemberServiceImpl; -import com.eatsfine.eatsfine.global.auth.CustomAccessDeniedHandler; -import com.eatsfine.eatsfine.global.auth.CustomAuthenticationEntryPoint; +import com.eatsfine.domain.user.exception.handler.CustomOAuth2FailureHandler; +import com.eatsfine.domain.user.exception.handler.CustomOAuth2SuccessHandler; +import com.eatsfine.domain.user.service.oauth.CustomOAuth2MemberServiceImpl; +import com.eatsfine.global.auth.CustomAccessDeniedHandler; +import com.eatsfine.global.auth.CustomAuthenticationEntryPoint; -import com.eatsfine.eatsfine.global.auth.HttpCookieOAuth2AuthorizationRequestRepository; -import com.eatsfine.eatsfine.global.config.jwt.JwtAuthenticationFilter; +import com.eatsfine.global.auth.HttpCookieOAuth2AuthorizationRequestRepository; +import com.eatsfine.global.config.jwt.JwtAuthenticationFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/SwaggerConfig.java b/src/main/java/com/eatsfine/global/config/SwaggerConfig.java similarity index 97% rename from src/main/java/com/eatsfine/eatsfine/global/config/SwaggerConfig.java rename to src/main/java/com/eatsfine/global/config/SwaggerConfig.java index db0f57ea..76ae1b13 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/SwaggerConfig.java +++ b/src/main/java/com/eatsfine/global/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config; +package com.eatsfine.global.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/TossPaymentConfig.java b/src/main/java/com/eatsfine/global/config/TossPaymentConfig.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/global/config/TossPaymentConfig.java rename to src/main/java/com/eatsfine/global/config/TossPaymentConfig.java index d210a393..25bf3f83 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/TossPaymentConfig.java +++ b/src/main/java/com/eatsfine/global/config/TossPaymentConfig.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config; +package com.eatsfine.global.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/jwt/JwtAuthenticationFilter.java b/src/main/java/com/eatsfine/global/config/jwt/JwtAuthenticationFilter.java similarity index 98% rename from src/main/java/com/eatsfine/eatsfine/global/config/jwt/JwtAuthenticationFilter.java rename to src/main/java/com/eatsfine/global/config/jwt/JwtAuthenticationFilter.java index 904267b6..bcad7cb7 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/jwt/JwtAuthenticationFilter.java +++ b/src/main/java/com/eatsfine/global/config/jwt/JwtAuthenticationFilter.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config.jwt; +package com.eatsfine.global.config.jwt; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.JwtException; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/jwt/JwtTokenProvider.java b/src/main/java/com/eatsfine/global/config/jwt/JwtTokenProvider.java similarity index 90% rename from src/main/java/com/eatsfine/eatsfine/global/config/jwt/JwtTokenProvider.java rename to src/main/java/com/eatsfine/global/config/jwt/JwtTokenProvider.java index ad36e9e9..53106d50 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/jwt/JwtTokenProvider.java +++ b/src/main/java/com/eatsfine/global/config/jwt/JwtTokenProvider.java @@ -1,14 +1,14 @@ -package com.eatsfine.eatsfine.global.config.jwt; +package com.eatsfine.global.config.jwt; -import com.eatsfine.eatsfine.domain.user.exception.AuthException; -import com.eatsfine.eatsfine.domain.user.exception.UserException; -import com.eatsfine.eatsfine.domain.user.status.AuthErrorStatus; -import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus; -import com.eatsfine.eatsfine.global.config.properties.Constants; +import com.eatsfine.domain.user.exception.AuthException; +import com.eatsfine.domain.user.exception.UserException; +import com.eatsfine.domain.user.status.AuthErrorStatus; +import com.eatsfine.domain.user.status.UserErrorStatus; +import com.eatsfine.global.config.properties.Constants; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; -import com.eatsfine.eatsfine.global.config.properties.JwtProperties; +import com.eatsfine.global.config.properties.JwtProperties; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/properties/Constants.java b/src/main/java/com/eatsfine/global/config/properties/Constants.java similarity index 73% rename from src/main/java/com/eatsfine/eatsfine/global/config/properties/Constants.java rename to src/main/java/com/eatsfine/global/config/properties/Constants.java index d3e0d94f..111e64fa 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/properties/Constants.java +++ b/src/main/java/com/eatsfine/global/config/properties/Constants.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config.properties; +package com.eatsfine.global.config.properties; public final class Constants { public static final String AUTH_HEADER = "Authorization"; diff --git a/src/main/java/com/eatsfine/eatsfine/global/config/properties/JwtProperties.java b/src/main/java/com/eatsfine/global/config/properties/JwtProperties.java similarity index 88% rename from src/main/java/com/eatsfine/eatsfine/global/config/properties/JwtProperties.java rename to src/main/java/com/eatsfine/global/config/properties/JwtProperties.java index dd85c4fb..47603e20 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/config/properties/JwtProperties.java +++ b/src/main/java/com/eatsfine/global/config/properties/JwtProperties.java @@ -1,4 +1,4 @@ -package com.eatsfine.eatsfine.global.config.properties; +package com.eatsfine.global.config.properties; import jakarta.validation.constraints.NotBlank; import lombok.Getter; diff --git a/src/main/java/com/eatsfine/eatsfine/global/controller/HealthController.java b/src/main/java/com/eatsfine/global/controller/HealthController.java similarity index 83% rename from src/main/java/com/eatsfine/eatsfine/global/controller/HealthController.java rename to src/main/java/com/eatsfine/global/controller/HealthController.java index 4a549845..13480f9c 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/controller/HealthController.java +++ b/src/main/java/com/eatsfine/global/controller/HealthController.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.global.controller; +package com.eatsfine.global.controller; -import com.eatsfine.eatsfine.global.config.DeployProperties; +import com.eatsfine.global.config.DeployProperties; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/eatsfine/eatsfine/global/s3/S3Service.java b/src/main/java/com/eatsfine/global/s3/S3Service.java similarity index 94% rename from src/main/java/com/eatsfine/eatsfine/global/s3/S3Service.java rename to src/main/java/com/eatsfine/global/s3/S3Service.java index d3fdb380..c76b9cef 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/s3/S3Service.java +++ b/src/main/java/com/eatsfine/global/s3/S3Service.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.global.s3; +package com.eatsfine.global.s3; -import com.eatsfine.eatsfine.domain.image.exception.ImageException; -import com.eatsfine.eatsfine.domain.image.status.ImageErrorStatus; +import com.eatsfine.domain.image.exception.ImageException; +import com.eatsfine.domain.image.status.ImageErrorStatus; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/eatsfine/eatsfine/global/validator/annotation/PasswordMatch.java b/src/main/java/com/eatsfine/global/validator/annotation/PasswordMatch.java similarity index 80% rename from src/main/java/com/eatsfine/eatsfine/global/validator/annotation/PasswordMatch.java rename to src/main/java/com/eatsfine/global/validator/annotation/PasswordMatch.java index d9f16cce..aae9c33f 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/validator/annotation/PasswordMatch.java +++ b/src/main/java/com/eatsfine/global/validator/annotation/PasswordMatch.java @@ -1,6 +1,6 @@ -package com.eatsfine.eatsfine.global.validator.annotation; +package com.eatsfine.global.validator.annotation; -import com.eatsfine.eatsfine.global.validator.valid.PasswordMatchValidator; +import com.eatsfine.global.validator.valid.PasswordMatchValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/eatsfine/eatsfine/global/validator/valid/PasswordMatchValidator.java b/src/main/java/com/eatsfine/global/validator/valid/PasswordMatchValidator.java similarity index 93% rename from src/main/java/com/eatsfine/eatsfine/global/validator/valid/PasswordMatchValidator.java rename to src/main/java/com/eatsfine/global/validator/valid/PasswordMatchValidator.java index 6fd130c6..351fc3b7 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/validator/valid/PasswordMatchValidator.java +++ b/src/main/java/com/eatsfine/global/validator/valid/PasswordMatchValidator.java @@ -1,7 +1,7 @@ -package com.eatsfine.eatsfine.global.validator.valid; +package com.eatsfine.global.validator.valid; -import com.eatsfine.eatsfine.global.validator.annotation.PasswordMatch; +import com.eatsfine.global.validator.annotation.PasswordMatch; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import org.springframework.beans.BeanWrapperImpl; diff --git a/src/test/java/com/eatsfine/eatsfine/EatsfineApplicationTests.java b/src/test/java/com/eatsfine/EatsfineApplicationTests.java similarity index 65% rename from src/test/java/com/eatsfine/eatsfine/EatsfineApplicationTests.java rename to src/test/java/com/eatsfine/EatsfineApplicationTests.java index b262add2..78a7611c 100644 --- a/src/test/java/com/eatsfine/eatsfine/EatsfineApplicationTests.java +++ b/src/test/java/com/eatsfine/EatsfineApplicationTests.java @@ -1,8 +1,10 @@ -package com.eatsfine.eatsfine; +package com.eatsfine; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +@ActiveProfiles("test") @SpringBootTest class EatsfineApplicationTests { diff --git a/src/test/java/com/eatsfine/eatsfine/controller/HealthControllerTest.java b/src/test/java/com/eatsfine/controller/HealthControllerTest.java similarity index 88% rename from src/test/java/com/eatsfine/eatsfine/controller/HealthControllerTest.java rename to src/test/java/com/eatsfine/controller/HealthControllerTest.java index fc997345..e9a8e68a 100644 --- a/src/test/java/com/eatsfine/eatsfine/controller/HealthControllerTest.java +++ b/src/test/java/com/eatsfine/controller/HealthControllerTest.java @@ -1,10 +1,10 @@ -package com.eatsfine.eatsfine.controller; +package com.eatsfine.controller; -import com.eatsfine.eatsfine.global.auth.CustomAccessDeniedHandler; -import com.eatsfine.eatsfine.global.auth.CustomAuthenticationEntryPoint; -import com.eatsfine.eatsfine.global.config.DeployProperties; -import com.eatsfine.eatsfine.global.config.jwt.JwtAuthenticationFilter; -import com.eatsfine.eatsfine.global.controller.HealthController; +import com.eatsfine.global.auth.CustomAccessDeniedHandler; +import com.eatsfine.global.auth.CustomAuthenticationEntryPoint; +import com.eatsfine.global.config.DeployProperties; +import com.eatsfine.global.config.jwt.JwtAuthenticationFilter; +import com.eatsfine.global.controller.HealthController; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/eatsfine/eatsfine/domain/inquiry/controller/InquiryControllerTest.java b/src/test/java/com/eatsfine/domain/inquiry/controller/InquiryControllerTest.java similarity index 92% rename from src/test/java/com/eatsfine/eatsfine/domain/inquiry/controller/InquiryControllerTest.java rename to src/test/java/com/eatsfine/domain/inquiry/controller/InquiryControllerTest.java index 7d2c7eeb..8072bbf6 100644 --- a/src/test/java/com/eatsfine/eatsfine/domain/inquiry/controller/InquiryControllerTest.java +++ b/src/test/java/com/eatsfine/domain/inquiry/controller/InquiryControllerTest.java @@ -1,9 +1,9 @@ -package com.eatsfine.eatsfine.domain.inquiry.controller; +package com.eatsfine.domain.inquiry.controller; -import com.eatsfine.eatsfine.domain.inquiry.dto.InquiryRequestDTO; -import com.eatsfine.eatsfine.domain.inquiry.dto.InquiryResponseDTO; -import com.eatsfine.eatsfine.domain.inquiry.enums.InquiryType; -import com.eatsfine.eatsfine.domain.inquiry.service.InquiryService; +import com.eatsfine.domain.inquiry.dto.request.InquiryRequestDTO; +import com.eatsfine.domain.inquiry.dto.response.InquiryResponseDTO; +import com.eatsfine.domain.inquiry.enums.InquiryType; +import com.eatsfine.domain.inquiry.service.InquiryService; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -12,14 +12,15 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.http.MediaType; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.util.ReflectionTestUtils; import java.time.LocalDateTime; -import com.eatsfine.eatsfine.global.auth.CustomAccessDeniedHandler; -import com.eatsfine.eatsfine.global.auth.CustomAuthenticationEntryPoint; -import com.eatsfine.eatsfine.global.config.jwt.JwtAuthenticationFilter; +import com.eatsfine.global.auth.CustomAccessDeniedHandler; +import com.eatsfine.global.auth.CustomAuthenticationEntryPoint; +import com.eatsfine.global.config.jwt.JwtAuthenticationFilter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -37,6 +38,7 @@ @WebMvcTest(InquiryController.class) @WithMockUser +@ActiveProfiles("test") class InquiryControllerTest { @Autowired From 960eda7efa73d995ef753b11c0e7f876c6bfddba Mon Sep 17 00:00:00 2001 From: CHAN <150508884+zerochani@users.noreply.github.com> Date: Tue, 31 Mar 2026 22:44:46 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[CHORE]:=20.gitignore=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 8 -------- src/main/resources/application.yml | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/application.yml diff --git a/.gitignore b/.gitignore index ddc7ab30..d2ca175b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,14 +36,6 @@ out/ ### VS Code ### .vscode/ -### secret properties files ### -/src/main/resources/application-blue.yml -/src/main/resources/application-green.yml -/src/main/resources/application-local.yml - - -### Application Config (개인 설정, 보안 정보) ### -src/main/resources/application.yml ### Gradle 설정 파일 제외 build.gradle diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 00000000..822efd5d --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,5 @@ +spring: + application: + name: Eatsfine + profiles: + default: local From 98da9dbb4104c63e8c2ae8003db965611f289144 Mon Sep 17 00:00:00 2001 From: CHAN <150508884+zerochani@users.noreply.github.com> Date: Mon, 6 Apr 2026 22:37:43 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[FIX]:=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EA=B0=92=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 57feea69..0c0f8f64 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -7,14 +7,14 @@ spring: activate: on-profile: local datasource: - url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eatsfine_local}?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&zeroDateTimeBehavior=convertToNull - username: ${DB_USERNAME:user} - password: ${DB_PASSWORD:password} + url: jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&zeroDateTimeBehavior=convertToNull + username: ${DB_USERNAME} + password: ${DB_PASSWORD} driver-class-name: com.mysql.cj.jdbc.Driver data: redis: - host: ${REDIS_HOST:localhost} - port: ${REDIS_PORT:6379} + host: ${REDIS_HOST} + port: ${REDIS_PORT} jpa: hibernate: ddl-auto: update