Merge pull request #397 from navikt/omgjoeringskrav

Support omgjøringskrav.
navikt · Nov 12, 2024 · 2044bd9 · 2044bd9
2 parents 805e910 + 87d50ec
commit 2044bd9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ val threeTenExtraVersion = "1.8.0"
 val archunitVersion = "1.3.0"
 val opensearchVersion = "2.17.1"
 val reactorSpringVersion = "1.0.1.RELEASE"
-val kodeverkVersion = "1.8.56"
+val kodeverkVersion = "1.8.58"
 val ehcacheVersion = "3.10.8"
 val logbackSyslog4jVersion = "1.0.0"
 

diff --git a/src/main/kotlin/no/nav/klage/search/service/OppgaverService.kt b/src/main/kotlin/no/nav/klage/search/service/OppgaverService.kt
@@ -9,6 +9,7 @@ import no.nav.klage.search.api.view.AntallUtgaatteFristerResponse
 import no.nav.klage.search.api.view.BehandlingerListResponse
 import no.nav.klage.search.api.view.MineLedigeOppgaverCountQueryParams
 import no.nav.klage.search.api.view.MineLedigeOppgaverQueryParams
+import no.nav.klage.search.util.getLogger
 import org.springframework.stereotype.Service
 
 @Service
@@ -18,6 +19,12 @@ class OppgaverService(
     private val elasticsearchService: ElasticsearchService,
     private val behandlingListMapper: BehandlingListMapper,
 ) {
+
+    companion object {
+        @Suppress("JAVA_CLASS_ON_COMPANION")
+        private val logger = getLogger(javaClass.enclosingClass)
+    }
+
     fun getLedigeOppgaverForInnloggetSaksbehandler(
         queryParams: MineLedigeOppgaverQueryParams,
     ): BehandlingerListResponse {
@@ -34,7 +41,7 @@ class OppgaverService(
         )
 
         val typer = queryParams.typer.ifEmpty {
-            listOf(Type.KLAGE.id, Type.ANKE.id, Type.BEHANDLING_ETTER_TRYGDERETTEN_OPPHEVET.id)
+            getDefaultSearchTypes()
         }
 
         val searchCriteria = behandlingerSearchCriteriaMapper.toLedigeOppgaverSearchCriteria(
@@ -70,7 +77,7 @@ class OppgaverService(
         )
 
         val typer = queryParams.typer.ifEmpty {
-            listOf(Type.KLAGE.id, Type.ANKE.id, Type.BEHANDLING_ETTER_TRYGDERETTEN_OPPHEVET.id)
+            getDefaultSearchTypes()
         }
 
         val searchCriteria = behandlingerSearchCriteriaMapper.toSearchCriteriaForLedigeMedUtgaattFrist(
@@ -90,6 +97,15 @@ class OppgaverService(
         )
     }
 
+    private fun getDefaultSearchTypes(): List<String> {
+        return listOf(
+            Type.KLAGE.id,
+            Type.ANKE.id,
+            Type.BEHANDLING_ETTER_TRYGDERETTEN_OPPHEVET.id,
+            Type.OMGJOERINGSKRAV.id,
+        )
+    }
+
     private fun getYtelserQueryListForSaksbehandler(
         queryYtelser: List<String>,
         innstillingerYtelser: List<Ytelse>