diff --git a/src/main/java/roomescape/member/service/MemberService.java b/src/main/java/roomescape/member/business/MemberService.java similarity index 84% rename from src/main/java/roomescape/member/service/MemberService.java rename to src/main/java/roomescape/member/business/MemberService.java index ff5dbd4c..b531a0fc 100644 --- a/src/main/java/roomescape/member/service/MemberService.java +++ b/src/main/java/roomescape/member/business/MemberService.java @@ -1,4 +1,4 @@ -package roomescape.member.service; +package roomescape.member.business; import java.util.List; @@ -6,10 +6,10 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import roomescape.member.domain.Member; -import roomescape.member.domain.repository.MemberRepository; -import roomescape.member.dto.MemberResponse; -import roomescape.member.dto.MembersResponse; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.MemberRepository; +import roomescape.member.web.MemberResponse; +import roomescape.member.web.MembersResponse; import roomescape.system.exception.ErrorType; import roomescape.system.exception.RoomEscapeException; diff --git a/src/main/java/roomescape/member/domain/Role.java b/src/main/java/roomescape/member/domain/Role.java deleted file mode 100644 index e573fc02..00000000 --- a/src/main/java/roomescape/member/domain/Role.java +++ /dev/null @@ -1,6 +0,0 @@ -package roomescape.member.domain; - -public enum Role { - MEMBER, - ADMIN -} diff --git a/src/main/java/roomescape/member/domain/Member.java b/src/main/java/roomescape/member/infrastructure/entity/Member.java similarity index 97% rename from src/main/java/roomescape/member/domain/Member.java rename to src/main/java/roomescape/member/infrastructure/entity/Member.java index 5654a7da..8eb9023a 100644 --- a/src/main/java/roomescape/member/domain/Member.java +++ b/src/main/java/roomescape/member/infrastructure/entity/Member.java @@ -1,4 +1,4 @@ -package roomescape.member.domain; +package roomescape.member.infrastructure.entity; import org.springframework.http.HttpStatus; diff --git a/src/main/java/roomescape/member/domain/repository/MemberRepository.java b/src/main/java/roomescape/member/infrastructure/entity/MemberRepository.java similarity index 73% rename from src/main/java/roomescape/member/domain/repository/MemberRepository.java rename to src/main/java/roomescape/member/infrastructure/entity/MemberRepository.java index 4f039582..8c35fb30 100644 --- a/src/main/java/roomescape/member/domain/repository/MemberRepository.java +++ b/src/main/java/roomescape/member/infrastructure/entity/MemberRepository.java @@ -1,11 +1,9 @@ -package roomescape.member.domain.repository; +package roomescape.member.infrastructure.entity; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import roomescape.member.domain.Member; - public interface MemberRepository extends JpaRepository { Optional findByEmailAndPassword(String email, String password); diff --git a/src/main/java/roomescape/member/infrastructure/entity/Role.java b/src/main/java/roomescape/member/infrastructure/entity/Role.java new file mode 100644 index 00000000..c42f70c8 --- /dev/null +++ b/src/main/java/roomescape/member/infrastructure/entity/Role.java @@ -0,0 +1,6 @@ +package roomescape.member.infrastructure.entity; + +public enum Role { + MEMBER, + ADMIN +} diff --git a/src/main/java/roomescape/member/controller/MemberController.java b/src/main/java/roomescape/member/web/MemberController.java similarity index 90% rename from src/main/java/roomescape/member/controller/MemberController.java rename to src/main/java/roomescape/member/web/MemberController.java index 96cf2728..40dddf7d 100644 --- a/src/main/java/roomescape/member/controller/MemberController.java +++ b/src/main/java/roomescape/member/web/MemberController.java @@ -1,4 +1,4 @@ -package roomescape.member.controller; +package roomescape.member.web; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.GetMapping; @@ -9,8 +9,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; -import roomescape.member.dto.MembersResponse; -import roomescape.member.service.MemberService; +import roomescape.member.business.MemberService; import roomescape.system.auth.annotation.Admin; import roomescape.system.dto.response.RoomEscapeApiResponse; diff --git a/src/main/java/roomescape/member/dto/MemberResponse.java b/src/main/java/roomescape/member/web/MemberResponse.java similarity index 84% rename from src/main/java/roomescape/member/dto/MemberResponse.java rename to src/main/java/roomescape/member/web/MemberResponse.java index 8683b6aa..876f5752 100644 --- a/src/main/java/roomescape/member/dto/MemberResponse.java +++ b/src/main/java/roomescape/member/web/MemberResponse.java @@ -1,7 +1,7 @@ -package roomescape.member.dto; +package roomescape.member.web; import io.swagger.v3.oas.annotations.media.Schema; -import roomescape.member.domain.Member; +import roomescape.member.infrastructure.entity.Member; @Schema(name = "회원 조회 응답", description = "회원 정보 조회 응답시 사용됩니다.") public record MemberResponse( diff --git a/src/main/java/roomescape/member/dto/MembersResponse.java b/src/main/java/roomescape/member/web/MembersResponse.java similarity index 91% rename from src/main/java/roomescape/member/dto/MembersResponse.java rename to src/main/java/roomescape/member/web/MembersResponse.java index 5a83c97d..92543779 100644 --- a/src/main/java/roomescape/member/dto/MembersResponse.java +++ b/src/main/java/roomescape/member/web/MembersResponse.java @@ -1,4 +1,4 @@ -package roomescape.member.dto; +package roomescape.member.web; import java.util.List; diff --git a/src/main/java/roomescape/reservation/domain/Reservation.java b/src/main/java/roomescape/reservation/domain/Reservation.java index 8fee6fc6..d038b04b 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.domain.Member; +import roomescape.member.infrastructure.entity.Member; import roomescape.system.exception.ErrorType; import roomescape.system.exception.RoomEscapeException; import roomescape.theme.domain.Theme; diff --git a/src/main/java/roomescape/reservation/dto/response/ReservationResponse.java b/src/main/java/roomescape/reservation/dto/response/ReservationResponse.java index c4d5c8fa..ba4ecb2b 100644 --- a/src/main/java/roomescape/reservation/dto/response/ReservationResponse.java +++ b/src/main/java/roomescape/reservation/dto/response/ReservationResponse.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; -import roomescape.member.dto.MemberResponse; +import roomescape.member.web.MemberResponse; import roomescape.reservation.domain.Reservation; import roomescape.reservation.domain.ReservationStatus; import roomescape.theme.dto.ThemeResponse; diff --git a/src/main/java/roomescape/reservation/service/ReservationService.java b/src/main/java/roomescape/reservation/service/ReservationService.java index 05f22a41..b82d42eb 100644 --- a/src/main/java/roomescape/reservation/service/ReservationService.java +++ b/src/main/java/roomescape/reservation/service/ReservationService.java @@ -9,8 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import roomescape.member.domain.Member; -import roomescape.member.service.MemberService; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.business.MemberService; 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 4304a37f..1e372aad 100644 --- a/src/main/java/roomescape/system/auth/interceptor/AdminInterceptor.java +++ b/src/main/java/roomescape/system/auth/interceptor/AdminInterceptor.java @@ -10,8 +10,8 @@ import org.springframework.web.servlet.HandlerInterceptor; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import roomescape.member.domain.Member; -import roomescape.member.service.MemberService; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.business.MemberService; 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 2aa0bafc..c82343eb 100644 --- a/src/main/java/roomescape/system/auth/interceptor/LoginInterceptor.java +++ b/src/main/java/roomescape/system/auth/interceptor/LoginInterceptor.java @@ -10,8 +10,8 @@ import org.springframework.web.servlet.HandlerInterceptor; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import roomescape.member.domain.Member; -import roomescape.member.service.MemberService; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.business.MemberService; 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 e8d43828..8fa1447a 100644 --- a/src/main/java/roomescape/system/auth/service/AuthService.java +++ b/src/main/java/roomescape/system/auth/service/AuthService.java @@ -2,8 +2,8 @@ package roomescape.system.auth.service; import org.springframework.stereotype.Service; -import roomescape.member.domain.Member; -import roomescape.member.service.MemberService; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.business.MemberService; 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 0eb6f562..2a6736bf 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.domain.Member -import roomescape.member.domain.Role +import roomescape.member.infrastructure.entity.Member +import roomescape.member.infrastructure.entity.Role import java.util.concurrent.atomic.AtomicLong object MemberFixture { diff --git a/src/test/java/roomescape/member/controller/MemberControllerTest.java b/src/test/java/roomescape/member/controller/MemberControllerTest.java index 5cf989d9..80744610 100644 --- a/src/test/java/roomescape/member/controller/MemberControllerTest.java +++ b/src/test/java/roomescape/member/controller/MemberControllerTest.java @@ -13,9 +13,9 @@ import org.springframework.test.context.jdbc.Sql; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Header; -import roomescape.member.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @Sql(scripts = "/truncate.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) diff --git a/src/test/java/roomescape/member/domain/MemberTest.java b/src/test/java/roomescape/member/domain/MemberTest.java index 666982fd..8f6473cc 100644 --- a/src/test/java/roomescape/member/domain/MemberTest.java +++ b/src/test/java/roomescape/member/domain/MemberTest.java @@ -4,6 +4,8 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; import roomescape.system.exception.RoomEscapeException; class MemberTest { diff --git a/src/test/java/roomescape/payment/domain/PaymentTest.java b/src/test/java/roomescape/payment/domain/PaymentTest.java index 3c6e1fbc..bfbe95f6 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.domain.Member; -import roomescape.member.domain.Role; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.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 29a7ad75..486f40b0 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.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; 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 ffba15b6..91baa3d4 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.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; 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 cefd9aff..f74f25a1 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.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; 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 f66623e6..e66b99e1 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.domain.Member; -import roomescape.member.domain.Role; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.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 62cb372f..f92a4ae6 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.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; 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 59ecd913..d29fa51c 100644 --- a/src/test/java/roomescape/reservation/service/ReservationServiceTest.java +++ b/src/test/java/roomescape/reservation/service/ReservationServiceTest.java @@ -14,10 +14,10 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.jdbc.Sql.ExecutionPhase; -import roomescape.member.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; -import roomescape.member.service.MemberService; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; +import roomescape.member.business.MemberService; 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 5b3e57a9..135c550c 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.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; 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 973ccf03..863d01c0 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.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; 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 fb3918e3..34e3d1c7 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.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; @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 bf8a5af8..2aace90e 100644 --- a/src/test/java/roomescape/system/auth/service/AuthServiceTest.java +++ b/src/test/java/roomescape/system/auth/service/AuthServiceTest.java @@ -9,10 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; -import roomescape.member.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; -import roomescape.member.service.MemberService; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; +import roomescape.member.business.MemberService; 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 8eba3ab3..5b373a0c 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.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; @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 be91c3ca..d40970b8 100644 --- a/src/test/java/roomescape/theme/service/ThemeServiceTest.java +++ b/src/test/java/roomescape/theme/service/ThemeServiceTest.java @@ -13,10 +13,10 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.context.annotation.Import; import org.springframework.test.context.jdbc.Sql; -import roomescape.member.domain.Member; -import roomescape.member.domain.Role; -import roomescape.member.domain.repository.MemberRepository; -import roomescape.member.service.MemberService; +import roomescape.member.infrastructure.entity.Member; +import roomescape.member.infrastructure.entity.Role; +import roomescape.member.infrastructure.entity.MemberRepository; +import roomescape.member.business.MemberService; import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.dto.request.ReservationTimeRequest; import roomescape.reservation.dto.response.ReservationTimeResponse; diff --git a/src/test/java/roomescape/view/controller/PageControllerTest.kt b/src/test/java/roomescape/view/controller/PageControllerTest.kt index 170b397c..21d09e77 100644 --- a/src/test/java/roomescape/view/controller/PageControllerTest.kt +++ b/src/test/java/roomescape/view/controller/PageControllerTest.kt @@ -13,8 +13,8 @@ import org.springframework.boot.test.web.server.LocalServerPort import org.springframework.http.HttpStatus import roomescape.common.MemberFixture import roomescape.common.NoSqlInitialize -import roomescape.member.domain.Member -import roomescape.member.service.MemberService +import roomescape.member.infrastructure.entity.Member +import roomescape.member.business.MemberService import roomescape.system.auth.jwt.JwtHandler import roomescape.system.exception.ErrorType import roomescape.system.exception.RoomEscapeException