From a43b692acfb7869285bc58fdef19e44d60c649a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Mon, 6 Apr 2020 01:17:15 +0200
Subject: [PATCH] change config strings

---
 docker-compose.yml              | 5 ++++-
 resources/application.conf      | 8 ++++----
 src/database/DatabaseFactory.kt | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 99f1604..477026e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,8 +25,11 @@ services:
       POSTGRES_DB: "output-service-rdb"
       DB_URL: "jdbc:postgresql://output-service-postgres:5432/output-service-rdb"
       MQ_HOST: rabbitmq
-      MQ_USERNAME: rabbitmq
+      MQ_USERNMAE: rabbitmq
       MQ_PASSWORD: rabbitmq
+    depends_on:
+      - rabbitmq
+      - output-service-postgres
 
   rabbitmq:
     image: "rabbitmq:3-management"
diff --git a/resources/application.conf b/resources/application.conf
index 9a80149..6f4b7c9 100644
--- a/resources/application.conf
+++ b/resources/application.conf
@@ -7,13 +7,13 @@ ktor {
         modules = [ com.kmalbz.ApplicationKt.module ]
     }
     db {
-        jdbcUrl = ${DB_URL} //jdbc:postgresql://localhost:${db_port}/${db_name}
-        dbUser = ${DB_USER}
-        dbPassword = ${DB_PASSWORD}
+        jdbc = ${DB_URL}
+        user = ${DB_USER}
+        password = ${DB_PASSWORD}
     }
     mq{
         host = ${MQ_HOST}
-        username = ${MQ_USERNMAE}
+        username = ${MQ_USERNAME}
         password = ${MQ_PASSWORD}
     }
 }
\ No newline at end of file
diff --git a/src/database/DatabaseFactory.kt b/src/database/DatabaseFactory.kt
index a162d38..bc8a2d1 100644
--- a/src/database/DatabaseFactory.kt
+++ b/src/database/DatabaseFactory.kt
@@ -14,11 +14,11 @@ object DatabaseFactory {
     @KtorExperimentalAPI
     private val appConfig = HoconApplicationConfig(ConfigFactory.load())
     @KtorExperimentalAPI
-    private val dbUrl = appConfig.property("db.jdbcUrl").getString()
+    private val dbUrl = appConfig.property("db.jdbc").getString()
     @KtorExperimentalAPI
-    private val dbUser = appConfig.property("db.dbUser").getString()
+    private val dbUser = appConfig.property("db.user").getString()
     @KtorExperimentalAPI
-    private val dbPassword = appConfig.property("db.dbPassword").getString()
+    private val dbPassword = appConfig.property("db.password").getString()
 
     @KtorExperimentalAPI
     fun init() {