diff --git a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt index 95f6d8ca..7e8f5f94 100644 --- a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt +++ b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt @@ -8,9 +8,14 @@ import org.springframework.transaction.annotation.Transactional import roomescape.common.exception.ErrorType import roomescape.common.exception.RoomescapeException import roomescape.member.business.MemberService -import roomescape.reservation.infrastructure.persistence.* +import roomescape.reservation.infrastructure.persistence.ReservationEntity +import roomescape.reservation.infrastructure.persistence.ReservationRepository +import roomescape.reservation.infrastructure.persistence.ReservationSearchSpecification +import roomescape.reservation.infrastructure.persistence.ReservationStatus import roomescape.reservation.web.* import roomescape.theme.business.ThemeService +import roomescape.time.business.TimeService +import roomescape.time.infrastructure.persistence.TimeEntity import java.time.LocalDate import java.time.LocalDateTime diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt index b7912f5b..31acb5f6 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt +++ b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore import jakarta.persistence.* import roomescape.member.infrastructure.persistence.MemberEntity import roomescape.theme.infrastructure.persistence.ThemeEntity +import roomescape.time.infrastructure.persistence.TimeEntity import java.time.LocalDate @Entity diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt index 4c563eea..a0a4f499 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt +++ b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt @@ -6,6 +6,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.web.MyReservationRetrieveResponse +import roomescape.time.infrastructure.persistence.TimeEntity import java.time.LocalDate interface ReservationRepository diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecification.kt b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecification.kt index f42892c3..0de81420 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecification.kt +++ b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecification.kt @@ -3,6 +3,7 @@ package roomescape.reservation.infrastructure.persistence import org.springframework.data.jpa.domain.Specification import roomescape.member.infrastructure.persistence.MemberEntity import roomescape.theme.infrastructure.persistence.ThemeEntity +import roomescape.time.infrastructure.persistence.TimeEntity import java.time.LocalDate class ReservationSearchSpecification( diff --git a/src/main/kotlin/roomescape/reservation/web/ReservationResponse.kt b/src/main/kotlin/roomescape/reservation/web/ReservationResponse.kt index 711eabd6..3a6b7577 100644 --- a/src/main/kotlin/roomescape/reservation/web/ReservationResponse.kt +++ b/src/main/kotlin/roomescape/reservation/web/ReservationResponse.kt @@ -8,6 +8,8 @@ import roomescape.reservation.infrastructure.persistence.ReservationEntity import roomescape.reservation.infrastructure.persistence.ReservationStatus import roomescape.theme.web.ThemeRetrieveResponse import roomescape.theme.web.toResponse +import roomescape.time.web.TimeCreateResponse +import roomescape.time.web.toCreateResponse import java.time.LocalDate import java.time.LocalTime diff --git a/src/main/kotlin/roomescape/reservation/business/TimeService.kt b/src/main/kotlin/roomescape/time/business/TimeService.kt similarity index 92% rename from src/main/kotlin/roomescape/reservation/business/TimeService.kt rename to src/main/kotlin/roomescape/time/business/TimeService.kt index edde1923..7b8d956a 100644 --- a/src/main/kotlin/roomescape/reservation/business/TimeService.kt +++ b/src/main/kotlin/roomescape/time/business/TimeService.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.business +package roomescape.time.business import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpStatus @@ -8,9 +8,9 @@ import roomescape.common.exception.ErrorType import roomescape.common.exception.RoomescapeException import roomescape.reservation.infrastructure.persistence.ReservationEntity import roomescape.reservation.infrastructure.persistence.ReservationRepository -import roomescape.reservation.infrastructure.persistence.TimeEntity -import roomescape.reservation.infrastructure.persistence.TimeRepository -import roomescape.reservation.web.* +import roomescape.time.infrastructure.persistence.TimeEntity +import roomescape.time.infrastructure.persistence.TimeRepository +import roomescape.time.web.* import java.time.LocalDate import java.time.LocalTime @@ -70,4 +70,4 @@ class TimeService( TimeWithAvailabilityResponse(time.id!!, time.startAt, isAvailable) }) } -} +} \ No newline at end of file diff --git a/src/main/kotlin/roomescape/reservation/docs/TimeAPI.kt b/src/main/kotlin/roomescape/time/docs/TimeAPI.kt similarity index 89% rename from src/main/kotlin/roomescape/reservation/docs/TimeAPI.kt rename to src/main/kotlin/roomescape/time/docs/TimeAPI.kt index 067137f3..6e1280c2 100644 --- a/src/main/kotlin/roomescape/reservation/docs/TimeAPI.kt +++ b/src/main/kotlin/roomescape/time/docs/TimeAPI.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.docs +package roomescape.time.docs import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.responses.ApiResponse @@ -12,10 +12,10 @@ import org.springframework.web.bind.annotation.RequestParam import roomescape.auth.web.support.Admin import roomescape.auth.web.support.LoginRequired import roomescape.common.dto.response.CommonApiResponse -import roomescape.reservation.web.TimeCreateRequest -import roomescape.reservation.web.TimeCreateResponse -import roomescape.reservation.web.TimeRetrieveListResponse -import roomescape.reservation.web.TimeWithAvailabilityListResponse +import roomescape.time.web.TimeCreateRequest +import roomescape.time.web.TimeCreateResponse +import roomescape.time.web.TimeRetrieveListResponse +import roomescape.time.web.TimeWithAvailabilityListResponse import java.time.LocalDate @Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.") @@ -47,4 +47,4 @@ interface TimeAPI { @RequestParam date: LocalDate, @RequestParam themeId: Long ): ResponseEntity> -} +} \ No newline at end of file diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/TimeEntity.kt b/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt similarity index 80% rename from src/main/kotlin/roomescape/reservation/infrastructure/persistence/TimeEntity.kt rename to src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt index 38f1f361..d0fc306d 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/TimeEntity.kt +++ b/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.infrastructure.persistence +package roomescape.time.infrastructure.persistence import jakarta.persistence.* import java.time.LocalTime diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/TimeRepository.kt b/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeRepository.kt similarity index 78% rename from src/main/kotlin/roomescape/reservation/infrastructure/persistence/TimeRepository.kt rename to src/main/kotlin/roomescape/time/infrastructure/persistence/TimeRepository.kt index df798889..5e726669 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/TimeRepository.kt +++ b/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeRepository.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.infrastructure.persistence +package roomescape.time.infrastructure.persistence import org.springframework.data.jpa.repository.JpaRepository import java.time.LocalTime diff --git a/src/main/kotlin/roomescape/reservation/web/TimeController.kt b/src/main/kotlin/roomescape/time/web/TimeController.kt similarity index 92% rename from src/main/kotlin/roomescape/reservation/web/TimeController.kt rename to src/main/kotlin/roomescape/time/web/TimeController.kt index d697bafa..67a6b494 100644 --- a/src/main/kotlin/roomescape/reservation/web/TimeController.kt +++ b/src/main/kotlin/roomescape/time/web/TimeController.kt @@ -1,11 +1,11 @@ -package roomescape.reservation.web +package roomescape.time.web import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* import roomescape.common.dto.response.CommonApiResponse -import roomescape.reservation.business.TimeService -import roomescape.reservation.docs.TimeAPI +import roomescape.time.business.TimeService +import roomescape.time.docs.TimeAPI import java.net.URI import java.time.LocalDate diff --git a/src/main/kotlin/roomescape/reservation/web/TimeDTO.kt b/src/main/kotlin/roomescape/time/web/TimeDTO.kt similarity index 94% rename from src/main/kotlin/roomescape/reservation/web/TimeDTO.kt rename to src/main/kotlin/roomescape/time/web/TimeDTO.kt index b6f121eb..257d7ff8 100644 --- a/src/main/kotlin/roomescape/reservation/web/TimeDTO.kt +++ b/src/main/kotlin/roomescape/time/web/TimeDTO.kt @@ -1,7 +1,7 @@ -package roomescape.reservation.web +package roomescape.time.web import io.swagger.v3.oas.annotations.media.Schema -import roomescape.reservation.infrastructure.persistence.TimeEntity +import roomescape.time.infrastructure.persistence.TimeEntity import java.time.LocalTime @Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.") diff --git a/src/test/kotlin/roomescape/reservation/business/ReservationServiceTest.kt b/src/test/kotlin/roomescape/reservation/business/ReservationServiceTest.kt index 745cc89d..408718d4 100644 --- a/src/test/kotlin/roomescape/reservation/business/ReservationServiceTest.kt +++ b/src/test/kotlin/roomescape/reservation/business/ReservationServiceTest.kt @@ -11,6 +11,7 @@ import roomescape.member.business.MemberService import roomescape.member.infrastructure.persistence.Role import roomescape.reservation.infrastructure.persistence.ReservationRepository import roomescape.theme.business.ThemeService +import roomescape.time.business.TimeService import roomescape.util.MemberFixture import roomescape.util.ReservationFixture import roomescape.util.TimeFixture diff --git a/src/test/kotlin/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecificationTest.kt b/src/test/kotlin/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecificationTest.kt index 6d764f42..d1e63d9d 100644 --- a/src/test/kotlin/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecificationTest.kt +++ b/src/test/kotlin/roomescape/reservation/infrastructure/persistence/ReservationSearchSpecificationTest.kt @@ -8,6 +8,7 @@ import jakarta.persistence.EntityManager import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import roomescape.member.infrastructure.persistence.MemberEntity import roomescape.theme.infrastructure.persistence.ThemeEntity +import roomescape.time.infrastructure.persistence.TimeEntity import roomescape.util.MemberFixture import roomescape.util.ReservationFixture import roomescape.util.ThemeFixture diff --git a/src/test/kotlin/roomescape/reservation/web/ReservationControllerTest.kt b/src/test/kotlin/roomescape/reservation/web/ReservationControllerTest.kt index c7a1802b..5a94cae9 100644 --- a/src/test/kotlin/roomescape/reservation/web/ReservationControllerTest.kt +++ b/src/test/kotlin/roomescape/reservation/web/ReservationControllerTest.kt @@ -28,9 +28,9 @@ import roomescape.payment.infrastructure.client.TossPaymentClient import roomescape.payment.infrastructure.persistence.PaymentEntity import roomescape.reservation.infrastructure.persistence.ReservationEntity import roomescape.reservation.infrastructure.persistence.ReservationStatus -import roomescape.reservation.infrastructure.persistence.TimeEntity import roomescape.theme.exception.ThemeErrorCode import roomescape.theme.infrastructure.persistence.ThemeEntity +import roomescape.time.infrastructure.persistence.TimeEntity import roomescape.util.* import java.time.LocalDate import java.time.LocalTime diff --git a/src/test/kotlin/roomescape/theme/util/TestThemeCreateUtil.kt b/src/test/kotlin/roomescape/theme/util/TestThemeCreateUtil.kt index 0dacd49b..43c46762 100644 --- a/src/test/kotlin/roomescape/theme/util/TestThemeCreateUtil.kt +++ b/src/test/kotlin/roomescape/theme/util/TestThemeCreateUtil.kt @@ -3,8 +3,8 @@ package roomescape.theme.util import jakarta.persistence.EntityManager import roomescape.member.infrastructure.persistence.MemberEntity import roomescape.reservation.infrastructure.persistence.ReservationStatus -import roomescape.reservation.infrastructure.persistence.TimeEntity import roomescape.theme.infrastructure.persistence.ThemeEntity +import roomescape.time.infrastructure.persistence.TimeEntity import roomescape.util.MemberFixture import roomescape.util.ReservationFixture import roomescape.util.ThemeFixture diff --git a/src/test/kotlin/roomescape/reservation/business/TimeServiceTest.kt b/src/test/kotlin/roomescape/time/business/TimeServiceTest.kt similarity index 94% rename from src/test/kotlin/roomescape/reservation/business/TimeServiceTest.kt rename to src/test/kotlin/roomescape/time/business/TimeServiceTest.kt index 83ed7417..58d8a17a 100644 --- a/src/test/kotlin/roomescape/reservation/business/TimeServiceTest.kt +++ b/src/test/kotlin/roomescape/time/business/TimeServiceTest.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.business +package roomescape.time.business import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.FunSpec @@ -10,8 +10,8 @@ import org.springframework.http.HttpStatus import roomescape.common.exception.ErrorType import roomescape.common.exception.RoomescapeException import roomescape.reservation.infrastructure.persistence.ReservationRepository -import roomescape.reservation.infrastructure.persistence.TimeRepository -import roomescape.reservation.web.TimeCreateRequest +import roomescape.time.infrastructure.persistence.TimeRepository +import roomescape.time.web.TimeCreateRequest import roomescape.util.TimeFixture import java.time.LocalTime @@ -84,4 +84,4 @@ class TimeServiceTest : FunSpec({ } } } -}) +}) \ No newline at end of file diff --git a/src/test/kotlin/roomescape/reservation/infrastructure/persistence/TimeRepositoryTest.kt b/src/test/kotlin/roomescape/time/infrastructure/persistence/TimeRepositoryTest.kt similarity index 93% rename from src/test/kotlin/roomescape/reservation/infrastructure/persistence/TimeRepositoryTest.kt rename to src/test/kotlin/roomescape/time/infrastructure/persistence/TimeRepositoryTest.kt index d3ef18c5..34f1b421 100644 --- a/src/test/kotlin/roomescape/reservation/infrastructure/persistence/TimeRepositoryTest.kt +++ b/src/test/kotlin/roomescape/time/infrastructure/persistence/TimeRepositoryTest.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.infrastructure.persistence +package roomescape.time.infrastructure.persistence import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe @@ -30,4 +30,4 @@ class TimeRepositoryTest( timeRepository.existsByStartAt(startAt.plusSeconds(1)) shouldBe false } } -}) +}) \ No newline at end of file diff --git a/src/test/kotlin/roomescape/reservation/web/TimeControllerTest.kt b/src/test/kotlin/roomescape/time/web/TimeControllerTest.kt similarity index 97% rename from src/test/kotlin/roomescape/reservation/web/TimeControllerTest.kt rename to src/test/kotlin/roomescape/time/web/TimeControllerTest.kt index 1161b705..4ce52364 100644 --- a/src/test/kotlin/roomescape/reservation/web/TimeControllerTest.kt +++ b/src/test/kotlin/roomescape/time/web/TimeControllerTest.kt @@ -1,4 +1,4 @@ -package roomescape.reservation.web +package roomescape.time.web import com.ninjasquad.springmockk.MockkBean import com.ninjasquad.springmockk.SpykBean @@ -13,10 +13,10 @@ import org.springframework.http.MediaType import org.springframework.test.web.servlet.MockMvc import roomescape.common.config.JacksonConfig import roomescape.common.exception.ErrorType -import roomescape.reservation.business.TimeService import roomescape.reservation.infrastructure.persistence.ReservationRepository -import roomescape.reservation.infrastructure.persistence.TimeEntity -import roomescape.reservation.infrastructure.persistence.TimeRepository +import roomescape.time.business.TimeService +import roomescape.time.infrastructure.persistence.TimeEntity +import roomescape.time.infrastructure.persistence.TimeRepository import roomescape.util.ReservationFixture import roomescape.util.RoomescapeApiTest import roomescape.util.ThemeFixture @@ -292,4 +292,4 @@ class TimeControllerTest( } } } -} +} \ No newline at end of file diff --git a/src/test/kotlin/roomescape/util/Fixtures.kt b/src/test/kotlin/roomescape/util/Fixtures.kt index 21316345..5413b676 100644 --- a/src/test/kotlin/roomescape/util/Fixtures.kt +++ b/src/test/kotlin/roomescape/util/Fixtures.kt @@ -12,10 +12,10 @@ import roomescape.payment.web.PaymentCancelRequest import roomescape.payment.web.PaymentCancelResponse import roomescape.reservation.infrastructure.persistence.ReservationEntity import roomescape.reservation.infrastructure.persistence.ReservationStatus -import roomescape.reservation.infrastructure.persistence.TimeEntity import roomescape.reservation.web.ReservationCreateWithPaymentRequest import roomescape.reservation.web.WaitingCreateRequest import roomescape.theme.infrastructure.persistence.ThemeEntity +import roomescape.time.infrastructure.persistence.TimeEntity import java.time.LocalDate import java.time.LocalTime import java.time.OffsetDateTime