Merge pull request #79 from navikt/feature/sivilstandType-enum

Edit sivilstandtype enum
navikt · Nov 8, 2023 · b8addca · b8addca
2 parents d624120 + 91719e4
commit b8addca
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/src/main/kotlin/no/nav/bidrag/behandling/database/datamodell/SivilstandType.kt b/src/main/kotlin/no/nav/bidrag/behandling/database/datamodell/SivilstandType.kt
@@ -5,14 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema
 // TODO Bruk Sivilstandstype fra bidrag-domain istedenfor
 @Schema(enumAsRef = true)
 enum class SivilstandType {
-    ENKE_ELLER_ENKEMANN,
+    BOR_ALENE_MED_BARN,
     GIFT,
-    GJENLEVENDE_PARTNER,
-    REGISTRERT_PARTNER,
-    SEPARERT,
-    SEPARERT_PARTNER,
-    SKILT,
-    SKILT_PARTNER,
-    UGIFT,
-    UOPPGITT,
 }
diff --git a/src/main/resources/db/migration/V1.0.30__edit_sivilstandType_enum.sql b/src/main/resources/db/migration/V1.0.30__edit_sivilstandType_enum.sql
@@ -0,0 +1,17 @@
+alter type SIVILSTAND_TYPE rename to SIVILSTAND_TYPE_OLD;
+
+CREATE TYPE SIVILSTAND_TYPE AS ENUM
+    (
+        'BOR_ALENE_MED_BARN',
+        'GIFT'
+    );
+
+CREATE CAST (VARCHAR AS SIVILSTAND_TYPE) WITH INOUT AS IMPLICIT;
+alter table SIVILSTAND rename column SIVILSTAND_TYPE to SIVILSTAND_TYPE_OLD;
+
+ALTER TABLE SIVILSTAND
+    ADD COLUMN SIVILSTAND_TYPE SIVILSTAND_TYPE DEFAULT 'BOR_ALENE_MED_BARN' not null ;
+update SIVILSTAND set SIVILSTAND_TYPE = 'BOR_ALENE_MED_BARN' where SIVILSTAND_TYPE_OLD != 'GIFT';
+
+ALTER TABLE SIVILSTAND DROP COLUMN IF EXISTS SIVILSTAND_TYPE_OLD cascade;
+drop type SIVILSTAND_TYPE_OLD cascade;
diff --git a/src/test/kotlin/no/nav/bidrag/behandling/service/BehandlingServiceTest.kt b/src/test/kotlin/no/nav/bidrag/behandling/service/BehandlingServiceTest.kt
@@ -125,7 +125,7 @@ class BehandlingServiceTest : TestContainerRunner() {
                         null,
                         Calendar.getInstance().time.toLocalDate(),
                         Calendar.getInstance().time.toLocalDate(),
-                        SivilstandType.ENKE_ELLER_ENKEMANN,
+                        SivilstandType.BOR_ALENE_MED_BARN,
                     ),
                 )