generated from pricelees/issue-pr-template
[#41] 예약 스키마 재정의 #42
@ -18,22 +18,18 @@ abstract class AuditingBaseEntity(
|
|||||||
@Column(updatable = false)
|
@Column(updatable = false)
|
||||||
@CreatedDate
|
@CreatedDate
|
||||||
lateinit var createdAt: LocalDateTime
|
lateinit var createdAt: LocalDateTime
|
||||||
protected set
|
|
||||||
|
|
||||||
@Column(updatable = false)
|
@Column(updatable = false)
|
||||||
@CreatedBy
|
@CreatedBy
|
||||||
var createdBy: Long = 0L
|
var createdBy: Long = 0L
|
||||||
protected set
|
|
||||||
|
|
||||||
@Column
|
@Column
|
||||||
@LastModifiedDate
|
@LastModifiedDate
|
||||||
lateinit var updatedAt: LocalDateTime
|
lateinit var updatedAt: LocalDateTime
|
||||||
protected set
|
|
||||||
|
|
||||||
@Column
|
@Column
|
||||||
@LastModifiedBy
|
@LastModifiedBy
|
||||||
var updatedBy: Long = 0L
|
var updatedBy: Long = 0L
|
||||||
protected set
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@MappedSuperclass
|
@MappedSuperclass
|
||||||
|
|||||||
@ -10,19 +10,8 @@ import roomescape.payment.exception.PaymentException
|
|||||||
import roomescape.payment.infrastructure.client.PaymentClientCancelResponse
|
import roomescape.payment.infrastructure.client.PaymentClientCancelResponse
|
||||||
import roomescape.payment.infrastructure.client.PaymentClientConfirmResponse
|
import roomescape.payment.infrastructure.client.PaymentClientConfirmResponse
|
||||||
import roomescape.payment.infrastructure.client.TosspayClient
|
import roomescape.payment.infrastructure.client.TosspayClient
|
||||||
import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity
|
import roomescape.payment.infrastructure.persistence.*
|
||||||
import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository
|
import roomescape.payment.web.*
|
||||||
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
|
|
||||||
|
|
||||||
private val log: KLogger = KotlinLogging.logger {}
|
private val log: KLogger = KotlinLogging.logger {}
|
||||||
|
|
||||||
|
|||||||
@ -10,12 +10,7 @@ import roomescape.payment.exception.PaymentException
|
|||||||
import roomescape.payment.infrastructure.client.*
|
import roomescape.payment.infrastructure.client.*
|
||||||
import roomescape.payment.infrastructure.common.PaymentMethod
|
import roomescape.payment.infrastructure.common.PaymentMethod
|
||||||
import roomescape.payment.infrastructure.common.PaymentType
|
import roomescape.payment.infrastructure.common.PaymentType
|
||||||
import roomescape.payment.infrastructure.persistence.CanceledPaymentEntity
|
import roomescape.payment.infrastructure.persistence.*
|
||||||
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 java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
|
|
||||||
private val log: KLogger = KotlinLogging.logger {}
|
private val log: KLogger = KotlinLogging.logger {}
|
||||||
|
|||||||
@ -5,9 +5,7 @@ import roomescape.payment.exception.PaymentException
|
|||||||
import roomescape.payment.infrastructure.common.PaymentStatus
|
import roomescape.payment.infrastructure.common.PaymentStatus
|
||||||
import roomescape.payment.infrastructure.common.PaymentType
|
import roomescape.payment.infrastructure.common.PaymentType
|
||||||
import roomescape.payment.infrastructure.persistence.*
|
import roomescape.payment.infrastructure.persistence.*
|
||||||
import roomescape.payment.web.PaymentDetailResponse.BankTransferDetailResponse
|
import roomescape.payment.web.PaymentDetailResponse.*
|
||||||
import roomescape.payment.web.PaymentDetailResponse.CardDetailResponse
|
|
||||||
import roomescape.payment.web.PaymentDetailResponse.EasyPayPrepaidDetailResponse
|
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
import java.time.OffsetDateTime
|
import java.time.OffsetDateTime
|
||||||
|
|
||||||
|
|||||||
@ -11,11 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody
|
|||||||
import roomescape.auth.web.support.LoginRequired
|
import roomescape.auth.web.support.LoginRequired
|
||||||
import roomescape.auth.web.support.MemberId
|
import roomescape.auth.web.support.MemberId
|
||||||
import roomescape.common.dto.response.CommonApiResponse
|
import roomescape.common.dto.response.CommonApiResponse
|
||||||
import roomescape.reservation.web.PendingReservationCreateRequest
|
import roomescape.reservation.web.*
|
||||||
import roomescape.reservation.web.PendingReservationCreateResponse
|
|
||||||
import roomescape.reservation.web.ReservationCancelRequest
|
|
||||||
import roomescape.reservation.web.ReservationDetailRetrieveResponse
|
|
||||||
import roomescape.reservation.web.ReservationSummaryRetrieveListResponse
|
|
||||||
|
|
||||||
interface ReservationAPI {
|
interface ReservationAPI {
|
||||||
|
|
||||||
@ -56,5 +52,4 @@ interface ReservationAPI {
|
|||||||
fun findDetailById(
|
fun findDetailById(
|
||||||
@PathVariable("id") id: Long
|
@PathVariable("id") id: Long
|
||||||
): ResponseEntity<CommonApiResponse<ReservationDetailRetrieveResponse>>
|
): ResponseEntity<CommonApiResponse<ReservationDetailRetrieveResponse>>
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -20,7 +20,6 @@ class ReservationEntity(
|
|||||||
|
|
||||||
@Enumerated(value = EnumType.STRING)
|
@Enumerated(value = EnumType.STRING)
|
||||||
var status: ReservationStatus,
|
var status: ReservationStatus,
|
||||||
|
|
||||||
) : AuditingBaseEntity(id) {
|
) : AuditingBaseEntity(id) {
|
||||||
fun confirm() {
|
fun confirm() {
|
||||||
this.status = ReservationStatus.CONFIRMED
|
this.status = ReservationStatus.CONFIRMED
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
package roomescape.schedule.infrastructure.persistence
|
package roomescape.schedule.infrastructure.persistence
|
||||||
|
|
||||||
import jakarta.persistence.Entity
|
import jakarta.persistence.*
|
||||||
import jakarta.persistence.EnumType
|
|
||||||
import jakarta.persistence.Enumerated
|
|
||||||
import jakarta.persistence.Table
|
|
||||||
import jakarta.persistence.UniqueConstraint
|
|
||||||
import roomescape.common.entity.AuditingBaseEntity
|
import roomescape.common.entity.AuditingBaseEntity
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
import java.time.LocalTime
|
import java.time.LocalTime
|
||||||
|
|||||||
@ -13,10 +13,12 @@ interface ScheduleRepository : JpaRepository<ScheduleEntity, Long> {
|
|||||||
|
|
||||||
fun existsByDateAndThemeIdAndTime(date: LocalDate, themeId: Long, time: LocalTime): Boolean
|
fun existsByDateAndThemeIdAndTime(date: LocalDate, themeId: Long, time: LocalTime): Boolean
|
||||||
|
|
||||||
@Query("""
|
@Query(
|
||||||
|
"""
|
||||||
SELECT DISTINCT s.themeId
|
SELECT DISTINCT s.themeId
|
||||||
FROM ScheduleEntity s
|
FROM ScheduleEntity s
|
||||||
WHERE s.date = :date
|
WHERE s.date = :date
|
||||||
""")
|
"""
|
||||||
|
)
|
||||||
fun findAllUniqueThemeIdByDate(date: LocalDate): List<Long>
|
fun findAllUniqueThemeIdByDate(date: LocalDate): List<Long>
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,13 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody
|
|||||||
import roomescape.auth.web.support.Admin
|
import roomescape.auth.web.support.Admin
|
||||||
import roomescape.auth.web.support.LoginRequired
|
import roomescape.auth.web.support.LoginRequired
|
||||||
import roomescape.common.dto.response.CommonApiResponse
|
import roomescape.common.dto.response.CommonApiResponse
|
||||||
import roomescape.theme.web.AdminThemeDetailRetrieveResponse
|
import roomescape.theme.web.*
|
||||||
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
|
|
||||||
|
|
||||||
@Tag(name = "5. 관리자 테마 API", description = "관리자 페이지에서 테마를 조회 / 추가 / 삭제할 때 사용합니다.")
|
@Tag(name = "5. 관리자 테마 API", description = "관리자 페이지에서 테마를 조회 / 추가 / 삭제할 때 사용합니다.")
|
||||||
interface ThemeAPIV2 {
|
interface ThemeAPIV2 {
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
package roomescape.theme.infrastructure.persistence
|
package roomescape.theme.infrastructure.persistence
|
||||||
|
|
||||||
import jakarta.persistence.Column
|
import jakarta.persistence.*
|
||||||
import jakarta.persistence.Entity
|
|
||||||
import jakarta.persistence.EnumType
|
|
||||||
import jakarta.persistence.Enumerated
|
|
||||||
import jakarta.persistence.Table
|
|
||||||
import roomescape.common.entity.AuditingBaseEntity
|
import roomescape.common.entity.AuditingBaseEntity
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
|
|||||||
@ -6,11 +6,7 @@ import io.kotest.assertions.throwables.shouldThrow
|
|||||||
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 io.kotest.matchers.string.shouldContain
|
import io.kotest.matchers.string.shouldContain
|
||||||
import java.time.LocalDate
|
import java.time.*
|
||||||
import java.time.LocalDateTime
|
|
||||||
import java.time.LocalTime
|
|
||||||
import java.time.OffsetDateTime
|
|
||||||
import java.time.ZoneOffset
|
|
||||||
|
|
||||||
class JacksonConfigTest(
|
class JacksonConfigTest(
|
||||||
private val objectMapper: ObjectMapper = JacksonConfig().objectMapper()
|
private val objectMapper: ObjectMapper = JacksonConfig().objectMapper()
|
||||||
|
|||||||
@ -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
|
||||||
@ -45,7 +44,11 @@ class ApiLogMessageConverterTest : StringSpec({
|
|||||||
val requestURI = "/test/sangdol".also { every { request.requestURI } returns it }
|
val requestURI = "/test/sangdol".also { every { request.requestURI } returns it }
|
||||||
|
|
||||||
converter.convertToControllerInvokedMessage(request, controllerPayload) shouldBe """
|
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()
|
""".trimIndent()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -135,7 +135,6 @@ class TosspayClientTest(
|
|||||||
.createResponse(it)
|
.createResponse(it)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
val exception = shouldThrow<PaymentException> {
|
val exception = shouldThrow<PaymentException> {
|
||||||
client.cancel(
|
client.cancel(
|
||||||
SampleTosspayConstant.PAYMENT_KEY,
|
SampleTosspayConstant.PAYMENT_KEY,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user