Endre CascadeType

navikt · Dec 5, 2023 · d2f810b · d2f810b
1 parent f9fed0a
commit d2f810b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/kotlin/no/nav/bidrag/behandling/database/datamodell/Behandling.kt b/src/main/kotlin/no/nav/bidrag/behandling/database/datamodell/Behandling.kt
@@ -77,7 +77,7 @@ class Behandling(
     @OneToMany(
         fetch = FetchType.EAGER,
         mappedBy = "behandling",
-        cascade = [CascadeType.MERGE],
+        cascade = [CascadeType.MERGE, CascadeType.PERSIST],
         orphanRemoval = true,
     )
     var inntekter: MutableSet<Inntekt> = mutableSetOf(),
@@ -91,14 +91,14 @@ class Behandling(
     @OneToMany(
         fetch = FetchType.EAGER,
         mappedBy = "behandling",
-        cascade = [CascadeType.ALL],
+        cascade = [CascadeType.MERGE, CascadeType.PERSIST],
         orphanRemoval = true,
     )
     var barnetillegg: MutableSet<Barnetillegg> = mutableSetOf(),
     @OneToMany(
         fetch = FetchType.EAGER,
         mappedBy = "behandling",
-        cascade = [CascadeType.MERGE],
+        cascade = [CascadeType.MERGE, CascadeType.PERSIST],
         orphanRemoval = true,
     )
     var utvidetbarnetrygd: MutableSet<Utvidetbarnetrygd> = mutableSetOf(),

diff --git a/src/main/kotlin/no/nav/bidrag/behandling/database/datamodell/Inntekt.kt b/src/main/kotlin/no/nav/bidrag/behandling/database/datamodell/Inntekt.kt
@@ -24,7 +24,7 @@ class Inntekt(
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     val id: Long? = null,
-    @ManyToOne(fetch = FetchType.EAGER)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "behandling_id", nullable = false)
     val behandling: Behandling? = null,
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "inntekt", cascade = [CascadeType.ALL], orphanRemoval = true)