diff --git a/src/main/java/roomescape/member/business/MemberService.kt b/src/main/java/roomescape/member/business/MemberService.kt index 2949740c..af7b60f1 100644 --- a/src/main/java/roomescape/member/business/MemberService.kt +++ b/src/main/java/roomescape/member/business/MemberService.kt @@ -4,8 +4,8 @@ import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpStatus import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import roomescape.member.infrastructure.entity.Member -import roomescape.member.infrastructure.entity.MemberRepository +import roomescape.member.infrastructure.persistence.Member +import roomescape.member.infrastructure.persistence.MemberRepository import roomescape.member.web.MembersResponse import roomescape.member.web.toResponse import roomescape.system.exception.ErrorType diff --git a/src/main/java/roomescape/member/infrastructure/entity/Member.kt b/src/main/java/roomescape/member/infrastructure/persistence/Member.kt similarity index 88% rename from src/main/java/roomescape/member/infrastructure/entity/Member.kt rename to src/main/java/roomescape/member/infrastructure/persistence/Member.kt index 5b22934c..1e63e863 100644 --- a/src/main/java/roomescape/member/infrastructure/entity/Member.kt +++ b/src/main/java/roomescape/member/infrastructure/persistence/Member.kt @@ -1,4 +1,4 @@ -package roomescape.member.infrastructure.entity +package roomescape.member.infrastructure.persistence import jakarta.persistence.* diff --git a/src/main/java/roomescape/member/infrastructure/entity/MemberRepository.kt b/src/main/java/roomescape/member/infrastructure/persistence/MemberRepository.kt similarity index 78% rename from src/main/java/roomescape/member/infrastructure/entity/MemberRepository.kt rename to src/main/java/roomescape/member/infrastructure/persistence/MemberRepository.kt index a681120a..c08e3920 100644 --- a/src/main/java/roomescape/member/infrastructure/entity/MemberRepository.kt +++ b/src/main/java/roomescape/member/infrastructure/persistence/MemberRepository.kt @@ -1,4 +1,4 @@ -package roomescape.member.infrastructure.entity +package roomescape.member.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/java/roomescape/member/web/MemberController.kt b/src/main/java/roomescape/member/web/MemberController.kt index 1d883be0..1889ebb3 100644 --- a/src/main/java/roomescape/member/web/MemberController.kt +++ b/src/main/java/roomescape/member/web/MemberController.kt @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RestController import roomescape.member.business.MemberService -import roomescape.member.infrastructure.entity.Member +import roomescape.member.infrastructure.persistence.Member import roomescape.system.dto.response.RoomEscapeApiResponse @RestController diff --git a/src/main/java/roomescape/reservation/domain/Reservation.java b/src/main/java/roomescape/reservation/domain/Reservation.java index d038b04b..7d300176 100644 --- a/src/main/java/roomescape/reservation/domain/Reservation.java +++ b/src/main/java/roomescape/reservation/domain/Reservation.java @@ -15,7 +15,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.persistence.Member; import roomescape.system.exception.ErrorType; import roomescape.system.exception.RoomEscapeException; import roomescape.theme.domain.Theme; diff --git a/src/main/java/roomescape/reservation/service/ReservationService.java b/src/main/java/roomescape/reservation/service/ReservationService.java index 9304e8fe..20a856c6 100644 --- a/src/main/java/roomescape/reservation/service/ReservationService.java +++ b/src/main/java/roomescape/reservation/service/ReservationService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import roomescape.member.business.MemberService; -import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.persistence.Member; import roomescape.reservation.domain.Reservation; import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.domain.ReservationTime; diff --git a/src/main/java/roomescape/system/auth/interceptor/AdminInterceptor.java b/src/main/java/roomescape/system/auth/interceptor/AdminInterceptor.java index 0788419d..8d5d38eb 100644 --- a/src/main/java/roomescape/system/auth/interceptor/AdminInterceptor.java +++ b/src/main/java/roomescape/system/auth/interceptor/AdminInterceptor.java @@ -11,7 +11,7 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import roomescape.member.business.MemberService; -import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.persistence.Member; import roomescape.system.auth.annotation.Admin; import roomescape.system.auth.jwt.JwtHandler; import roomescape.system.exception.ErrorType; diff --git a/src/main/java/roomescape/system/auth/interceptor/LoginInterceptor.java b/src/main/java/roomescape/system/auth/interceptor/LoginInterceptor.java index 6522fb0a..07152963 100644 --- a/src/main/java/roomescape/system/auth/interceptor/LoginInterceptor.java +++ b/src/main/java/roomescape/system/auth/interceptor/LoginInterceptor.java @@ -11,7 +11,7 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import roomescape.member.business.MemberService; -import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.persistence.Member; import roomescape.system.auth.annotation.LoginRequired; import roomescape.system.auth.jwt.JwtHandler; import roomescape.system.exception.ErrorType; diff --git a/src/main/java/roomescape/system/auth/service/AuthService.java b/src/main/java/roomescape/system/auth/service/AuthService.java index 695031f3..087fe05a 100644 --- a/src/main/java/roomescape/system/auth/service/AuthService.java +++ b/src/main/java/roomescape/system/auth/service/AuthService.java @@ -3,7 +3,7 @@ package roomescape.system.auth.service; import org.springframework.stereotype.Service; import roomescape.member.business.MemberService; -import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.persistence.Member; import roomescape.system.auth.dto.LoginCheckResponse; import roomescape.system.auth.dto.LoginRequest; import roomescape.system.auth.jwt.JwtHandler; diff --git a/src/test/java/roomescape/common/Fixtures.kt b/src/test/java/roomescape/common/Fixtures.kt index 2a6736bf..ebe4c439 100644 --- a/src/test/java/roomescape/common/Fixtures.kt +++ b/src/test/java/roomescape/common/Fixtures.kt @@ -1,7 +1,7 @@ package roomescape.common -import roomescape.member.infrastructure.entity.Member -import roomescape.member.infrastructure.entity.Role +import roomescape.member.infrastructure.persistence.Member +import roomescape.member.infrastructure.persistence.Role import java.util.concurrent.atomic.AtomicLong object MemberFixture { diff --git a/src/test/java/roomescape/common/RoomescapeApiTest.kt b/src/test/java/roomescape/common/RoomescapeApiTest.kt index 6f6c872d..f69fce78 100644 --- a/src/test/java/roomescape/common/RoomescapeApiTest.kt +++ b/src/test/java/roomescape/common/RoomescapeApiTest.kt @@ -10,8 +10,8 @@ import io.restassured.response.ValidatableResponse import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.web.server.LocalServerPort import org.springframework.data.repository.findByIdOrNull -import roomescape.member.infrastructure.entity.Member -import roomescape.member.infrastructure.entity.MemberRepository +import roomescape.member.infrastructure.persistence.Member +import roomescape.member.infrastructure.persistence.MemberRepository import roomescape.system.auth.jwt.JwtHandler const val NOT_LOGGED_IN_USERID: Long = 0; diff --git a/src/test/java/roomescape/payment/domain/PaymentTest.java b/src/test/java/roomescape/payment/domain/PaymentTest.java index 9c0b52f9..1544cbb0 100644 --- a/src/test/java/roomescape/payment/domain/PaymentTest.java +++ b/src/test/java/roomescape/payment/domain/PaymentTest.java @@ -13,8 +13,8 @@ import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.NullAndEmptySource; import org.junit.jupiter.params.provider.NullSource; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +import roomescape.member.infrastructure.persistence.Role; import roomescape.reservation.domain.Reservation; import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.domain.ReservationTime; diff --git a/src/test/java/roomescape/payment/service/PaymentServiceTest.java b/src/test/java/roomescape/payment/service/PaymentServiceTest.java index b42d0d95..66719b95 100644 --- a/src/test/java/roomescape/payment/service/PaymentServiceTest.java +++ b/src/test/java/roomescape/payment/service/PaymentServiceTest.java @@ -13,9 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.jdbc.Sql.ExecutionPhase; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +import roomescape.member.infrastructure.persistence.MemberRepository; +import roomescape.member.infrastructure.persistence.Role; import roomescape.payment.domain.repository.CanceledPaymentRepository; import roomescape.payment.dto.request.PaymentCancelRequest; import roomescape.payment.dto.response.PaymentResponse; diff --git a/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java b/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java index 8404274c..b5f625b1 100644 --- a/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java +++ b/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java @@ -2,7 +2,6 @@ package roomescape.reservation.controller; import static org.assertj.core.api.Assertions.*; import static org.hamcrest.Matchers.*; -import static org.mockito.ArgumentMatchers.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -33,9 +32,9 @@ import org.springframework.test.context.jdbc.Sql.ExecutionPhase; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Header; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +import roomescape.member.infrastructure.persistence.MemberRepository; +import roomescape.member.infrastructure.persistence.Role; import roomescape.payment.client.TossPaymentClient; import roomescape.payment.domain.CanceledPayment; import roomescape.payment.domain.Payment; diff --git a/src/test/java/roomescape/reservation/controller/ReservationTimeControllerTest.java b/src/test/java/roomescape/reservation/controller/ReservationTimeControllerTest.java index f7381e83..9f809fe9 100644 --- a/src/test/java/roomescape/reservation/controller/ReservationTimeControllerTest.java +++ b/src/test/java/roomescape/reservation/controller/ReservationTimeControllerTest.java @@ -21,9 +21,9 @@ import org.springframework.test.context.jdbc.Sql.ExecutionPhase; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Header; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +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; diff --git a/src/test/java/roomescape/reservation/domain/ReservationTest.java b/src/test/java/roomescape/reservation/domain/ReservationTest.java index 8f9a9da1..757b27a5 100644 --- a/src/test/java/roomescape/reservation/domain/ReservationTest.java +++ b/src/test/java/roomescape/reservation/domain/ReservationTest.java @@ -10,8 +10,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +import roomescape.member.infrastructure.persistence.Role; import roomescape.system.exception.RoomEscapeException; import roomescape.theme.domain.Theme; diff --git a/src/test/java/roomescape/reservation/domain/repository/ReservationSearchSpecificationTest.java b/src/test/java/roomescape/reservation/domain/repository/ReservationSearchSpecificationTest.java index dd672197..89dda95c 100644 --- a/src/test/java/roomescape/reservation/domain/repository/ReservationSearchSpecificationTest.java +++ b/src/test/java/roomescape/reservation/domain/repository/ReservationSearchSpecificationTest.java @@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.data.jpa.domain.Specification; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +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; diff --git a/src/test/java/roomescape/reservation/service/ReservationServiceTest.java b/src/test/java/roomescape/reservation/service/ReservationServiceTest.java index b7bc072f..17cacf6d 100644 --- a/src/test/java/roomescape/reservation/service/ReservationServiceTest.java +++ b/src/test/java/roomescape/reservation/service/ReservationServiceTest.java @@ -15,9 +15,9 @@ import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.jdbc.Sql.ExecutionPhase; import roomescape.member.business.MemberService; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +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; diff --git a/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java b/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java index 8788a072..73682f55 100644 --- a/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java +++ b/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java @@ -13,9 +13,9 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.jdbc.Sql.ExecutionPhase; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +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; diff --git a/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java b/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java index 32077e16..fe0bec73 100644 --- a/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java +++ b/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java @@ -13,9 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.jdbc.Sql.ExecutionPhase; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +import roomescape.member.infrastructure.persistence.MemberRepository; +import roomescape.member.infrastructure.persistence.Role; import roomescape.payment.domain.repository.CanceledPaymentRepository; import roomescape.payment.domain.repository.PaymentRepository; import roomescape.payment.dto.request.PaymentCancelRequest; diff --git a/src/test/java/roomescape/system/auth/controller/AuthControllerTest.java b/src/test/java/roomescape/system/auth/controller/AuthControllerTest.java index 2fbcf1c3..2bd51dd1 100644 --- a/src/test/java/roomescape/system/auth/controller/AuthControllerTest.java +++ b/src/test/java/roomescape/system/auth/controller/AuthControllerTest.java @@ -14,9 +14,9 @@ import org.springframework.test.context.jdbc.Sql; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +import roomescape.member.infrastructure.persistence.MemberRepository; +import roomescape.member.infrastructure.persistence.Role; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @Sql(scripts = "/truncate.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) diff --git a/src/test/java/roomescape/system/auth/service/AuthServiceTest.java b/src/test/java/roomescape/system/auth/service/AuthServiceTest.java index 26bd6783..776a4a54 100644 --- a/src/test/java/roomescape/system/auth/service/AuthServiceTest.java +++ b/src/test/java/roomescape/system/auth/service/AuthServiceTest.java @@ -10,9 +10,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import roomescape.member.business.MemberService; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +import roomescape.member.infrastructure.persistence.MemberRepository; +import roomescape.member.infrastructure.persistence.Role; import roomescape.system.auth.dto.LoginRequest; import roomescape.system.auth.jwt.JwtHandler; import roomescape.system.auth.jwt.dto.TokenDto; diff --git a/src/test/java/roomescape/theme/controller/ThemeControllerTest.java b/src/test/java/roomescape/theme/controller/ThemeControllerTest.java index 354d9be8..391ed044 100644 --- a/src/test/java/roomescape/theme/controller/ThemeControllerTest.java +++ b/src/test/java/roomescape/theme/controller/ThemeControllerTest.java @@ -18,9 +18,9 @@ import org.springframework.test.context.jdbc.Sql.ExecutionPhase; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Header; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +import roomescape.member.infrastructure.persistence.MemberRepository; +import roomescape.member.infrastructure.persistence.Role; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @Sql(scripts = "/truncate.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD) diff --git a/src/test/java/roomescape/theme/service/ThemeServiceTest.java b/src/test/java/roomescape/theme/service/ThemeServiceTest.java index 8f31529a..3ef8b8b7 100644 --- a/src/test/java/roomescape/theme/service/ThemeServiceTest.java +++ b/src/test/java/roomescape/theme/service/ThemeServiceTest.java @@ -14,9 +14,9 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.jdbc.Sql; import roomescape.member.business.MemberService; -import roomescape.member.infrastructure.entity.Member; -import roomescape.member.infrastructure.entity.MemberRepository; -import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.persistence.Member; +import roomescape.member.infrastructure.persistence.MemberRepository; +import roomescape.member.infrastructure.persistence.Role; import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.dto.request.ReservationTimeRequest; import roomescape.reservation.dto.response.ReservationTimeResponse;