Merge pull request #400 from MTES-MCT/jpa-init-infraction-natinf

fix(Backend): fix lazy init error on InfractionModel.natinf
MTES-MCT · Oct 31, 2024 · c721fc6 · c721fc6
2 parents b2e1240 + 961277e
commit c721fc6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...ouv/dgampa/rapportnav/infrastructure/database/model/mission/infraction/InfractionModel.kt b/...ouv/dgampa/rapportnav/infrastructure/database/model/mission/infraction/InfractionModel.kt
@@ -36,9 +36,9 @@ class InfractionModel(
         joinColumns = [JoinColumn(name = "infraction_id")]
     )
     @Column(name = "natinf_code")
-    var natinfs: List<String>? = mutableListOf(),
+    var natinfs: List<String> = mutableListOf(),
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "control_id", referencedColumnName = "id")
     @JsonIgnore
     var control: ControlModel? = null,
@@ -50,7 +50,7 @@ class InfractionModel(
         targetEntity = InfractionEnvTargetModel::class
     )
     @JsonIgnore
-    var target: List<InfractionEnvTargetModel>? = null
+    var target: List<InfractionEnvTargetModel> = mutableListOf()
 
 
 ) {
@@ -63,7 +63,7 @@ class InfractionModel(
             controlType = ControlType.valueOf(controlType),
             infractionType = infractionType?.let { InfractionTypeEnum.valueOf(it) },
             observations = observations,
-            target = target?.map { it.toInfractionEnvTargetEntity() }?.firstOrNull(),
+            target = target.map { it.toInfractionEnvTargetEntity() }?.firstOrNull(),
             natinfs = natinfs
         )
     }
@@ -76,7 +76,7 @@ class InfractionModel(
                 actionId = infraction.actionId,
                 controlType = infraction.controlType.toString(),
                 infractionType = infraction.infractionType?.toString(),
-                natinfs = infraction.natinfs,
+                natinfs = infraction.natinfs.orEmpty(),
                 observations = infraction.observations,
                 target = infraction.target?.let {
                     listOf(InfractionEnvTargetModel.fromInfractionEnvTargetEntity(it))

diff --git a/...frastructure/database/repositories/mission/infraction/JPAInfractionEnvTargetRepository.kt b/...frastructure/database/repositories/mission/infraction/JPAInfractionEnvTargetRepository.kt
@@ -40,6 +40,7 @@ class JPAInfractionEnvTargetRepository(
         }
     }
 
+    @Transactional
     override fun findByActionIdAndVesselIdentifier(
         actionId: String,
         vesselIdentifier: String

diff --git a/...ortnav/infrastructure/database/repositories/mission/infraction/JPAInfractionRepository.kt b/...ortnav/infrastructure/database/repositories/mission/infraction/JPAInfractionRepository.kt
@@ -71,10 +71,12 @@ class JPAInfractionRepository(
     }
 
 
+    @Transactional
     override fun findAllByActionId(actionId: String): List<InfractionModel> {
         return dbRepo.findAllByActionId(actionId = actionId)
     }
 
+    @Transactional
     override fun findById(id: UUID): Optional<InfractionModel> {
         return dbRepo.findById(id)
     }