Tabell for å lagre status på import/eksport jobbene

.github/workflows/build-deploy.yaml

@@ -36,9 +36,9 @@ jobs:
       image: ${{ steps.docker-push.outputs.image }}
 
   deploy-to-dev:
-    name: Deploy to dev-gcp
+    name: Deploy to dev-fss
     needs: docker-build-push
-    if: github.ref == 'refs/heads/arkitektur'
+    if: github.ref == 'refs/heads/tabell'
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -51,7 +51,7 @@ jobs:
           RESOURCE: nais/dev.yaml
 
   deploy-to-prod:
-    name: Deploy to dev-gcp
+    name: Deploy to prod-fss
     needs: docker-build-push
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
@@ -71,7 +71,7 @@ jobs:
     if: github.ref == 'refs/heads/use_gar_distroless'
     steps:
       - uses: actions/checkout@v3
-      - name: Deploy topics to dev-gcp
+      - name: Deploy topics to dev-fss
         uses: nais/deploy/actions/deploy@v1
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
@@ -92,7 +92,7 @@ jobs:
     if: github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v3
-      - name: Deploy topics to prod-gcp
+      - name: Deploy topics to prod-fss
         uses: nais/deploy/actions/deploy@v1
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}

pom.xml

@@ -41,6 +41,7 @@
         <com.oracle.ojdbc.ojdbc8.version>19.3.0.0</com.oracle.ojdbc.ojdbc8.version>
         <com.h2database.h2.version>2.2.220</com.h2database.h2.version>
         <org.apache.logging.log4j.version>3.0.0-alpha1</org.apache.logging.log4j.version>
+        <jetbrainsExposedVersion>0.42.0</jetbrainsExposedVersion>
     </properties>
     <dependencies>
         <dependency>
@@ -125,6 +126,22 @@
             <version>${no.nav.vault-jdbc.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.jetbrains.exposed</groupId>
+            <artifactId>exposed-core</artifactId>
+            <version>${jetbrainsExposedVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.exposed</groupId>
+            <artifactId>exposed-jdbc</artifactId>
+            <version>${jetbrainsExposedVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.exposed</groupId>
+            <artifactId>exposed-java-time</artifactId>
+            <version>${jetbrainsExposedVersion}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
@@ -196,7 +213,6 @@
             <version>${net.minidev.json-smart.version}</version>
         </dependency>
 
-
         <dependency>
             <groupId>no.nav.arbeidsgiver</groupId>
             <artifactId>altinn-rettigheter-proxy-klient</artifactId>
@@ -259,12 +275,14 @@
             <artifactId>kotlinx-coroutines-core-jvm</artifactId>
             <version>1.6.4</version>
         </dependency>
+
         <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test</artifactId>
-            <version>${kotlin.version}</version>
+            <groupId>io.kotest</groupId>
+            <artifactId>kotest-assertions-core-jvm</artifactId>
+            <version>5.6.2</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>net.javacrumbs.json-unit</groupId>
             <artifactId>json-unit-assertj</artifactId>

src/main/java/no/nav/arbeidsgiver/sykefravarsstatistikk/api/applikasjon/domenemodeller/ImportEksportStatus.kt

@@ -0,0 +1,13 @@
+package no.nav.arbeidsgiver.sykefravarsstatistikk.api.applikasjon.domenemodeller
+
+/**
+ * Viser status på alle stegene som gjøres ved automatisk
+ * import og eksport av sykefraværsstatistikk.
+ */
+interface ImportEksportStatus {
+    val årstallOgKvartal: ÅrstallOgKvartal
+    val importertStatistikk: Boolean
+    val importertVirksomhetsdata: Boolean
+    val forberedtNesteEksport: Boolean
+    val eksportertPåKafka: Boolean
+}

src/main/java/no/nav/arbeidsgiver/sykefravarsstatistikk/api/config/ApplikasjonDBConfig.kt

@@ -0,0 +1,91 @@
+package no.nav.arbeidsgiver.sykefravarsstatistikk.api.config
+
+import com.zaxxer.hikari.HikariConfig
+import com.zaxxer.hikari.HikariDataSource
+import no.nav.vault.jdbc.hikaricp.HikariCPVaultUtil
+import no.nav.vault.jdbc.hikaricp.VaultError
+import org.flywaydb.core.Flyway
+import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.sql.transactions.TransactionManager
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Primary
+import org.springframework.context.annotation.Profile
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
+import javax.sql.DataSource
+
+@Configuration
+@Profile("dev", "prod")
+open class ApplikasjonDBConfig {
+    // URL hentes i Vault
+    @Value("\${spring.datasource.url}")
+    private val databaseUrl: String? = null
+
+    @Value("\${database.navn}")
+    private val databaseNavn: String? = null
+
+    @Value("\${vault.mount-path}")
+    private val mountPath: String? = null
+    @Primary
+    @Bean(name = ["sykefravarsstatistikkDataSource"])
+    open fun userDataSource(): DataSource? {
+        return dataSource("admin")
+    }
+
+    @Primary
+    @Bean(name = ["sykefravarsstatistikkJdbcTemplate"])
+    open fun sykefravarsstatistikkJdbcTemplate(
+        @Qualifier("sykefravarsstatistikkDataSource") dataSource: DataSource
+    ): NamedParameterJdbcTemplate {
+        return NamedParameterJdbcTemplate(dataSource)
+    }
+
+    @Bean
+    open fun database(
+        @Qualifier("sykefravarsstatistikkDataSource") dataSource: DataSource,
+    ): Database {
+        val db = Database.connect(dataSource)
+        TransactionManager.defaultDatabase = db
+        return db
+    }
+
+    private fun dataSource(user: String): HikariDataSource? {
+        val config = HikariConfig()
+        config.poolName = "Sykefraværsstatistikk-connection-pool"
+        config.jdbcUrl = databaseUrl
+        config.maximumPoolSize = 8
+        config.minimumIdle = 1
+        val hikariDataSourceWithVaultIntegration: HikariDataSource? = try {
+            HikariCPVaultUtil.createHikariDataSourceWithVaultIntegration(
+                config, mountPath, dbRole(user)
+            )
+        } catch (vaultError: VaultError) {
+            logger.warn("[GCP-migrering] Kunne ikke opprette DS. Returnerer null. ", vaultError)
+            return null
+        }
+        return hikariDataSourceWithVaultIntegration
+    }
+
+    @Bean
+    open fun flywayMigrationStrategy(): FlywayMigrationStrategy {
+        return FlywayMigrationStrategy { flyway: Flyway? ->
+            Flyway.configure()
+                .dataSource(dataSource("admin"))
+                .initSql(String.format("SET ROLE \"%s\"", dbRole("admin")))
+                .load()
+                .migrate()
+        }
+    }
+
+    private fun dbRole(role: String): String {
+        return java.lang.String.join("-", databaseNavn, role)
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(ApplikasjonDBConfig::class.java)
+    }
+}