[REFACTOR]: 프로젝트 파일 구조 정리

.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
@@ -53,3 +45,5 @@ build.gradle
 
 src/main/resources/static/payment-test.html
 src/main/resources/static/payment-success.html
+
+.env

src/main/java/com/eatsfine/eatsfine/EatsfineApplication.java → 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;

src/main/java/com/eatsfine/eatsfine/domain/booking/controller/BookingController.java → 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<BookingResponseDTO.CreateBookingResultDTO> 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<BookingResponseDTO.CancelBookingResultDTO> 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<BookingResponseDTO.BookingPreviewListDTO> 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로 맞춰줍니다.

src/main/java/com/eatsfine/eatsfine/domain/booking/converter/BookingConverter.java → 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;

src/main/java/com/eatsfine/eatsfine/domain/booking/dto/request/BookingRequestDTO.java → 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;

src/main/java/com/eatsfine/eatsfine/domain/booking/dto/response/BookingResponseDTO.java → 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;

src/main/java/com/eatsfine/eatsfine/domain/booking/entity/Booking.java → 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.*;

src/main/java/com/eatsfine/eatsfine/domain/booking/entity/mapping/BookingMenu.java → 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.*;
 

src/main/java/com/eatsfine/eatsfine/domain/booking/entity/mapping/BookingTable.java → 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.*;
 

src/main/java/com/eatsfine/eatsfine/domain/booking/enums/BookingStatus.java → 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 {
 

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);
+    }
+}

src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java → 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<Booking> 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<Long> 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<Object[]> countActiveBookingsByStores(@Param("stores") List<Store> stores);
 }

src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingCommandService.java → 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;
 

src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingCommandServiceImpl.java → 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;

src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingQueryService.java → 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;