DrunkenPinguin/LernApp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
aldemirm 2026-09-04 12:37:13 +02:00
parent c2c1e334c7
commit 86dcc68825
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/kotlin/com/oliver/kidio/backend/data/database/DatabaseFactory.kt
View file

@ -26,7 +26,7 @@ object ScreentimeTable : Table("user_screentime") {
object UserTable : Table("users") { object UserTable : Table("users") {
val id = varchar("id", 36) val id = varchar("id", 36)
val user_username = varchar("username", 50).index(isUnique = true) val username = varchar("username", 50).index(isUnique = true)
val passwordHash = varchar("password_hash", 255) val passwordHash = varchar("password_hash", 255)
override val primaryKey = PrimaryKey(id) override val primaryKey = PrimaryKey(id)
@ -48,7 +48,7 @@ object DatabaseFactory {
?: config.propertyOrNull("storage.database")?.getString() ?: config.propertyOrNull("storage.database")?.getString()
?: "kidio_db" ?: "kidio_db"
val username = System.getenv("DB_USER") val dbUsername = System.getenv("DB_USER")
?: config.propertyOrNull("storage.username")?.getString() ?: config.propertyOrNull("storage.username")?.getString()
?: "postgres" ?: "postgres"
@ -61,7 +61,7 @@ object DatabaseFactory {
val database = Database.connect( val database = Database.connect(
url = jdbcURL, url = jdbcURL,
driver = driverClassName, driver = driverClassName,
user = username, user = dbUsername,
password = password password = password
) )
@ -100,7 +100,7 @@ object DatabaseFactory {
UserTable.insert { UserTable.insert {
// ID automatische generierung // ID automatische generierung
it[id] = "default_user" it[id] = "default_user"
it[user_username] = "default_user" it[username] = "default_user"
it[passwordHash] = "1234" it[passwordHash] = "1234"
} }
} }

6
src/main/kotlin/com/oliver/kidio/backend/domain/repository/KidioRepository.kt
View file

@ -39,7 +39,7 @@ class ExposedKidioRepository : KidioRepository {
} }
override suspend fun getScreentime(userId: String): Int { override suspend fun getScreentime(userId: String): Int {
var redisKey = "screentime:$userId" val redisKey = "screentime:$userId"
try { try {
RedisFactory.getResource().use { jedis -> RedisFactory.getResource().use { jedis ->
@ -84,11 +84,11 @@ class ExposedKidioRepository : KidioRepository {
override suspend fun findByUsername(username: String): User? = DatabaseFactory.dbQuery { override suspend fun findByUsername(username: String): User? = DatabaseFactory.dbQuery {
UserTable.selectAll() UserTable.selectAll()
.where { UserTable.user_username eq username } .where { UserTable.username eq username }
.map { .map {
User( User(
id = it[UserTable.id], id = it[UserTable.id],
username = it[UserTable.user_username], username = it[UserTable.username],
passwordHash = it[UserTable.passwordHash] passwordHash = it[UserTable.passwordHash]
) )
} }