From 8a126344f0844e646f32f151c87819f317524433 Mon Sep 17 00:00:00 2001 From: pricelees Date: Sat, 2 Aug 2025 15:53:25 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=AA=A8=EB=93=A0=20=EC=97=94?= =?UTF-8?q?=ED=8B=B0=ED=8B=B0=EC=97=90=20BaseEntity=20=EB=B0=8F=20TSID=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/MemberEntity.kt | 16 ++++++++++--- .../persistence/CanceledPaymentEntity.kt | 23 +++++++++++++++---- .../persistence/PaymentEntity.kt | 17 ++++++++------ .../persistence/ReservationEntity.kt | 13 +++++++---- .../infrastructure/persistence/ThemeEntity.kt | 21 +++++++++++++---- .../infrastructure/persistence/TimeEntity.kt | 18 +++++++++++---- 6 files changed, 79 insertions(+), 29 deletions(-) diff --git a/src/main/kotlin/roomescape/member/infrastructure/persistence/MemberEntity.kt b/src/main/kotlin/roomescape/member/infrastructure/persistence/MemberEntity.kt index 75db9f8f..7ea5665d 100644 --- a/src/main/kotlin/roomescape/member/infrastructure/persistence/MemberEntity.kt +++ b/src/main/kotlin/roomescape/member/infrastructure/persistence/MemberEntity.kt @@ -1,20 +1,30 @@ package roomescape.member.infrastructure.persistence import jakarta.persistence.* +import roomescape.common.entity.BaseEntity @Entity @Table(name = "members") class MemberEntity( @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - var id: Long? = null, + @Column(name = "member_id") + private var _id: Long?, + + @Column(name = "name", nullable = false) var name: String, + + @Column(name = "email", nullable = false) var email: String, + + @Column(name = "password", nullable = false) var password: String, + @Column(name = "role", nullable = false, length = 20) @Enumerated(value = EnumType.STRING) var role: Role -) { +): BaseEntity() { + override fun getId(): Long? = _id + fun isAdmin(): Boolean = role == Role.ADMIN } diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt b/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt index 6a581d55..133e3eb4 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt +++ b/src/main/kotlin/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt @@ -1,18 +1,33 @@ package roomescape.payment.infrastructure.persistence -import jakarta.persistence.* +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table +import roomescape.common.entity.BaseEntity import java.time.OffsetDateTime @Entity @Table(name = "canceled_payments") class CanceledPaymentEntity( @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - var id: Long? = null, + @Column(name = "canceled_payment_id") + private var _id: Long?, + @Column(name = "payment_key", nullable = false) var paymentKey: String, + + @Column(name = "cancel_reason", nullable = false) var cancelReason: String, + + @Column(name = "cancel_amount", nullable = false) var cancelAmount: Long, + + @Column(name = "approved_at", nullable = false) var approvedAt: OffsetDateTime, + + @Column(name = "canceled_at", nullable = false) var canceledAt: OffsetDateTime, -) +): BaseEntity() { + override fun getId(): Long? = _id +} diff --git a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt b/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt index 59a89e8d..f3c80bd6 100644 --- a/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt +++ b/src/main/kotlin/roomescape/payment/infrastructure/persistence/PaymentEntity.kt @@ -1,6 +1,7 @@ package roomescape.payment.infrastructure.persistence import jakarta.persistence.* +import roomescape.common.entity.BaseEntity import roomescape.reservation.infrastructure.persistence.ReservationEntity import java.time.OffsetDateTime @@ -8,22 +9,24 @@ import java.time.OffsetDateTime @Table(name = "payments") class PaymentEntity( @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - var id: Long? = null, + @Column(name = "payment_id") + private var _id: Long?, - @Column(nullable = false) + @Column(name = "order_id", nullable = false) var orderId: String, - @Column(nullable = false) + @Column(name="payment_key", nullable = false) var paymentKey: String, - @Column(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(nullable = false) + @Column(name="approved_at", nullable = false) var approvedAt: OffsetDateTime -) \ No newline at end of file +): BaseEntity() { + override fun getId(): Long? = _id +} diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt index 0ae9d2fa..e3c92f2f 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt +++ b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt @@ -2,6 +2,7 @@ package roomescape.reservation.infrastructure.persistence import com.fasterxml.jackson.annotation.JsonIgnore import jakarta.persistence.* +import roomescape.common.entity.BaseEntity import roomescape.member.infrastructure.persistence.MemberEntity import roomescape.theme.infrastructure.persistence.ThemeEntity import roomescape.time.infrastructure.persistence.TimeEntity @@ -11,8 +12,8 @@ import java.time.LocalDate @Table(name = "reservations") class ReservationEntity( @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - var id: Long? = null, + @Column(name = "reservation_id") + private var _id: Long?, @Column(name = "date", nullable = false) var date: LocalDate, @@ -30,9 +31,11 @@ class ReservationEntity( var member: MemberEntity, @Enumerated(value = EnumType.STRING) - @Column(name = "status", nullable = false) - var status: ReservationStatus -) { + @Column(name = "status", nullable = false, length = 30) + var status: ReservationStatus, +): BaseEntity() { + override fun getId(): Long? = _id + @JsonIgnore fun isWaiting(): Boolean = status == ReservationStatus.WAITING diff --git a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt b/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt index acb6555b..4abd4383 100644 --- a/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt +++ b/src/main/kotlin/roomescape/theme/infrastructure/persistence/ThemeEntity.kt @@ -1,15 +1,26 @@ package roomescape.theme.infrastructure.persistence -import jakarta.persistence.* +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table +import roomescape.common.entity.BaseEntity @Entity @Table(name = "themes") class ThemeEntity( @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - var id: Long? = null, + @Column(name = "theme_id") + private var _id: Long?, + @Column(name = "name", nullable = false) var name: String, + + @Column(name = "description", nullable = false) var description: String, - var thumbnail: String -) \ No newline at end of file + + @Column(name = "thumbnail", nullable = false) + var thumbnail: String, +): BaseEntity() { + override fun getId(): Long? = _id +} diff --git a/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt b/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt index f2f78706..3e31dd80 100644 --- a/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt +++ b/src/main/kotlin/roomescape/time/infrastructure/persistence/TimeEntity.kt @@ -1,13 +1,21 @@ package roomescape.time.infrastructure.persistence -import jakarta.persistence.* +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table +import roomescape.common.entity.BaseEntity import java.time.LocalTime @Entity @Table(name = "times") class TimeEntity( @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - var id: Long? = null, - var startAt: LocalTime -) + @Column(name = "time_id") + private var _id: Long?, + + @Column(name = "start_at", nullable = false) + var startAt: LocalTime, +): BaseEntity() { + override fun getId(): Long? = _id +}