Fix missions control unit resources saving in Backend

MTES-MCT · Oct 23, 2023 · 721c842 · 721c842
1 parent 91df6b3
commit 721c842
Show file tree

Hide file tree

Showing 21 changed files with 140 additions and 194 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
@@ -325,7 +325,9 @@
 				</executions>
 				<configuration>
 					<compilerArgument>-parameters</compilerArgument>
-				</configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.jetbrains.kotlin</groupId>

diff --git a/.../kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlUnit/ControlUnitResourceEntity.kt b/.../kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlUnit/ControlUnitResourceEntity.kt
@@ -42,4 +42,11 @@ data class ControlUnitResourceEntity(
 
         return result
     }
+
+    fun toLegacyControlUnitEntity(): LegacyControlUnitResourceEntity {
+        return LegacyControlUnitResourceEntity(
+            id = requireNotNull(id),
+            name,
+        )
+    }
 }
diff --git a/...in/kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlUnit/LegacyControlUnitEntity.kt b/...in/kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlUnit/LegacyControlUnitEntity.kt
@@ -1,11 +1,11 @@
 package fr.gouv.cacem.monitorenv.domain.entities.controlUnit
 
-// TODO Replace this entity with `FullControlUnitEntity`. It's left for `MissionEntity.units` backward compatibility.
+// TODO Replace this entity with `ControlUnitEntity`. It's left for `MissionEntity.units` backward compatibility.
 data class LegacyControlUnitEntity(
     val id: Int,
     val administration: String,
     val isArchived: Boolean,
     val name: String,
-    val resources: List<ControlUnitResourceEntity>,
+    val resources: List<LegacyControlUnitResourceEntity>,
     val contact: String? = null,
 )
diff --git a/...n/fr/gouv/cacem/monitorenv/domain/entities/controlUnit/LegacyControlUnitResourceEntity.kt b/...n/fr/gouv/cacem/monitorenv/domain/entities/controlUnit/LegacyControlUnitResourceEntity.kt
@@ -0,0 +1,7 @@
+package fr.gouv.cacem.monitorenv.domain.entities.controlUnit
+
+// TODO Replace this entity with `ControlUnitResourceEntity`. It's left for `MissionEntity.units` backward compatibility.
+data class LegacyControlUnitResourceEntity(
+    val id: Int,
+    val name: String,
+)
diff --git a/...tlin/fr/gouv/cacem/monitorenv/domain/exceptions/ControlResourceOrUnitNotFoundException.kt b/...tlin/fr/gouv/cacem/monitorenv/domain/exceptions/ControlResourceOrUnitNotFoundException.kt
diff --git a/...ain/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlUnitResourceRepository.kt b/...ain/kotlin/fr/gouv/cacem/monitorenv/domain/repositories/IControlUnitResourceRepository.kt
@@ -10,5 +10,7 @@ interface IControlUnitResourceRepository {
 
     fun findAll(): List<FullControlUnitResourceDTO>
 
+    fun findAllById(controlUnitResourceIds: List<Int>): List<FullControlUnitResourceDTO>
+
     fun save(controlUnitResource: ControlUnitResourceEntity): ControlUnitResourceEntity
 }
diff --git a/...n/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/dtos/FullControlUnitDTO.kt b/...n/kotlin/fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/dtos/FullControlUnitDTO.kt
@@ -20,7 +20,7 @@ data class FullControlUnitDTO(
             administration = administration.name,
             isArchived = controlUnit.isArchived,
             name = controlUnit.name,
-            resources = controlUnitResources.map { it.toControlUnitResource() },
+            resources = controlUnitResources.map { it.toLegacyControlUnitResource() },
         )
     }
 }
diff --git a/.../fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/dtos/FullControlUnitResourceDTO.kt b/.../fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/dtos/FullControlUnitResourceDTO.kt
@@ -3,22 +3,17 @@ package fr.gouv.cacem.monitorenv.domain.use_cases.controlUnit.dtos
 import fr.gouv.cacem.monitorenv.domain.entities.base.BaseEntity
 import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.ControlUnitEntity
 import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.ControlUnitResourceEntity
+import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.LegacyControlUnitResourceEntity
 
 data class FullControlUnitResourceDTO(
     val base: BaseEntity,
     val controlUnit: ControlUnitEntity,
     val controlUnitResource: ControlUnitResourceEntity,
 ) {
-    fun toControlUnitResource(): ControlUnitResourceEntity {
-        return ControlUnitResourceEntity(
-            id = controlUnitResource.id,
-            baseId = controlUnitResource.baseId,
-            controlUnitId = controlUnitResource.controlUnitId,
-            isArchived = controlUnitResource.isArchived,
+    fun toLegacyControlUnitResource(): LegacyControlUnitResourceEntity {
+        return LegacyControlUnitResourceEntity(
+            id = requireNotNull(controlUnitResource.id),
             name = controlUnitResource.name,
-            note = controlUnitResource.note,
-            photo = controlUnitResource.photo,
-            type = controlUnitResource.type,
         )
     }
 }
diff --git a/...v/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/LegacyControlUnitDataOutput.kt b/...v/cacem/monitorenv/infrastructure/api/adapters/bff/outputs/LegacyControlUnitDataOutput.kt
@@ -10,14 +10,15 @@ data class LegacyControlUnitDataOutput(
     val resources: List<LegacyControlUnitResourceDataOutput>,
 ) {
     companion object {
-        fun fromLegacyControlUnit(legacyControlUnit: LegacyControlUnitEntity) = LegacyControlUnitDataOutput(
-            id = legacyControlUnit.id,
-            administration = legacyControlUnit.administration,
-            name = legacyControlUnit.name,
-            isArchived = legacyControlUnit.isArchived,
-            resources = legacyControlUnit.resources.map {
-                LegacyControlUnitResourceDataOutput.fromControlResourceEntity(it)
-            },
-        )
+        fun fromLegacyControlUnit(legacyControlUnit: LegacyControlUnitEntity) =
+            LegacyControlUnitDataOutput(
+                id = legacyControlUnit.id,
+                administration = legacyControlUnit.administration,
+                name = legacyControlUnit.name,
+                isArchived = legacyControlUnit.isArchived,
+                resources = legacyControlUnit.resources.map {
+                    LegacyControlUnitResourceDataOutput.fromLegacyControlResourceEntity(it)
+                },
+            )
     }
 }
diff --git a/...monitorenv/infrastructure/api/adapters/bff/outputs/LegacyControlUnitResourceDataOutput.kt b/...monitorenv/infrastructure/api/adapters/bff/outputs/LegacyControlUnitResourceDataOutput.kt
@@ -1,16 +1,18 @@
 package fr.gouv.cacem.monitorenv.infrastructure.api.adapters.bff.outputs
 
-import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.ControlUnitResourceEntity
+import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.LegacyControlUnitResourceEntity
 
 data class LegacyControlUnitResourceDataOutput(
     val id: Int,
     val name: String,
 ) {
     companion object {
-        fun fromControlResourceEntity(controlUnitResource: ControlUnitResourceEntity) =
+        fun fromLegacyControlResourceEntity(
+            legacyControlUnitResource: LegacyControlUnitResourceEntity,
+        ) =
             LegacyControlUnitResourceDataOutput(
-                id = requireNotNull(controlUnitResource.id),
-                name = controlUnitResource.name,
+                id = requireNotNull(legacyControlUnitResource.id),
+                name = legacyControlUnitResource.name,
             )
     }
 }
diff --git a/...acem/monitorenv/infrastructure/api/endpoints/publicapi/ApiLegacyControlUnitsController.kt b/...acem/monitorenv/infrastructure/api/endpoints/publicapi/ApiLegacyControlUnitsController.kt
@@ -17,6 +17,8 @@ class ApiLegacyControlUnitsController(
     @GetMapping("")
     @Operation(summary = "Get legacy control units")
     fun getControlResourcesController(): List<LegacyControlUnitDataOutput> {
-        return getLegacyControlUnits.execute().map { LegacyControlUnitDataOutput.fromLegacyControlUnit(it) }
+        return getLegacyControlUnits.execute().map {
+            LegacyControlUnitDataOutput.fromLegacyControlUnit(it)
+        }
     }
 }
diff --git a/...rc/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/ControlUnitModel.kt b/...rc/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/ControlUnitModel.kt
@@ -80,6 +80,28 @@ data class ControlUnitModel(
                 termsNote = controlUnit.termsNote,
             )
         }
+
+        /**
+         * @param controlUnitContactModels Return control unit contacts relations when provided.
+         * @param controlUnitResourceModels Return control unit resources relations when provided.
+         */
+        fun fromFullControlUnit(
+            fullControlUnit: FullControlUnitDTO,
+            controlUnitContactModels: List<ControlUnitContactModel>? = null,
+            controlUnitResourceModels: List<ControlUnitResourceModel>? = null,
+        ): ControlUnitModel {
+            return ControlUnitModel(
+                id = fullControlUnit.controlUnit.id,
+                areaNote = fullControlUnit.controlUnit.areaNote,
+                administration = AdministrationModel.fromAdministration(fullControlUnit.administration),
+                controlUnitContacts = controlUnitContactModels,
+                controlUnitResources = controlUnitResourceModels,
+                departmentArea = fullControlUnit.departmentArea?.let { DepartmentAreaModel.fromDepartmentArea(it) },
+                isArchived = fullControlUnit.controlUnit.isArchived,
+                name = fullControlUnit.controlUnit.name,
+                termsNote = fullControlUnit.controlUnit.termsNote,
+            )
+        }
     }
 
     fun toControlUnit(): ControlUnitEntity {
@@ -110,7 +132,7 @@ data class ControlUnitModel(
             administration = administration.name,
             isArchived,
             name,
-            resources = requireNotNull(controlUnitResources).map { it.toControlUnitResource() },
+            resources = requireNotNull(controlUnitResources).map { it.toLegacyControlUnitResource() },
             contact = "",
         )
     }

diff --git a/...kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/ControlUnitResourceModel.kt b/...kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/ControlUnitResourceModel.kt
@@ -3,6 +3,7 @@ package fr.gouv.cacem.monitorenv.infrastructure.database.model
 import com.fasterxml.jackson.annotation.JsonBackReference
 import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.ControlUnitResourceEntity
 import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.ControlUnitResourceType
+import fr.gouv.cacem.monitorenv.domain.entities.controlUnit.LegacyControlUnitResourceEntity
 import fr.gouv.cacem.monitorenv.domain.use_cases.controlUnit.dtos.FullControlUnitResourceDTO
 import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType
 import jakarta.persistence.*
@@ -131,4 +132,11 @@ data class ControlUnitResourceModel(
             controlUnitResource = toControlUnitResource(),
         )
     }
+
+    fun toLegacyControlUnitResource(): LegacyControlUnitResourceEntity {
+        return LegacyControlUnitResourceEntity(
+            id = requireNotNull(id),
+            name,
+        )
+    }
 }
diff --git a/...lin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionControlResourceModel.kt b/...lin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionControlResourceModel.kt
@@ -17,39 +17,18 @@ data class MissionControlResourceModel(
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false, cascade = [CascadeType.MERGE])
     @JoinColumn(name = "control_resource_id")
-    var ressource: ControlUnitResourceModel,
+    var resource: ControlUnitResourceModel,
 ) {
-    companion object {
-        fun fromControlUnitResource(
-            controlUnitResource: ControlUnitResourceEntity,
-            baseModel: BaseModel,
-            missionModel: MissionModel,
-            controlUnitModel: ControlUnitModel,
-        ) = MissionControlResourceModel(
-            ressource = ControlUnitResourceModel(
-                id = requireNotNull(controlUnitResource.id),
-                base = baseModel,
-                controlUnit = controlUnitModel,
-                isArchived = controlUnitResource.isArchived,
-                name = controlUnitResource.name,
-                note = controlUnitResource.note,
-                photo = controlUnitResource.photo,
-                type = controlUnitResource.type,
-            ),
-            mission = missionModel,
-        )
-    }
-
     fun toControlUnitResource(): ControlUnitResourceEntity {
         return ControlUnitResourceEntity(
-            id = ressource.id,
-            baseId = requireNotNull(ressource.base.id),
-            controlUnitId = requireNotNull(ressource.controlUnit.id),
-            isArchived = ressource.isArchived,
-            name = ressource.name,
-            note = ressource.note,
+            id = resource.id,
+            baseId = requireNotNull(resource.base.id),
+            controlUnitId = requireNotNull(resource.controlUnit.id),
+            isArchived = resource.isArchived,
+            name = resource.name,
+            note = resource.note,
             photo = byteArrayOf(),
-            type = ressource.type,
+            type = resource.type,
         )
     }
 }
diff --git a/...nd/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionModel.kt b/...nd/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionModel.kt
@@ -14,18 +14,7 @@ import fr.gouv.cacem.monitorenv.utils.mapOrElseEmpty
 import io.hypersistence.utils.hibernate.type.array.ListArrayType
 import io.hypersistence.utils.hibernate.type.array.internal.AbstractArrayType.SQL_ARRAY_TYPE
 import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType
-import jakarta.persistence.Basic
-import jakarta.persistence.CascadeType
-import jakarta.persistence.Column
-import jakarta.persistence.Entity
-import jakarta.persistence.EnumType
-import jakarta.persistence.Enumerated
-import jakarta.persistence.FetchType
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-import jakarta.persistence.OneToMany
-import jakarta.persistence.Table
+import jakarta.persistence.*
 import org.hibernate.Hibernate
 import org.hibernate.annotations.Fetch
 import org.hibernate.annotations.FetchMode
@@ -140,16 +129,11 @@ data class MissionModel(
 ) {
     fun toMissionEntity(objectMapper: ObjectMapper): MissionEntity {
         val controlUnits = controlUnits.mapOrElseEmpty { missionControlUnitModel ->
-            val maybeMissionControlResourceModels = controlResources
-                ?.filter { missionControlResourceModel ->
-                    missionControlResourceModel.ressource.controlUnit.id == missionControlUnitModel.unit.id
-                }
-
-            val controlUnitResources = maybeMissionControlResourceModels.mapOrElseEmpty { it.toControlUnitResource() }
+            val controlUnitResources = controlResources.mapOrElseEmpty { it.toControlUnitResource() }
 
             missionControlUnitModel.unit.toLegacyControlUnit().copy(
                 contact = missionControlUnitModel.contact,
-                resources = controlUnitResources,
+                resources = controlUnitResources.map { it.toLegacyControlUnitEntity() },
             )
         }
 
@@ -186,7 +170,7 @@ data class MissionModel(
         fun fromMissionEntity(
             mission: MissionEntity,
             mapper: ObjectMapper,
-            baseModelMap: Map<Int, BaseModel>,
+            controlUnitResourceModelMap: Map<Int, ControlUnitResourceModel>,
         ): MissionModel {
             val missionModel = MissionModel(
                 id = mission.id,
@@ -212,20 +196,19 @@ data class MissionModel(
             }
 
             mission.controlUnits.map {
-                val controlUnitModel = MissionControlUnitModel.fromLegacyControlUnit(
+                val missionControlUnitModel = MissionControlUnitModel.fromLegacyControlUnit(
                     it,
                     missionModel,
                 )
-                missionModel.controlUnits?.add(controlUnitModel)
+                missionModel.controlUnits?.add(missionControlUnitModel)
 
                 val missionControlUnitResourceModels = it.resources.map { controlUnitResource ->
-                    val baseModel = requireNotNull(baseModelMap[controlUnitResource.baseId])
+                    val controlUnitResourceModel = requireNotNull(controlUnitResourceModelMap[controlUnitResource.id])
 
-                    MissionControlResourceModel.fromControlUnitResource(
-                        controlUnitResource,
-                        baseModel,
-                        missionModel,
-                        controlUnitModel.unit,
+                    MissionControlResourceModel(
+                        id = mission.id,
+                        resource = controlUnitResourceModel,
+                        mission = missionModel,
                     )
                 }
                 missionModel.controlResources?.addAll(missionControlUnitResourceModels)

diff --git a/...cacem/monitorenv/infrastructure/database/repositories/JpaControlUnitResourceRepository.kt b/...cacem/monitorenv/infrastructure/database/repositories/JpaControlUnitResourceRepository.kt
@@ -27,6 +27,12 @@ class JpaControlUnitResourceRepository(
         return dbControlUnitResourceRepository.findAll().map { it.toFullControlUnitResource() }
     }
 
+    override fun findAllById(controlUnitResourceIds: List<Int>): List<FullControlUnitResourceDTO> {
+        return dbControlUnitResourceRepository.findAllById(controlUnitResourceIds).map {
+            it.toFullControlUnitResource()
+        }
+    }
+
     override fun findById(controlUnitResourceId: Int): FullControlUnitResourceDTO {
         return dbControlUnitResourceRepository.findById(controlUnitResourceId).get().toFullControlUnitResource()
     }