IS: Move queries to repository

navikt · Nov 5, 2024 · d20c814 · d20c814
1 parent 73ba875
commit d20c814
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/src/main/kotlin/no/nav/syfo/cronjob/statusendring/PublishDialogmoteStatusEndringService.kt b/src/main/kotlin/no/nav/syfo/cronjob/statusendring/PublishDialogmoteStatusEndringService.kt
@@ -45,7 +45,7 @@ class PublishDialogmoteStatusEndringService(
             virksomhetsnummer = database.getMoteDeltakerArbeidsgiver(moteId).virksomhetsnummer,
         )
         dialogmoteStatusEndringProducer.sendDialogmoteStatusEndring(kDialogmoteStatusEndring)
-        
+
         moteStatusEndretRepository.updateMoteStatusEndretPublishedAt(
             moteStatusEndretId = dialogmoteStatusEndret.id,
         )

diff --git a/src/main/kotlin/no/nav/syfo/dialogmote/DialogmotestatusService.kt b/src/main/kotlin/no/nav/syfo/dialogmote/DialogmotestatusService.kt
@@ -3,7 +3,6 @@ package no.nav.syfo.dialogmote
 import no.nav.syfo.client.oppfolgingstilfelle.OppfolgingstilfelleClient
 import no.nav.syfo.dialogmote.database.repository.MoteStatusEndretRepository
 import no.nav.syfo.dialogmote.api.domain.DialogmoteStatusEndringDTO
-import no.nav.syfo.dialogmote.database.createMoteStatusEndring
 import no.nav.syfo.dialogmote.database.updateMoteStatus
 import no.nav.syfo.dialogmote.domain.*
 import no.nav.syfo.domain.PersonIdent

diff --git a/src/main/kotlin/no/nav/syfo/dialogmote/database/repository/MoteStatusEndretRepository.kt b/src/main/kotlin/no/nav/syfo/dialogmote/database/repository/MoteStatusEndretRepository.kt
@@ -34,15 +34,15 @@ class MoteStatusEndretRepository(private val database: DatabaseInterface) {
                     }
             }
         }
-    
+
     fun getMoteStatusEndretNotPublished(): List<PMoteStatusEndret> {
         return database.connection.use { connection ->
             connection.prepareStatement(GET_MOTE_STATUS_ENDRET_NOT_PUBLISHED).use {
                 it.executeQuery().toList { toPMoteStatusEndret() }
             }
         }
     }
-    
+
     fun updateMoteStatusEndretPublishedAt(moteStatusEndretId: Int) {
         val now = Timestamp.from(Instant.now())
         database.connection.use { connection ->
@@ -55,7 +55,7 @@ class MoteStatusEndretRepository(private val database: DatabaseInterface) {
             connection.commit()
         }
     }
-    
+
     fun createMoteStatusEndring(
         connection: Connection,
         commit: Boolean = true,
@@ -67,9 +67,9 @@ class MoteStatusEndretRepository(private val database: DatabaseInterface) {
     ): Pair<Int, UUID> {
         val now = Timestamp.from(Instant.now())
         val startDate = tilfelleStart ?: LocalDate.EPOCH
-        
+
         val moteStatusEndringUuid = UUID.randomUUID()
-        
+
         val moteStatusEndringIdList = connection.prepareStatement(CREATE_MOTE_STATUS_ENDRING).use {
             it.setString(1, moteStatusEndringUuid.toString())
             it.setTimestamp(2, now)
@@ -81,18 +81,18 @@ class MoteStatusEndretRepository(private val database: DatabaseInterface) {
             it.setBoolean(8, isBehandlerMotedeltaker)
             it.executeQuery().toList { getInt("id") }
         }
-        
+
         if (moteStatusEndringIdList.size != 1) {
             throw SQLException("Creating MoteStatusEndring failed, no rows affected.")
         }
-        
+
         if (commit) {
             connection.commit()
         }
-        
+
         return Pair(moteStatusEndringIdList.first(), moteStatusEndringUuid)
     }
-    
+
     companion object {
         private const val GET_MOTE_STATUS_ENDRINGER =
             """
@@ -105,7 +105,7 @@ class MoteStatusEndretRepository(private val database: DatabaseInterface) {
             WHERE mda.personident = ?
             ORDER BY mse.created_at DESC
             """
-        
+
         private const val CREATE_MOTE_STATUS_ENDRING =
             """
             INSERT INTO MOTE_STATUS_ENDRET (
@@ -120,15 +120,15 @@ class MoteStatusEndretRepository(private val database: DatabaseInterface) {
                 motedeltaker_behandler
                 ) VALUES (DEFAULT, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id
             """
-        
+
         private const val GET_MOTE_STATUS_ENDRET_NOT_PUBLISHED =
             """
             SELECT *
             FROM MOTE_STATUS_ENDRET
             WHERE published_at IS NULL
             ORDER BY created_at ASC LIMIT 100
             """
-        
+
         private const val UPDATE_MOTE_STATUS_ENDRET_PUBLISHED_AT =
             """
             UPDATE MOTE_STATUS_ENDRET

diff --git a/...est/kotlin/no/nav/syfo/cronjob/statusendring/PublishDialogmoteStatusEndringCronjobSpek.kt b/...est/kotlin/no/nav/syfo/cronjob/statusendring/PublishDialogmoteStatusEndringCronjobSpek.kt
@@ -45,7 +45,7 @@ class PublishDialogmoteStatusEndringCronjobSpek : Spek({
 
             val externalMockEnvironment = ExternalMockEnvironment.getInstance()
             val database = externalMockEnvironment.database
-            
+
             val moteStatusEndretRepository = MoteStatusEndretRepository(database)
 
             val behandlerDialogmeldingProducer = mockk<BehandlerDialogmeldingProducer>()

diff --git a/src/test/kotlin/no/nav/syfo/janitor/JanitorServiceSpek.kt b/src/test/kotlin/no/nav/syfo/janitor/JanitorServiceSpek.kt
@@ -224,7 +224,7 @@ class JanitorServiceSpek : Spek({
                             )
                         )
                     }
-                    
+
                     moteStatusEndretRepository.getMoteStatusEndretNotPublished().shouldBeEmpty()
                     verify(exactly = 0) { eventStatusProducerMock.sendEventStatus(any()) }
                 }