Improve Database container code

Hyunk3l · Dec 8, 2021 · d98c0e0 · d98c0e0
1 parent f107668
commit d98c0e0
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/...]]/[[ project_name ]]/infrastructure/adapters/outbound/postgres/DatabaseContainer.kt.tmpl b/...]]/[[ project_name ]]/infrastructure/adapters/outbound/postgres/DatabaseContainer.kt.tmpl
@@ -9,8 +9,6 @@ import org.testcontainers.utility.DockerImageName
 
 class DatabaseContainer {
 
-    val dataSource: HikariDataSource
-
     val postgresContainer: PostgreSQLContainer<*> = PostgreSQLContainer(DockerImageName.parse("postgres:14.1"))
         .also {
             it.withDatabaseName("somedatabasename")
@@ -19,18 +17,17 @@ class DatabaseContainer {
         }
         .also { it.start() }
 
-    init {
-        val databaseConfig = HikariConfig().also {
+    val dataSource: HikariDataSource = HikariConfig()
+        .also {
             it.jdbcUrl = postgresContainer.jdbcUrl
             it.username = postgresContainer.username
             it.password = postgresContainer.password
             it.driverClassName = postgresContainer.driverClassName
+        }.let {
+            HikariDataSource(it)
+        }.also {
+            Flyway(
+                FluentConfiguration().dataSource(it)
+            ).migrate()
         }
-        dataSource = HikariDataSource(databaseConfig)
-
-        Flyway(
-            FluentConfiguration()
-                .dataSource(dataSource)
-        ).migrate()
-    }
 }