diff --git a/src/main/java/roomescape/payment/business/PaymentService.kt b/src/main/java/roomescape/payment/business/PaymentService.kt index 1b4e6deb..9d092ed6 100644 --- a/src/main/java/roomescape/payment/business/PaymentService.kt +++ b/src/main/java/roomescape/payment/business/PaymentService.kt @@ -13,7 +13,7 @@ import roomescape.payment.web.PaymentApprove import roomescape.payment.web.PaymentCancel import roomescape.payment.web.ReservationPaymentResponse import roomescape.payment.web.toReservationPaymentResponse -import roomescape.reservation.domain.Reservation +import roomescape.reservation.infrastructure.persistence.Reservation import java.time.OffsetDateTime @Service diff --git a/src/main/java/roomescape/payment/infrastructure/persistence/PaymentEntity.kt b/src/main/java/roomescape/payment/infrastructure/persistence/PaymentEntity.kt index 8de5d4da..bcc52d20 100644 --- a/src/main/java/roomescape/payment/infrastructure/persistence/PaymentEntity.kt +++ b/src/main/java/roomescape/payment/infrastructure/persistence/PaymentEntity.kt @@ -1,7 +1,7 @@ package roomescape.payment.infrastructure.persistence import jakarta.persistence.* -import roomescape.reservation.domain.Reservation +import roomescape.reservation.infrastructure.persistence.Reservation import java.time.OffsetDateTime @Entity diff --git a/src/main/java/roomescape/payment/web/PaymentDTO.kt b/src/main/java/roomescape/payment/web/PaymentDTO.kt index 8b4b12e2..2f549b36 100644 --- a/src/main/java/roomescape/payment/web/PaymentDTO.kt +++ b/src/main/java/roomescape/payment/web/PaymentDTO.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.databind.annotation.JsonDeserialize import roomescape.payment.infrastructure.client.PaymentCancelResponseDeserializer import roomescape.payment.infrastructure.persistence.PaymentEntity -import roomescape.reservation.dto.response.ReservationResponse +import roomescape.reservation.web.response.ReservationResponse import java.time.OffsetDateTime class PaymentApprove { diff --git a/src/main/java/roomescape/reservation/service/ReservationService.java b/src/main/java/roomescape/reservation/business/ReservationService.java similarity index 90% rename from src/main/java/roomescape/reservation/service/ReservationService.java rename to src/main/java/roomescape/reservation/business/ReservationService.java index 4c80e19b..b6be3a21 100644 --- a/src/main/java/roomescape/reservation/service/ReservationService.java +++ b/src/main/java/roomescape/reservation/business/ReservationService.java @@ -1,4 +1,4 @@ -package roomescape.reservation.service; +package roomescape.reservation.business; import java.time.LocalDate; import java.time.LocalDateTime; @@ -13,17 +13,17 @@ import roomescape.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; import roomescape.member.business.MemberService; import roomescape.member.infrastructure.persistence.MemberEntity; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; -import roomescape.reservation.domain.ReservationTime; -import roomescape.reservation.domain.repository.ReservationRepository; -import roomescape.reservation.domain.repository.ReservationSearchSpecification; -import roomescape.reservation.dto.request.AdminReservationRequest; -import roomescape.reservation.dto.request.ReservationRequest; -import roomescape.reservation.dto.request.WaitingRequest; -import roomescape.reservation.dto.response.MyReservationsResponse; -import roomescape.reservation.dto.response.ReservationResponse; -import roomescape.reservation.dto.response.ReservationsResponse; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.infrastructure.persistence.ReservationStatus; +import roomescape.reservation.infrastructure.persistence.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationRepository; +import roomescape.reservation.infrastructure.persistence.ReservationSearchSpecification; +import roomescape.reservation.web.request.AdminReservationRequest; +import roomescape.reservation.web.request.ReservationRequest; +import roomescape.reservation.web.request.WaitingRequest; +import roomescape.reservation.web.response.MyReservationsResponse; +import roomescape.reservation.web.response.ReservationResponse; +import roomescape.reservation.web.response.ReservationsResponse; import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.business.ThemeService; diff --git a/src/main/java/roomescape/reservation/service/ReservationTimeService.java b/src/main/java/roomescape/reservation/business/ReservationTimeService.java similarity index 83% rename from src/main/java/roomescape/reservation/service/ReservationTimeService.java rename to src/main/java/roomescape/reservation/business/ReservationTimeService.java index 276a0daa..19716136 100644 --- a/src/main/java/roomescape/reservation/service/ReservationTimeService.java +++ b/src/main/java/roomescape/reservation/business/ReservationTimeService.java @@ -1,4 +1,4 @@ -package roomescape.reservation.service; +package roomescape.reservation.business; import java.time.LocalDate; import java.util.List; @@ -9,15 +9,15 @@ import org.springframework.transaction.annotation.Transactional; import roomescape.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationTime; -import roomescape.reservation.domain.repository.ReservationRepository; -import roomescape.reservation.domain.repository.ReservationTimeRepository; -import roomescape.reservation.dto.request.ReservationTimeRequest; -import roomescape.reservation.dto.response.ReservationTimeInfoResponse; -import roomescape.reservation.dto.response.ReservationTimeInfosResponse; -import roomescape.reservation.dto.response.ReservationTimeResponse; -import roomescape.reservation.dto.response.ReservationTimesResponse; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.infrastructure.persistence.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationRepository; +import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository; +import roomescape.reservation.web.request.ReservationTimeRequest; +import roomescape.reservation.web.response.ReservationTimeInfoResponse; +import roomescape.reservation.web.response.ReservationTimeInfosResponse; +import roomescape.reservation.web.response.ReservationTimeResponse; +import roomescape.reservation.web.response.ReservationTimesResponse; @Service @Transactional diff --git a/src/main/java/roomescape/reservation/service/ReservationWithPaymentService.java b/src/main/java/roomescape/reservation/business/ReservationWithPaymentService.java similarity index 88% rename from src/main/java/roomescape/reservation/service/ReservationWithPaymentService.java rename to src/main/java/roomescape/reservation/business/ReservationWithPaymentService.java index 853e6e30..e1bb4c74 100644 --- a/src/main/java/roomescape/reservation/service/ReservationWithPaymentService.java +++ b/src/main/java/roomescape/reservation/business/ReservationWithPaymentService.java @@ -1,4 +1,4 @@ -package roomescape.reservation.service; +package roomescape.reservation.business; import java.time.OffsetDateTime; @@ -9,9 +9,9 @@ import roomescape.payment.business.PaymentService; import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentCancel; import roomescape.payment.web.ReservationPaymentResponse; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.dto.request.ReservationRequest; -import roomescape.reservation.dto.response.ReservationResponse; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.web.request.ReservationRequest; +import roomescape.reservation.web.response.ReservationResponse; @Service @Transactional diff --git a/src/main/java/roomescape/reservation/domain/Reservation.java b/src/main/java/roomescape/reservation/infrastructure/persistence/Reservation.java similarity index 98% rename from src/main/java/roomescape/reservation/domain/Reservation.java rename to src/main/java/roomescape/reservation/infrastructure/persistence/Reservation.java index f8dc6858..be474891 100644 --- a/src/main/java/roomescape/reservation/domain/Reservation.java +++ b/src/main/java/roomescape/reservation/infrastructure/persistence/Reservation.java @@ -1,4 +1,4 @@ -package roomescape.reservation.domain; +package roomescape.reservation.infrastructure.persistence; import java.time.LocalDate; diff --git a/src/main/java/roomescape/reservation/domain/repository/ReservationRepository.java b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationRepository.java similarity index 86% rename from src/main/java/roomescape/reservation/domain/repository/ReservationRepository.java rename to src/main/java/roomescape/reservation/infrastructure/persistence/ReservationRepository.java index af83b3dc..987dd6b4 100644 --- a/src/main/java/roomescape/reservation/domain/repository/ReservationRepository.java +++ b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationRepository.java @@ -1,4 +1,4 @@ -package roomescape.reservation.domain.repository; +package roomescape.reservation.infrastructure.persistence; import java.util.List; @@ -8,10 +8,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; -import roomescape.reservation.domain.ReservationTime; -import roomescape.reservation.dto.response.MyReservationResponse; +import roomescape.reservation.web.response.MyReservationResponse; public interface ReservationRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/src/main/java/roomescape/reservation/domain/repository/ReservationSearchSpecification.java b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecification.java similarity index 93% rename from src/main/java/roomescape/reservation/domain/repository/ReservationSearchSpecification.java rename to src/main/java/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecification.java index 69eb914a..888d62f2 100644 --- a/src/main/java/roomescape/reservation/domain/repository/ReservationSearchSpecification.java +++ b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecification.java @@ -1,12 +1,9 @@ -package roomescape.reservation.domain.repository; +package roomescape.reservation.infrastructure.persistence; import java.time.LocalDate; import org.springframework.data.jpa.domain.Specification; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; - public class ReservationSearchSpecification { private Specification spec; diff --git a/src/main/java/roomescape/reservation/domain/ReservationStatus.java b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationStatus.java similarity index 87% rename from src/main/java/roomescape/reservation/domain/ReservationStatus.java rename to src/main/java/roomescape/reservation/infrastructure/persistence/ReservationStatus.java index d8978397..d5f10221 100644 --- a/src/main/java/roomescape/reservation/domain/ReservationStatus.java +++ b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationStatus.java @@ -1,4 +1,4 @@ -package roomescape.reservation.domain; +package roomescape.reservation.infrastructure.persistence; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/roomescape/reservation/domain/ReservationTime.java b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationTime.java similarity index 95% rename from src/main/java/roomescape/reservation/domain/ReservationTime.java rename to src/main/java/roomescape/reservation/infrastructure/persistence/ReservationTime.java index e54a39b0..fa9ef589 100644 --- a/src/main/java/roomescape/reservation/domain/ReservationTime.java +++ b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationTime.java @@ -1,4 +1,4 @@ -package roomescape.reservation.domain; +package roomescape.reservation.infrastructure.persistence; import java.time.LocalTime; diff --git a/src/main/java/roomescape/reservation/domain/repository/ReservationTimeRepository.java b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationTimeRepository.java similarity index 71% rename from src/main/java/roomescape/reservation/domain/repository/ReservationTimeRepository.java rename to src/main/java/roomescape/reservation/infrastructure/persistence/ReservationTimeRepository.java index 791077d2..8b6a1c0b 100644 --- a/src/main/java/roomescape/reservation/domain/repository/ReservationTimeRepository.java +++ b/src/main/java/roomescape/reservation/infrastructure/persistence/ReservationTimeRepository.java @@ -1,12 +1,10 @@ -package roomescape.reservation.domain.repository; +package roomescape.reservation.infrastructure.persistence; import java.time.LocalTime; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import roomescape.reservation.domain.ReservationTime; - public interface ReservationTimeRepository extends JpaRepository { List findByStartAt(LocalTime startAt); diff --git a/src/main/java/roomescape/reservation/controller/ReservationController.java b/src/main/java/roomescape/reservation/web/ReservationController.java similarity index 95% rename from src/main/java/roomescape/reservation/controller/ReservationController.java rename to src/main/java/roomescape/reservation/web/ReservationController.java index f5df5f57..90303267 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationController.java +++ b/src/main/java/roomescape/reservation/web/ReservationController.java @@ -1,4 +1,4 @@ -package roomescape.reservation.controller; +package roomescape.reservation.web; import java.time.LocalDate; @@ -33,14 +33,14 @@ import roomescape.common.exception.RoomescapeException; import roomescape.payment.infrastructure.client.TossPaymentClient; import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentCancel; -import roomescape.reservation.dto.request.AdminReservationRequest; -import roomescape.reservation.dto.request.ReservationRequest; -import roomescape.reservation.dto.request.WaitingRequest; -import roomescape.reservation.dto.response.MyReservationsResponse; -import roomescape.reservation.dto.response.ReservationResponse; -import roomescape.reservation.dto.response.ReservationsResponse; -import roomescape.reservation.service.ReservationService; -import roomescape.reservation.service.ReservationWithPaymentService; +import roomescape.reservation.web.request.AdminReservationRequest; +import roomescape.reservation.web.request.ReservationRequest; +import roomescape.reservation.web.request.WaitingRequest; +import roomescape.reservation.web.response.MyReservationsResponse; +import roomescape.reservation.web.response.ReservationResponse; +import roomescape.reservation.web.response.ReservationsResponse; +import roomescape.reservation.business.ReservationService; +import roomescape.reservation.business.ReservationWithPaymentService; @RestController @Tag(name = "3. 예약 API", description = "예약 및 대기 정보를 추가 / 조회 / 삭제할 때 사용합니다.") diff --git a/src/main/java/roomescape/reservation/controller/ReservationTimeController.java b/src/main/java/roomescape/reservation/web/ReservationTimeController.java similarity index 92% rename from src/main/java/roomescape/reservation/controller/ReservationTimeController.java rename to src/main/java/roomescape/reservation/web/ReservationTimeController.java index 18d5abb5..bd494779 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationTimeController.java +++ b/src/main/java/roomescape/reservation/web/ReservationTimeController.java @@ -1,4 +1,4 @@ -package roomescape.reservation.controller; +package roomescape.reservation.web; import java.time.LocalDate; @@ -27,11 +27,11 @@ import roomescape.auth.web.support.Admin; import roomescape.auth.web.support.LoginRequired; import roomescape.common.dto.response.RoomescapeApiResponse; import roomescape.common.dto.response.RoomescapeErrorResponse; -import roomescape.reservation.dto.request.ReservationTimeRequest; -import roomescape.reservation.dto.response.ReservationTimeInfosResponse; -import roomescape.reservation.dto.response.ReservationTimeResponse; -import roomescape.reservation.dto.response.ReservationTimesResponse; -import roomescape.reservation.service.ReservationTimeService; +import roomescape.reservation.web.request.ReservationTimeRequest; +import roomescape.reservation.web.response.ReservationTimeInfosResponse; +import roomescape.reservation.web.response.ReservationTimeResponse; +import roomescape.reservation.web.response.ReservationTimesResponse; +import roomescape.reservation.business.ReservationTimeService; @RestController @Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.") diff --git a/src/main/java/roomescape/reservation/dto/request/AdminReservationRequest.java b/src/main/java/roomescape/reservation/web/request/AdminReservationRequest.java similarity index 93% rename from src/main/java/roomescape/reservation/dto/request/AdminReservationRequest.java rename to src/main/java/roomescape/reservation/web/request/AdminReservationRequest.java index 5b2ea0e1..af07eab7 100644 --- a/src/main/java/roomescape/reservation/dto/request/AdminReservationRequest.java +++ b/src/main/java/roomescape/reservation/web/request/AdminReservationRequest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.request; +package roomescape.reservation.web.request; import java.time.LocalDate; diff --git a/src/main/java/roomescape/reservation/dto/request/ReservationRequest.java b/src/main/java/roomescape/reservation/web/request/ReservationRequest.java similarity index 96% rename from src/main/java/roomescape/reservation/dto/request/ReservationRequest.java rename to src/main/java/roomescape/reservation/web/request/ReservationRequest.java index e15b00fb..88805c05 100644 --- a/src/main/java/roomescape/reservation/dto/request/ReservationRequest.java +++ b/src/main/java/roomescape/reservation/web/request/ReservationRequest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.request; +package roomescape.reservation.web.request; import java.time.LocalDate; diff --git a/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java b/src/main/java/roomescape/reservation/web/request/ReservationTimeRequest.java similarity index 89% rename from src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java rename to src/main/java/roomescape/reservation/web/request/ReservationTimeRequest.java index dd2f24c5..74c60b84 100644 --- a/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java +++ b/src/main/java/roomescape/reservation/web/request/ReservationTimeRequest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.request; +package roomescape.reservation.web.request; import java.time.LocalTime; @@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import roomescape.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; -import roomescape.reservation.domain.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationTime; @Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.") public record ReservationTimeRequest( diff --git a/src/main/java/roomescape/reservation/dto/request/WaitingRequest.java b/src/main/java/roomescape/reservation/web/request/WaitingRequest.java similarity index 94% rename from src/main/java/roomescape/reservation/dto/request/WaitingRequest.java rename to src/main/java/roomescape/reservation/web/request/WaitingRequest.java index 0568a670..da794d3f 100644 --- a/src/main/java/roomescape/reservation/dto/request/WaitingRequest.java +++ b/src/main/java/roomescape/reservation/web/request/WaitingRequest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.request; +package roomescape.reservation.web.request; import java.time.LocalDate; diff --git a/src/main/java/roomescape/reservation/dto/response/MyReservationResponse.java b/src/main/java/roomescape/reservation/web/response/MyReservationResponse.java similarity index 91% rename from src/main/java/roomescape/reservation/dto/response/MyReservationResponse.java rename to src/main/java/roomescape/reservation/web/response/MyReservationResponse.java index 8667c371..ba7dfe16 100644 --- a/src/main/java/roomescape/reservation/dto/response/MyReservationResponse.java +++ b/src/main/java/roomescape/reservation/web/response/MyReservationResponse.java @@ -1,10 +1,10 @@ -package roomescape.reservation.dto.response; +package roomescape.reservation.web.response; import java.time.LocalDate; import java.time.LocalTime; import io.swagger.v3.oas.annotations.media.Schema; -import roomescape.reservation.domain.ReservationStatus; +import roomescape.reservation.infrastructure.persistence.ReservationStatus; @Schema(name = "회원의 예약 및 대기 응답", description = "회원의 예약 및 대기 정보 응답시 사용됩니다.") public record MyReservationResponse( diff --git a/src/main/java/roomescape/reservation/dto/response/MyReservationsResponse.java b/src/main/java/roomescape/reservation/web/response/MyReservationsResponse.java similarity index 90% rename from src/main/java/roomescape/reservation/dto/response/MyReservationsResponse.java rename to src/main/java/roomescape/reservation/web/response/MyReservationsResponse.java index a32ef460..6d9b70e0 100644 --- a/src/main/java/roomescape/reservation/dto/response/MyReservationsResponse.java +++ b/src/main/java/roomescape/reservation/web/response/MyReservationsResponse.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.response; +package roomescape.reservation.web.response; import java.util.List; diff --git a/src/main/java/roomescape/reservation/dto/response/ReservationResponse.java b/src/main/java/roomescape/reservation/web/response/ReservationResponse.java similarity index 87% rename from src/main/java/roomescape/reservation/dto/response/ReservationResponse.java rename to src/main/java/roomescape/reservation/web/response/ReservationResponse.java index f1fa1704..a6aa290c 100644 --- a/src/main/java/roomescape/reservation/dto/response/ReservationResponse.java +++ b/src/main/java/roomescape/reservation/web/response/ReservationResponse.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.response; +package roomescape.reservation.web.response; import java.time.LocalDate; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import roomescape.member.web.MemberResponse; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.infrastructure.persistence.ReservationStatus; import roomescape.theme.web.ThemeResponse; @Schema(name = "예약 정보", description = "예약 저장 및 조회 응답에 사용됩니다.") diff --git a/src/main/java/roomescape/reservation/dto/response/ReservationTimeInfoResponse.java b/src/main/java/roomescape/reservation/web/response/ReservationTimeInfoResponse.java similarity index 93% rename from src/main/java/roomescape/reservation/dto/response/ReservationTimeInfoResponse.java rename to src/main/java/roomescape/reservation/web/response/ReservationTimeInfoResponse.java index 1105bf03..6912ef81 100644 --- a/src/main/java/roomescape/reservation/dto/response/ReservationTimeInfoResponse.java +++ b/src/main/java/roomescape/reservation/web/response/ReservationTimeInfoResponse.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.response; +package roomescape.reservation.web.response; import java.time.LocalTime; diff --git a/src/main/java/roomescape/reservation/dto/response/ReservationTimeInfosResponse.java b/src/main/java/roomescape/reservation/web/response/ReservationTimeInfosResponse.java similarity index 90% rename from src/main/java/roomescape/reservation/dto/response/ReservationTimeInfosResponse.java rename to src/main/java/roomescape/reservation/web/response/ReservationTimeInfosResponse.java index ef02deeb..97ee2ef9 100644 --- a/src/main/java/roomescape/reservation/dto/response/ReservationTimeInfosResponse.java +++ b/src/main/java/roomescape/reservation/web/response/ReservationTimeInfosResponse.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.response; +package roomescape.reservation.web.response; import java.util.List; diff --git a/src/main/java/roomescape/reservation/dto/response/ReservationTimeResponse.java b/src/main/java/roomescape/reservation/web/response/ReservationTimeResponse.java similarity index 83% rename from src/main/java/roomescape/reservation/dto/response/ReservationTimeResponse.java rename to src/main/java/roomescape/reservation/web/response/ReservationTimeResponse.java index fc27d3d5..8edcae24 100644 --- a/src/main/java/roomescape/reservation/dto/response/ReservationTimeResponse.java +++ b/src/main/java/roomescape/reservation/web/response/ReservationTimeResponse.java @@ -1,9 +1,9 @@ -package roomescape.reservation.dto.response; +package roomescape.reservation.web.response; import java.time.LocalTime; import io.swagger.v3.oas.annotations.media.Schema; -import roomescape.reservation.domain.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationTime; @Schema(name = "예약 시간 정보", description = "예약 시간 추가 및 조회 응답시 사용됩니다.") public record ReservationTimeResponse( diff --git a/src/main/java/roomescape/reservation/dto/response/ReservationTimesResponse.java b/src/main/java/roomescape/reservation/web/response/ReservationTimesResponse.java similarity index 88% rename from src/main/java/roomescape/reservation/dto/response/ReservationTimesResponse.java rename to src/main/java/roomescape/reservation/web/response/ReservationTimesResponse.java index 1cbff917..196721c5 100644 --- a/src/main/java/roomescape/reservation/dto/response/ReservationTimesResponse.java +++ b/src/main/java/roomescape/reservation/web/response/ReservationTimesResponse.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.response; +package roomescape.reservation.web.response; import java.util.List; diff --git a/src/main/java/roomescape/reservation/dto/response/ReservationsResponse.java b/src/main/java/roomescape/reservation/web/response/ReservationsResponse.java similarity index 88% rename from src/main/java/roomescape/reservation/dto/response/ReservationsResponse.java rename to src/main/java/roomescape/reservation/web/response/ReservationsResponse.java index 83386f1d..1b9811b5 100644 --- a/src/main/java/roomescape/reservation/dto/response/ReservationsResponse.java +++ b/src/main/java/roomescape/reservation/web/response/ReservationsResponse.java @@ -1,4 +1,4 @@ -package roomescape.reservation.dto.response; +package roomescape.reservation.web.response; import java.util.List; diff --git a/src/test/java/roomescape/payment/business/PaymentServiceTest.java b/src/test/java/roomescape/payment/business/PaymentServiceTest.java index 3770c56f..1731aab3 100644 --- a/src/test/java/roomescape/payment/business/PaymentServiceTest.java +++ b/src/test/java/roomescape/payment/business/PaymentServiceTest.java @@ -22,11 +22,11 @@ import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository; import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentCancel; import roomescape.payment.web.ReservationPaymentResponse; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; -import roomescape.reservation.domain.ReservationTime; -import roomescape.reservation.domain.repository.ReservationRepository; -import roomescape.reservation.domain.repository.ReservationTimeRepository; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.infrastructure.persistence.ReservationStatus; +import roomescape.reservation.infrastructure.persistence.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationRepository; +import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository; import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeRepository; diff --git a/src/test/java/roomescape/reservation/service/ReservationServiceTest.java b/src/test/java/roomescape/reservation/business/ReservationServiceTest.java similarity index 94% rename from src/test/java/roomescape/reservation/service/ReservationServiceTest.java rename to src/test/java/roomescape/reservation/business/ReservationServiceTest.java index f42ea4e7..b5136835 100644 --- a/src/test/java/roomescape/reservation/service/ReservationServiceTest.java +++ b/src/test/java/roomescape/reservation/business/ReservationServiceTest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.service; +package roomescape.reservation.business; import static org.assertj.core.api.Assertions.*; @@ -18,14 +18,14 @@ import roomescape.member.business.MemberService; import roomescape.member.infrastructure.persistence.MemberEntity; import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.Role; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; -import roomescape.reservation.domain.ReservationTime; -import roomescape.reservation.domain.repository.ReservationRepository; -import roomescape.reservation.domain.repository.ReservationTimeRepository; -import roomescape.reservation.dto.request.ReservationRequest; -import roomescape.reservation.dto.request.WaitingRequest; -import roomescape.reservation.dto.response.ReservationResponse; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.infrastructure.persistence.ReservationStatus; +import roomescape.reservation.infrastructure.persistence.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationRepository; +import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository; +import roomescape.reservation.web.request.ReservationRequest; +import roomescape.reservation.web.request.WaitingRequest; +import roomescape.reservation.web.response.ReservationResponse; import roomescape.common.exception.RoomescapeException; import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeRepository; diff --git a/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java b/src/test/java/roomescape/reservation/business/ReservationTimeServiceTest.java similarity index 86% rename from src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java rename to src/test/java/roomescape/reservation/business/ReservationTimeServiceTest.java index 2fa7406c..a6c91918 100644 --- a/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java +++ b/src/test/java/roomescape/reservation/business/ReservationTimeServiceTest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.service; +package roomescape.reservation.business; import static org.assertj.core.api.Assertions.*; @@ -16,12 +16,12 @@ import org.springframework.test.context.jdbc.Sql.ExecutionPhase; import roomescape.member.infrastructure.persistence.MemberEntity; import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.Role; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; -import roomescape.reservation.domain.ReservationTime; -import roomescape.reservation.domain.repository.ReservationRepository; -import roomescape.reservation.domain.repository.ReservationTimeRepository; -import roomescape.reservation.dto.request.ReservationTimeRequest; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.infrastructure.persistence.ReservationStatus; +import roomescape.reservation.infrastructure.persistence.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationRepository; +import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository; +import roomescape.reservation.web.request.ReservationTimeRequest; import roomescape.common.exception.RoomescapeException; import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeRepository; diff --git a/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java b/src/test/java/roomescape/reservation/business/ReservationWithPaymentServiceTest.java similarity index 92% rename from src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java rename to src/test/java/roomescape/reservation/business/ReservationWithPaymentServiceTest.java index e30a2faa..8d321b7c 100644 --- a/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java +++ b/src/test/java/roomescape/reservation/business/ReservationWithPaymentServiceTest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.service; +package roomescape.reservation.business; import static org.assertj.core.api.Assertions.*; @@ -21,13 +21,13 @@ import roomescape.payment.infrastructure.persistence.PaymentEntity; import roomescape.payment.infrastructure.persistence.PaymentRepository; import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentCancel; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; -import roomescape.reservation.domain.ReservationTime; -import roomescape.reservation.domain.repository.ReservationRepository; -import roomescape.reservation.domain.repository.ReservationTimeRepository; -import roomescape.reservation.dto.request.ReservationRequest; -import roomescape.reservation.dto.response.ReservationResponse; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.infrastructure.persistence.ReservationStatus; +import roomescape.reservation.infrastructure.persistence.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationRepository; +import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository; +import roomescape.reservation.web.request.ReservationRequest; +import roomescape.reservation.web.response.ReservationResponse; import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeRepository; diff --git a/src/test/java/roomescape/reservation/domain/repository/ReservationSearchSpecificationTest.java b/src/test/java/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecificationTest.java similarity index 96% rename from src/test/java/roomescape/reservation/domain/repository/ReservationSearchSpecificationTest.java rename to src/test/java/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecificationTest.java index 17b97f00..a9b75a04 100644 --- a/src/test/java/roomescape/reservation/domain/repository/ReservationSearchSpecificationTest.java +++ b/src/test/java/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecificationTest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.domain.repository; +package roomescape.reservation.infrastructure.persistence; import static org.assertj.core.api.Assertions.*; @@ -16,9 +16,6 @@ import org.springframework.data.jpa.domain.Specification; import roomescape.member.infrastructure.persistence.MemberEntity; import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.Role; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; -import roomescape.reservation.domain.ReservationTime; import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeRepository; diff --git a/src/test/java/roomescape/reservation/domain/ReservationTest.java b/src/test/java/roomescape/reservation/infrastructure/persistence/ReservationTest.java similarity index 97% rename from src/test/java/roomescape/reservation/domain/ReservationTest.java rename to src/test/java/roomescape/reservation/infrastructure/persistence/ReservationTest.java index bf1bc3bd..061b0326 100644 --- a/src/test/java/roomescape/reservation/domain/ReservationTest.java +++ b/src/test/java/roomescape/reservation/infrastructure/persistence/ReservationTest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.domain; +package roomescape.reservation.infrastructure.persistence; import java.time.LocalDate; import java.time.LocalTime; diff --git a/src/test/java/roomescape/reservation/domain/ReservationTimeTest.java b/src/test/java/roomescape/reservation/infrastructure/persistence/ReservationTimeTest.java similarity index 88% rename from src/test/java/roomescape/reservation/domain/ReservationTimeTest.java rename to src/test/java/roomescape/reservation/infrastructure/persistence/ReservationTimeTest.java index 17e9dfaa..18260e0e 100644 --- a/src/test/java/roomescape/reservation/domain/ReservationTimeTest.java +++ b/src/test/java/roomescape/reservation/infrastructure/persistence/ReservationTimeTest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.domain; +package roomescape.reservation.infrastructure.persistence; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java b/src/test/java/roomescape/reservation/web/ReservationControllerTest.java similarity index 97% rename from src/test/java/roomescape/reservation/controller/ReservationControllerTest.java rename to src/test/java/roomescape/reservation/web/ReservationControllerTest.java index 726f164b..bc772916 100644 --- a/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java +++ b/src/test/java/roomescape/reservation/web/ReservationControllerTest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.controller; +package roomescape.reservation.web; import static org.assertj.core.api.Assertions.*; import static org.hamcrest.Matchers.*; @@ -41,14 +41,14 @@ import roomescape.payment.infrastructure.persistence.PaymentEntity; import roomescape.payment.infrastructure.persistence.PaymentRepository; import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentCancel; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; -import roomescape.reservation.domain.ReservationTime; -import roomescape.reservation.domain.repository.ReservationRepository; -import roomescape.reservation.domain.repository.ReservationTimeRepository; -import roomescape.reservation.dto.request.AdminReservationRequest; -import roomescape.reservation.dto.request.ReservationRequest; -import roomescape.reservation.dto.request.WaitingRequest; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.infrastructure.persistence.ReservationStatus; +import roomescape.reservation.infrastructure.persistence.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationRepository; +import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository; +import roomescape.reservation.web.request.AdminReservationRequest; +import roomescape.reservation.web.request.ReservationRequest; +import roomescape.reservation.web.request.WaitingRequest; import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeRepository; diff --git a/src/test/java/roomescape/reservation/controller/ReservationTimeControllerTest.java b/src/test/java/roomescape/reservation/web/ReservationTimeControllerTest.java similarity index 94% rename from src/test/java/roomescape/reservation/controller/ReservationTimeControllerTest.java rename to src/test/java/roomescape/reservation/web/ReservationTimeControllerTest.java index f3adec83..3aa5883b 100644 --- a/src/test/java/roomescape/reservation/controller/ReservationTimeControllerTest.java +++ b/src/test/java/roomescape/reservation/web/ReservationTimeControllerTest.java @@ -1,4 +1,4 @@ -package roomescape.reservation.controller; +package roomescape.reservation.web; import static org.hamcrest.Matchers.*; @@ -24,11 +24,11 @@ import io.restassured.http.Header; import roomescape.member.infrastructure.persistence.MemberEntity; import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.Role; -import roomescape.reservation.domain.Reservation; -import roomescape.reservation.domain.ReservationStatus; -import roomescape.reservation.domain.ReservationTime; -import roomescape.reservation.domain.repository.ReservationRepository; -import roomescape.reservation.domain.repository.ReservationTimeRepository; +import roomescape.reservation.infrastructure.persistence.Reservation; +import roomescape.reservation.infrastructure.persistence.ReservationStatus; +import roomescape.reservation.infrastructure.persistence.ReservationTime; +import roomescape.reservation.infrastructure.persistence.ReservationRepository; +import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository; import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeRepository; diff --git a/src/test/java/roomescape/theme/util/TestThemeCreateUtil.kt b/src/test/java/roomescape/theme/util/TestThemeCreateUtil.kt index 6d3b0d6d..c3765df7 100644 --- a/src/test/java/roomescape/theme/util/TestThemeCreateUtil.kt +++ b/src/test/java/roomescape/theme/util/TestThemeCreateUtil.kt @@ -2,8 +2,8 @@ package roomescape.theme.util import jakarta.persistence.EntityManager import roomescape.member.infrastructure.persistence.MemberEntity -import roomescape.reservation.domain.ReservationStatus -import roomescape.reservation.domain.ReservationTime +import roomescape.reservation.infrastructure.persistence.ReservationStatus +import roomescape.reservation.infrastructure.persistence.ReservationTime import roomescape.theme.infrastructure.persistence.ThemeEntity import roomescape.util.MemberFixture import roomescape.util.ReservationFixture diff --git a/src/test/java/roomescape/util/Fixtures.kt b/src/test/java/roomescape/util/Fixtures.kt index 2afb8d10..d61b70ba 100644 --- a/src/test/java/roomescape/util/Fixtures.kt +++ b/src/test/java/roomescape/util/Fixtures.kt @@ -8,9 +8,9 @@ import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity import roomescape.payment.infrastructure.persistence.PaymentEntity import roomescape.payment.web.PaymentApprove import roomescape.payment.web.PaymentCancel -import roomescape.reservation.domain.Reservation -import roomescape.reservation.domain.ReservationStatus -import roomescape.reservation.domain.ReservationTime +import roomescape.reservation.infrastructure.persistence.Reservation +import roomescape.reservation.infrastructure.persistence.ReservationStatus +import roomescape.reservation.infrastructure.persistence.ReservationTime import roomescape.theme.infrastructure.persistence.ThemeEntity import java.time.LocalDate import java.time.LocalTime