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

[#41] 예약 스키마 재정의 #42

Merged
pricelees merged 41 commits from refactor/#41 into main 2025-09-09 00:43:39 +00:00
Conversation 0 Commits 41 Files Changed 177 +41 -83
24 changed files with 41 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 865026aff2 - Show all commits

2
src/main/kotlin/roomescape/common/entity/BaseEntity.kt
View File

@ -42,7 +42,7 @@ abstract class PersistableBaseEntity(
@Transient
private var isNewEntity: Boolean = true
): Persistable<Long> {
) : Persistable<Long> {
@PostLoad
@PostPersist
fun markNotNew() {

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

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

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/infrastructure/persistence/PaymentDetailRepository.kt
View File

@ -2,6 +2,6 @@ package roomescape.payment.infrastructure.persistence
import org.springframework.data.jpa.repository.JpaRepository
interface PaymentDetailRepository: JpaRepository<PaymentDetailEntity, Long> {
fun findByPaymentId(paymentId: Long) : PaymentDetailEntity?
interface PaymentDetailRepository : JpaRepository<PaymentDetailEntity, Long> {
fun findByPaymentId(paymentId: Long): PaymentDetailEntity?
}

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

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

@ -20,7 +20,7 @@ class CanceledReservationEntity(
@Enumerated(value = EnumType.STRING)
val status: CanceledReservationStatus,
): BaseEntityV2(id)
) : BaseEntityV2(id)
enum class CanceledReservationStatus {
PROCESSING, FAILED, COMPLETED

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

@ -2,4 +2,4 @@ package roomescape.reservation.infrastructure.persistence
import org.springframework.data.jpa.repository.JpaRepository
interface CanceledReservationRepository: JpaRepository<CanceledReservationEntity, Long>
interface CanceledReservationRepository : JpaRepository<CanceledReservationEntity, Long>

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

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

2
src/main/kotlin/roomescape/schedule/business/ScheduleValidator.kt
View File

@ -23,7 +23,7 @@ class ScheduleValidator(
fun validateCanDelete(schedule: ScheduleEntity) {
val status: ScheduleStatus = schedule.status
if (status !in listOf(ScheduleStatus.AVAILABLE,ScheduleStatus.BLOCKED)) {
if (status !in listOf(ScheduleStatus.AVAILABLE, ScheduleStatus.BLOCKED)) {
log.info { "[ScheduleValidator.validateCanDelete] 삭제 실패: id=${schedule.id} / status=${status}" }
throw ScheduleException(ScheduleErrorCode.SCHEDULE_IN_USE)
}

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

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

@ -3,7 +3,7 @@ package roomescape.theme.infrastructure.persistence
import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.data.jpa.repository.Query
interface ThemeRepository: JpaRepository<ThemeEntity, Long> {
interface ThemeRepository : JpaRepository<ThemeEntity, Long> {
@Query("SELECT t FROM ThemeEntity t WHERE t.isOpen = true")
fun findOpenedThemes(): List<ThemeEntity>

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

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

@ -119,7 +119,7 @@ class TosspayClientTest(
assertSoftly(cancelResponse) {
this.status shouldBe PaymentStatus.CANCELED
with (this.cancels) {
with(this.cancels) {
this.cancelAmount shouldBe SampleTosspayConstant.AMOUNT
this.cancelReason shouldBe SampleTosspayConstant.CANCEL_REASON
}
@ -135,7 +135,6 @@ class TosspayClientTest(
.createResponse(it)
}
val exception = shouldThrow<PaymentException> {
client.cancel(
SampleTosspayConstant.PAYMENT_KEY,

2
src/test/kotlin/roomescape/util/KotestConfig.kt
View File

@ -26,7 +26,7 @@ object KotestConfig : AbstractProjectConfig() {
@Import(TestConfig::class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
abstract class FunSpecSpringbootTest: FunSpec({
abstract class FunSpecSpringbootTest : FunSpec({
extension(DatabaseCleanerExtension(mode = AFTER_EACH_TEST))
}) {
@Autowired