Merge branch 'main' into kafka_receiver_signal_ebms_provider

navikt · Jan 7, 2025 · 93e8452 · 93e8452
2 parents 8c2cadc + 104231d
commit 93e8452
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/cpa-repo/src/main/kotlin/no/nav/emottak/cpa/persistence/Database.kt b/cpa-repo/src/main/kotlin/no/nav/emottak/cpa/persistence/Database.kt
@@ -2,6 +2,7 @@ package no.nav.emottak.cpa.persistence
 
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
+import no.nav.emottak.util.getEnvVar
 import org.flywaydb.core.Flyway
 import org.jetbrains.exposed.sql.Database
 
@@ -18,6 +19,11 @@ class Database(
             .dataSource(migrationConfig.jdbcUrl, migrationConfig.username, migrationConfig.password)
             .initSql("SET ROLE \"$CPA_DB_NAME-admin\"")
             .lockRetryCount(50)
+            .also {
+                if (getEnvVar("NAIS_CLUSTER_NAME", "local") == "local") {
+                    it.locations("filesystem:src/main/resources/db/migration")
+                }
+            }
             .load()
             .migrate()
     }

diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/persistence/Database.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/persistence/Database.kt
@@ -21,7 +21,7 @@ class Database(
             .lockRetryCount(50)
             .also {
                 if (getEnvVar("NAIS_CLUSTER_NAME", "local") == "local") {
-                    it.locations("filesystem:src/main/resources/db/migrations")
+                    it.locations("filesystem:src/main/resources/db/migration")
                 }
             }
             .load()

diff --git a/...rations/V1__create_ebms_message_table.sql → ...gration/V1__create_ebms_message_table.sql b/...rations/V1__create_ebms_message_table.sql → ...gration/V1__create_ebms_message_table.sql
diff --git a/...b/migrations/V2__create_payload_table.sql → ...db/migration/V2__create_payload_table.sql b/...b/migrations/V2__create_payload_table.sql → ...db/migration/V2__create_payload_table.sql