add more db config

FigureTechnologies · Jan 31, 2023 · 9d1ccc4 · 9d1ccc4
1 parent fb58fd3
commit 9d1ccc4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/common/src/main/kotlin/tech/figure/aggregate/common/Config.kt b/common/src/main/kotlin/tech/figure/aggregate/common/Config.kt
@@ -23,6 +23,8 @@ data class DBConfig(
     val dbUri: String,
     val dbUser: String,
     val dbPassword: String,
+    val dbName: String,
+    val dbSchema: String,
     val cacheUri: String,
     val cacheCheckpoint: String,
     val cacheTable: String,

diff --git a/src/main/kotlin/tech/figure/aggregate/service/Main.kt b/src/main/kotlin/tech/figure/aggregate/service/Main.kt
@@ -150,7 +150,7 @@ fun main(args: Array<String>) {
         withManagedChannelConfig(config.blockApi.maxBlockSize)
     )
 
-    Database.connect("jdbc:postgresql://${config.dbConfig.dbUri}/postgresdb", "org.postgresql.Driver", config.dbConfig.dbUser, config.dbConfig.dbPassword)
+    Database.connect("jdbc:postgresql://${config.dbConfig.dbUri}/${config.dbConfig.dbName}", "org.postgresql.Driver", config.dbConfig.dbUser, config.dbConfig.dbPassword)
 
     val dbClient = DBClient()
     val ravenClient = RavenDB(config.dbConfig)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -7,7 +7,9 @@ msg_fee_height: ${MSG_FEE_HEIGHT}
 dbConfig:
   dbUri: ${DB_URI}
   dbUser: ${DB_USER}
-  dbPassword: ${DB_PASSWORD}
+  dbPassword: ${DB_PASS}
+  dbName: ${DB_NAME}
+  dbSchema: ${DB_SCHEMA}
   cacheUri: ${CACHE_URI}
   cacheCheckpoint: ${CACHE_CHECKPOINT}
   cacheTable: ${CACHE_TABLE}

diff --git a/src/main/resources/local.env.properties b/src/main/resources/local.env.properties
@@ -2,7 +2,9 @@ BATCH_SIZE=10
 WS_NODE=http://34.148.31.174:26657
 DB_URI=localhost:5432
 DB_USER=postgres
-DB_PASSWORD=password1
+DB_PASS=password1
+DB_NAME=aggregatordb
+DB_SCHEMA=aggregator
 CACHE_URI=http://localhost:8080
 CACHE_CHECKPOINT=Aggregator-Checkpoint
 CACHE_TABLE=Aggregator-Cache