diff --git a/src/main/kotlin/roomescape/member/infrastructure/persistence/MemberEntity.kt b/src/main/kotlin/roomescape/member/infrastructure/persistence/MemberEntity.kt index 7ea5665d..2b287722 100644 --- a/src/main/kotlin/roomescape/member/infrastructure/persistence/MemberEntity.kt +++ b/src/main/kotlin/roomescape/member/infrastructure/persistence/MemberEntity.kt @@ -22,7 +22,7 @@ class MemberEntity( @Column(name = "role", nullable = false, length = 20) @Enumerated(value = EnumType.STRING) var role: Role -): BaseEntity() { +) : BaseEntity() { override fun getId(): Long? = _id fun isAdmin(): Boolean = role == Role.ADMIN diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt b/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt index 133e3eb4..a1a02991 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt +++ b/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt @@ -28,6 +28,6 @@ class CanceledPaymentEntity( @Column(name = "canceled_at", nullable = false) var canceledAt: OffsetDateTime, -): BaseEntity() { +) : BaseEntity() { override fun getId(): Long? = _id } diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt b/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt index f3c80bd6..d35bdee9 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt +++ b/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt @@ -15,18 +15,18 @@ class PaymentEntity( @Column(name = "order_id", nullable = false) var orderId: String, - @Column(name="payment_key", nullable = false) + @Column(name = "payment_key", nullable = false) var paymentKey: String, - @Column(name="total_amount", nullable = false) + @Column(name = "total_amount", nullable = false) var totalAmount: Long, @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "reservation_id", nullable = false) var reservation: ReservationEntity, - @Column(name="approved_at", nullable = false) + @Column(name = "approved_at", nullable = false) var approvedAt: OffsetDateTime -): BaseEntity() { +) : BaseEntity() { override fun getId(): Long? = _id } diff --git a/src/main/kotlin/roomescape/reservation/implement/ReservationFinder.kt b/src/main/kotlin/roomescape/reservation/implement/ReservationFinder.kt index adf824d7..c57c3afe 100644 --- a/src/main/kotlin/roomescape/reservation/implement/ReservationFinder.kt +++ b/src/main/kotlin/roomescape/reservation/implement/ReservationFinder.kt @@ -79,8 +79,10 @@ class ReservationFinder( return reservationRepository.findAll(spec) .also { - log.debug { "[ReservationFinder.searchReservations] ${it.size}개 예약 조회 완료. " + - "themeId=${themeId}, memberId=${memberId}, startFrom=${startFrom}, endAt=${endAt}" } + log.debug { + "[ReservationFinder.searchReservations] ${it.size}개 예약 조회 완료. " + + "themeId=${themeId}, memberId=${memberId}, startFrom=${startFrom}, endAt=${endAt}" + } } } diff --git a/src/main/kotlin/roomescape/reservation/implement/ReservationWriter.kt b/src/main/kotlin/roomescape/reservation/implement/ReservationWriter.kt index 23f34de8..50380798 100644 --- a/src/main/kotlin/roomescape/reservation/implement/ReservationWriter.kt +++ b/src/main/kotlin/roomescape/reservation/implement/ReservationWriter.kt @@ -6,8 +6,6 @@ import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Component import roomescape.common.config.next import roomescape.member.implement.MemberFinder -import roomescape.reservation.exception.ReservationErrorCode -import roomescape.reservation.exception.ReservationException import roomescape.reservation.infrastructure.persistence.ReservationEntity import roomescape.reservation.infrastructure.persistence.ReservationRepository import roomescape.reservation.infrastructure.persistence.ReservationStatus diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt index 3f8afa87..df7009dc 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt +++ b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt @@ -33,7 +33,7 @@ class ReservationEntity( @Enumerated(value = EnumType.STRING) @Column(name = "status", nullable = false, length = 30) var status: ReservationStatus, -): BaseEntity() { +) : BaseEntity() { override fun getId(): Long? = _id @JsonIgnore diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt index b3b0c607..b2de4be4 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt +++ b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt @@ -1,6 +1,5 @@ package roomescape.reservation.infrastructure.persistence -import org.springframework.data.jpa.domain.Specification import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.JpaSpecificationExecutor import org.springframework.data.jpa.repository.Modifying diff --git a/src/main/kotlin/roomescape/reservation/web/ReservationController.kt b/src/main/kotlin/roomescape/reservation/web/ReservationController.kt index 431a57be..b8c4163b 100644 --- a/src/main/kotlin/roomescape/reservation/web/ReservationController.kt +++ b/src/main/kotlin/roomescape/reservation/web/ReservationController.kt @@ -10,9 +10,9 @@ import roomescape.payment.infrastructure.client.PaymentApproveRequest import roomescape.payment.infrastructure.client.PaymentApproveResponse import roomescape.payment.infrastructure.client.TossPaymentClient import roomescape.payment.web.PaymentCancelRequest -import roomescape.reservation.business.ReservationWriteService import roomescape.reservation.business.ReservationFindService import roomescape.reservation.business.ReservationWithPaymentService +import roomescape.reservation.business.ReservationWriteService import roomescape.reservation.docs.ReservationAPI import java.net.URI import java.time.LocalDate diff --git a/src/main/kotlin/roomescape/reservation/web/ReservationResponse.kt b/src/main/kotlin/roomescape/reservation/web/ReservationResponse.kt index 2318c9c6..8f75328a 100644 --- a/src/main/kotlin/roomescape/reservation/web/ReservationResponse.kt +++ b/src/main/kotlin/roomescape/reservation/web/ReservationResponse.kt @@ -88,6 +88,6 @@ data class ReservationRetrieveListResponse( val reservations: List ) -fun List.toRetrieveListResponse()= ReservationRetrieveListResponse( +fun List.toRetrieveListResponse() = ReservationRetrieveListResponse( this.map { it.toRetrieveResponse() } ) diff --git a/src/main/kotlin/roomescape/theme/docs/ThemeAPI.kt b/src/main/kotlin/roomescape/theme/docs/ThemeAPI.kt index 0a9db7dc..c2b75b33 100644 --- a/src/main/kotlin/roomescape/theme/docs/ThemeAPI.kt +++ b/src/main/kotlin/roomescape/theme/docs/ThemeAPI.kt @@ -16,7 +16,6 @@ import roomescape.common.dto.response.CommonApiResponse import roomescape.theme.web.ThemeCreateRequest import roomescape.theme.web.ThemeCreateResponse import roomescape.theme.web.ThemeRetrieveListResponse -import roomescape.theme.web.ThemeRetrieveResponse @Tag(name = "5. 테마 API", description = "테마를 조회 / 추가 / 삭제할 때 사용합니다.") interface ThemeAPI { diff --git a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt b/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt index 4abd4383..30e64257 100644 --- a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt +++ b/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt @@ -21,6 +21,6 @@ class ThemeEntity( @Column(name = "thumbnail", nullable = false) var thumbnail: String, -): BaseEntity() { +) : BaseEntity() { override fun getId(): Long? = _id } diff --git a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeRepository.kt b/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeRepository.kt index c7129a93..9b70e305 100644 --- a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeRepository.kt +++ b/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeRepository.kt @@ -6,7 +6,8 @@ import java.time.LocalDate interface ThemeRepository : JpaRepository { - @Query(value = """ + @Query( + value = """ SELECT t FROM ThemeEntity t RIGHT JOIN ReservationEntity r ON t._id = r.theme._id @@ -20,7 +21,8 @@ interface ThemeRepository : JpaRepository { fun existsByName(name: String): Boolean - @Query(value = """ + @Query( + value = """ SELECT EXISTS( SELECT 1 FROM ReservationEntity r diff --git a/src/main/kotlin/roomescape/time/implement/TimeFinder.kt b/src/main/kotlin/roomescape/time/implement/TimeFinder.kt index 609a0fa3..5c4101a3 100644 --- a/src/main/kotlin/roomescape/time/implement/TimeFinder.kt +++ b/src/main/kotlin/roomescape/time/implement/TimeFinder.kt @@ -6,8 +6,8 @@ import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Component import roomescape.reservation.implement.ReservationFinder import roomescape.reservation.infrastructure.persistence.ReservationEntity -import roomescape.time.business.domain.TimeWithAvailability import roomescape.theme.implement.ThemeFinder +import roomescape.time.business.domain.TimeWithAvailability import roomescape.time.exception.TimeErrorCode import roomescape.time.exception.TimeException import roomescape.time.infrastructure.persistence.TimeEntity diff --git a/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt b/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt index 3e31dd80..2bc5df0f 100644 --- a/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt +++ b/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt @@ -16,6 +16,6 @@ class TimeEntity( @Column(name = "start_at", nullable = false) var startAt: LocalTime, -): BaseEntity() { +) : BaseEntity() { override fun getId(): Long? = _id } diff --git a/src/main/resources/logback-deploy.xml b/src/main/resources/logback-deploy.xml index 662eea5e..53a2f49b 100644 --- a/src/main/resources/logback-deploy.xml +++ b/src/main/resources/logback-deploy.xml @@ -85,7 +85,8 @@ 512 - 0 false + 0 + false diff --git a/src/test/kotlin/roomescape/common/log/ApiLogMessageConverterTest.kt b/src/test/kotlin/roomescape/common/log/ApiLogMessageConverterTest.kt index 62eea129..b5940c84 100644 --- a/src/test/kotlin/roomescape/common/log/ApiLogMessageConverterTest.kt +++ b/src/test/kotlin/roomescape/common/log/ApiLogMessageConverterTest.kt @@ -1,7 +1,6 @@ package roomescape.common.log import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import io.kotest.core.spec.style.FunSpec import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe import io.mockk.every diff --git a/src/test/kotlin/roomescape/member/implement/MemberValidatorTest.kt b/src/test/kotlin/roomescape/member/implement/MemberValidatorTest.kt index ade55e4b..2d7e2928 100644 --- a/src/test/kotlin/roomescape/member/implement/MemberValidatorTest.kt +++ b/src/test/kotlin/roomescape/member/implement/MemberValidatorTest.kt @@ -3,7 +3,6 @@ package roomescape.member.implement import io.kotest.assertions.throwables.shouldNotThrow import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.FunSpec -import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe import io.mockk.every import io.mockk.mockk diff --git a/src/test/kotlin/roomescape/member/implement/MemberWriterTest.kt b/src/test/kotlin/roomescape/member/implement/MemberWriterTest.kt index 16e09201..edf7066b 100644 --- a/src/test/kotlin/roomescape/member/implement/MemberWriterTest.kt +++ b/src/test/kotlin/roomescape/member/implement/MemberWriterTest.kt @@ -2,17 +2,12 @@ package roomescape.member.implement import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.FunSpec -import io.kotest.core.spec.style.StringSpec -import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe import io.mockk.every import io.mockk.mockk -import io.mockk.slot -import io.mockk.spyk import io.mockk.verify import roomescape.member.exception.MemberErrorCode import roomescape.member.exception.MemberException -import roomescape.member.infrastructure.persistence.MemberEntity import roomescape.member.infrastructure.persistence.MemberRepository import roomescape.member.infrastructure.persistence.Role import roomescape.util.MemberFixture diff --git a/src/test/kotlin/roomescape/payment/implement/PaymentFinderTest.kt b/src/test/kotlin/roomescape/payment/implement/PaymentFinderTest.kt index b5fd6d10..65d4da5f 100644 --- a/src/test/kotlin/roomescape/payment/implement/PaymentFinderTest.kt +++ b/src/test/kotlin/roomescape/payment/implement/PaymentFinderTest.kt @@ -78,7 +78,7 @@ class PaymentFinderTest : FunSpec({ } } - test("결제 취소 정보가 없으면 실패한다.") { + test("결제 취소 정보가 없으면 실패한다.") { every { canceledPaymentRepository.findByPaymentKey(paymentKey) } returns null diff --git a/src/test/kotlin/roomescape/payment/implement/PaymentWriterTest.kt b/src/test/kotlin/roomescape/payment/implement/PaymentWriterTest.kt index ac003c06..191bd641 100644 --- a/src/test/kotlin/roomescape/payment/implement/PaymentWriterTest.kt +++ b/src/test/kotlin/roomescape/payment/implement/PaymentWriterTest.kt @@ -3,13 +3,8 @@ package roomescape.payment.implement import com.ninjasquad.springmockk.MockkClear import com.ninjasquad.springmockk.clear import io.kotest.core.spec.style.FunSpec -import io.kotest.matchers.date.after import io.kotest.matchers.shouldBe -import io.mockk.clearMocks -import io.mockk.every -import io.mockk.mockk -import io.mockk.slot -import io.mockk.verify +import io.mockk.* import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository import roomescape.payment.infrastructure.persistence.PaymentEntity diff --git a/src/test/kotlin/roomescape/payment/infrastructure/client/TossPaymentClientTest.kt b/src/test/kotlin/roomescape/payment/infrastructure/client/TossPaymentClientTest.kt index 98419344..2f8886fe 100644 --- a/src/test/kotlin/roomescape/payment/infrastructure/client/TossPaymentClientTest.kt +++ b/src/test/kotlin/roomescape/payment/infrastructure/client/TossPaymentClientTest.kt @@ -105,7 +105,6 @@ class TossPaymentClientTest( .createResponse(it) } - val cancelRequest: PaymentCancelRequest = SampleTossPaymentConst.cancelRequest val cancelResponse: PaymentCancelResponse = client.cancel(cancelRequest) diff --git a/src/test/kotlin/roomescape/payment/infrastructure/persistence/PaymentRepositoryTest.kt b/src/test/kotlin/roomescape/payment/infrastructure/persistence/PaymentRepositoryTest.kt index a58d0580..456423b3 100644 --- a/src/test/kotlin/roomescape/payment/infrastructure/persistence/PaymentRepositoryTest.kt +++ b/src/test/kotlin/roomescape/payment/infrastructure/persistence/PaymentRepositoryTest.kt @@ -1,6 +1,5 @@ package roomescape.payment.infrastructure.persistence -import io.kotest.assertions.assertSoftly import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe import jakarta.persistence.EntityManager diff --git a/src/test/kotlin/roomescape/reservation/business/ReservationCommandServiceTest.kt b/src/test/kotlin/roomescape/reservation/business/ReservationCommandServiceTest.kt index d75b2366..156498da 100644 --- a/src/test/kotlin/roomescape/reservation/business/ReservationCommandServiceTest.kt +++ b/src/test/kotlin/roomescape/reservation/business/ReservationCommandServiceTest.kt @@ -248,7 +248,7 @@ class ReservationCommandServiceTest : FunSpec({ reservationFinder.findById(reservationId) } throws ReservationException(ReservationErrorCode.RESERVATION_NOT_FOUND) - shouldThrow< ReservationException> { + shouldThrow { reservationWriteService.deleteWaiting(reservationId, memberId) }.also { it.errorCode shouldBe ReservationErrorCode.RESERVATION_NOT_FOUND diff --git a/src/test/kotlin/roomescape/reservation/implement/ReservationFinderTest.kt b/src/test/kotlin/roomescape/reservation/implement/ReservationFinderTest.kt index e11946d3..82a25c89 100644 --- a/src/test/kotlin/roomescape/reservation/implement/ReservationFinderTest.kt +++ b/src/test/kotlin/roomescape/reservation/implement/ReservationFinderTest.kt @@ -5,18 +5,11 @@ import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe import io.mockk.every import io.mockk.mockk -import io.mockk.spyk import io.mockk.verify -import org.springframework.data.jpa.domain.Specification import org.springframework.data.repository.findByIdOrNull import roomescape.reservation.exception.ReservationErrorCode import roomescape.reservation.exception.ReservationException -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.time.exception.TimeErrorCode -import roomescape.time.exception.TimeException import java.time.LocalDate class ReservationFinderTest : FunSpec({ diff --git a/src/test/kotlin/roomescape/reservation/implement/ReservationWriterTest.kt b/src/test/kotlin/roomescape/reservation/implement/ReservationWriterTest.kt index 2fe07bce..e38c4571 100644 --- a/src/test/kotlin/roomescape/reservation/implement/ReservationWriterTest.kt +++ b/src/test/kotlin/roomescape/reservation/implement/ReservationWriterTest.kt @@ -151,7 +151,14 @@ class ReservationWriterTest : FunSpec({ } throws MemberException(MemberErrorCode.MEMBER_NOT_FOUND) shouldThrow { - reservationWriter.create(today, timeId, themeId, memberId = memberId, status, requesterId = (memberId + 1)) + reservationWriter.create( + today, + timeId, + themeId, + memberId = memberId, + status, + requesterId = (memberId + 1) + ) }.also { it.errorCode shouldBe MemberErrorCode.MEMBER_NOT_FOUND } @@ -173,7 +180,14 @@ class ReservationWriterTest : FunSpec({ } throws ReservationException(ReservationErrorCode.NO_PERMISSION) shouldThrow { - reservationWriter.create(today, timeId, themeId, memberId = memberId, status, requesterId = (memberId + 1)) + reservationWriter.create( + today, + timeId, + themeId, + memberId = memberId, + status, + requesterId = (memberId + 1) + ) }.also { it.errorCode shouldBe ReservationErrorCode.NO_PERMISSION } diff --git a/src/test/kotlin/roomescape/theme/util/TestThemeDataHelper.kt b/src/test/kotlin/roomescape/theme/util/TestThemeDataHelper.kt index 9df5f6a3..dbb92d7d 100644 --- a/src/test/kotlin/roomescape/theme/util/TestThemeDataHelper.kt +++ b/src/test/kotlin/roomescape/theme/util/TestThemeDataHelper.kt @@ -30,7 +30,6 @@ class TestThemeDataHelper( transactionTemplate.execute { createAndGet(name, reservedCount, date) }!! } - fun createAndGet(name: String, reservedCount: Int, date: LocalDate): ThemeEntity { val themeEntity: ThemeEntity = ThemeFixture.create(name = name).also { entityManager.persist(it) } val member: MemberEntity = MemberFixture.create().also { entityManager.persist(it) } diff --git a/src/test/kotlin/roomescape/time/business/TimeServiceTest.kt b/src/test/kotlin/roomescape/time/business/TimeServiceTest.kt index 95add3b7..6dd4c222 100644 --- a/src/test/kotlin/roomescape/time/business/TimeServiceTest.kt +++ b/src/test/kotlin/roomescape/time/business/TimeServiceTest.kt @@ -11,9 +11,9 @@ import io.mockk.Runs import io.mockk.every import io.mockk.just import io.mockk.mockk -import roomescape.time.business.domain.TimeWithAvailability import roomescape.theme.exception.ThemeErrorCode import roomescape.theme.exception.ThemeException +import roomescape.time.business.domain.TimeWithAvailability import roomescape.time.exception.TimeErrorCode import roomescape.time.exception.TimeException import roomescape.time.implement.TimeFinder diff --git a/src/test/kotlin/roomescape/time/implement/TimeFinderTest.kt b/src/test/kotlin/roomescape/time/implement/TimeFinderTest.kt index 5c7c092d..ed0fdf0d 100644 --- a/src/test/kotlin/roomescape/time/implement/TimeFinderTest.kt +++ b/src/test/kotlin/roomescape/time/implement/TimeFinderTest.kt @@ -10,10 +10,10 @@ import io.mockk.mockk import io.mockk.verify import org.springframework.data.repository.findByIdOrNull import roomescape.reservation.implement.ReservationFinder -import roomescape.time.business.domain.TimeWithAvailability import roomescape.theme.exception.ThemeErrorCode import roomescape.theme.exception.ThemeException import roomescape.theme.implement.ThemeFinder +import roomescape.time.business.domain.TimeWithAvailability import roomescape.time.exception.TimeErrorCode import roomescape.time.exception.TimeException import roomescape.time.infrastructure.persistence.TimeRepository