generated from pricelees/issue-pr-template
[#16] Reservation 도메인 코드 코틀린 마이그레이션 #17
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.domain;
|
||||
package roomescape.reservation.infrastructure.persistence;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@ -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<Reservation, Long>, JpaSpecificationExecutor<Reservation> {
|
||||
|
||||
@ -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<Reservation> spec;
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.domain;
|
||||
package roomescape.reservation.infrastructure.persistence;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.domain;
|
||||
package roomescape.reservation.infrastructure.persistence;
|
||||
|
||||
import java.time.LocalTime;
|
||||
|
||||
@ -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<ReservationTime, Long> {
|
||||
|
||||
List<ReservationTime> findByStartAt(LocalTime startAt);
|
||||
@ -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 = "예약 및 대기 정보를 추가 / 조회 / 삭제할 때 사용합니다.")
|
||||
@ -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 = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.")
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.dto.request;
|
||||
package roomescape.reservation.web.request;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.dto.request;
|
||||
package roomescape.reservation.web.request;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@ -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(
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.dto.request;
|
||||
package roomescape.reservation.web.request;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@ -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(
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.dto.response;
|
||||
package roomescape.reservation.web.response;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -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 = "예약 저장 및 조회 응답에 사용됩니다.")
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.dto.response;
|
||||
package roomescape.reservation.web.response;
|
||||
|
||||
import java.time.LocalTime;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.dto.response;
|
||||
package roomescape.reservation.web.response;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -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(
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.dto.response;
|
||||
package roomescape.reservation.web.response;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.dto.response;
|
||||
package roomescape.reservation.web.response;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
@ -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;
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package roomescape.reservation.domain;
|
||||
package roomescape.reservation.infrastructure.persistence;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalTime;
|
||||
@ -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;
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user