Migrate also timestamp from inntekt_v1_arena_mapping to inntekt_v1_person_mapping

navikt/dagpenger#397

Author: geiralund

src/main/kotlin/no/nav/dagpenger/inntekt/db/ArenaMappingMigrator.kt

@@ -1,6 +1,7 @@
 package no.nav.dagpenger.inntekt.db
 
 import javax.sql.DataSource
+import kotliquery.TransactionalSession
 import kotliquery.queryOf
 import kotliquery.sessionOf
 import kotliquery.using
@@ -16,49 +17,46 @@ internal class ArenaMappingMigrator(private val datasource: DataSource) {
 
     @Language("sql")
     private val statement: String = """
-                  INSERT INTO inntekt_v1_person_mapping (inntektid, aktørid, vedtakid, beregningsdato)
-                  SELECT inntektid, aktørid, vedtakid, beregningsdato
+                  INSERT INTO inntekt_v1_person_mapping (inntektid, aktørid, vedtakid, beregningsdato, timestamp)
+                  SELECT inntektid, aktørid, vedtakid, beregningsdato, timestamp
                   FROM inntekt_v1_arena_mapping 
                   WHERE inntektid NOT IN (SELECT inntektid from inntekt_v1_person_mapping)
                 """.trimIndent()
 
     fun migrate(): Int {
         try {
-            val locked = lock()
-            return if (locked) {
-                logger.info { "Obtained lock for migrator" }
-                val rowsMigrated = using(sessionOf(datasource)) { session ->
-                    session.transaction {
-                        it.run(queryOf(statement).asUpdate)
+            val rowsMigrated = using(sessionOf(datasource)) { session ->
+                session.transaction { transaction ->
+                    if (lock(transaction)) {
+                        logger.info { "Obtained lock for migrator" }
+                        transaction.run(queryOf(statement).asUpdate)
+                    } else {
+                        logger.info { "Could not obtain lock for migrator" }
+                        0
                     }
                 }
-
-                logger.info { "Migrated $rowsMigrated rows from inntekt_v1_arena_mapping to inntekt_v1_person_mapping" }
-                rowsMigrated
-            } else {
-                logger.info { "Could not obtain lock for migrator" }
-                0
             }
+
+            logger.info { "Migrated $rowsMigrated rows from inntekt_v1_arena_mapping to inntekt_v1_person_mapping" }
+            return rowsMigrated
         } finally {
             val unlocked = unlock()
             logger.info { "Unlocked = $unlocked for migrator" }
         }
     }
 
-    private fun unlock(): Boolean {
-        return using(sessionOf(datasource)) { session ->
-            session.run(
-                queryOf("select pg_advisory_unlock($lockKey)").map {
-                    it.string(1) == "t"
-                }.asSingle
-            ) ?: false
-        }
+    private fun lock(session: TransactionalSession): Boolean {
+        return session.run(
+            queryOf("select pg_try_advisory_xact_lock($lockKey)").map {
+                it.string(1) == "t"
+            }.asSingle
+        ) ?: false
     }
 
-    private fun lock(): Boolean {
+    private fun unlock(): Boolean {
         return using(sessionOf(datasource)) { session ->
             session.run(
-                queryOf("select pg_try_advisory_lock($lockKey)").map {
+                queryOf("select pg_advisory_unlock($lockKey)").map {
                     it.string(1) == "t"
                 }.asSingle
             ) ?: false

src/test/kotlin/no/nav/dagpenger/inntekt/db/ArenaMappingMigratorTest.kt

@@ -17,7 +17,7 @@ import no.nav.dagpenger.inntekt.withMigratedDb
 import org.junit.jupiter.api.Test
 import org.postgresql.util.PGobject
 
-internal class ArenaMappingMigratorTest {
+internal class ArenaMappingMigratorTest() {
 
     companion object {