generated from pricelees/issue-pr-template
[#20] 도메인별 예외 분리 #21
@ -8,9 +8,14 @@ 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.member.business.MemberService
|
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.reservation.web.*
|
||||||
import roomescape.theme.business.ThemeService
|
import roomescape.theme.business.ThemeService
|
||||||
|
import roomescape.time.business.TimeService
|
||||||
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore
|
|||||||
import jakarta.persistence.*
|
import jakarta.persistence.*
|
||||||
import roomescape.member.infrastructure.persistence.MemberEntity
|
import roomescape.member.infrastructure.persistence.MemberEntity
|
||||||
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
||||||
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
|
|||||||
@ -6,6 +6,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.web.MyReservationRetrieveResponse
|
import roomescape.reservation.web.MyReservationRetrieveResponse
|
||||||
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
|
|
||||||
interface ReservationRepository
|
interface ReservationRepository
|
||||||
|
|||||||
@ -3,6 +3,7 @@ package roomescape.reservation.infrastructure.persistence
|
|||||||
import org.springframework.data.jpa.domain.Specification
|
import org.springframework.data.jpa.domain.Specification
|
||||||
import roomescape.member.infrastructure.persistence.MemberEntity
|
import roomescape.member.infrastructure.persistence.MemberEntity
|
||||||
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
||||||
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
|
|
||||||
class ReservationSearchSpecification(
|
class ReservationSearchSpecification(
|
||||||
|
|||||||
@ -8,6 +8,8 @@ import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
|||||||
import roomescape.reservation.infrastructure.persistence.ReservationStatus
|
import roomescape.reservation.infrastructure.persistence.ReservationStatus
|
||||||
import roomescape.theme.web.ThemeRetrieveResponse
|
import roomescape.theme.web.ThemeRetrieveResponse
|
||||||
import roomescape.theme.web.toResponse
|
import roomescape.theme.web.toResponse
|
||||||
|
import roomescape.time.web.TimeCreateResponse
|
||||||
|
import roomescape.time.web.toCreateResponse
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
import java.time.LocalTime
|
import java.time.LocalTime
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.reservation.business
|
package roomescape.time.business
|
||||||
|
|
||||||
import org.springframework.data.repository.findByIdOrNull
|
import org.springframework.data.repository.findByIdOrNull
|
||||||
import org.springframework.http.HttpStatus
|
import org.springframework.http.HttpStatus
|
||||||
@ -8,9 +8,9 @@ import roomescape.common.exception.ErrorType
|
|||||||
import roomescape.common.exception.RoomescapeException
|
import roomescape.common.exception.RoomescapeException
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
||||||
import roomescape.reservation.infrastructure.persistence.TimeEntity
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import roomescape.reservation.infrastructure.persistence.TimeRepository
|
import roomescape.time.infrastructure.persistence.TimeRepository
|
||||||
import roomescape.reservation.web.*
|
import roomescape.time.web.*
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
import java.time.LocalTime
|
import java.time.LocalTime
|
||||||
|
|
||||||
@ -70,4 +70,4 @@ class TimeService(
|
|||||||
TimeWithAvailabilityResponse(time.id!!, time.startAt, isAvailable)
|
TimeWithAvailabilityResponse(time.id!!, time.startAt, isAvailable)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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.Operation
|
||||||
import io.swagger.v3.oas.annotations.responses.ApiResponse
|
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.Admin
|
||||||
import roomescape.auth.web.support.LoginRequired
|
import roomescape.auth.web.support.LoginRequired
|
||||||
import roomescape.common.dto.response.CommonApiResponse
|
import roomescape.common.dto.response.CommonApiResponse
|
||||||
import roomescape.reservation.web.TimeCreateRequest
|
import roomescape.time.web.TimeCreateRequest
|
||||||
import roomescape.reservation.web.TimeCreateResponse
|
import roomescape.time.web.TimeCreateResponse
|
||||||
import roomescape.reservation.web.TimeRetrieveListResponse
|
import roomescape.time.web.TimeRetrieveListResponse
|
||||||
import roomescape.reservation.web.TimeWithAvailabilityListResponse
|
import roomescape.time.web.TimeWithAvailabilityListResponse
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
|
|
||||||
@Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.")
|
@Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.")
|
||||||
@ -47,4 +47,4 @@ interface TimeAPI {
|
|||||||
@RequestParam date: LocalDate,
|
@RequestParam date: LocalDate,
|
||||||
@RequestParam themeId: Long
|
@RequestParam themeId: Long
|
||||||
): ResponseEntity<CommonApiResponse<TimeWithAvailabilityListResponse>>
|
): ResponseEntity<CommonApiResponse<TimeWithAvailabilityListResponse>>
|
||||||
}
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.reservation.infrastructure.persistence
|
package roomescape.time.infrastructure.persistence
|
||||||
|
|
||||||
import jakarta.persistence.*
|
import jakarta.persistence.*
|
||||||
import java.time.LocalTime
|
import java.time.LocalTime
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.reservation.infrastructure.persistence
|
package roomescape.time.infrastructure.persistence
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository
|
import org.springframework.data.jpa.repository.JpaRepository
|
||||||
import java.time.LocalTime
|
import java.time.LocalTime
|
||||||
@ -1,11 +1,11 @@
|
|||||||
package roomescape.reservation.web
|
package roomescape.time.web
|
||||||
|
|
||||||
import jakarta.validation.Valid
|
import jakarta.validation.Valid
|
||||||
import org.springframework.http.ResponseEntity
|
import org.springframework.http.ResponseEntity
|
||||||
import org.springframework.web.bind.annotation.*
|
import org.springframework.web.bind.annotation.*
|
||||||
import roomescape.common.dto.response.CommonApiResponse
|
import roomescape.common.dto.response.CommonApiResponse
|
||||||
import roomescape.reservation.business.TimeService
|
import roomescape.time.business.TimeService
|
||||||
import roomescape.reservation.docs.TimeAPI
|
import roomescape.time.docs.TimeAPI
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package roomescape.reservation.web
|
package roomescape.time.web
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema
|
import io.swagger.v3.oas.annotations.media.Schema
|
||||||
import roomescape.reservation.infrastructure.persistence.TimeEntity
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import java.time.LocalTime
|
import java.time.LocalTime
|
||||||
|
|
||||||
@Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.")
|
@Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.")
|
||||||
@ -11,6 +11,7 @@ import roomescape.member.business.MemberService
|
|||||||
import roomescape.member.infrastructure.persistence.Role
|
import roomescape.member.infrastructure.persistence.Role
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
||||||
import roomescape.theme.business.ThemeService
|
import roomescape.theme.business.ThemeService
|
||||||
|
import roomescape.time.business.TimeService
|
||||||
import roomescape.util.MemberFixture
|
import roomescape.util.MemberFixture
|
||||||
import roomescape.util.ReservationFixture
|
import roomescape.util.ReservationFixture
|
||||||
import roomescape.util.TimeFixture
|
import roomescape.util.TimeFixture
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import jakarta.persistence.EntityManager
|
|||||||
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
|
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
|
||||||
import roomescape.member.infrastructure.persistence.MemberEntity
|
import roomescape.member.infrastructure.persistence.MemberEntity
|
||||||
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
||||||
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import roomescape.util.MemberFixture
|
import roomescape.util.MemberFixture
|
||||||
import roomescape.util.ReservationFixture
|
import roomescape.util.ReservationFixture
|
||||||
import roomescape.util.ThemeFixture
|
import roomescape.util.ThemeFixture
|
||||||
|
|||||||
@ -28,9 +28,9 @@ import roomescape.payment.infrastructure.client.TossPaymentClient
|
|||||||
import roomescape.payment.infrastructure.persistence.PaymentEntity
|
import roomescape.payment.infrastructure.persistence.PaymentEntity
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationStatus
|
import roomescape.reservation.infrastructure.persistence.ReservationStatus
|
||||||
import roomescape.reservation.infrastructure.persistence.TimeEntity
|
|
||||||
import roomescape.theme.exception.ThemeErrorCode
|
import roomescape.theme.exception.ThemeErrorCode
|
||||||
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
||||||
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import roomescape.util.*
|
import roomescape.util.*
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
import java.time.LocalTime
|
import java.time.LocalTime
|
||||||
|
|||||||
@ -3,8 +3,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.infrastructure.persistence.ReservationStatus
|
import roomescape.reservation.infrastructure.persistence.ReservationStatus
|
||||||
import roomescape.reservation.infrastructure.persistence.TimeEntity
|
|
||||||
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
||||||
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import roomescape.util.MemberFixture
|
import roomescape.util.MemberFixture
|
||||||
import roomescape.util.ReservationFixture
|
import roomescape.util.ReservationFixture
|
||||||
import roomescape.util.ThemeFixture
|
import roomescape.util.ThemeFixture
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.reservation.business
|
package roomescape.time.business
|
||||||
|
|
||||||
import io.kotest.assertions.throwables.shouldThrow
|
import io.kotest.assertions.throwables.shouldThrow
|
||||||
import io.kotest.core.spec.style.FunSpec
|
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.ErrorType
|
||||||
import roomescape.common.exception.RoomescapeException
|
import roomescape.common.exception.RoomescapeException
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
||||||
import roomescape.reservation.infrastructure.persistence.TimeRepository
|
import roomescape.time.infrastructure.persistence.TimeRepository
|
||||||
import roomescape.reservation.web.TimeCreateRequest
|
import roomescape.time.web.TimeCreateRequest
|
||||||
import roomescape.util.TimeFixture
|
import roomescape.util.TimeFixture
|
||||||
import java.time.LocalTime
|
import java.time.LocalTime
|
||||||
|
|
||||||
@ -84,4 +84,4 @@ class TimeServiceTest : FunSpec({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.reservation.infrastructure.persistence
|
package roomescape.time.infrastructure.persistence
|
||||||
|
|
||||||
import io.kotest.core.spec.style.FunSpec
|
import io.kotest.core.spec.style.FunSpec
|
||||||
import io.kotest.matchers.shouldBe
|
import io.kotest.matchers.shouldBe
|
||||||
@ -30,4 +30,4 @@ class TimeRepositoryTest(
|
|||||||
timeRepository.existsByStartAt(startAt.plusSeconds(1)) shouldBe false
|
timeRepository.existsByStartAt(startAt.plusSeconds(1)) shouldBe false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.reservation.web
|
package roomescape.time.web
|
||||||
|
|
||||||
import com.ninjasquad.springmockk.MockkBean
|
import com.ninjasquad.springmockk.MockkBean
|
||||||
import com.ninjasquad.springmockk.SpykBean
|
import com.ninjasquad.springmockk.SpykBean
|
||||||
@ -13,10 +13,10 @@ import org.springframework.http.MediaType
|
|||||||
import org.springframework.test.web.servlet.MockMvc
|
import org.springframework.test.web.servlet.MockMvc
|
||||||
import roomescape.common.config.JacksonConfig
|
import roomescape.common.config.JacksonConfig
|
||||||
import roomescape.common.exception.ErrorType
|
import roomescape.common.exception.ErrorType
|
||||||
import roomescape.reservation.business.TimeService
|
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
||||||
import roomescape.reservation.infrastructure.persistence.TimeEntity
|
import roomescape.time.business.TimeService
|
||||||
import roomescape.reservation.infrastructure.persistence.TimeRepository
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
|
import roomescape.time.infrastructure.persistence.TimeRepository
|
||||||
import roomescape.util.ReservationFixture
|
import roomescape.util.ReservationFixture
|
||||||
import roomescape.util.RoomescapeApiTest
|
import roomescape.util.RoomescapeApiTest
|
||||||
import roomescape.util.ThemeFixture
|
import roomescape.util.ThemeFixture
|
||||||
@ -292,4 +292,4 @@ class TimeControllerTest(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -12,10 +12,10 @@ import roomescape.payment.web.PaymentCancelRequest
|
|||||||
import roomescape.payment.web.PaymentCancelResponse
|
import roomescape.payment.web.PaymentCancelResponse
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationStatus
|
import roomescape.reservation.infrastructure.persistence.ReservationStatus
|
||||||
import roomescape.reservation.infrastructure.persistence.TimeEntity
|
|
||||||
import roomescape.reservation.web.ReservationCreateWithPaymentRequest
|
import roomescape.reservation.web.ReservationCreateWithPaymentRequest
|
||||||
import roomescape.reservation.web.WaitingCreateRequest
|
import roomescape.reservation.web.WaitingCreateRequest
|
||||||
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
import roomescape.theme.infrastructure.persistence.ThemeEntity
|
||||||
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
import java.time.LocalTime
|
import java.time.LocalTime
|
||||||
import java.time.OffsetDateTime
|
import java.time.OffsetDateTime
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user