make database caching configurable

fabXlabs · Oct 16, 2023 · a8cddda · a8cddda
1 parent 96e73a4
commit a8cddda
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 11 deletions.
diff --git a/app/src/main/kotlin/cloud/fabX/fabXaccess/App.kt b/app/src/main/kotlin/cloud/fabX/fabXaccess/App.kt
@@ -29,9 +29,14 @@ val config = Config.fromEnv()
 val app = DI {
     import(domainModule)
     import(webModule)
-    import(persistenceModule)
     import(loggingModule)
 
+    if (config.dbCaching) {
+        import(cachedPersistenceModule)
+    } else {
+        import(persistenceModule)
+    }
+
     bindConstant(tag = "port") { config.port }
 
     bindConstant(tag = "dburl") { config.dbUrl }

diff --git a/app/src/main/kotlin/cloud/fabX/fabXaccess/common/Config.kt b/app/src/main/kotlin/cloud/fabX/fabXaccess/common/Config.kt
@@ -8,6 +8,7 @@ data class Config(
     val dbUrl: String,
     val dbUser: String,
     val dbPassword: String,
+    val dbCaching: Boolean,
     val jwtIssuer: String,
     val jwtAudience: String,
     val jwtHMAC256Secret: String,
@@ -22,6 +23,7 @@ data class Config(
     companion object {
         fun fromEnv(): Config {
             val port = readEnvInt("PORT", 80)
+            val dbCaching = readEnvBoolean("DATABASE_CACHING", false)
             val jwtIssuer = readEnvString("JWT_ISSUER", "localhost")
             val jwtAudience = readEnvString("JWT_AUDIENCE", "localhost")
             val jwtHMAC256Secret = readEnvString("JWT_HMAC256_SECRET", Random.nextBytes(32).decodeToString())
@@ -46,6 +48,7 @@ data class Config(
                         dbUrl,
                         dbUser,
                         dbPassword,
+                        dbCaching,
                         jwtIssuer,
                         jwtAudience,
                         jwtHMAC256Secret,
@@ -68,6 +71,7 @@ data class Config(
                         dbUrl,
                         dbUser,
                         dbPassword,
+                        dbCaching,
                         jwtIssuer,
                         jwtAudience,
                         jwtHMAC256Secret,

diff --git a/app/src/test/kotlin/cloud/fabX/fabXaccess/common/TestApp.kt b/app/src/test/kotlin/cloud/fabX/fabXaccess/common/TestApp.kt
@@ -8,7 +8,7 @@ import cloud.fabX.fabXaccess.common.model.UserId
 import cloud.fabX.fabXaccess.common.model.newCorrelationId
 import cloud.fabX.fabXaccess.domainModule
 import cloud.fabX.fabXaccess.loggingModule
-import cloud.fabX.fabXaccess.persistenceModule
+import cloud.fabX.fabXaccess.cachedPersistenceModule
 import cloud.fabX.fabXaccess.user.model.IsAdminChanged
 import cloud.fabX.fabXaccess.user.model.UserCreated
 import cloud.fabX.fabXaccess.user.model.UserRepository
@@ -76,7 +76,7 @@ private fun testSetup(): WebApp {
     val testApp = DI {
         import(domainModule)
         import(webModule)
-        import(persistenceModule)
+        import(cachedPersistenceModule)
         import(loggingModule)
 
         bindInstance(overrides = true) { dbPool }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,6 +8,8 @@ services:
       FABX_DB_URL: jdbc:postgresql://postgres/postgres
       FABX_DB_USER: postgres
       FABX_DB_PASSWORD: postgrespassword
+      # must be false when running multiple instances
+      DATABASE_CACHING: true
 
   postgres:
     image: postgres:16

diff --git a/persistence/src/main/kotlin/cloud/fabX/fabXaccess/PersistenceModule.kt b/persistence/src/main/kotlin/cloud/fabX/fabXaccess/PersistenceModule.kt
@@ -2,9 +2,13 @@ package cloud.fabX.fabXaccess
 
 import cloud.fabX.fabXaccess.common.LiquibaseMigrationHandler
 import cloud.fabX.fabXaccess.device.infrastructure.CachedDeviceDatabaseRepository
+import cloud.fabX.fabXaccess.device.infrastructure.DeviceDatabaseRepository
 import cloud.fabX.fabXaccess.qualification.infrastructure.CachedQualificationDatabaseRepository
+import cloud.fabX.fabXaccess.qualification.infrastructure.QualificationDatabaseRepository
 import cloud.fabX.fabXaccess.tool.infrastructure.CachedToolDatabaseRepository
+import cloud.fabX.fabXaccess.tool.infrastructure.ToolDatabaseRepository
 import cloud.fabX.fabXaccess.user.infrastructure.CachedUserDatabaseRepository
+import cloud.fabX.fabXaccess.user.infrastructure.UserDatabaseRepository
 import cloud.fabX.fabXaccess.user.infrastructure.WebauthnInMemoryRepository
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
@@ -13,11 +17,22 @@ import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import org.kodein.di.instance
 
-val persistenceModule = DI.Module("persistence") {
-    bindSingleton { CachedDeviceDatabaseRepository(instance()) }
-    bindSingleton { CachedQualificationDatabaseRepository(instance()) }
-    bindSingleton { CachedToolDatabaseRepository(instance(), instance()) }
-    bindSingleton { CachedUserDatabaseRepository(instance()) }
+val persistenceModule = makePersistenceModule(cached = false)
+val cachedPersistenceModule = makePersistenceModule(cached = true)
+
+fun makePersistenceModule(cached: Boolean): DI.Module = DI.Module("persistence") {
+    if (cached) {
+        bindSingleton { CachedDeviceDatabaseRepository(instance()) }
+        bindSingleton { CachedQualificationDatabaseRepository(instance()) }
+        bindSingleton { CachedToolDatabaseRepository(instance(), instance()) }
+        bindSingleton { CachedUserDatabaseRepository(instance()) }
+    } else {
+        bindSingleton { DeviceDatabaseRepository(instance()) }
+        bindSingleton { QualificationDatabaseRepository(instance()) }
+        bindSingleton { ToolDatabaseRepository(instance(), instance()) }
+        bindSingleton { UserDatabaseRepository(instance()) }
+    }
+
     bindSingleton { WebauthnInMemoryRepository() }
 
     bindSingleton {
@@ -48,4 +63,4 @@ val persistenceModule = DI.Module("persistence") {
     bindSingleton {
         Database.connect(instance<HikariDataSource>())
     }
-}
+}
diff --git a/persistence/src/test/kotlin/cloud/fabX/fabXaccess/common/infrastructure/TestApp.kt b/persistence/src/test/kotlin/cloud/fabX/fabXaccess/common/infrastructure/TestApp.kt
@@ -3,7 +3,7 @@ package cloud.fabX.fabXaccess.common.infrastructure
 import cloud.fabX.fabXaccess.PersistenceApp
 import cloud.fabX.fabXaccess.device.infrastructure.DeviceDatabaseRepository
 import cloud.fabX.fabXaccess.loggingModule
-import cloud.fabX.fabXaccess.persistenceModule
+import cloud.fabX.fabXaccess.cachedPersistenceModule
 import cloud.fabX.fabXaccess.qualification.infrastructure.QualificationDatabaseRepository
 import cloud.fabX.fabXaccess.tool.infrastructure.ToolDatabaseRepository
 import cloud.fabX.fabXaccess.user.infrastructure.UserDatabaseRepository
@@ -52,7 +52,7 @@ internal fun withTestApp(
     }
 
     val testApp = DI {
-        import(persistenceModule)
+        import(cachedPersistenceModule)
         import(loggingModule)
 
         bindInstance(overrides = true) { dbPool }