litt refactoring

navikt · Nov 8, 2024 · e9875c6 · e9875c6
1 parent db58886
commit e9875c6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 70 deletions.
diff --git a/...sorgsopptjening/start/innlesning/barnetrygd/repository/BarnetrygdinformasjonRepository.kt b/...sorgsopptjening/start/innlesning/barnetrygd/repository/BarnetrygdinformasjonRepository.kt
@@ -152,21 +152,6 @@ class BarnetrygdinformasjonRepository(
         )
     }
 
-    fun finnAntallMedStatus(status: Barnetrygdinformasjon.Status): Long {
-        return jdbcTemplate.queryForObject(
-            """select count(*) 
-                |from barnetrygdinnlesing
-                |and status = :status""".trimMargin(),
-            mapOf(
-                "status" to when (status) {
-                    Barnetrygdinformasjon.Status.KLAR -> "Klar"
-                    Barnetrygdinformasjon.Status.SENDT -> "Sendt"
-                }
-            ),
-            Long::class.java,
-        )!!
-    }
-
     fun frigiGamleLåser(): Int {
         val oneHourAgo = Instant.now(clock).minus(1.hours.toJavaDuration()).toString()
         return jdbcTemplate.update(

diff --git a/.../omsorgsopptjening/start/innlesning/barnetrygd/repository/BarnetrygdmottakerRepository.kt b/.../omsorgsopptjening/start/innlesning/barnetrygd/repository/BarnetrygdmottakerRepository.kt
@@ -241,22 +241,7 @@ class BarnetrygdmottakerRepository(
             Long::class.java,
         )!!
     }
-
-    fun harBarnetrygdmottakereKlareTilBehandling(): Boolean {
-        return jdbcTemplate.queryForObject(
-            """select 1 
-                |from barnetrygdmottaker
-                |and status_type = 'Klar'
-                |or (status_type = 'Retry' and karanteneTil < :now)
-                |fetch first row only
-                |""".trimMargin(),
-            mapOf(
-                "now" to Instant.now(clock).toString(),
-            ),
-            Long::class.java,
-        ) != null
-    }
-
+
     fun oppdaterFeiledeRaderTilKlar(innlesingId: UUID): Int {
         val nyStatus = serialize(Barnetrygdmottaker.Status.Klar())
         return jdbcTemplate.update(

diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
@@ -1,4 +1,4 @@
-<html>
+<html lang="nb-NO">
 <head>
     <meta charset="utf8">
     <style>
@@ -109,6 +109,7 @@
             localStorage.setItem("hjelpetekst", hjelpetekst.hidden ? "hidden" : "shown")
         }
     </script>
+    <title>Administrasjon omsorgsopptjening-start-innlesning</title>
 </head>
 <body onload="init()">
 <h1>Omsorgsopptjening - Administrasjon av meldinger</h1>

diff --git a/...orgsopptjening/start/innlesning/barnetrygd/repository/BarnetrygdmottakerRepositoryTest.kt b/...orgsopptjening/start/innlesning/barnetrygd/repository/BarnetrygdmottakerRepositoryTest.kt
@@ -280,11 +280,6 @@ class BarnetrygdmottakerRepositoryTest : SpringContextTest.NoKafka() {
         assertThat(barnetrygdmottakerRepository.finnAlle(innlesingUberørt.id).single().statushistorikk).hasSize(1)
     }
 
-    @Test
-    fun `harBarnetrygdmottakereKlareTilBehandling svarer riktig når ingen barnetrygdmottakere`() {
-
-    }
-
     private fun lagreBestiltInnlesing(
         innlesing: BarnetrygdInnlesing.Bestilt = BarnetrygdInnlesing.Bestilt(
             id = InnlesingId.generate(),

diff --git a/...av/pensjon/opptjening/omsorgsopptjening/start/innlesning/external/pdl/WiremockScenario.kt b/...av/pensjon/opptjening/omsorgsopptjening/start/innlesning/external/pdl/WiremockScenario.kt
@@ -7,21 +7,21 @@ import com.github.tomakehurst.wiremock.junit5.WireMockExtension
 import com.github.tomakehurst.wiremock.stubbing.StubMapping
 import no.nav.pensjon.opptjening.omsorgsopptjening.start.innlesning.barnetrygd.domain.Ident
 
-private fun WireMockExtension.pdlResponse(fileName: String): StubMapping {
+fun WireMockExtension.`pdl error not_found`(): StubMapping {
     synchronized(this) {
         return this.stubFor(
             WireMock.post(WireMock.urlPathEqualTo("/graphql"))
                 .willReturn(
                     aResponse()
                         .withHeader("Content-Type", "application/json")
                         .withStatus(202)
-                        .withBodyFile("pdl/$fileName")
+                        .withBodyFile("pdl/error_not_found.json")
                 )
         )
     }
 }
 
-private fun WireMockExtension.pdlResponse(fnr: String, fileName: String): StubMapping {
+fun WireMockExtension.`pdl error not_found`(fnr: String): StubMapping {
     synchronized(this) {
         return this.stubFor(
             WireMock.post(WireMock.urlPathEqualTo("/graphql"))
@@ -30,7 +30,7 @@ private fun WireMockExtension.pdlResponse(fnr: String, fileName: String): StubMa
                     aResponse()
                         .withHeader("Content-Type", "application/json")
                         .withStatus(202)
-                        .withBodyFile("pdl/$fileName")
+                        .withBodyFile("pdl/error_not_found.json")
                 )
         )
     }
@@ -76,12 +76,4 @@ fun WireMockExtension.`pdl fnr fra query`(): StubMapping {
                     )
             )
     )
-}
-
-fun WireMockExtension.`pdl error not_found`(): StubMapping {
-    return this.pdlResponse("error_not_found.json")
-}
-
-fun WireMockExtension.`pdl error not_found`(fnr: String): StubMapping {
-    return this.pdlResponse(fnr, "error_not_found.json")
 }
diff --git a/src/test/resources/__files/barnetrygd/fagsaker_2.json b/src/test/resources/__files/barnetrygd/fagsaker_2.json