[Refactor] 프로젝트 구조 변경 및 서비스 코드 수정

nowait-api/src/main/java/com/nowait/booking/application/BookingService.java → nowait-api/src/main/java/com/nowait/application/BookingService.java

@@ -1,15 +1,13 @@
-package com.nowait.booking.application;
+package com.nowait.application;
 
-import com.nowait.booking.domain.model.Booking;
-import com.nowait.booking.domain.model.BookingSlot;
-import com.nowait.booking.domain.repository.BookingRepository;
-import com.nowait.booking.domain.repository.BookingSlotRepository;
-import com.nowait.booking.dto.TimeSlotDto;
-import com.nowait.booking.dto.response.BookingRes;
-import com.nowait.booking.dto.response.DailyBookingStatusRes;
-import com.nowait.place.domain.repository.PlaceRepository;
-import com.nowait.user.domain.repository.UserRepository;
-import jakarta.persistence.EntityNotFoundException;
+import com.nowait.application.dto.response.booking.BookingRes;
+import com.nowait.application.dto.response.booking.DailyBookingStatusRes;
+import com.nowait.application.dto.response.booking.TimeSlotDto;
+import com.nowait.application.event.BookingEventPublisher;
+import com.nowait.domain.model.booking.Booking;
+import com.nowait.domain.model.booking.BookingSlot;
+import com.nowait.domain.repository.BookingRepository;
+import com.nowait.domain.repository.BookingSlotRepository;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.List;
@@ -25,9 +23,9 @@ public class BookingService {
 
     private final BookingSlotRepository bookingSlotRepository;
     private final BookingRepository bookingRepository;
-    private final UserRepository userRepository;
-    private final PlaceRepository placeRepository;
     private final BookingEventPublisher bookingEventPublisher;
+    private final UserService userService;
+    private final PlaceService placeService;
 
     public DailyBookingStatusRes getDailyBookingStatus(Long placeId, LocalDate date) {
         List<BookingSlot> bookingSlots = bookingSlotRepository.findAllByPlaceIdAndDate(
@@ -45,11 +43,11 @@ public DailyBookingStatusRes getDailyBookingStatus(Long placeId, LocalDate date)
     @Transactional
     public BookingRes book(Long loginId, Long placeId, LocalDate date, LocalTime time,
         Integer partySize) {
-        validateUserExist(loginId, "존재하지 않는 사용자의 요청입니다.");
-        validatePlaceExist(placeId, "존재하지 않는 식당입니다.");
+        userService.validateUserExist(loginId, "존재하지 않는 사용자의 요청입니다.");
+        placeService.validatePlaceExist(placeId, "존재하지 않는 식당입니다.");
 
         BookingSlot slot = findAvailableSlot(placeId, date, time);
-        Booking booking = bookingRepository.save(Booking.of(loginId, partySize, slot));
+        Booking booking = bookingRepository.save(Booking.of(loginId, slot, partySize));
 
         bookingEventPublisher.publishBookedEvent(booking, placeId);
 
@@ -61,18 +59,6 @@ private boolean isAvailable(List<BookingSlot> slots) {
         return slots.stream().anyMatch(slot -> !slot.isBooked());
     }
 
-    private void validateUserExist(Long userId, String errorMessage) {
-        if (!userRepository.existsById(userId)) {
-            throw new EntityNotFoundException(errorMessage);
-        }
-    }
-
-    private void validatePlaceExist(Long placeId, String errorMessage) {
-        if (!placeRepository.existsById(placeId)) {
-            throw new EntityNotFoundException(errorMessage);
-        }
-    }
-
     private BookingSlot findAvailableSlot(Long placeId, LocalDate date, LocalTime time) {
         return bookingSlotRepository.findFirstByPlaceIdAndDateAndTimeAndIsBookedFalse(placeId, date,
             time).orElseThrow(() -> new IllegalArgumentException("예약 가능한 테이블이 없습니다."));

nowait-api/src/main/java/com/nowait/application/PlaceService.java

@@ -0,0 +1,21 @@
+package com.nowait.application;
+
+import com.nowait.domain.repository.PlaceRepository;
+import jakarta.persistence.EntityNotFoundException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class PlaceService {
+
+    private final PlaceRepository placeRepository;
+
+    public void validatePlaceExist(Long placeId, String errorMessage) {
+        if (!placeRepository.existsById(placeId)) {
+            throw new EntityNotFoundException(errorMessage);
+        }
+    }
+}

nowait-api/src/main/java/com/nowait/application/UserService.java

@@ -0,0 +1,22 @@
+package com.nowait.application;
+
+import com.nowait.domain.repository.UserRepository;
+import jakarta.persistence.EntityNotFoundException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class UserService {
+
+    private final UserRepository userRepository;
+
+    public void validateUserExist(Long userId, String errorMessage) {
+        if (!userRepository.existsById(userId)) {
+            throw new EntityNotFoundException(errorMessage);
+        }
+    }
+
+}

nowait-api/src/main/java/com/nowait/auth/dto/response/GetLoginPageRes.java → nowait-api/src/main/java/com/nowait/application/dto/response/auth/GetLoginPageRes.java

@@ -1,4 +1,4 @@
-package com.nowait.auth.dto.response;
+package com.nowait.application.dto.response.auth;
 
 public record GetLoginPageRes(
     String loginPageUrl

nowait-api/src/main/java/com/nowait/auth/dto/response/LoginRes.java → nowait-api/src/main/java/com/nowait/application/dto/response/auth/LoginRes.java

@@ -1,4 +1,4 @@
-package com.nowait.auth.dto.response;
+package com.nowait.application.dto.response.auth;
 
 public record LoginRes(
     String accessToken,

nowait-api/src/main/java/com/nowait/booking/dto/response/BookingRes.java → nowait-api/src/main/java/com/nowait/application/dto/response/booking/BookingRes.java

@@ -1,7 +1,7 @@
-package com.nowait.booking.dto.response;
+package com.nowait.application.dto.response.booking;
 
-import com.nowait.booking.domain.model.Booking;
-import com.nowait.booking.domain.model.BookingSlot;
+import com.nowait.domain.model.booking.Booking;
+import com.nowait.domain.model.booking.BookingSlot;
 
 public record BookingRes(
     Long bookingId,

nowait-api/src/main/java/com/nowait/booking/dto/response/DailyBookingStatusRes.java → nowait-api/src/main/java/com/nowait/application/dto/response/booking/DailyBookingStatusRes.java

@@ -1,6 +1,5 @@
-package com.nowait.booking.dto.response;
+package com.nowait.application.dto.response.booking;
 
-import com.nowait.booking.dto.TimeSlotDto;
 import java.time.LocalDate;
 import java.util.List;
 

nowait-api/src/main/java/com/nowait/booking/dto/response/GetBookingInfoRes.java → nowait-api/src/main/java/com/nowait/application/dto/response/booking/GetBookingInfoRes.java

@@ -1,4 +1,4 @@
-package com.nowait.booking.dto.response;
+package com.nowait.application.dto.response.booking;
 
 import static com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING;
 

nowait-api/src/main/java/com/nowait/booking/dto/response/GetDepositInfoRes.java → nowait-api/src/main/java/com/nowait/application/dto/response/booking/GetDepositInfoRes.java

@@ -1,4 +1,4 @@
-package com.nowait.booking.dto.response;
+package com.nowait.application.dto.response.booking;
 
 public record GetDepositInfoRes(
     Long bookingId,

nowait-api/src/main/java/com/nowait/booking/dto/TimeSlotDto.java → nowait-api/src/main/java/com/nowait/application/dto/response/booking/TimeSlotDto.java

@@ -1,4 +1,4 @@
-package com.nowait.booking.dto;
+package com.nowait.application.dto.response.booking;
 
 import static com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING;
 

nowait-api/src/main/java/com/nowait/application/dto/response/payment/PayDepositRes.java

@@ -0,0 +1,10 @@
+package com.nowait.application.dto.response.payment;
+
+public record PayDepositRes(
+    Long paymentId,
+    String paymentStatus,
+    String paymentMethod,
+    String url
+) {
+
+}

nowait-api/src/main/java/com/nowait/common/event/BookedEvent.java → nowait-api/src/main/java/com/nowait/application/event/BookedEvent.java

@@ -1,4 +1,4 @@
-package com.nowait.common.event;
+package com.nowait.application.event;
 
 public record BookedEvent(
     Long bookingId,

nowait-api/src/main/java/com/nowait/booking/application/BookingEventPublisher.java → nowait-api/src/main/java/com/nowait/application/event/BookingEventPublisher.java

@@ -1,7 +1,6 @@
-package com.nowait.booking.application;
+package com.nowait.application.event;
 
-import com.nowait.booking.domain.model.Booking;
-import com.nowait.common.event.BookedEvent;
+import com.nowait.domain.model.booking.Booking;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.annotation.Async;

nowait-api/src/main/java/com/nowait/common/config/JpaConfig.java → nowait-api/src/main/java/com/nowait/config/JpaConfig.java

@@ -1,4 +1,4 @@
-package com.nowait.common.config;
+package com.nowait.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

nowait-api/src/main/java/com/nowait/auth/api/AuthApi.java → nowait-api/src/main/java/com/nowait/controller/api/AuthApi.java

@@ -1,9 +1,9 @@
-package com.nowait.auth.api;
+package com.nowait.controller.api;
 
-import com.nowait.auth.dto.request.ReissueTokenReq;
-import com.nowait.auth.dto.response.GetLoginPageRes;
-import com.nowait.auth.dto.response.LoginRes;
-import com.nowait.common.api.dto.ApiResult;
+import com.nowait.application.dto.response.auth.GetLoginPageRes;
+import com.nowait.application.dto.response.auth.LoginRes;
+import com.nowait.controller.api.dto.request.ReissueTokenReq;
+import com.nowait.controller.api.dto.response.ApiResult;
 import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

nowait-api/src/main/java/com/nowait/booking/api/BookingApi.java → nowait-api/src/main/java/com/nowait/controller/api/BookingApi.java

@@ -1,13 +1,13 @@
-package com.nowait.booking.api;
+package com.nowait.controller.api;
 
-import com.nowait.booking.application.BookingService;
-import com.nowait.booking.dto.TimeSlotDto;
-import com.nowait.booking.dto.request.BookingReq;
-import com.nowait.booking.dto.response.BookingRes;
-import com.nowait.booking.dto.response.DailyBookingStatusRes;
-import com.nowait.booking.dto.response.GetBookingInfoRes;
-import com.nowait.booking.dto.response.GetDepositInfoRes;
-import com.nowait.common.api.dto.ApiResult;
+import com.nowait.application.BookingService;
+import com.nowait.application.dto.response.booking.BookingRes;
+import com.nowait.application.dto.response.booking.DailyBookingStatusRes;
+import com.nowait.application.dto.response.booking.GetBookingInfoRes;
+import com.nowait.application.dto.response.booking.GetDepositInfoRes;
+import com.nowait.application.dto.response.booking.TimeSlotDto;
+import com.nowait.controller.api.dto.request.BookingReq;
+import com.nowait.controller.api.dto.response.ApiResult;
 import jakarta.validation.Valid;
 import java.time.LocalDate;
 import java.time.LocalDateTime;

nowait-api/src/main/java/com/nowait/notification/api/NotificationApi.java → nowait-api/src/main/java/com/nowait/controller/api/NotificationApi.java

@@ -1,7 +1,7 @@
-package com.nowait.notification.api;
+package com.nowait.controller.api;
 
-import com.nowait.common.api.dto.ApiResult;
-import com.nowait.notification.dto.request.SetVacancyNotificationReq;
+import com.nowait.controller.api.dto.request.SetVacancyNotificationReq;
+import com.nowait.controller.api.dto.response.ApiResult;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;

nowait-api/src/main/java/com/nowait/controller/api/PaymentApi.java

@@ -0,0 +1,32 @@
+package com.nowait.controller.api;
+
+import com.nowait.application.dto.response.payment.PayDepositRes;
+import com.nowait.controller.api.dto.request.PayDepositReq;
+import com.nowait.controller.api.dto.response.ApiResult;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/payments")
+@RequiredArgsConstructor
+public class PaymentApi {
+
+    /**
+     * 예약금 결제 API
+     *
+     * @param request 예약금 결제 요청
+     * @return 예약금 결제 결과
+     */
+    @PostMapping("/deposit")
+    public ApiResult<PayDepositRes> payDeposit(
+        @RequestBody @Valid PayDepositReq request
+    ) {
+        // TODO: 예약금 결제 비즈니스 로직 호출
+
+        return ApiResult.ok(null);
+    }
+}

nowait-api/src/main/java/com/nowait/booking/dto/request/BookingReq.java → nowait-api/src/main/java/com/nowait/controller/api/dto/request/BookingReq.java

@@ -1,4 +1,4 @@
-package com.nowait.booking.dto.request;
+package com.nowait.controller.api.dto.request;
 
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDate;

nowait-api/src/main/java/com/nowait/controller/api/dto/request/PayDepositReq.java

@@ -0,0 +1,10 @@
+package com.nowait.controller.api.dto.request;
+
+public record PayDepositReq(
+    Long bookingId,
+    String paymentMethod,
+    Integer amount,
+    String currency
+) {
+
+}

nowait-api/src/main/java/com/nowait/auth/dto/request/ReissueTokenReq.java → nowait-api/src/main/java/com/nowait/controller/api/dto/request/ReissueTokenReq.java

@@ -1,4 +1,4 @@
-package com.nowait.auth.dto.request;
+package com.nowait.controller.api.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 

nowait-api/src/main/java/com/nowait/notification/dto/request/SetVacancyNotificationReq.java → nowait-api/src/main/java/com/nowait/controller/api/dto/request/SetVacancyNotificationReq.java

@@ -1,4 +1,4 @@
-package com.nowait.notification.dto.request;
+package com.nowait.controller.api.dto.request;
 
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDate;

nowait-api/src/main/java/com/nowait/common/api/dto/ApiResult.java → nowait-api/src/main/java/com/nowait/controller/api/dto/response/ApiResult.java

@@ -1,10 +1,10 @@
-package com.nowait.common.api.dto;
+package com.nowait.controller.api.dto.response;
 
 import org.springframework.http.HttpStatus;
 
 /**
  * API 응답을 표준화하기 위한 제네릭 레코드(Record)
- *
+ * <p>
  * 이 클래스는 API 응답에서 반환되는 상태 코드, 상태 메시지, 응답 데이터 등을 포함하여
  * 일관된 응답 형식을 제공하기 위해 설계되었습니다.
  */
@@ -14,6 +14,7 @@ public record ApiResult<T>(
     String message,
     T data
 ) {
+
     private ApiResult(HttpStatus status, String message, T data) {
         this(status.value(), status, message, data);
     }

nowait-api/src/main/java/com/nowait/common/domain/model/BaseTimeEntity.java → nowait-api/src/main/java/com/nowait/domain/model/BaseTimeEntity.java

@@ -1,4 +1,4 @@
-package com.nowait.common.domain.model;
+package com.nowait.domain.model;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.EntityListeners;