🐛 Hver modul kjører med sin egen testcontainers-Postgresinstans

Co-authored-by: Jakob Havstein Eriksen <[email protected]>

Author: navelgen

Diff for: spesialist-bootstrap/src/test/kotlin/no/nav/helse/spesialist/bootstrap/LocalApp.kt

@@ -21,7 +21,7 @@ import no.nav.helse.spesialist.api.bootstrap.Gruppe
 import no.nav.helse.spesialist.api.bootstrap.Tilgangsgrupper
 import no.nav.helse.spesialist.application.Reservasjonshenter
 import no.nav.helse.spesialist.application.Snapshothenter
-import no.nav.helse.spesialist.db.testfixtures.TestDatabase
+import no.nav.helse.spesialist.db.testfixtures.TestcontainersDatabase
 import no.nav.security.mock.oauth2.MockOAuth2Server
 import org.apache.kafka.clients.CommonClientConfigs
 import org.apache.kafka.clients.consumer.ConsumerConfig
@@ -81,7 +81,7 @@ object LocalApp {
             reservasjonshenter = reservasjonshenter,
             versjonAvKode = "versjon_1",
             featureToggles = object : FeatureToggles {},
-            dbModuleConfiguration = TestDatabase.dbModuleConfiguration
+            dbModuleConfiguration = TestcontainersDatabase("local-app").dbModuleConfiguration
         )
 
     private val localModule: Application.() -> Unit  = {

Diff for: spesialist-db/src/test/kotlin/no/nav/helse/spesialist/db/AbstractDBIntegrationTest.kt

@@ -91,9 +91,9 @@ abstract class AbstractDBIntegrationTest {
             epost = SAKSBEHANDLER_EPOST,
         )
 
-    protected val dataSource = DBTestFixture.module.dataSource
+    protected val dataSource = DBDBTestFixture.fixture.module.dataSource
     protected val dbQuery = DbQuery(dataSource)
-    protected val daos = DBTestFixture.module.daos
+    protected val daos = DBDBTestFixture.fixture.module.daos
 
     protected val session = sessionOf(dataSource, returnGeneratedKey = true)
     private val sessionContext = DBSessionContext(session)
@@ -727,3 +727,7 @@ abstract class AbstractDBIntegrationTest {
                 .registerModule(JavaTimeModule())
     }
 }
+
+object DBDBTestFixture {
+    val fixture = DBTestFixture("db")
+}

Diff for: spesialist-db/src/testFixtures/kotlin/no/nav/helse/spesialist/db/testfixtures/DBTestFixture.kt

@@ -5,8 +5,8 @@ import kotliquery.sessionOf
 import no.nav.helse.spesialist.db.bootstrap.DBModule
 import org.intellij.lang.annotations.Language
 
-object DBTestFixture {
-    val module = DBModule(TestDatabase.dbModuleConfiguration)
+class DBTestFixture(moduleLabel: String) {
+    val module = DBModule(TestcontainersDatabase(moduleLabel).dbModuleConfiguration)
 
     init {
         module.flywayMigrator.migrate()

Diff for: spesialist-db/src/testFixtures/kotlin/no/nav/helse/spesialist/db/testfixtures/TestDatabase.kt renamed to spesialist-db/src/testFixtures/kotlin/no/nav/helse/spesialist/db/testfixtures/TestcontainersDatabase.kt

@@ -3,11 +3,12 @@ package no.nav.helse.spesialist.db.testfixtures
 import no.nav.helse.spesialist.db.bootstrap.DBModule
 import org.testcontainers.containers.PostgreSQLContainer
 
-object TestDatabase {
+class TestcontainersDatabase(moduleLabel: String) {
     private val postgres =
         PostgreSQLContainer("postgres:14")
             .withReuse(true)
             .withLabel("app", "spesialist")
+            .withLabel("module", moduleLabel)
             .withLabel("code-location", javaClass.canonicalName)
             .apply {
                 start()

Diff for: spesialist-e2e-tests/src/test/kotlin/no/nav/helse/e2e/AbstractDatabaseTest.kt

@@ -11,7 +11,11 @@ abstract class AbstractDatabaseTest {
         override val kanGodkjenneUtenBesluttertilgang = false
     }
 
-    protected val dataSource = DBTestFixture.module.dataSource
-    protected val daos = DBTestFixture.module.daos
-    protected val sessionFactory = DBTestFixture.module.sessionFactory
+    protected val dataSource = E2eDBTestFixture.fixture.module.dataSource
+    protected val daos = E2eDBTestFixture.fixture.module.daos
+    protected val sessionFactory = E2eDBTestFixture.fixture.module.sessionFactory
+}
+
+object E2eDBTestFixture {
+    val fixture = DBTestFixture("e2e-tests")
 }

Diff for: spesialist-opprydding-dev/src/test/kotlin/no/nav/helse/opprydding/AbstractDatabaseTest.kt

@@ -10,7 +10,7 @@ import java.util.UUID
 import kotlin.random.Random
 
 internal abstract class AbstractDatabaseTest {
-    protected val dataSource = DBTestFixture.module.dataSource
+    protected val dataSource = OppryddingDevDBTestFixture.fixture.module.dataSource
     protected val personRepository = PersonRepository(dataSource)
 
     protected fun opprettPerson(
@@ -257,7 +257,7 @@ internal abstract class AbstractDatabaseTest {
 
     @BeforeEach
     fun resetDatabase() {
-        DBTestFixture.truncate()
+        OppryddingDevDBTestFixture.fixture.truncate()
     }
 
     protected companion object {
@@ -273,3 +273,7 @@ enum class Comparison(
     EXACTLY("exactly", { a, b -> a == b }),
     AT_LEAST("at least", { a, b -> a >= b }),
 }
+
+object OppryddingDevDBTestFixture {
+    val fixture = DBTestFixture("opprydding-dev")
+}

Diff for: spesialist-sidegig/src/test/kotlin/no/nav/helse/sidegig/AbstractDatabaseTest.kt

@@ -3,7 +3,11 @@ package no.nav.helse.sidegig
 import no.nav.helse.spesialist.db.testfixtures.DBTestFixture
 
 internal abstract class AbstractDatabaseTest {
-    protected val dataSource = DBTestFixture.module.dataSource
+    protected val dataSource = SidegigDBTestFixture.fixture.module.dataSource
     protected val behandlingDao = PgBehandlingDao(dataSource)
 }
 
+object SidegigDBTestFixture {
+    val fixture = DBTestFixture("sidegig")
+}
+