pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 패키지 구조 수정

Browse Source
This commit is contained in:
이상진 2025-07-18 02:05:12 +09:00
parent 514066adb6
commit 0707aa856b
37 changed files with 120 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/roomescape/payment/business/PaymentService.kt
View File

@ -13,7 +13,7 @@ import roomescape.payment.web.PaymentApprove
import roomescape.payment.web.PaymentCancel import roomescape.payment.web.PaymentCancel
import roomescape.payment.web.ReservationPaymentResponse import roomescape.payment.web.ReservationPaymentResponse
import roomescape.payment.web.toReservationPaymentResponse import roomescape.payment.web.toReservationPaymentResponse
import roomescape.reservation.domain.Reservation import roomescape.reservation.infrastructure.persistence.Reservation
import java.time.OffsetDateTime import java.time.OffsetDateTime
@Service @Service

2
src/main/java/roomescape/payment/infrastructure/persistence/PaymentEntity.kt
View File

@ -1,7 +1,7 @@
package roomescape.payment.infrastructure.persistence package roomescape.payment.infrastructure.persistence
import jakarta.persistence.* import jakarta.persistence.*
import roomescape.reservation.domain.Reservation import roomescape.reservation.infrastructure.persistence.Reservation
import java.time.OffsetDateTime import java.time.OffsetDateTime
@Entity @Entity

2
src/main/java/roomescape/payment/web/PaymentDTO.kt
View File

@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import roomescape.payment.infrastructure.client.PaymentCancelResponseDeserializer import roomescape.payment.infrastructure.client.PaymentCancelResponseDeserializer
import roomescape.payment.infrastructure.persistence.PaymentEntity import roomescape.payment.infrastructure.persistence.PaymentEntity
import roomescape.reservation.dto.response.ReservationResponse import roomescape.reservation.web.response.ReservationResponse
import java.time.OffsetDateTime import java.time.OffsetDateTime
class PaymentApprove { class PaymentApprove {

24
src/main/java/roomescape/reservation/service/ReservationService.java → src/main/java/roomescape/reservation/business/ReservationService.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.service; package roomescape.reservation.business;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -13,17 +13,17 @@ import roomescape.common.exception.ErrorType;
import roomescape.common.exception.RoomescapeException; import roomescape.common.exception.RoomescapeException;
import roomescape.member.business.MemberService; import roomescape.member.business.MemberService;
import roomescape.member.infrastructure.persistence.MemberEntity; import roomescape.member.infrastructure.persistence.MemberEntity;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.infrastructure.persistence.ReservationStatus;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.infrastructure.persistence.ReservationRepository;
import roomescape.reservation.domain.repository.ReservationSearchSpecification; import roomescape.reservation.infrastructure.persistence.ReservationSearchSpecification;
import roomescape.reservation.dto.request.AdminReservationRequest; import roomescape.reservation.web.request.AdminReservationRequest;
import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.web.request.ReservationRequest;
import roomescape.reservation.dto.request.WaitingRequest; import roomescape.reservation.web.request.WaitingRequest;
import roomescape.reservation.dto.response.MyReservationsResponse; import roomescape.reservation.web.response.MyReservationsResponse;
import roomescape.reservation.dto.response.ReservationResponse; import roomescape.reservation.web.response.ReservationResponse;
import roomescape.reservation.dto.response.ReservationsResponse; import roomescape.reservation.web.response.ReservationsResponse;
import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeEntity;
import roomescape.theme.business.ThemeService; import roomescape.theme.business.ThemeService;

20
src/main/java/roomescape/reservation/service/ReservationTimeService.java → src/main/java/roomescape/reservation/business/ReservationTimeService.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.service; package roomescape.reservation.business;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -9,15 +9,15 @@ import org.springframework.transaction.annotation.Transactional;
import roomescape.common.exception.ErrorType; import roomescape.common.exception.ErrorType;
import roomescape.common.exception.RoomescapeException; import roomescape.common.exception.RoomescapeException;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.infrastructure.persistence.ReservationRepository;
import roomescape.reservation.domain.repository.ReservationTimeRepository; import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository;
import roomescape.reservation.dto.request.ReservationTimeRequest; import roomescape.reservation.web.request.ReservationTimeRequest;
import roomescape.reservation.dto.response.ReservationTimeInfoResponse; import roomescape.reservation.web.response.ReservationTimeInfoResponse;
import roomescape.reservation.dto.response.ReservationTimeInfosResponse; import roomescape.reservation.web.response.ReservationTimeInfosResponse;
import roomescape.reservation.dto.response.ReservationTimeResponse; import roomescape.reservation.web.response.ReservationTimeResponse;
import roomescape.reservation.dto.response.ReservationTimesResponse; import roomescape.reservation.web.response.ReservationTimesResponse;
@Service @Service
@Transactional @Transactional

8
src/main/java/roomescape/reservation/service/ReservationWithPaymentService.java → src/main/java/roomescape/reservation/business/ReservationWithPaymentService.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.service; package roomescape.reservation.business;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
@ -9,9 +9,9 @@ import roomescape.payment.business.PaymentService;
import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentApprove;
import roomescape.payment.web.PaymentCancel; import roomescape.payment.web.PaymentCancel;
import roomescape.payment.web.ReservationPaymentResponse; import roomescape.payment.web.ReservationPaymentResponse;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.web.request.ReservationRequest;
import roomescape.reservation.dto.response.ReservationResponse; import roomescape.reservation.web.response.ReservationResponse;
@Service @Service
@Transactional @Transactional

2
src/main/java/roomescape/reservation/domain/Reservation.java → src/main/java/roomescape/reservation/infrastructure/persistence/Reservation.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.domain; package roomescape.reservation.infrastructure.persistence;
import java.time.LocalDate; import java.time.LocalDate;

7
src/main/java/roomescape/reservation/domain/repository/ReservationRepository.java → src/main/java/roomescape/reservation/infrastructure/persistence/ReservationRepository.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.domain.repository; package roomescape.reservation.infrastructure.persistence;
import java.util.List; 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.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.web.response.MyReservationResponse;
import roomescape.reservation.domain.ReservationStatus;
import roomescape.reservation.domain.ReservationTime;
import roomescape.reservation.dto.response.MyReservationResponse;
public interface ReservationRepository extends JpaRepository<Reservation, Long>, JpaSpecificationExecutor<Reservation> { public interface ReservationRepository extends JpaRepository<Reservation, Long>, JpaSpecificationExecutor<Reservation> {

5
src/main/java/roomescape/reservation/domain/repository/ReservationSearchSpecification.java → src/main/java/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecification.java
View File

@ -1,12 +1,9 @@
package roomescape.reservation.domain.repository; package roomescape.reservation.infrastructure.persistence;
import java.time.LocalDate; import java.time.LocalDate;
import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.domain.Specification;
import roomescape.reservation.domain.Reservation;
import roomescape.reservation.domain.ReservationStatus;
public class ReservationSearchSpecification { public class ReservationSearchSpecification {
private Specification<Reservation> spec; private Specification<Reservation> spec;

2
src/main/java/roomescape/reservation/domain/ReservationStatus.java → src/main/java/roomescape/reservation/infrastructure/persistence/ReservationStatus.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.domain; package roomescape.reservation.infrastructure.persistence;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

2
src/main/java/roomescape/reservation/domain/ReservationTime.java → src/main/java/roomescape/reservation/infrastructure/persistence/ReservationTime.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.domain; package roomescape.reservation.infrastructure.persistence;
import java.time.LocalTime; import java.time.LocalTime;

4
src/main/java/roomescape/reservation/domain/repository/ReservationTimeRepository.java → src/main/java/roomescape/reservation/infrastructure/persistence/ReservationTimeRepository.java
View File

@ -1,12 +1,10 @@
package roomescape.reservation.domain.repository; package roomescape.reservation.infrastructure.persistence;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.List; import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import roomescape.reservation.domain.ReservationTime;
public interface ReservationTimeRepository extends JpaRepository<ReservationTime, Long> { public interface ReservationTimeRepository extends JpaRepository<ReservationTime, Long> {
List<ReservationTime> findByStartAt(LocalTime startAt); List<ReservationTime> findByStartAt(LocalTime startAt);

18
src/main/java/roomescape/reservation/controller/ReservationController.java → src/main/java/roomescape/reservation/web/ReservationController.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.controller; package roomescape.reservation.web;
import java.time.LocalDate; import java.time.LocalDate;
@ -33,14 +33,14 @@ import roomescape.common.exception.RoomescapeException;
import roomescape.payment.infrastructure.client.TossPaymentClient; import roomescape.payment.infrastructure.client.TossPaymentClient;
import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentApprove;
import roomescape.payment.web.PaymentCancel; import roomescape.payment.web.PaymentCancel;
import roomescape.reservation.dto.request.AdminReservationRequest; import roomescape.reservation.web.request.AdminReservationRequest;
import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.web.request.ReservationRequest;
import roomescape.reservation.dto.request.WaitingRequest; import roomescape.reservation.web.request.WaitingRequest;
import roomescape.reservation.dto.response.MyReservationsResponse; import roomescape.reservation.web.response.MyReservationsResponse;
import roomescape.reservation.dto.response.ReservationResponse; import roomescape.reservation.web.response.ReservationResponse;
import roomescape.reservation.dto.response.ReservationsResponse; import roomescape.reservation.web.response.ReservationsResponse;
import roomescape.reservation.service.ReservationService; import roomescape.reservation.business.ReservationService;
import roomescape.reservation.service.ReservationWithPaymentService; import roomescape.reservation.business.ReservationWithPaymentService;
@RestController @RestController
@Tag(name = "3. 예약 API", description = "예약 및 대기 정보를 추가 / 조회 / 삭제할 때 사용합니다.") @Tag(name = "3. 예약 API", description = "예약 및 대기 정보를 추가 / 조회 / 삭제할 때 사용합니다.")

12
src/main/java/roomescape/reservation/controller/ReservationTimeController.java → src/main/java/roomescape/reservation/web/ReservationTimeController.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.controller; package roomescape.reservation.web;
import java.time.LocalDate; import java.time.LocalDate;
@ -27,11 +27,11 @@ import roomescape.auth.web.support.Admin;
import roomescape.auth.web.support.LoginRequired; import roomescape.auth.web.support.LoginRequired;
import roomescape.common.dto.response.RoomescapeApiResponse; import roomescape.common.dto.response.RoomescapeApiResponse;
import roomescape.common.dto.response.RoomescapeErrorResponse; import roomescape.common.dto.response.RoomescapeErrorResponse;
import roomescape.reservation.dto.request.ReservationTimeRequest; import roomescape.reservation.web.request.ReservationTimeRequest;
import roomescape.reservation.dto.response.ReservationTimeInfosResponse; import roomescape.reservation.web.response.ReservationTimeInfosResponse;
import roomescape.reservation.dto.response.ReservationTimeResponse; import roomescape.reservation.web.response.ReservationTimeResponse;
import roomescape.reservation.dto.response.ReservationTimesResponse; import roomescape.reservation.web.response.ReservationTimesResponse;
import roomescape.reservation.service.ReservationTimeService; import roomescape.reservation.business.ReservationTimeService;
@RestController @RestController
@Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.") @Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.")

2
src/main/java/roomescape/reservation/dto/request/AdminReservationRequest.java → src/main/java/roomescape/reservation/web/request/AdminReservationRequest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.request; package roomescape.reservation.web.request;
import java.time.LocalDate; import java.time.LocalDate;

2
src/main/java/roomescape/reservation/dto/request/ReservationRequest.java → src/main/java/roomescape/reservation/web/request/ReservationRequest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.request; package roomescape.reservation.web.request;
import java.time.LocalDate; import java.time.LocalDate;

4
src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java → src/main/java/roomescape/reservation/web/request/ReservationTimeRequest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.request; package roomescape.reservation.web.request;
import java.time.LocalTime; import java.time.LocalTime;
@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import roomescape.common.exception.ErrorType; import roomescape.common.exception.ErrorType;
import roomescape.common.exception.RoomescapeException; import roomescape.common.exception.RoomescapeException;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
@Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.") @Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.")
public record ReservationTimeRequest( public record ReservationTimeRequest(

2
src/main/java/roomescape/reservation/dto/request/WaitingRequest.java → src/main/java/roomescape/reservation/web/request/WaitingRequest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.request; package roomescape.reservation.web.request;
import java.time.LocalDate; import java.time.LocalDate;

4
src/main/java/roomescape/reservation/dto/response/MyReservationResponse.java → src/main/java/roomescape/reservation/web/response/MyReservationResponse.java
View File

@ -1,10 +1,10 @@
package roomescape.reservation.dto.response; package roomescape.reservation.web.response;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.infrastructure.persistence.ReservationStatus;
@Schema(name = "회원의 예약 및 대기 응답", description = "회원의 예약 및 대기 정보 응답시 사용됩니다.") @Schema(name = "회원의 예약 및 대기 응답", description = "회원의 예약 및 대기 정보 응답시 사용됩니다.")
public record MyReservationResponse( public record MyReservationResponse(

2
src/main/java/roomescape/reservation/dto/response/MyReservationsResponse.java → src/main/java/roomescape/reservation/web/response/MyReservationsResponse.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.response; package roomescape.reservation.web.response;
import java.util.List; import java.util.List;

6
src/main/java/roomescape/reservation/dto/response/ReservationResponse.java → src/main/java/roomescape/reservation/web/response/ReservationResponse.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.response; package roomescape.reservation.web.response;
import java.time.LocalDate; import java.time.LocalDate;
@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import roomescape.member.web.MemberResponse; import roomescape.member.web.MemberResponse;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.infrastructure.persistence.ReservationStatus;
import roomescape.theme.web.ThemeResponse; import roomescape.theme.web.ThemeResponse;
@Schema(name = "예약 정보", description = "예약 저장 및 조회 응답에 사용됩니다.") @Schema(name = "예약 정보", description = "예약 저장 및 조회 응답에 사용됩니다.")

2
src/main/java/roomescape/reservation/dto/response/ReservationTimeInfoResponse.java → src/main/java/roomescape/reservation/web/response/ReservationTimeInfoResponse.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.response; package roomescape.reservation.web.response;
import java.time.LocalTime; import java.time.LocalTime;

2
src/main/java/roomescape/reservation/dto/response/ReservationTimeInfosResponse.java → src/main/java/roomescape/reservation/web/response/ReservationTimeInfosResponse.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.response; package roomescape.reservation.web.response;
import java.util.List; import java.util.List;

4
src/main/java/roomescape/reservation/dto/response/ReservationTimeResponse.java → src/main/java/roomescape/reservation/web/response/ReservationTimeResponse.java
View File

@ -1,9 +1,9 @@
package roomescape.reservation.dto.response; package roomescape.reservation.web.response;
import java.time.LocalTime; import java.time.LocalTime;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
@Schema(name = "예약 시간 정보", description = "예약 시간 추가 및 조회 응답시 사용됩니다.") @Schema(name = "예약 시간 정보", description = "예약 시간 추가 및 조회 응답시 사용됩니다.")
public record ReservationTimeResponse( public record ReservationTimeResponse(

2
src/main/java/roomescape/reservation/dto/response/ReservationTimesResponse.java → src/main/java/roomescape/reservation/web/response/ReservationTimesResponse.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.response; package roomescape.reservation.web.response;
import java.util.List; import java.util.List;

2
src/main/java/roomescape/reservation/dto/response/ReservationsResponse.java → src/main/java/roomescape/reservation/web/response/ReservationsResponse.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.dto.response; package roomescape.reservation.web.response;
import java.util.List; import java.util.List;

10
src/test/java/roomescape/payment/business/PaymentServiceTest.java
View File

@ -22,11 +22,11 @@ import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository;
import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentApprove;
import roomescape.payment.web.PaymentCancel; import roomescape.payment.web.PaymentCancel;
import roomescape.payment.web.ReservationPaymentResponse; import roomescape.payment.web.ReservationPaymentResponse;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.infrastructure.persistence.ReservationStatus;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.infrastructure.persistence.ReservationRepository;
import roomescape.reservation.domain.repository.ReservationTimeRepository; import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository;
import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeEntity;
import roomescape.theme.infrastructure.persistence.ThemeRepository; import roomescape.theme.infrastructure.persistence.ThemeRepository;

18
src/test/java/roomescape/reservation/service/ReservationServiceTest.java → src/test/java/roomescape/reservation/business/ReservationServiceTest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.service; package roomescape.reservation.business;
import static org.assertj.core.api.Assertions.*; 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.MemberEntity;
import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.MemberRepository;
import roomescape.member.infrastructure.persistence.Role; import roomescape.member.infrastructure.persistence.Role;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.infrastructure.persistence.ReservationStatus;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.infrastructure.persistence.ReservationRepository;
import roomescape.reservation.domain.repository.ReservationTimeRepository; import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository;
import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.web.request.ReservationRequest;
import roomescape.reservation.dto.request.WaitingRequest; import roomescape.reservation.web.request.WaitingRequest;
import roomescape.reservation.dto.response.ReservationResponse; import roomescape.reservation.web.response.ReservationResponse;
import roomescape.common.exception.RoomescapeException; import roomescape.common.exception.RoomescapeException;
import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeEntity;
import roomescape.theme.infrastructure.persistence.ThemeRepository; import roomescape.theme.infrastructure.persistence.ThemeRepository;

14
src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java → src/test/java/roomescape/reservation/business/ReservationTimeServiceTest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.service; package roomescape.reservation.business;
import static org.assertj.core.api.Assertions.*; 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.MemberEntity;
import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.MemberRepository;
import roomescape.member.infrastructure.persistence.Role; import roomescape.member.infrastructure.persistence.Role;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.infrastructure.persistence.ReservationStatus;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.infrastructure.persistence.ReservationRepository;
import roomescape.reservation.domain.repository.ReservationTimeRepository; import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository;
import roomescape.reservation.dto.request.ReservationTimeRequest; import roomescape.reservation.web.request.ReservationTimeRequest;
import roomescape.common.exception.RoomescapeException; import roomescape.common.exception.RoomescapeException;
import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeEntity;
import roomescape.theme.infrastructure.persistence.ThemeRepository; import roomescape.theme.infrastructure.persistence.ThemeRepository;

16
src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java → src/test/java/roomescape/reservation/business/ReservationWithPaymentServiceTest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.service; package roomescape.reservation.business;
import static org.assertj.core.api.Assertions.*; 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.infrastructure.persistence.PaymentRepository;
import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentApprove;
import roomescape.payment.web.PaymentCancel; import roomescape.payment.web.PaymentCancel;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.infrastructure.persistence.ReservationStatus;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.infrastructure.persistence.ReservationRepository;
import roomescape.reservation.domain.repository.ReservationTimeRepository; import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository;
import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.web.request.ReservationRequest;
import roomescape.reservation.dto.response.ReservationResponse; import roomescape.reservation.web.response.ReservationResponse;
import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeEntity;
import roomescape.theme.infrastructure.persistence.ThemeRepository; import roomescape.theme.infrastructure.persistence.ThemeRepository;

5
src/test/java/roomescape/reservation/domain/repository/ReservationSearchSpecificationTest.java → src/test/java/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecificationTest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.domain.repository; package roomescape.reservation.infrastructure.persistence;
import static org.assertj.core.api.Assertions.*; 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.MemberEntity;
import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.MemberRepository;
import roomescape.member.infrastructure.persistence.Role; 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.ThemeEntity;
import roomescape.theme.infrastructure.persistence.ThemeRepository; import roomescape.theme.infrastructure.persistence.ThemeRepository;

2
src/test/java/roomescape/reservation/domain/ReservationTest.java → src/test/java/roomescape/reservation/infrastructure/persistence/ReservationTest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.domain; package roomescape.reservation.infrastructure.persistence;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;

2
src/test/java/roomescape/reservation/domain/ReservationTimeTest.java → src/test/java/roomescape/reservation/infrastructure/persistence/ReservationTimeTest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.domain; package roomescape.reservation.infrastructure.persistence;
import org.assertj.core.api.Assertions; import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;

18
src/test/java/roomescape/reservation/controller/ReservationControllerTest.java → src/test/java/roomescape/reservation/web/ReservationControllerTest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.controller; package roomescape.reservation.web;
import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
@ -41,14 +41,14 @@ import roomescape.payment.infrastructure.persistence.PaymentEntity;
import roomescape.payment.infrastructure.persistence.PaymentRepository; import roomescape.payment.infrastructure.persistence.PaymentRepository;
import roomescape.payment.web.PaymentApprove; import roomescape.payment.web.PaymentApprove;
import roomescape.payment.web.PaymentCancel; import roomescape.payment.web.PaymentCancel;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.infrastructure.persistence.ReservationStatus;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.infrastructure.persistence.ReservationRepository;
import roomescape.reservation.domain.repository.ReservationTimeRepository; import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository;
import roomescape.reservation.dto.request.AdminReservationRequest; import roomescape.reservation.web.request.AdminReservationRequest;
import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.web.request.ReservationRequest;
import roomescape.reservation.dto.request.WaitingRequest; import roomescape.reservation.web.request.WaitingRequest;
import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeEntity;
import roomescape.theme.infrastructure.persistence.ThemeRepository; import roomescape.theme.infrastructure.persistence.ThemeRepository;

12
src/test/java/roomescape/reservation/controller/ReservationTimeControllerTest.java → src/test/java/roomescape/reservation/web/ReservationTimeControllerTest.java
View File

@ -1,4 +1,4 @@
package roomescape.reservation.controller; package roomescape.reservation.web;
import static org.hamcrest.Matchers.*; 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.MemberEntity;
import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.MemberRepository;
import roomescape.member.infrastructure.persistence.Role; import roomescape.member.infrastructure.persistence.Role;
import roomescape.reservation.domain.Reservation; import roomescape.reservation.infrastructure.persistence.Reservation;
import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.infrastructure.persistence.ReservationStatus;
import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.infrastructure.persistence.ReservationTime;
import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.infrastructure.persistence.ReservationRepository;
import roomescape.reservation.domain.repository.ReservationTimeRepository; import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository;
import roomescape.theme.infrastructure.persistence.ThemeEntity; import roomescape.theme.infrastructure.persistence.ThemeEntity;
import roomescape.theme.infrastructure.persistence.ThemeRepository; import roomescape.theme.infrastructure.persistence.ThemeRepository;

4
src/test/java/roomescape/theme/util/TestThemeCreateUtil.kt
View File

@ -2,8 +2,8 @@ package roomescape.theme.util
import jakarta.persistence.EntityManager import jakarta.persistence.EntityManager
import roomescape.member.infrastructure.persistence.MemberEntity import roomescape.member.infrastructure.persistence.MemberEntity
import roomescape.reservation.domain.ReservationStatus import roomescape.reservation.infrastructure.persistence.ReservationStatus
import roomescape.reservation.domain.ReservationTime import roomescape.reservation.infrastructure.persistence.ReservationTime
import roomescape.theme.infrastructure.persistence.ThemeEntity import roomescape.theme.infrastructure.persistence.ThemeEntity
import roomescape.util.MemberFixture import roomescape.util.MemberFixture
import roomescape.util.ReservationFixture import roomescape.util.ReservationFixture

6
src/test/java/roomescape/util/Fixtures.kt
View File

@ -8,9 +8,9 @@ import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity
import roomescape.payment.infrastructure.persistence.PaymentEntity import roomescape.payment.infrastructure.persistence.PaymentEntity
import roomescape.payment.web.PaymentApprove import roomescape.payment.web.PaymentApprove
import roomescape.payment.web.PaymentCancel import roomescape.payment.web.PaymentCancel
import roomescape.reservation.domain.Reservation import roomescape.reservation.infrastructure.persistence.Reservation
import roomescape.reservation.domain.ReservationStatus import roomescape.reservation.infrastructure.persistence.ReservationStatus
import roomescape.reservation.domain.ReservationTime import roomescape.reservation.infrastructure.persistence.ReservationTime
import roomescape.theme.infrastructure.persistence.ThemeEntity import roomescape.theme.infrastructure.persistence.ThemeEntity
import java.time.LocalDate import java.time.LocalDate
import java.time.LocalTime import java.time.LocalTime