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: import 정리 & 코드 포맷 정렬

Browse Source
This commit is contained in:
이상진 2025-09-09 09:14:42 +09:00
parent cb14e1d6a5
commit 865026aff2
24 changed files with 41 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/roomescape/common/entity/BaseEntityV2.kt
View File

@ -18,22 +18,18 @@ abstract class AuditingBaseEntity(
@Column(updatable = false)
@CreatedDate
lateinit var createdAt: LocalDateTime
protected set
@Column(updatable = false)
@CreatedBy
var createdBy: Long = 0L
protected set
@Column
@LastModifiedDate
lateinit var updatedAt: LocalDateTime
protected set
@Column
@LastModifiedBy
var updatedBy: Long = 0L
protected set
}
@MappedSuperclass

15
src/main/kotlin/roomescape/payment/business/PaymentService.kt
View File

@ -10,19 +10,8 @@ import roomescape.payment.exception.PaymentException
import roomescape.payment.infrastructure.client.PaymentClientCancelResponse
import roomescape.payment.infrastructure.client.PaymentClientConfirmResponse
import roomescape.payment.infrastructure.client.TosspayClient
import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity
import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository
import roomescape.payment.infrastructure.persistence.PaymentDetailEntity
import roomescape.payment.infrastructure.persistence.PaymentDetailRepository
import roomescape.payment.infrastructure.persistence.PaymentEntity
import roomescape.payment.infrastructure.persistence.PaymentRepository
import roomescape.payment.web.PaymentCancelRequest
import roomescape.payment.web.PaymentConfirmRequest
import roomescape.payment.web.PaymentCreateResponse
import roomescape.payment.web.PaymentRetrieveResponse
import roomescape.payment.web.toCancelDetailResponse
import roomescape.payment.web.toPaymentDetailResponse
import roomescape.payment.web.toRetrieveResponse
import roomescape.payment.infrastructure.persistence.*
import roomescape.payment.web.*
private val log: KLogger = KotlinLogging.logger {}

7
src/main/kotlin/roomescape/payment/business/PaymentWriter.kt
View File

@ -10,12 +10,7 @@ import roomescape.payment.exception.PaymentException
import roomescape.payment.infrastructure.client.*
import roomescape.payment.infrastructure.common.PaymentMethod
import roomescape.payment.infrastructure.common.PaymentType
import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity
import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository
import roomescape.payment.infrastructure.persistence.PaymentDetailEntity
import roomescape.payment.infrastructure.persistence.PaymentDetailRepository
import roomescape.payment.infrastructure.persistence.PaymentEntity
import roomescape.payment.infrastructure.persistence.PaymentRepository
import roomescape.payment.infrastructure.persistence.*
import java.time.LocalDateTime
private val log: KLogger = KotlinLogging.logger {}

4
src/main/kotlin/roomescape/payment/web/PaymentDTO.kt
View File

@ -5,9 +5,7 @@ import roomescape.payment.exception.PaymentException
import roomescape.payment.infrastructure.common.PaymentStatus
import roomescape.payment.infrastructure.common.PaymentType
import roomescape.payment.infrastructure.persistence.*
import roomescape.payment.web.PaymentDetailResponse.BankTransferDetailResponse
import roomescape.payment.web.PaymentDetailResponse.CardDetailResponse
import roomescape.payment.web.PaymentDetailResponse.EasyPayPrepaidDetailResponse
import roomescape.payment.web.PaymentDetailResponse.*
import java.time.LocalDateTime
import java.time.OffsetDateTime

7
src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt
View File

@ -11,11 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody
import roomescape.auth.web.support.LoginRequired
import roomescape.auth.web.support.MemberId
import roomescape.common.dto.response.CommonApiResponse
import roomescape.reservation.web.PendingReservationCreateRequest
import roomescape.reservation.web.PendingReservationCreateResponse
import roomescape.reservation.web.ReservationCancelRequest
import roomescape.reservation.web.ReservationDetailRetrieveResponse
import roomescape.reservation.web.ReservationSummaryRetrieveListResponse
import roomescape.reservation.web.*
interface ReservationAPI {
@ -56,5 +52,4 @@ interface ReservationAPI {
fun findDetailById(
@PathVariable("id") id: Long
): ResponseEntity<CommonApiResponse<ReservationDetailRetrieveResponse>>
}

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

@ -20,7 +20,6 @@ class ReservationEntity(
@Enumerated(value = EnumType.STRING)
var status: ReservationStatus,
) : AuditingBaseEntity(id) {
fun confirm() {
this.status = ReservationStatus.CONFIRMED

6
src/main/kotlin/roomescape/schedule/infrastructure/persistence/ScheduleEntity.kt
View File

@ -1,10 +1,6 @@
package roomescape.schedule.infrastructure.persistence
import jakarta.persistence.Entity
import jakarta.persistence.EnumType
import jakarta.persistence.Enumerated
import jakarta.persistence.Table
import jakarta.persistence.UniqueConstraint
import jakarta.persistence.*
import roomescape.common.entity.AuditingBaseEntity
import java.time.LocalDate
import java.time.LocalTime

6
src/main/kotlin/roomescape/schedule/infrastructure/persistence/ScheduleRepository.kt
View File

@ -13,10 +13,12 @@ interface ScheduleRepository : JpaRepository<ScheduleEntity, Long> {
fun existsByDateAndThemeIdAndTime(date: LocalDate, themeId: Long, time: LocalTime): Boolean
@Query("""
@Query(
"""
SELECT DISTINCT s.themeId
FROM ScheduleEntity s
WHERE s.date = :date
""")
"""
)
fun findAllUniqueThemeIdByDate(date: LocalDate): List<Long>
}

8
src/main/kotlin/roomescape/theme/docs/ThemeApi.kt
View File

@ -11,13 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody
import roomescape.auth.web.support.Admin
import roomescape.auth.web.support.LoginRequired
import roomescape.common.dto.response.CommonApiResponse
import roomescape.theme.web.AdminThemeDetailRetrieveResponse
import roomescape.theme.web.AdminThemeSummaryRetrieveListResponse
import roomescape.theme.web.ThemeCreateRequest
import roomescape.theme.web.ThemeCreateResponseV2
import roomescape.theme.web.ThemeListRetrieveRequest
import roomescape.theme.web.ThemeUpdateRequest
import roomescape.theme.web.ThemeSummaryListResponse
import roomescape.theme.web.*
@Tag(name = "5. 관리자 테마 API", description = "관리자 페이지에서 테마를 조회 / 추가 / 삭제할 때 사용합니다.")
interface ThemeAPIV2 {

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

@ -1,10 +1,6 @@
package roomescape.theme.infrastructure.persistence
import jakarta.persistence.Column
import jakarta.persistence.Entity
import jakarta.persistence.EnumType
import jakarta.persistence.Enumerated
import jakarta.persistence.Table
import jakarta.persistence.*
import roomescape.common.entity.AuditingBaseEntity
@Entity

6
src/test/kotlin/roomescape/common/config/JacksonConfigTest.kt
View File

@ -6,11 +6,7 @@ import io.kotest.assertions.throwables.shouldThrow
import io.kotest.core.spec.style.FunSpec
import io.kotest.matchers.shouldBe
import io.kotest.matchers.string.shouldContain
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.LocalTime
import java.time.OffsetDateTime
import java.time.ZoneOffset
import java.time.*
class JacksonConfigTest(
private val objectMapper: ObjectMapper = JacksonConfig().objectMapper()

7
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
@ -45,7 +44,11 @@ class ApiLogMessageConverterTest : StringSpec({
val requestURI = "/test/sangdol".also { every { request.requestURI } returns it }
converter.convertToControllerInvokedMessage(request, controllerPayload) shouldBe """
{"type":"CONTROLLER_INVOKED","method":"$method","uri":"$requestURI","member_id":1,"controller_method":"${controllerPayload.get("controller_method")}","request_body":{"key1":"value1"}}
{"type":"CONTROLLER_INVOKED","method":"$method","uri":"$requestURI","member_id":1,"controller_method":"${
controllerPayload.get(
"controller_method"
)
}","request_body":{"key1":"value1"}}
""".trimIndent()
}

1
src/test/kotlin/roomescape/payment/TosspayClientTest.kt
View File

@ -135,7 +135,6 @@ class TosspayClientTest(
.createResponse(it)
}
val exception = shouldThrow<PaymentException> {
client.cancel(
SampleTosspayConstant.PAYMENT_KEY,