Skip to content

Commit 1b9d513

Browse files
author
Björn Urban
committed
fix(backend): set correct conf values and readd file
1 parent d3b0650 commit 1b9d513

File tree

4 files changed

+44
-4
lines changed

4 files changed

+44
-4
lines changed

src/main/kotlin/com/cardmaster/Application.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ data class Game(
1818
)
1919

2020
fun Application.module() {
21-
println(environment.config.property("ktor.db.password"))
2221
configureInjection()
2322
configureSecurity()
2423
configureMonitoring()
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.cardmaster.plugins
2+
3+
import com.cardmaster.service.CardMasterService
4+
import com.typesafe.config.ConfigFactory
5+
import io.ktor.server.application.*
6+
import org.koin.dsl.module
7+
import org.koin.ktor.plugin.Koin
8+
import org.koin.logger.slf4jLogger
9+
10+
val dbModule = module {
11+
val config = ConfigFactory.load()
12+
single<SurrealDatabase> {
13+
SurrealDatabase(
14+
config.getString("ktor.db.password"),
15+
config.getString("ktor.db.username"),
16+
config.getString("ktor.db.host"),
17+
"club",
18+
"cardmaster",
19+
)
20+
}
21+
}
22+
val serviceModule = module {
23+
single<CardMasterService> {
24+
CardMasterService()
25+
}
26+
}
27+
28+
fun Application.configureInjection() {
29+
install(Koin) {
30+
slf4jLogger()
31+
modules(dbModule, serviceModule)
32+
}
33+
}

src/main/kotlin/com/cardmaster/plugins/SurrealDatabase.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@ package com.cardmaster.plugins
33
import com.surrealdb.connection.SurrealWebSocketConnection
44
import com.surrealdb.driver.SyncSurrealDriver
55

6-
class SurrealDatabase(val password: String, val username: String, val database: String, val namespace: String) {
6+
class SurrealDatabase(
7+
val password: String,
8+
val username: String,
9+
val host: String,
10+
val database: String,
11+
val namespace: String,
12+
) {
713
val driver: SyncSurrealDriver
814

915
init {
1016

11-
val conn = SurrealWebSocketConnection("localhost", 8000, false)
17+
val conn = SurrealWebSocketConnection(host, 8000, false)
1218
conn.connect(5)
1319
this.driver = SyncSurrealDriver(conn)
1420
this.driver.signIn(username, password)

src/main/resources/application.conf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ ktor {
88
modules = [com.cardmaster.ApplicationKt.module]
99
}
1010
db {
11-
password = ${?DB_PASSWORD}
11+
username = ${?SURREAL_USER}
12+
password = ${?SURREAL_PASSWORD}
13+
host = ${?SURREAL_HOST}
1214
}
1315
}

0 commit comments

Comments
 (0)