Mission General Information ULAM

.gitlab-ci.yml

@@ -16,7 +16,7 @@ variables:
     value: "postgres:15.10-alpine"
     description: "Image de la base de données"
   PROJECT_VERSION:
-    value: "2.5.3"
+    value: "2.5.4"
     description: "Version du projet à déployer"
   SERVER_ENV_INT:
     value: "int-rapportnav-appli01"

backend/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.lang.System.getenv
 
 group = "fr.gouv.dgampa"
-version = "2.5.3"
+version = "2.5.4"
 description = "RapportNav"
 
 val kotlinVersion by extra("1.9.24")

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/env/MissionSourceEnum.kt

@@ -6,4 +6,5 @@ enum class MissionSourceEnum {
     POSEIDON_CACEM,
     POSEIDON_CNSP,
     RAPPORTNAV,
+    RAPPORT_NAV
 }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/env/controlResources/ControlResourceEntity.kt

@@ -1,6 +1,19 @@
 package fr.gouv.dgampa.rapportnav.domain.entities.mission.env.controlResources
 
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.v2.env.ControlUnitResourceEnv
+
 data class ControlResourceEntity(
     val id: Int,
     val name: String,
-)
+) {
+    companion object {
+        fun fromControlUnitResourceEnv(
+            resourceEnv: ControlUnitResourceEnv
+        ): ControlResourceEntity {
+            return ControlResourceEntity(
+                id = resourceEnv.id,
+                name = resourceEnv.name
+            )
+        }
+    }
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/env/controlResources/ControlUnitResourceEntity.kt

@@ -0,0 +1,4 @@
+package fr.gouv.dgampa.rapportnav.domain.entities.mission.env.controlResources
+
+class ControlUnitResourceEntity {
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/env/controlResources/ControlUnitResourceType.kt

@@ -0,0 +1,29 @@
+package fr.gouv.dgampa.rapportnav.domain.entities.mission.env.controlResources
+
+enum class ControlUnitResourceType(val label: String) {
+    AIRPLANE("Avion"),
+    BARGE("Barge"),
+    CAR("Voiture"),
+    DRONE("Drône"),
+    EQUESTRIAN("Équestre"),
+    FAST_BOAT("Vedette"),
+    FRIGATE("Frégate"),
+    HELICOPTER("Hélicoptère"),
+    HYDROGRAPHIC_SHIP("Bâtiment hydrographique"),
+    KAYAK("Kayak"),
+    LIGHT_FAST_BOAT("Vedette légère"),
+    MINE_DIVER("Plongeur démineur"),
+    MOTORCYCLE("Moto"),
+    NET_LIFTER("Remonte-filets"),
+    NO_RESOURCE("Aucun moyen"),
+    OTHER("Autre"),
+    PATROL_BOAT("Patrouilleur"),
+    PEDESTRIAN("Piéton"),
+    PIROGUE("Pirogue"),
+    RIGID_HULL("Coque rigide"),
+    SEA_SCOOTER("Scooter de mer"),
+    SEMI_RIGID("Semi-rigide"),
+    SUPPORT_SHIP("Bâtiment de soutien"),
+    TRAINING_SHIP("Bâtiment-école"),
+    TUGBOAT("Remorqueur"),
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/crew/MissionCrewEntity.kt

@@ -6,6 +6,6 @@ data class MissionCrewEntity(
     val id: Int? = null,
     val agent: AgentEntity,
     val comment: String? = null,
-    val role: AgentRoleEntity,
+    val role: AgentRoleEntity?,
     val missionId: Int,
 )

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/generalInfo/InterMinisterialServiceEntity.kt

@@ -0,0 +1,9 @@
+package fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.generalInfo
+
+data class InterMinisterialServiceEntity(
+    var id: Int? = null,
+    var administrationId: Int,
+    var controlUnitId: Int,
+    var missionGeneralInfo: MissionGeneralInfoEntity? = null
+) {
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/generalInfo/MissionGeneralInfoEntity.kt

@@ -1,6 +1,10 @@
 package fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.generalInfo
 
 import fr.gouv.dgampa.rapportnav.config.MandatoryForStats
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.env.controlResources.ControlResourceEntity
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.v2.MissionReinforcementTypeEnum
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.v2.MissionReportTypeEnum
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.generalInfo.MissionGeneralInfo
 
 data class MissionGeneralInfoEntity(
     var id: Int,
@@ -11,4 +15,24 @@ data class MissionGeneralInfoEntity(
     var serviceId: Int? = null,
     @MandatoryForStats
     var nbrOfRecognizedVessel: Int? = null,
-)
+    var isWithInterMinisterialService: Boolean? = false,
+    var isAllAgentsParticipating: Boolean? = false,
+    var isMissionArmed: Boolean? = false,
+    var resources: List<ControlResourceEntity>? = null,
+    var nbHourAtSea: Int? = null,
+    var missionReportType: MissionReportTypeEnum? = null,
+    var reinforcementType: MissionReinforcementTypeEnum? = null,
+    var interMinisterialServices: List<InterMinisterialServiceEntity>? = listOf()
+) {
+    fun toMissionGeneralInfo(): MissionGeneralInfo {
+        return MissionGeneralInfo(
+            id = id,
+            missionId = missionId,
+            distanceInNauticalMiles = distanceInNauticalMiles,
+            consumedGOInLiters = consumedGOInLiters,
+            consumedFuelInLiters = consumedFuelInLiters,
+            serviceId = serviceId,
+            nbrOfRecognizedVessel = nbrOfRecognizedVessel
+        )
+    }
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/v2/env/AdministrationEntity.kt

@@ -0,0 +1,7 @@
+package fr.gouv.dgampa.rapportnav.domain.entities.mission.v2.env
+
+data class AdministrationEntity(
+    val id: Int? = null,
+    val isArchived: Boolean,
+    val name: String,
+)

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/repositories/v2/IEnvAdministrationRepository.kt

@@ -0,0 +1,10 @@
+package fr.gouv.dgampa.rapportnav.domain.repositories.v2
+
+import fr.gouv.dgampa.rapportnav.infrastructure.monitorenv.v2.outputs.FullAdministrationDataOutput
+
+interface IEnvAdministrationRepository {
+
+    fun findById(administrationId: Int): FullAdministrationDataOutput?
+
+    fun findAll(): List<FullAdministrationDataOutput>?
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/repositories/v2/IInterMinisterialServiceRepository.kt

@@ -0,0 +1,10 @@
+package fr.gouv.dgampa.rapportnav.domain.repositories.v2
+
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.generalInfo.InterMinisterialServiceEntity
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.generalInfo.MissionGeneralInfoEntity
+import fr.gouv.dgampa.rapportnav.infrastructure.database.model.mission.generalInfo.InterMinisterialServiceModel
+
+interface IInterMinisterialServiceRepository {
+
+    fun save(service: InterMinisterialServiceEntity, generalInfo: MissionGeneralInfoEntity): InterMinisterialServiceModel
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/repositories/v2/controlUnitResource/IEnvControlUnitResourceRepository.kt

@@ -0,0 +1,8 @@
+package fr.gouv.dgampa.rapportnav.domain.repositories.v2.controlUnitResource
+
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.v2.env.ControlUnitResourceEnv
+
+interface IEnvControlUnitResourceRepository {
+
+    fun findAll(): List<ControlUnitResourceEnv>?
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/CreateEnvMission.kt → backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/CreateOrUpdateEnvMission.kt

@@ -11,11 +11,11 @@ import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.v2.generalInfo.Mis
 import org.slf4j.LoggerFactory
 
 @UseCase
-class CreateEnvMission(
+class CreateOrUpdateEnvMission(
     private val monitorEnvRepo: IEnvMissionRepository,
-    private val monitorEnvControlUnitRepo: IEnvControlUnitRepository
+    private val monitorEnvControlUnitRepo: IEnvControlUnitRepository,
 ) {
-    private val logger = LoggerFactory.getLogger(CreateEnvMission::class.java)
+    private val logger = LoggerFactory.getLogger(CreateOrUpdateEnvMission::class.java)
 
     fun execute(missionGeneralInfo: MissionGeneralInfo2, controlUnitIds: List<Int>?): MissionEnvEntity? {
         try {
@@ -30,12 +30,13 @@ class CreateEnvMission(
             }
 
             if (matchedControlUnits.isEmpty()) {
-                throw Exception("CreateEnvMission : controlUnits is empty for this user")
+                throw Exception("CreateOrUpdateEnvMission : controlUnits is empty for this user")
             }
 
             val missionEnv = MissionEnv(
+                id = missionGeneralInfo.missionId,
                 missionTypes = missionGeneralInfo.missionTypes,
-                missionSource = MissionSourceEnum.MONITORENV,
+                missionSource = MissionSourceEnum.RAPPORT_NAV,
                 startDateTimeUtc = missionGeneralInfo.startDateTimeUtc,
                 endDateTimeUtc = missionGeneralInfo.endDateTimeUtc,
                 controlUnits = matchedControlUnits,
@@ -47,7 +48,7 @@ class CreateEnvMission(
             return monitorEnvRepo.createMission(missionEnv)
 
         } catch (e: Exception) {
-            logger.error("CreateEnvMission failed creating missions", e)
+            logger.error("CreateOrUpdateEnvMission failed creating missions", e)
             return null
         }
     }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/crew/DeleteMissionCrew.kt

@@ -2,16 +2,19 @@ package fr.gouv.dgampa.rapportnav.domain.use_cases.mission.crew
 
 import fr.gouv.dgampa.rapportnav.config.UseCase
 import fr.gouv.dgampa.rapportnav.domain.repositories.mission.crew.IMissionCrewRepository
+import org.slf4j.LoggerFactory
 
 @UseCase
 data class DeleteMissionCrew(private val crewRepository: IMissionCrewRepository) {
 
+    private val logger = LoggerFactory.getLogger(DeleteMissionCrew::class.java)
+
     fun execute(id: Int): Boolean {
 
         return try {
             crewRepository.deleteById(id = id)
         } catch (e: NoSuchElementException) {
-            // TODO add log
+            logger.error("DeleteMissionCrew : ${e.message}")
             return false
         }
     }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/crew/GetAgentsCrewByMissionId.kt

@@ -27,6 +27,6 @@ class GetAgentsCrewByMissionId(private val agentCrewRepository: IMissionCrewRepo
 
         return agentCrewRepository.findByMissionId(missionId = missionId)
             .map { it.toMissionCrewEntity(commentDefaultsToString) }
-            .sortedBy { rolePriority.indexOf(it.role.title) }
+            .sortedBy { rolePriority.indexOf(it.role?.title) }
     }
 }

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/export/ExportMissionRapportPatrouille.kt

@@ -127,7 +127,7 @@ class ExportMissionRapportPatrouille(
                 listOf("Fonction", "Nom", "Observation (formation, repos, mission, stage...)")
             ) + agentsCrew.map {
                 listOf(
-                    it.role.title,
+                    it.role?.title,
                     "${it.agent.firstName} ${it.agent.lastName}",
                     it.comment.takeIf { comment -> !comment.isNullOrEmpty() } ?: "Présent"
                 )

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/export/v2/ExportMissionPatrolSingle.kt

@@ -135,7 +135,7 @@ class ExportMissionPatrolSingle(
                 listOf("Fonction", "Nom", "Observation (formation, repos, mission, stage...)")
             ) + agentsCrew.map {
                 listOf(
-                    it.role.title,
+                    it.role?.title,
                     "${it.agent.firstName} ${it.agent.lastName}",
                     it.comment.takeIf { comment -> !comment.isNullOrEmpty() } ?: "Présent"
                 )

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/v2/AddOrUpdateInterMinisterialService.kt

@@ -0,0 +1,22 @@
+package fr.gouv.dgampa.rapportnav.domain.use_cases.mission.v2
+
+import fr.gouv.dgampa.rapportnav.config.UseCase
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.generalInfo.InterMinisterialServiceEntity
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.generalInfo.MissionGeneralInfoEntity
+import fr.gouv.dgampa.rapportnav.domain.repositories.v2.IInterMinisterialServiceRepository
+
+@UseCase
+class AddOrUpdateInterMinisterialService(
+    private val repository: IInterMinisterialServiceRepository
+) {
+
+    fun execute(generalInfoEntity: MissionGeneralInfoEntity): List<InterMinisterialServiceEntity> {
+        val interMinisterialServices = mutableListOf<InterMinisterialServiceEntity>()
+        generalInfoEntity.interMinisterialServices?.forEach { serviceEntity: InterMinisterialServiceEntity ->
+           val result = repository.save(serviceEntity, generalInfoEntity)
+            interMinisterialServices.add(result.toInterMinisterialServiceEntity())
+        }
+
+        return interMinisterialServices
+    }
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/v2/CreateOrUpdateGeneralInfo.kt

@@ -0,0 +1,56 @@
+package fr.gouv.dgampa.rapportnav.domain.use_cases.mission.v2
+
+import fr.gouv.dgampa.rapportnav.config.UseCase
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.generalInfo.InterMinisterialServiceEntity
+import fr.gouv.dgampa.rapportnav.domain.entities.mission.v2.MissionGeneralInfoEntity2
+import fr.gouv.dgampa.rapportnav.domain.repositories.mission.generalInfo.IMissionGeneralInfoRepository
+import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.CreateOrUpdateEnvMission
+import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.PatchEnvMission
+import fr.gouv.dgampa.rapportnav.domain.use_cases.mission.crew.AddOrUpdateMissionCrew
+import fr.gouv.dgampa.rapportnav.domain.use_cases.user.GetControlUnitsForUser
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.adapters.MissionEnvInput
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.v2.generalInfo.MissionGeneralInfo2
+
+@UseCase
+class CreateOrUpdateGeneralInfo(
+    private val repository: IMissionGeneralInfoRepository,
+    private val addOrUpdateInterMinisterialService: AddOrUpdateInterMinisterialService,
+    private val addOrUpdateMissionCrew: AddOrUpdateMissionCrew,
+    private val patchEnvMission: PatchEnvMission,
+    private val createOrUpdateEnvMission: CreateOrUpdateEnvMission,
+    private val getControlUnitsForUser: GetControlUnitsForUser
+) {
+
+    fun execute(generalInfo2: MissionGeneralInfo2): MissionGeneralInfoEntity2 {
+
+        val entity = generalInfo2.toMissionGeneralInfoEntity()
+        val generalInfoModel = repository.save(entity)
+        var interMinisterialServices = listOf<InterMinisterialServiceEntity>()
+
+        if (entity.interMinisterialServices?.isNotEmpty() == true) {
+            interMinisterialServices = addOrUpdateInterMinisterialService.execute(entity)
+        }
+
+        generalInfo2.crew?.forEach { crew ->
+            addOrUpdateMissionCrew.addOrUpdateMissionCrew(crew.toMissionCrewEntity())
+        }
+
+        patchEnvMission.execute(MissionEnvInput(
+            startDateTimeUtc = generalInfo2.startDateTimeUtc,
+            endDateTimeUtc = generalInfo2.endDateTimeUtc,
+            missionId = generalInfo2.missionId,
+            observationsByUnit = generalInfo2.observations
+        ))
+
+        val controlUnits = getControlUnitsForUser.execute()
+
+        createOrUpdateEnvMission.execute(generalInfo2, controlUnits) // TODO: to be replaced by patchEnvMission (for missionTypes)
+
+        val generalInfoEntity = generalInfoModel.toMissionGeneralInfoEntity(interMinisterialServices)
+
+        return MissionGeneralInfoEntity2(
+            data = generalInfoEntity
+        )
+
+    }
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/v2/administrations/GetAdministrationById.kt

@@ -0,0 +1,24 @@
+package fr.gouv.dgampa.rapportnav.domain.use_cases.mission.v2.administrations
+
+import fr.gouv.dgampa.rapportnav.config.UseCase
+import fr.gouv.dgampa.rapportnav.domain.repositories.v2.IEnvAdministrationRepository
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.v2.env.FullAdministration
+import org.slf4j.LoggerFactory
+
+@UseCase
+class GetAdministrationById(private val administrationRepository: IEnvAdministrationRepository) {
+
+    private val logger = LoggerFactory.getLogger(GetAdministrationById::class.java)
+
+    fun execute(administrationId: Int): FullAdministration? {
+        val dataOutput = administrationRepository.findById(administrationId)
+
+        if (dataOutput !== null) {
+            return FullAdministration.fromFullAdministrationDataOutput(dataOutput)
+        }
+
+        logger.info("Administration by id : $administrationId return empty result")
+
+        return null
+    }
+}

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/domain/use_cases/mission/v2/administrations/GetAdministrations.kt

@@ -0,0 +1,19 @@
+package fr.gouv.dgampa.rapportnav.domain.use_cases.mission.v2.administrations
+
+import fr.gouv.dgampa.rapportnav.config.UseCase
+import fr.gouv.dgampa.rapportnav.domain.repositories.v2.IEnvAdministrationRepository
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.v2.env.FullAdministration
+import org.slf4j.LoggerFactory
+
+@UseCase
+class GetAdministrations(private val administrationRepository: IEnvAdministrationRepository) {
+
+    private val logger = LoggerFactory.getLogger(GetAdministrations::class.java)
+
+    fun execute(): List<FullAdministration>? {
+        val dataOutputs = administrationRepository.findAll()
+        logger.info("Found ${dataOutputs?.size} administrations from env.")
+
+        return dataOutputs?.map { FullAdministration.fromFullAdministrationDataOutput(it) }
+    }
+}