generated from pricelees/issue-pr-template
style: optimize imports & reformat code
This commit is contained in:
parent
4de21d0b63
commit
c9a43491b8
@ -79,8 +79,10 @@ class ReservationFinder(
|
|||||||
|
|
||||||
return reservationRepository.findAll(spec)
|
return reservationRepository.findAll(spec)
|
||||||
.also {
|
.also {
|
||||||
log.debug { "[ReservationFinder.searchReservations] ${it.size}개 예약 조회 완료. " +
|
log.debug {
|
||||||
"themeId=${themeId}, memberId=${memberId}, startFrom=${startFrom}, endAt=${endAt}" }
|
"[ReservationFinder.searchReservations] ${it.size}개 예약 조회 완료. " +
|
||||||
|
"themeId=${themeId}, memberId=${memberId}, startFrom=${startFrom}, endAt=${endAt}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,8 +6,6 @@ import io.github.oshai.kotlinlogging.KotlinLogging
|
|||||||
import org.springframework.stereotype.Component
|
import org.springframework.stereotype.Component
|
||||||
import roomescape.common.config.next
|
import roomescape.common.config.next
|
||||||
import roomescape.member.implement.MemberFinder
|
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.ReservationEntity
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationStatus
|
import roomescape.reservation.infrastructure.persistence.ReservationStatus
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
package roomescape.reservation.infrastructure.persistence
|
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.JpaRepository
|
||||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor
|
import org.springframework.data.jpa.repository.JpaSpecificationExecutor
|
||||||
import org.springframework.data.jpa.repository.Modifying
|
import org.springframework.data.jpa.repository.Modifying
|
||||||
|
|||||||
@ -10,9 +10,9 @@ import roomescape.payment.infrastructure.client.PaymentApproveRequest
|
|||||||
import roomescape.payment.infrastructure.client.PaymentApproveResponse
|
import roomescape.payment.infrastructure.client.PaymentApproveResponse
|
||||||
import roomescape.payment.infrastructure.client.TossPaymentClient
|
import roomescape.payment.infrastructure.client.TossPaymentClient
|
||||||
import roomescape.payment.web.PaymentCancelRequest
|
import roomescape.payment.web.PaymentCancelRequest
|
||||||
import roomescape.reservation.business.ReservationWriteService
|
|
||||||
import roomescape.reservation.business.ReservationFindService
|
import roomescape.reservation.business.ReservationFindService
|
||||||
import roomescape.reservation.business.ReservationWithPaymentService
|
import roomescape.reservation.business.ReservationWithPaymentService
|
||||||
|
import roomescape.reservation.business.ReservationWriteService
|
||||||
import roomescape.reservation.docs.ReservationAPI
|
import roomescape.reservation.docs.ReservationAPI
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
|
|||||||
@ -16,7 +16,6 @@ import roomescape.common.dto.response.CommonApiResponse
|
|||||||
import roomescape.theme.web.ThemeCreateRequest
|
import roomescape.theme.web.ThemeCreateRequest
|
||||||
import roomescape.theme.web.ThemeCreateResponse
|
import roomescape.theme.web.ThemeCreateResponse
|
||||||
import roomescape.theme.web.ThemeRetrieveListResponse
|
import roomescape.theme.web.ThemeRetrieveListResponse
|
||||||
import roomescape.theme.web.ThemeRetrieveResponse
|
|
||||||
|
|
||||||
@Tag(name = "5. 테마 API", description = "테마를 조회 / 추가 / 삭제할 때 사용합니다.")
|
@Tag(name = "5. 테마 API", description = "테마를 조회 / 추가 / 삭제할 때 사용합니다.")
|
||||||
interface ThemeAPI {
|
interface ThemeAPI {
|
||||||
|
|||||||
@ -6,7 +6,8 @@ import java.time.LocalDate
|
|||||||
|
|
||||||
interface ThemeRepository : JpaRepository<ThemeEntity, Long> {
|
interface ThemeRepository : JpaRepository<ThemeEntity, Long> {
|
||||||
|
|
||||||
@Query(value = """
|
@Query(
|
||||||
|
value = """
|
||||||
SELECT t
|
SELECT t
|
||||||
FROM ThemeEntity t
|
FROM ThemeEntity t
|
||||||
RIGHT JOIN ReservationEntity r ON t._id = r.theme._id
|
RIGHT JOIN ReservationEntity r ON t._id = r.theme._id
|
||||||
@ -20,7 +21,8 @@ interface ThemeRepository : JpaRepository<ThemeEntity, Long> {
|
|||||||
|
|
||||||
fun existsByName(name: String): Boolean
|
fun existsByName(name: String): Boolean
|
||||||
|
|
||||||
@Query(value = """
|
@Query(
|
||||||
|
value = """
|
||||||
SELECT EXISTS(
|
SELECT EXISTS(
|
||||||
SELECT 1
|
SELECT 1
|
||||||
FROM ReservationEntity r
|
FROM ReservationEntity r
|
||||||
|
|||||||
@ -6,8 +6,8 @@ import org.springframework.data.repository.findByIdOrNull
|
|||||||
import org.springframework.stereotype.Component
|
import org.springframework.stereotype.Component
|
||||||
import roomescape.reservation.implement.ReservationFinder
|
import roomescape.reservation.implement.ReservationFinder
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
||||||
import roomescape.time.business.domain.TimeWithAvailability
|
|
||||||
import roomescape.theme.implement.ThemeFinder
|
import roomescape.theme.implement.ThemeFinder
|
||||||
|
import roomescape.time.business.domain.TimeWithAvailability
|
||||||
import roomescape.time.exception.TimeErrorCode
|
import roomescape.time.exception.TimeErrorCode
|
||||||
import roomescape.time.exception.TimeException
|
import roomescape.time.exception.TimeException
|
||||||
import roomescape.time.infrastructure.persistence.TimeEntity
|
import roomescape.time.infrastructure.persistence.TimeEntity
|
||||||
|
|||||||
@ -85,7 +85,8 @@
|
|||||||
<appender name="ASYNC_FILE_JSON" class="ch.qos.logback.classic.AsyncAppender">
|
<appender name="ASYNC_FILE_JSON" class="ch.qos.logback.classic.AsyncAppender">
|
||||||
<appender-ref ref="FILE_JSON"/>
|
<appender-ref ref="FILE_JSON"/>
|
||||||
<queueSize>512</queueSize>
|
<queueSize>512</queueSize>
|
||||||
<discardingThreshold>0</discardingThreshold> <includeCallerData>false</includeCallerData>
|
<discardingThreshold>0</discardingThreshold>
|
||||||
|
<includeCallerData>false</includeCallerData>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<root level="INFO">
|
<root level="INFO">
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
package roomescape.common.log
|
package roomescape.common.log
|
||||||
|
|
||||||
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
||||||
import io.kotest.core.spec.style.FunSpec
|
|
||||||
import io.kotest.core.spec.style.StringSpec
|
import io.kotest.core.spec.style.StringSpec
|
||||||
import io.kotest.matchers.shouldBe
|
import io.kotest.matchers.shouldBe
|
||||||
import io.mockk.every
|
import io.mockk.every
|
||||||
|
|||||||
@ -3,7 +3,6 @@ package roomescape.member.implement
|
|||||||
import io.kotest.assertions.throwables.shouldNotThrow
|
import io.kotest.assertions.throwables.shouldNotThrow
|
||||||
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
|
||||||
import io.kotest.core.spec.style.StringSpec
|
|
||||||
import io.kotest.matchers.shouldBe
|
import io.kotest.matchers.shouldBe
|
||||||
import io.mockk.every
|
import io.mockk.every
|
||||||
import io.mockk.mockk
|
import io.mockk.mockk
|
||||||
|
|||||||
@ -2,17 +2,12 @@ package roomescape.member.implement
|
|||||||
|
|
||||||
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
|
||||||
import io.kotest.core.spec.style.StringSpec
|
|
||||||
import io.kotest.matchers.nulls.shouldNotBeNull
|
|
||||||
import io.kotest.matchers.shouldBe
|
import io.kotest.matchers.shouldBe
|
||||||
import io.mockk.every
|
import io.mockk.every
|
||||||
import io.mockk.mockk
|
import io.mockk.mockk
|
||||||
import io.mockk.slot
|
|
||||||
import io.mockk.spyk
|
|
||||||
import io.mockk.verify
|
import io.mockk.verify
|
||||||
import roomescape.member.exception.MemberErrorCode
|
import roomescape.member.exception.MemberErrorCode
|
||||||
import roomescape.member.exception.MemberException
|
import roomescape.member.exception.MemberException
|
||||||
import roomescape.member.infrastructure.persistence.MemberEntity
|
|
||||||
import roomescape.member.infrastructure.persistence.MemberRepository
|
import roomescape.member.infrastructure.persistence.MemberRepository
|
||||||
import roomescape.member.infrastructure.persistence.Role
|
import roomescape.member.infrastructure.persistence.Role
|
||||||
import roomescape.util.MemberFixture
|
import roomescape.util.MemberFixture
|
||||||
|
|||||||
@ -3,13 +3,8 @@ package roomescape.payment.implement
|
|||||||
import com.ninjasquad.springmockk.MockkClear
|
import com.ninjasquad.springmockk.MockkClear
|
||||||
import com.ninjasquad.springmockk.clear
|
import com.ninjasquad.springmockk.clear
|
||||||
import io.kotest.core.spec.style.FunSpec
|
import io.kotest.core.spec.style.FunSpec
|
||||||
import io.kotest.matchers.date.after
|
|
||||||
import io.kotest.matchers.shouldBe
|
import io.kotest.matchers.shouldBe
|
||||||
import io.mockk.clearMocks
|
import io.mockk.*
|
||||||
import io.mockk.every
|
|
||||||
import io.mockk.mockk
|
|
||||||
import io.mockk.slot
|
|
||||||
import io.mockk.verify
|
|
||||||
import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity
|
import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity
|
||||||
import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository
|
import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository
|
||||||
import roomescape.payment.infrastructure.persistence.PaymentEntity
|
import roomescape.payment.infrastructure.persistence.PaymentEntity
|
||||||
|
|||||||
@ -105,7 +105,6 @@ class TossPaymentClientTest(
|
|||||||
.createResponse(it)
|
.createResponse(it)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
val cancelRequest: PaymentCancelRequest = SampleTossPaymentConst.cancelRequest
|
val cancelRequest: PaymentCancelRequest = SampleTossPaymentConst.cancelRequest
|
||||||
val cancelResponse: PaymentCancelResponse = client.cancel(cancelRequest)
|
val cancelResponse: PaymentCancelResponse = client.cancel(cancelRequest)
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
package roomescape.payment.infrastructure.persistence
|
package roomescape.payment.infrastructure.persistence
|
||||||
|
|
||||||
import io.kotest.assertions.assertSoftly
|
|
||||||
import io.kotest.core.spec.style.FunSpec
|
import io.kotest.core.spec.style.FunSpec
|
||||||
import io.kotest.matchers.shouldBe
|
import io.kotest.matchers.shouldBe
|
||||||
import jakarta.persistence.EntityManager
|
import jakarta.persistence.EntityManager
|
||||||
|
|||||||
@ -5,18 +5,11 @@ import io.kotest.core.spec.style.FunSpec
|
|||||||
import io.kotest.matchers.shouldBe
|
import io.kotest.matchers.shouldBe
|
||||||
import io.mockk.every
|
import io.mockk.every
|
||||||
import io.mockk.mockk
|
import io.mockk.mockk
|
||||||
import io.mockk.spyk
|
|
||||||
import io.mockk.verify
|
import io.mockk.verify
|
||||||
import org.springframework.data.jpa.domain.Specification
|
|
||||||
import org.springframework.data.repository.findByIdOrNull
|
import org.springframework.data.repository.findByIdOrNull
|
||||||
import roomescape.reservation.exception.ReservationErrorCode
|
import roomescape.reservation.exception.ReservationErrorCode
|
||||||
import roomescape.reservation.exception.ReservationException
|
import roomescape.reservation.exception.ReservationException
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationEntity
|
|
||||||
import roomescape.reservation.infrastructure.persistence.ReservationRepository
|
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
|
import java.time.LocalDate
|
||||||
|
|
||||||
class ReservationFinderTest : FunSpec({
|
class ReservationFinderTest : FunSpec({
|
||||||
|
|||||||
@ -151,7 +151,14 @@ class ReservationWriterTest : FunSpec({
|
|||||||
} throws MemberException(MemberErrorCode.MEMBER_NOT_FOUND)
|
} throws MemberException(MemberErrorCode.MEMBER_NOT_FOUND)
|
||||||
|
|
||||||
shouldThrow<MemberException> {
|
shouldThrow<MemberException> {
|
||||||
reservationWriter.create(today, timeId, themeId, memberId = memberId, status, requesterId = (memberId + 1))
|
reservationWriter.create(
|
||||||
|
today,
|
||||||
|
timeId,
|
||||||
|
themeId,
|
||||||
|
memberId = memberId,
|
||||||
|
status,
|
||||||
|
requesterId = (memberId + 1)
|
||||||
|
)
|
||||||
}.also {
|
}.also {
|
||||||
it.errorCode shouldBe MemberErrorCode.MEMBER_NOT_FOUND
|
it.errorCode shouldBe MemberErrorCode.MEMBER_NOT_FOUND
|
||||||
}
|
}
|
||||||
@ -173,7 +180,14 @@ class ReservationWriterTest : FunSpec({
|
|||||||
} throws ReservationException(ReservationErrorCode.NO_PERMISSION)
|
} throws ReservationException(ReservationErrorCode.NO_PERMISSION)
|
||||||
|
|
||||||
shouldThrow<ReservationException> {
|
shouldThrow<ReservationException> {
|
||||||
reservationWriter.create(today, timeId, themeId, memberId = memberId, status, requesterId = (memberId + 1))
|
reservationWriter.create(
|
||||||
|
today,
|
||||||
|
timeId,
|
||||||
|
themeId,
|
||||||
|
memberId = memberId,
|
||||||
|
status,
|
||||||
|
requesterId = (memberId + 1)
|
||||||
|
)
|
||||||
}.also {
|
}.also {
|
||||||
it.errorCode shouldBe ReservationErrorCode.NO_PERMISSION
|
it.errorCode shouldBe ReservationErrorCode.NO_PERMISSION
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,7 +30,6 @@ class TestThemeDataHelper(
|
|||||||
transactionTemplate.execute { createAndGet(name, reservedCount, date) }!!
|
transactionTemplate.execute { createAndGet(name, reservedCount, date) }!!
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fun createAndGet(name: String, reservedCount: Int, date: LocalDate): ThemeEntity {
|
fun createAndGet(name: String, reservedCount: Int, date: LocalDate): ThemeEntity {
|
||||||
val themeEntity: ThemeEntity = ThemeFixture.create(name = name).also { entityManager.persist(it) }
|
val themeEntity: ThemeEntity = ThemeFixture.create(name = name).also { entityManager.persist(it) }
|
||||||
val member: MemberEntity = MemberFixture.create().also { entityManager.persist(it) }
|
val member: MemberEntity = MemberFixture.create().also { entityManager.persist(it) }
|
||||||
|
|||||||
@ -11,9 +11,9 @@ import io.mockk.Runs
|
|||||||
import io.mockk.every
|
import io.mockk.every
|
||||||
import io.mockk.just
|
import io.mockk.just
|
||||||
import io.mockk.mockk
|
import io.mockk.mockk
|
||||||
import roomescape.time.business.domain.TimeWithAvailability
|
|
||||||
import roomescape.theme.exception.ThemeErrorCode
|
import roomescape.theme.exception.ThemeErrorCode
|
||||||
import roomescape.theme.exception.ThemeException
|
import roomescape.theme.exception.ThemeException
|
||||||
|
import roomescape.time.business.domain.TimeWithAvailability
|
||||||
import roomescape.time.exception.TimeErrorCode
|
import roomescape.time.exception.TimeErrorCode
|
||||||
import roomescape.time.exception.TimeException
|
import roomescape.time.exception.TimeException
|
||||||
import roomescape.time.implement.TimeFinder
|
import roomescape.time.implement.TimeFinder
|
||||||
|
|||||||
@ -10,10 +10,10 @@ import io.mockk.mockk
|
|||||||
import io.mockk.verify
|
import io.mockk.verify
|
||||||
import org.springframework.data.repository.findByIdOrNull
|
import org.springframework.data.repository.findByIdOrNull
|
||||||
import roomescape.reservation.implement.ReservationFinder
|
import roomescape.reservation.implement.ReservationFinder
|
||||||
import roomescape.time.business.domain.TimeWithAvailability
|
|
||||||
import roomescape.theme.exception.ThemeErrorCode
|
import roomescape.theme.exception.ThemeErrorCode
|
||||||
import roomescape.theme.exception.ThemeException
|
import roomescape.theme.exception.ThemeException
|
||||||
import roomescape.theme.implement.ThemeFinder
|
import roomescape.theme.implement.ThemeFinder
|
||||||
|
import roomescape.time.business.domain.TimeWithAvailability
|
||||||
import roomescape.time.exception.TimeErrorCode
|
import roomescape.time.exception.TimeErrorCode
|
||||||
import roomescape.time.exception.TimeException
|
import roomescape.time.exception.TimeException
|
||||||
import roomescape.time.infrastructure.persistence.TimeRepository
|
import roomescape.time.infrastructure.persistence.TimeRepository
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user