Merge pull request #1272 from navikt/svarbrev_handling

Add default svarbrev settings for AFP. Specify exception when setting…
navikt · Nov 25, 2024 · 63f8d74 · 63f8d74
2 parents d659a9b + 828378a
commit 63f8d74
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/src/main/kotlin/no/nav/klage/dokument/service/DokumentUnderArbeidService.kt b/src/main/kotlin/no/nav/klage/dokument/service/DokumentUnderArbeidService.kt
@@ -2048,6 +2048,10 @@ class DokumentUnderArbeidService(
                 type = behandling.type
             )
 
+            if (svarbrevSettings == null) {
+                throw RuntimeException("Fant ikke svarbrevinnstillinger for ytelse ${behandling.ytelse} og type ${behandling.type}")
+            }
+
             if (svarbrevSettings.shouldSend) {
                 logger.debug("Sender svarbrev for behandling {}", behandling.id)
                 val receiverId = if (behandling.klager.prosessfullmektig != null) {

diff --git a/src/main/kotlin/no/nav/klage/oppgave/service/SvarbrevSettingsService.kt b/src/main/kotlin/no/nav/klage/oppgave/service/SvarbrevSettingsService.kt
@@ -43,8 +43,8 @@ class SvarbrevSettingsService(
         } else settings!!.toConsumerView()
     }
 
-    fun getSvarbrevSettingsForYtelseAndType(ytelse: Ytelse, type: Type): SvarbrevSettings {
-        return svarbrevSettingsRepository.findAll().find { it.ytelse == ytelse && it.type == type }!!
+    fun getSvarbrevSettingsForYtelseAndType(ytelse: Ytelse, type: Type): SvarbrevSettings? {
+        return svarbrevSettingsRepository.findAll().find { it.ytelse == ytelse && it.type == type }
     }
 
     fun updateSvarbrevSettings(

diff --git a/src/main/resources/db/migration/V163__add_AFP_svarbrev_settings.sql b/src/main/resources/db/migration/V163__add_AFP_svarbrev_settings.sql
@@ -0,0 +1,25 @@
+INSERT INTO klage.svarbrev_settings (id, ytelse_id, behandlingstid_units, custom_text, should_send, created, modified,
+                                     created_by, behandlingstid_unit_type, type_id, behandlingstid_unit_type_id)
+VALUES (gen_random_uuid(), '27', 12, null, false, now(), now(), 'SYSTEMBRUKER', 'WEEKS', '1', '1');
+
+INSERT INTO klage.svarbrev_settings (id, ytelse_id, behandlingstid_units, custom_text, should_send, created, modified,
+                                     created_by, behandlingstid_unit_type, type_id, behandlingstid_unit_type_id)
+VALUES (gen_random_uuid(), '27', 12, null, false, now(), now(), 'SYSTEMBRUKER', 'WEEKS', '2', '1');
+
+INSERT INTO klage.svarbrev_settings_history (id, svarbrev_settings_id, ytelse_id, behandlingstid_units, custom_text,
+                                             created, created_by, should_send, behandlingstid_unit_type, type_id,
+                                             behandlingstid_unit_type_id)
+SELECT gen_random_uuid(),
+       s.id,
+       s.ytelse_id,
+       s.behandlingstid_units,
+       s.custom_text,
+       s.modified,
+       s.created_by,
+       s.should_send,
+       s.behandlingstid_unit_type,
+       s.type_id,
+       s.behandlingstid_unit_type_id
+FROM klage.svarbrev_settings s
+WHERE type_id IN ('1', '2')
+  AND ytelse_id = '27';