pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

style: optimize imports & reformat code

Browse Source
This commit is contained in:
이상진 2025-08-10 14:06:26 +09:00
parent 4de21d0b63
commit c9a43491b8
28 changed files with 43 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/roomescape/member/infrastructure/persistence/MemberEntity.kt
View File

@ -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

2
src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt
View File

@ -28,6 +28,6 @@ class CanceledPaymentEntity(
@Column(name = "canceled_at", nullable = false)
var canceledAt: OffsetDateTime,
): BaseEntity() {
) : BaseEntity() {
override fun getId(): Long? = _id
}

8
src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt
View File

@ -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
}

6
src/main/kotlin/roomescape/reservation/implement/ReservationFinder.kt
View File

@ -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}"
}
}
}

2
src/main/kotlin/roomescape/reservation/implement/ReservationWriter.kt
View File

@ -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

2
src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt
View File

@ -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

1
src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt
View File

@ -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

2
src/main/kotlin/roomescape/reservation/web/ReservationController.kt
View File

@ -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

2
src/main/kotlin/roomescape/reservation/web/ReservationResponse.kt
View File

@ -88,6 +88,6 @@ data class ReservationRetrieveListResponse(
val reservations: List<ReservationRetrieveResponse>
)
fun List<ReservationEntity>.toRetrieveListResponse()= ReservationRetrieveListResponse(
fun List<ReservationEntity>.toRetrieveListResponse() = ReservationRetrieveListResponse(
this.map { it.toRetrieveResponse() }
)

1
src/main/kotlin/roomescape/theme/docs/ThemeAPI.kt
View File

@ -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 {

2
src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt
View File

@ -21,6 +21,6 @@ class ThemeEntity(
@Column(name = "thumbnail", nullable = false)
var thumbnail: String,
): BaseEntity() {
) : BaseEntity() {
override fun getId(): Long? = _id
}

6
src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeRepository.kt
View File

@ -6,7 +6,8 @@ import java.time.LocalDate
interface ThemeRepository : JpaRepository<ThemeEntity, Long> {
@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<ThemeEntity, Long> {
fun existsByName(name: String): Boolean
@Query(value = """
@Query(
value = """
SELECT EXISTS(
SELECT 1
FROM ReservationEntity r

2
src/main/kotlin/roomescape/time/implement/TimeFinder.kt
View File

@ -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

2
src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt
View File

@ -16,6 +16,6 @@ class TimeEntity(
@Column(name = "start_at", nullable = false)
var startAt: LocalTime,
): BaseEntity() {
) : BaseEntity() {
override fun getId(): Long? = _id
}

3
src/main/resources/logback-deploy.xml
View File

@ -85,7 +85,8 @@
<appender name="ASYNC_FILE_JSON" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="FILE_JSON"/>
<queueSize>512</queueSize>
<discardingThreshold>0</discardingThreshold> <includeCallerData>false</includeCallerData>
<discardingThreshold>0</discardingThreshold>
<includeCallerData>false</includeCallerData>
</appender>
<root level="INFO">

1
src/test/kotlin/roomescape/common/log/ApiLogMessageConverterTest.kt
View File

@ -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

1
src/test/kotlin/roomescape/member/implement/MemberValidatorTest.kt
View File

@ -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

5
src/test/kotlin/roomescape/member/implement/MemberWriterTest.kt
View File

@ -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

7
src/test/kotlin/roomescape/payment/implement/PaymentWriterTest.kt
View File

@ -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

1
src/test/kotlin/roomescape/payment/infrastructure/client/TossPaymentClientTest.kt
View File

@ -105,7 +105,6 @@ class TossPaymentClientTest(
.createResponse(it)
}
val cancelRequest: PaymentCancelRequest = SampleTossPaymentConst.cancelRequest
val cancelResponse: PaymentCancelResponse = client.cancel(cancelRequest)

1
src/test/kotlin/roomescape/payment/infrastructure/persistence/PaymentRepositoryTest.kt
View File

@ -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

2
src/test/kotlin/roomescape/reservation/business/ReservationCommandServiceTest.kt
View File

@ -248,7 +248,7 @@ class ReservationCommandServiceTest : FunSpec({
reservationFinder.findById(reservationId)
} throws ReservationException(ReservationErrorCode.RESERVATION_NOT_FOUND)
shouldThrow< ReservationException> {
shouldThrow<ReservationException> {
reservationWriteService.deleteWaiting(reservationId, memberId)
}.also {
it.errorCode shouldBe ReservationErrorCode.RESERVATION_NOT_FOUND

7
src/test/kotlin/roomescape/reservation/implement/ReservationFinderTest.kt
View File

@ -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({

18
src/test/kotlin/roomescape/reservation/implement/ReservationWriterTest.kt
View File

@ -151,7 +151,14 @@ class ReservationWriterTest : FunSpec({
} throws MemberException(MemberErrorCode.MEMBER_NOT_FOUND)
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 {
it.errorCode shouldBe MemberErrorCode.MEMBER_NOT_FOUND
}
@ -173,7 +180,14 @@ class ReservationWriterTest : FunSpec({
} throws ReservationException(ReservationErrorCode.NO_PERMISSION)
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 {
it.errorCode shouldBe ReservationErrorCode.NO_PERMISSION
}

1
src/test/kotlin/roomescape/theme/util/TestThemeDataHelper.kt
View File

@ -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) }

2
src/test/kotlin/roomescape/time/business/TimeServiceTest.kt
View File

@ -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

2
src/test/kotlin/roomescape/time/implement/TimeFinderTest.kt
View File

@ -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