common/persistence/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id("org.springframework.boot")
+    kotlin("plugin.spring")
+    kotlin("plugin.jpa")
+}
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("com.github.f4b6a3:tsid-creator:5.2.6")
+
+    testRuntimeOnly("com.h2database:h2")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("io.kotest:kotest-runner-junit5:5.9.1")
+    testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0")
+
+    implementation(project(":common:utils"))
+}

common/persistence/src/main/kotlin/com/sangdol/common/persistence/AuditingBaseEntity.kt

@@ -1,14 +1,14 @@
-package com.sangdol.roomescape.common.entity
+package com.sangdol.common.persistence
 
-import jakarta.persistence.*
+import jakarta.persistence.Column
+import jakarta.persistence.EntityListeners
+import jakarta.persistence.MappedSuperclass
 import org.springframework.data.annotation.CreatedBy
 import org.springframework.data.annotation.CreatedDate
 import org.springframework.data.annotation.LastModifiedBy
 import org.springframework.data.annotation.LastModifiedDate
-import org.springframework.data.domain.Persistable
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
 import java.time.LocalDateTime
-import kotlin.jvm.Transient
 
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener::class)
@@ -31,23 +31,3 @@ abstract class AuditingBaseEntity(
     @LastModifiedBy
     var updatedBy: Long = 0L
 }
-
-@MappedSuperclass
-abstract class PersistableBaseEntity(
-    @Id
-    @Column(name = "id")
-    private val _id: Long,
-
-    @Transient
-    private var isNewEntity: Boolean = true
-) : Persistable<Long> {
-
-    @PostLoad
-    @PrePersist
-    fun markNotNew() {
-        isNewEntity = false
-    }
-
-    override fun getId(): Long = _id
-    override fun isNew(): Boolean = isNewEntity
-}

common/persistence/src/main/kotlin/com/sangdol/common/persistence/PersistableBaseEntity.kt

@@ -0,0 +1,25 @@
+package com.sangdol.common.persistence
+
+import jakarta.persistence.*
+import org.springframework.data.domain.Persistable
+import kotlin.jvm.Transient
+
+@MappedSuperclass
+abstract class PersistableBaseEntity(
+    @Id
+    @Column(name = "id")
+    private val _id: Long,
+
+    @Transient
+    private var isNewEntity: Boolean = true
+) : Persistable<Long> {
+
+    @PostLoad
+    @PrePersist
+    fun markNotNew() {
+        isNewEntity = false
+    }
+
+    override fun getId(): Long = _id
+    override fun isNew(): Boolean = isNewEntity
+}

service/src/main/kotlin/com/sangdol/roomescape/admin/infrastructure/persistence/AdminEntity.kt

@@ -1,8 +1,8 @@
 package com.sangdol.roomescape.admin.infrastructure.persistence
 
+import com.sangdol.common.persistence.AuditingBaseEntity
 import jakarta.persistence.*
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
-import com.sangdol.roomescape.common.entity.AuditingBaseEntity
 
 @Entity
 @Table(name = "admin")

service/src/main/kotlin/com/sangdol/roomescape/auth/infrastructure/persistence/LoginHistoryEntity.kt

@@ -1,10 +1,10 @@
 package com.sangdol.roomescape.auth.infrastructure.persistence
 
+import com.sangdol.common.persistence.PersistableBaseEntity
+import com.sangdol.roomescape.common.dto.PrincipalType
 import jakarta.persistence.*
 import org.springframework.data.annotation.CreatedDate
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
-import com.sangdol.roomescape.common.dto.PrincipalType
-import com.sangdol.roomescape.common.entity.PersistableBaseEntity
 import java.time.LocalDateTime
 
 @Entity

service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/CanceledPaymentEntity.kt

@@ -1,8 +1,8 @@
 package com.sangdol.roomescape.payment.infrastructure.persistence
 
+import com.sangdol.common.persistence.PersistableBaseEntity
 import jakarta.persistence.Entity
 import jakarta.persistence.Table
-import com.sangdol.roomescape.common.entity.PersistableBaseEntity
 import java.time.LocalDateTime
 import java.time.OffsetDateTime
 

service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentDetailEntity.kt

@@ -1,8 +1,8 @@
 package com.sangdol.roomescape.payment.infrastructure.persistence
 
-import jakarta.persistence.*
+import com.sangdol.common.persistence.PersistableBaseEntity
-import com.sangdol.roomescape.common.entity.PersistableBaseEntity
 import com.sangdol.roomescape.payment.infrastructure.common.*
+import jakarta.persistence.*
 
 @Entity
 @Table(name = "payment_detail")

service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/persistence/PaymentEntity.kt

@@ -1,13 +1,13 @@
 package com.sangdol.roomescape.payment.infrastructure.persistence
 
+import com.sangdol.common.persistence.PersistableBaseEntity
+import com.sangdol.roomescape.payment.infrastructure.common.PaymentMethod
+import com.sangdol.roomescape.payment.infrastructure.common.PaymentStatus
+import com.sangdol.roomescape.payment.infrastructure.common.PaymentType
 import jakarta.persistence.Entity
 import jakarta.persistence.EnumType
 import jakarta.persistence.Enumerated
 import jakarta.persistence.Table
-import com.sangdol.roomescape.common.entity.PersistableBaseEntity
-import com.sangdol.roomescape.payment.infrastructure.common.PaymentMethod
-import com.sangdol.roomescape.payment.infrastructure.common.PaymentStatus
-import com.sangdol.roomescape.payment.infrastructure.common.PaymentType
 import java.time.OffsetDateTime
 
 @Entity

service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/CanceledReservationEntity.kt

@@ -1,10 +1,10 @@
 package com.sangdol.roomescape.reservation.infrastructure.persistence
 
+import com.sangdol.common.persistence.PersistableBaseEntity
 import jakarta.persistence.Entity
 import jakarta.persistence.EnumType
 import jakarta.persistence.Enumerated
 import jakarta.persistence.Table
-import com.sangdol.roomescape.common.entity.PersistableBaseEntity
 import java.time.LocalDateTime
 
 @Entity

service/src/main/kotlin/com/sangdol/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt

@@ -1,10 +1,10 @@
 package com.sangdol.roomescape.reservation.infrastructure.persistence
 
+import com.sangdol.common.persistence.AuditingBaseEntity
 import jakarta.persistence.Entity
 import jakarta.persistence.EnumType
 import jakarta.persistence.Enumerated
 import jakarta.persistence.Table
-import com.sangdol.roomescape.common.entity.AuditingBaseEntity
 
 @Entity
 @Table(name = "reservation")

service/src/main/kotlin/com/sangdol/roomescape/schedule/infrastructure/persistence/ScheduleEntity.kt

@@ -1,12 +1,12 @@
 package com.sangdol.roomescape.schedule.infrastructure.persistence
 
+import com.sangdol.common.persistence.PersistableBaseEntity
+import com.sangdol.roomescape.common.util.MdcPrincipalId
 import jakarta.persistence.*
 import org.springframework.data.annotation.CreatedBy
 import org.springframework.data.annotation.CreatedDate
 import org.springframework.data.annotation.LastModifiedDate
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
-import com.sangdol.roomescape.common.entity.PersistableBaseEntity
-import com.sangdol.roomescape.common.util.MdcPrincipalId
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime

service/src/main/kotlin/com/sangdol/roomescape/store/infrastructure/persistence/StoreEntity.kt

@@ -1,8 +1,8 @@
 package com.sangdol.roomescape.store.infrastructure.persistence
 
+import com.sangdol.common.persistence.AuditingBaseEntity
 import jakarta.persistence.*
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
-import com.sangdol.roomescape.common.entity.AuditingBaseEntity
 
 @Entity
 @EntityListeners(AuditingEntityListener::class)

service/src/main/kotlin/com/sangdol/roomescape/theme/infrastructure/persistence/ThemeEntity.kt

@@ -1,7 +1,7 @@
 package com.sangdol.roomescape.theme.infrastructure.persistence
 
+import com.sangdol.common.persistence.AuditingBaseEntity
 import jakarta.persistence.*
-import com.sangdol.roomescape.common.entity.AuditingBaseEntity
 
 @Entity
 @Table(name = "theme")

service/src/main/kotlin/com/sangdol/roomescape/user/infrastructure/persistence/UserEntities.kt

@@ -1,7 +1,7 @@
 package com.sangdol.roomescape.user.infrastructure.persistence
 
+import com.sangdol.common.persistence.AuditingBaseEntity
 import jakarta.persistence.*
-import com.sangdol.roomescape.common.entity.AuditingBaseEntity
 
 @Entity
 @Table(name = "users")