allow running without db for testing

kartverket · Jun 25, 2024 · 8caea56 · 8caea56
1 parent 01d8559
commit 8caea56
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/src/main/kotlin/no/kartverket/matrikkel/bygning/Application.kt b/src/main/kotlin/no/kartverket/matrikkel/bygning/Application.kt
@@ -92,15 +92,17 @@ fun Application.internalModule() {
 
     DatabaseSingleton.init()
     val dbConnection = DatabaseSingleton.getConnection()
-    val healthRepository = HealthRepository(dbConnection)
-    val healthService = HealthService(healthRepository)
 
-    routing {
-        get("/metrics") {
-            call.respondText(appMicrometerRegistry.scrape())
-        }
+    if (dbConnection != null) {
+        val healthRepository = HealthRepository(dbConnection)
+        val healthService = HealthService(healthRepository)
 
-        probeRouting(healthService)
-    }
+        routing {
+            get("/metrics") {
+                call.respondText(appMicrometerRegistry.scrape())
+            }
 
+            probeRouting(healthService)
+        }
+    }
 }
diff --git a/src/main/kotlin/no/kartverket/matrikkel/bygning/db/DBSingleton.kt b/src/main/kotlin/no/kartverket/matrikkel/bygning/db/DBSingleton.kt
@@ -38,11 +38,18 @@ object DatabaseSingleton {
         }
     }
 
-    fun getConnection(): Connection {
-        if (connection != null) {
-            return connection as Connection
-        }
+    fun getConnection(): Connection? {
+        try {
+            if (connection != null) {
+                return connection as Connection
+            }
 
-        throw RuntimeException("Kunne ikke koble til database")
+            throw RuntimeException("Kunne ikke koble til database")
+
+        } catch (e: Exception) {
+            LOGGER.error(e.stackTraceToString())
+
+            return null
+        }
     }
 }