[Missions] Récupérer les dates d'actions des deux centres pour le calcul des zones de mission

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/alerts/PendingAlert.kt

@@ -2,7 +2,7 @@ package fr.gouv.cnsp.monitorfish.domain.entities.alerts
 
 import com.neovisionaries.i18n.CountryCode
 import fr.gouv.cnsp.monitorfish.domain.entities.alerts.type.AlertType
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.Infraction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.Infraction
 import fr.gouv.cnsp.monitorfish.domain.entities.vessel.VesselIdentifier
 import java.time.ZonedDateTime
 

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/Mission.kt

@@ -1,5 +1,6 @@
 package fr.gouv.cnsp.monitorfish.domain.entities.mission
 
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.env_mission_action.EnvMissionAction
 import java.time.ZonedDateTime
 
 /**
@@ -15,6 +16,9 @@ data class Mission(
     val observationsCnsp: String? = null,
     val facade: String? = null,
     val geom: MultiPolygon? = null,
+    val createdAtUtc: ZonedDateTime? = null,
+    val updatedAtUtc: ZonedDateTime? = null,
+    val envActions: List<EnvMissionAction>? = listOf(),
     val startDateTimeUtc: ZonedDateTime,
     val endDateTimeUtc: ZonedDateTime? = null,
     val isGeometryComputedFromControls: Boolean,

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/MissionAndActions.kt

@@ -1,6 +1,6 @@
 package fr.gouv.cnsp.monitorfish.domain.entities.mission
 
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionAction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionAction
 
 data class MissionAndActions(
     val mission: Mission,

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/env_mission_action/EnvMissionAction.kt

@@ -0,0 +1,10 @@
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.env_mission_action
+
+import java.time.ZonedDateTime
+import java.util.*
+
+data class EnvMissionAction(
+    val id: UUID,
+    val actionStartDateTimeUtc: ZonedDateTime? = null,
+    val actionType: EnvMissionActionType,
+)

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/env_mission_action/EnvMissionActionType.kt

@@ -0,0 +1,7 @@
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.env_mission_action
+
+enum class EnvMissionActionType(val value: String) {
+    CONTROL("CONTROL"),
+    NOTE("NOTE"),
+    SURVEILLANCE("SURVEILLANCE"),
+}

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/ControlCheck.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/ControlCheck.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 enum class ControlCheck(val value: String) {
     YES("YES"),

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/ControlOrigin.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/ControlOrigin.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 enum class ControlOrigin(val value: String) {
     POSEIDON_ENV("POSEIDON_ENV"),

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/Controller.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/Controller.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 data class Controller(
     var id: Int,

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/ControlsSummary.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/ControlsSummary.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 data class ControlsSummary(
     val vesselId: Int,

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/FleetSegment.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/FleetSegment.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 data class FleetSegment(
     var segment: String? = null,

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/FlightGoal.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/FlightGoal.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 enum class FlightGoal(val value: String) {
     VMS_AIS_CHECK("VMS_AIS_CHECK"),

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/GearControl.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/GearControl.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 class GearControl {
     var gearCode: String? = null

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/GearInfraction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/GearInfraction.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 data class GearInfraction(
     var infractionType: InfractionType? = null,

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/Infraction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/Infraction.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 data class Infraction(
     var natinfCode: Int,

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/InfractionCategory.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/InfractionCategory.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 enum class InfractionCategory(val value: String) {
     FISHING("Pêche"),

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/InfractionType.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/InfractionType.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 enum class InfractionType(val value: String) {
     WITH_RECORD("WITH_RECORD"),

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/LogbookInfraction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/LogbookInfraction.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 data class LogbookInfraction(
     var infractionType: InfractionType? = null,

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/MissionAction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/MissionAction.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 import fr.gouv.cnsp.monitorfish.domain.entities.mission.ControlUnit
 import java.time.ZonedDateTime

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/MissionActionType.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/MissionActionType.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 enum class MissionActionType(val value: String) {
     SEA_CONTROL("SEA_CONTROL"),

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/OtherInfraction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/OtherInfraction.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 class OtherInfraction {
     var infractionType: InfractionType? = null

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/SpeciesControl.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/SpeciesControl.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 class SpeciesControl {
     var speciesCode: String? = null

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/SpeciesInfraction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/SpeciesInfraction.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions
 
 class SpeciesInfraction {
     var infractionType: InfractionType? = null

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/actrep/ActivityCode.kt

@@ -0,0 +1,6 @@
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.actrep
+
+enum class ActivityCode {
+    FIS,
+    LAN,
+}

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/actrep/JointDeploymentPlan.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/actrep/JointDeploymentPlan.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.actrep
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.actrep
 
 enum class JointDeploymentPlan(private val species: List<FaoZonesAndSpecy>) {
     MEDITERRANEAN_AND_EASTERN_ATLANTIC(MEDITERRANEAN_AND_EASTERN_ATLANTIC_SPECIES),

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission_actions/actrep/species.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/mission/mission_actions/actrep/species.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.actrep
+package fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.actrep
 
 typealias FaoZones = List<String>
 typealias FaoZonesAndSpecy = Pair<FaoZones, String>

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/reporting/Reporting.kt

@@ -1,7 +1,7 @@
 package fr.gouv.cnsp.monitorfish.domain.entities.reporting
 
 import com.neovisionaries.i18n.CountryCode
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.Infraction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.Infraction
 import fr.gouv.cnsp.monitorfish.domain.entities.vessel.VesselIdentifier
 import java.time.ZonedDateTime
 

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/repositories/InfractionRepository.kt

@@ -1,6 +1,6 @@
 package fr.gouv.cnsp.monitorfish.domain.repositories
 
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.Infraction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.Infraction
 
 interface InfractionRepository {
     fun findInfractionByNatinfCode(natinfCode: Int): Infraction

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/repositories/MissionActionsRepository.kt

@@ -1,6 +1,6 @@
 package fr.gouv.cnsp.monitorfish.domain.repositories
 
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionAction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionAction
 import java.time.ZonedDateTime
 
 interface MissionActionsRepository {

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/repositories/MissionRepository.kt

@@ -2,6 +2,7 @@ package fr.gouv.cnsp.monitorfish.domain.repositories
 
 import fr.gouv.cnsp.monitorfish.domain.entities.mission.ControlUnit
 import fr.gouv.cnsp.monitorfish.domain.entities.mission.Mission
+import fr.gouv.cnsp.monitorfish.domain.exceptions.CouldNotFindException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import java.time.ZonedDateTime
@@ -21,4 +22,7 @@ interface MissionRepository {
     fun findByIds(
         ids: List<Int>,
     ): List<Mission>
+
+    @Throws(CouldNotFindException::class)
+    fun findById(id: Int): Mission
 }

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/infraction/GetAllInfractions.kt

@@ -1,12 +1,12 @@
 package fr.gouv.cnsp.monitorfish.domain.use_cases.infraction
 
 import fr.gouv.cnsp.monitorfish.config.UseCase
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.Infraction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.Infraction
 import fr.gouv.cnsp.monitorfish.domain.repositories.InfractionRepository
 
 @UseCase
 class GetAllInfractions(private val infractionRepository: InfractionRepository) {
-    fun execute(): List<Infraction> {
+    fun execute(): List<fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.Infraction> {
         return infractionRepository.findAll()
     }
 }

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/missions/GetAllMissions.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/GetAllMissions.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.missions
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission
 
 import fr.gouv.cnsp.monitorfish.config.DatabaseProperties
 import fr.gouv.cnsp.monitorfish.config.UseCase

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/GetMission.kt

@@ -0,0 +1,31 @@
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission
+
+import fr.gouv.cnsp.monitorfish.config.UseCase
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.MissionAndActions
+import fr.gouv.cnsp.monitorfish.domain.exceptions.CouldNotFindException
+import fr.gouv.cnsp.monitorfish.domain.repositories.MissionRepository
+import fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions.GetMissionActions
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+
+@UseCase
+class GetMission(
+    private val missionRepository: MissionRepository,
+    private val getMissionActions: GetMissionActions,
+) {
+    @Throws(CouldNotFindException::class)
+    suspend fun execute(missionId: Int): MissionAndActions {
+        return coroutineScope {
+            val missionFuture = async {
+                missionRepository.findById(missionId)
+            }
+
+            val actions = getMissionActions.execute(missionId)
+
+            return@coroutineScope MissionAndActions(
+                mission = missionFuture.await(),
+                actions = actions,
+            )
+        }
+    }
+}

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/AddMissionAction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/AddMissionAction.kt

@@ -1,7 +1,7 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions
 
 import fr.gouv.cnsp.monitorfish.config.UseCase
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionAction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionAction
 import fr.gouv.cnsp.monitorfish.domain.repositories.MissionActionsRepository
 
 @UseCase

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/DeleteMissionAction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/DeleteMissionAction.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions
 
 import fr.gouv.cnsp.monitorfish.config.UseCase
 import fr.gouv.cnsp.monitorfish.domain.exceptions.CouldNotDeleteException
@@ -10,9 +10,9 @@ class DeleteMissionAction(private val missionActionsRepository: MissionActionsRe
     fun execute(actionId: Int) {
         try {
             val targetedAction = missionActionsRepository.findById(actionId)
-            val sofDeletedAction = targetedAction.copy(isDeleted = true)
+            val softDeletedAction = targetedAction.copy(isDeleted = true)
 
-            missionActionsRepository.save(sofDeletedAction)
+            missionActionsRepository.save(softDeletedAction)
         } catch (e: Throwable) {
             throw CouldNotDeleteException("Could not find mission action with id: ${e.message}", e)
         }

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/GetActivityReports.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/GetActivityReports.kt

@@ -1,16 +1,16 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions
 
 import fr.gouv.cnsp.monitorfish.config.UseCase
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionActionType
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.actrep.ActivityCode
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.actrep.JointDeploymentPlan
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionActionType
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.actrep.ActivityCode
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.actrep.JointDeploymentPlan
 import fr.gouv.cnsp.monitorfish.domain.exceptions.CodeNotFoundException
 import fr.gouv.cnsp.monitorfish.domain.repositories.MissionActionsRepository
 import fr.gouv.cnsp.monitorfish.domain.repositories.MissionRepository
 import fr.gouv.cnsp.monitorfish.domain.repositories.PortRepository
 import fr.gouv.cnsp.monitorfish.domain.repositories.VesselRepository
-import fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions.dtos.ActivityReport
-import fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions.dtos.ActivityReports
+import fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions.dtos.ActivityReport
+import fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions.dtos.ActivityReports
 import org.slf4j.LoggerFactory
 import java.time.ZonedDateTime
 

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/GetMissionAction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/GetMissionAction.kt

@@ -1,7 +1,7 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions
 
 import fr.gouv.cnsp.monitorfish.config.UseCase
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionAction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionAction
 import fr.gouv.cnsp.monitorfish.domain.exceptions.CouldNotFindException
 import fr.gouv.cnsp.monitorfish.domain.repositories.MissionActionsRepository
 

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/GetMissionActionFacade.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/GetMissionActionFacade.kt

@@ -1,9 +1,9 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions
 
 import fr.gouv.cnsp.monitorfish.config.UseCase
 import fr.gouv.cnsp.monitorfish.domain.entities.facade.Facade
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionAction
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionActionType
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionAction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionActionType
 import fr.gouv.cnsp.monitorfish.domain.repositories.FacadeAreasRepository
 import fr.gouv.cnsp.monitorfish.domain.repositories.PortRepository
 import org.locationtech.jts.geom.Coordinate

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/GetMissionActions.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/GetMissionActions.kt

@@ -1,7 +1,7 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions
 
 import fr.gouv.cnsp.monitorfish.config.UseCase
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionAction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionAction
 import fr.gouv.cnsp.monitorfish.domain.repositories.MissionActionsRepository
 import org.slf4j.LoggerFactory
 

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/GetVesselControls.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/GetVesselControls.kt

@@ -1,8 +1,8 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions
 
 import fr.gouv.cnsp.monitorfish.config.UseCase
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.ControlsSummary
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionActionType
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.ControlsSummary
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionActionType
 import fr.gouv.cnsp.monitorfish.domain.exceptions.CodeNotFoundException
 import fr.gouv.cnsp.monitorfish.domain.repositories.GearRepository
 import fr.gouv.cnsp.monitorfish.domain.repositories.MissionActionsRepository

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/UpdateMissionAction.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/UpdateMissionAction.kt

@@ -1,7 +1,7 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions
 
 import fr.gouv.cnsp.monitorfish.config.UseCase
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionAction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionAction
 import fr.gouv.cnsp.monitorfish.domain.repositories.MissionActionsRepository
 import org.slf4j.LoggerFactory
 

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/dtos/ActivityReport.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/dtos/ActivityReport.kt

@@ -1,8 +1,8 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions.dtos
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions.dtos
 
 import fr.gouv.cnsp.monitorfish.domain.entities.mission.ControlUnit
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionAction
-import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.actrep.ActivityCode
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.MissionAction
+import fr.gouv.cnsp.monitorfish.domain.entities.mission.mission_actions.actrep.ActivityCode
 import fr.gouv.cnsp.monitorfish.domain.entities.vessel.Vessel
 
 data class ActivityReport(

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission_actions/dtos/ActivityReports.kt → backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/mission/mission_actions/dtos/ActivityReports.kt

@@ -1,4 +1,4 @@
-package fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions.dtos
+package fr.gouv.cnsp.monitorfish.domain.use_cases.mission.mission_actions.dtos
 
 data class ActivityReports(
     val activityReports: List<ActivityReport>,