refactored

xebia-functional · Sep 12, 2023 · 4a179dc · 4a179dc
1 parent e673ac4
commit 4a179dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/db/tables/XefTokensTable.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/db/tables/XefTokensTable.kt
@@ -1,14 +1,9 @@
 package com.xebia.functional.xef.server.db.tables
 
-import com.xebia.functional.xef.server.db.tables.OrganizationTable.defaultExpression
 import com.xebia.functional.xef.server.models.ProvidersConfig
-import com.xebia.functional.xef.server.models.XefTokens
+import kotlinx.datetime.Instant
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.json.Json
-import org.jetbrains.exposed.dao.Entity
-import org.jetbrains.exposed.dao.EntityClass
-import org.jetbrains.exposed.dao.IntEntity
-import org.jetbrains.exposed.dao.IntEntityClass
-import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.sql.ReferenceOption
 import org.jetbrains.exposed.sql.ResultRow
 import org.jetbrains.exposed.sql.Table
@@ -18,6 +13,16 @@ import org.jetbrains.exposed.sql.kotlin.datetime.timestamp
 
 val format = Json { prettyPrint = true }
 
+data class XefTokens(
+    @SerialName("user_id") val userId: Int,
+    @SerialName("project_id") val projectId: Int,
+    @SerialName("name") val name: String,
+    @SerialName("created_at") val createdAt: Instant,
+    @SerialName("updated_at") val updatedAt: Instant,
+    @SerialName("token") val token: String,
+    @SerialName("providers_config") val providersConfig: ProvidersConfig
+)
+
 object XefTokensTable : Table() {
     val userId = reference(
         name = "user_id",

diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/models/Database.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/models/Database.kt