Skip to content

Commit 1663568

Browse files
committed
Refactor AuditableLongIdTable and remove unused classes from the DAO layer
1 parent 0593873 commit 1663568

2 files changed

Lines changed: 1 addition & 27 deletions

File tree

gradle/libs.versions.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ r2dbc-pool = "1.0.2.RELEASE"
66
[libraries]
77
exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" }
88
exposed-r2dbc = { module = "org.jetbrains.exposed:exposed-r2dbc", version.ref = "exposed" }
9-
exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
109
exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
1110
exposed-json = { module = "org.jetbrains.exposed:exposed-json", version.ref = "exposed" }
1211
r2dbc-mariadb = { module = "org.mariadb:r2dbc-mariadb", version.ref = "r2dbc-mariadb" }
1312
r2dbc-pool = { module = "io.r2dbc:r2dbc-pool", version.ref = "r2dbc-pool" }
1413

1514

1615
[bundles]
17-
exposed = ["exposed-core", "exposed-r2dbc", "exposed-dao", "exposed-java-time", "exposed-json"]
16+
exposed = ["exposed-core", "exposed-r2dbc", "exposed-java-time", "exposed-json"]
1817
databaseDriver = ["r2dbc-mariadb"]
Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package dev.slne.surf.database.table
22

3-
import dev.slne.surf.surfapi.core.api.util.logger
4-
import org.jetbrains.exposed.v1.core.dao.id.EntityID
53
import org.jetbrains.exposed.v1.core.dao.id.LongIdTable
6-
import org.jetbrains.exposed.v1.dao.*
74
import org.jetbrains.exposed.v1.javatime.CurrentTimestampWithTimeZone
85
import org.jetbrains.exposed.v1.javatime.timestampWithTimeZone
9-
import java.time.OffsetDateTime
106

117
open class AuditableLongIdTable(name: String = "") : LongIdTable(name) {
128
val createdAt = timestampWithTimeZone("created_at")
@@ -15,24 +11,3 @@ open class AuditableLongIdTable(name: String = "") : LongIdTable(name) {
1511
.defaultExpression(CurrentTimestampWithTimeZone)
1612
}
1713

18-
abstract class AuditableLongEntity(id: EntityID<Long>, table: AuditableLongIdTable) :
19-
LongEntity(id) {
20-
val createdAt by table.createdAt
21-
var updatedAt by table.updatedAt
22-
}
23-
24-
abstract class AuditableLongEntityClass<out E : AuditableLongEntity>(table: AuditableLongIdTable) :
25-
LongEntityClass<E>(table) {
26-
init {
27-
EntityHook.subscribe { action ->
28-
if (action.changeType == EntityChangeType.Updated) {
29-
try {
30-
action.toEntity(this)?.updatedAt = OffsetDateTime.now()
31-
} catch (_: Exception) {
32-
logger().atWarning()
33-
.log("Failed to update updatedAt field for entity: ${action.entityClass}")
34-
}
35-
}
36-
}
37-
}
38-
}

0 commit comments

Comments
 (0)