DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

move database config env in object

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-01-22 20:25:32 +01:00
parent 97ccb6ee51
commit fac27d0725
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/application/Configuration.kt
View File

@@ -11,15 +11,17 @@ object Configuration {
val functionFiles: URI = this::class.java.getResource("/sql/functions").toURI()
val fixtureFiles: URI = this::class.java.getResource("/sql/fixtures").toURI()
}
object Database {
val host: String = config.getString("db.host")
val port: Int = config.getInt("db.port")
var database: String = config.getString("db.database")
var username: String = config.getString("db.username")
var password: String = config.getString("db.password")
}
val envName: String = config.getString("app.envName")
val domain: String = config.getString("app.domain")
val host: String = config.getString("db.host")
var database: String = config.getString("db.database")
var username: String = config.getString("db.username")
var password: String = config.getString("db.password")
val port: Int = config.getInt("db.port")
val redis: String = config.getString("redis.connection")
val elasticsearch: String = config.getString("elasticsearch.connection")
val rabbitmq: String = config.getString("rabbitmq.connection")

10
src/main/kotlin/application/KoinModule.kt
View File

@@ -58,11 +58,11 @@ val KoinModule = module {
// SQL connection
single {
Connection(
host = Configuration.host,
port = Configuration.port,
database = Configuration.database,
username = Configuration.username,
password = Configuration.password
host = Configuration.Database.host,
port = Configuration.Database.port,
database = Configuration.Database.database,
username = Configuration.Database.username,
password = Configuration.Database.password
)
}

18
src/test/kotlin/CucumberTest.kt
View File

@@ -32,9 +32,9 @@ class CucumberTest : En, KoinTest {
init {
if (!unitialized) {
Configuration.database = "test"
Configuration.username = "test"
Configuration.password = "test"
Configuration.Database.database = "test"
Configuration.Database.username = "test"
Configuration.Database.password = "test"
withTestApplication({ module(CUCUMBER) }) {
migrations()
@@ -43,9 +43,9 @@ class CucumberTest : En, KoinTest {
}
Before(-1) { _: Scenario ->
Configuration.database = "test"
Configuration.username = "test"
Configuration.password = "test"
Configuration.Database.database = "test"
Configuration.Database.username = "test"
Configuration.Database.password = "test"
ktorContext.start()
//language=PostgreSQL
get<Connection>().sendQuery("start transaction;", listOf())
@@ -59,9 +59,9 @@ class CucumberTest : En, KoinTest {
}
private fun migrations() {
Configuration.database = "test"
Configuration.username = "test"
Configuration.password = "test"
Configuration.Database.database = "test"
Configuration.Database.username = "test"
Configuration.Database.password = "test"
val migrations: Migrations = get()
migrations.forceAllDown()
migrations.run()