[Missions] Ajout des NATINFs CACEM (#2485)

## Linked issues

- Resolve #2396

----

- [ ] Tests E2E (Cypress)

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

@@ -4,5 +4,5 @@ import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.Infraction
 
 interface InfractionRepository {
     fun findInfractionByNatinfCode(natinfCode: Int): Infraction
-    fun findFishingAndSecurityInfractions(): List<Infraction>
+    fun findAll(): List<Infraction>
 }

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

@@ -5,8 +5,8 @@ import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.Infraction
 import fr.gouv.cnsp.monitorfish.domain.repositories.InfractionRepository
 
 @UseCase
-class GetFishingAndSecurityInfractions(private val infractionRepository: InfractionRepository) {
+class GetAllInfractions(private val infractionRepository: InfractionRepository) {
     fun execute(): List<Infraction> {
-        return infractionRepository.findFishingAndSecurityInfractions()
+        return infractionRepository.findAll()
     }
 }

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/InfractionController.kt

@@ -1,6 +1,6 @@
 package fr.gouv.cnsp.monitorfish.infrastructure.api.bff
 
-import fr.gouv.cnsp.monitorfish.domain.use_cases.infraction.GetFishingAndSecurityInfractions
+import fr.gouv.cnsp.monitorfish.domain.use_cases.infraction.GetAllInfractions
 import fr.gouv.cnsp.monitorfish.infrastructure.api.outputs.InfractionDataOutput
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
@@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 @RequestMapping("/bff/v1/infractions")
 @Tag(name = "APIs for Infractions")
-class InfractionController(private val getFishingAndSecurityInfractions: GetFishingAndSecurityInfractions) {
+class InfractionController(private val getAllInfractions: GetAllInfractions) {
 
     @GetMapping("")
     @Operation(summary = "Get fishing and security infractions")
     fun getFishingAndSecurityInfractions(): List<InfractionDataOutput> {
-        return getFishingAndSecurityInfractions.execute().map { infraction ->
+        return getAllInfractions.execute().map { infraction ->
             InfractionDataOutput.fromInfraction(infraction)
         }
     }

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/cache/CaffeineConfiguration.kt

@@ -35,7 +35,6 @@ class CaffeineConfiguration {
     val vesselsAllPositions = "vessels_all_position"
     val vesselsPositionsWithBeaconMalfunctions = "vessels_positions_with_beacon_malfunctions"
     val infractions = "infractions"
-    val fishingAndSecurityInfractions = "fishing_security_infractions"
     val infraction = "infraction"
     val currentSegments = "current_segment"
     val controlAnteriority = "control_anteriority"
@@ -82,7 +81,6 @@ class CaffeineConfiguration {
 
         val infractionsCache = buildMinutesCache(infractions, ticker, oneWeek)
         val infractionCache = buildMinutesCache(infraction, ticker, oneWeek)
-        val fishingInfractionsCache = buildMinutesCache(fishingAndSecurityInfractions, ticker, oneWeek)
 
         val vesselTrackCache = buildMinutesCache(vesselTrack, ticker, 1)
         val vesselsPositionsCache = buildSecondsCache(vesselsPositions, ticker, 30)
@@ -126,7 +124,6 @@ class CaffeineConfiguration {
                 logbookRawMessageCache,
                 infractionsCache,
                 infractionCache,
-                fishingInfractionsCache,
                 currentSegmentsCache,
                 controlAnteriorityCache,
                 riskFactorsCache,

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaInfractionRepository.kt

@@ -10,9 +10,9 @@ import org.springframework.stereotype.Repository
 
 @Repository
 class JpaInfractionRepository(private val dbInfractionRepository: DBInfractionRepository) : InfractionRepository {
-    @Cacheable(value = ["fishing_security_infractions"])
-    override fun findFishingAndSecurityInfractions(): List<Infraction> {
-        return dbInfractionRepository.findAllByInfractionCategoryEqualsSecurityOrFishing().map {
+    @Cacheable(value = ["infractions"])
+    override fun findAll(): List<Infraction> {
+        return dbInfractionRepository.findAll().map {
             it.toInfraction()
         }
     }

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBInfractionRepository.kt

@@ -1,22 +1,8 @@
 package fr.gouv.cnsp.monitorfish.infrastructure.database.repositories.interfaces
 
 import fr.gouv.cnsp.monitorfish.infrastructure.database.entities.InfractionEntity
-import org.springframework.data.jpa.repository.Query
 import org.springframework.data.repository.CrudRepository
 
 interface DBInfractionRepository : CrudRepository<InfractionEntity, Long> {
     fun findByNatinfCodeEquals(natinfCode: Int): InfractionEntity
-
-    @Query(
-        value = """
-        SELECT
-            *
-        FROM
-            infractions
-        WHERE
-            infraction_category IN ('Sécurité / Rôle', 'Pêche')
-        """,
-        nativeQuery = true,
-    )
-    fun findAllByInfractionCategoryEqualsSecurityOrFishing(): List<InfractionEntity>
 }

backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/InfractionControllerITests.kt

@@ -5,7 +5,7 @@ import fr.gouv.cnsp.monitorfish.config.SecurityConfig
 import fr.gouv.cnsp.monitorfish.config.SentryConfig
 import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.Infraction
 import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.InfractionCategory
-import fr.gouv.cnsp.monitorfish.domain.use_cases.infraction.GetFishingAndSecurityInfractions
+import fr.gouv.cnsp.monitorfish.domain.use_cases.infraction.GetAllInfractions
 import org.hamcrest.Matchers.equalTo
 import org.junit.jupiter.api.Test
 import org.mockito.BDDMockito.given
@@ -26,12 +26,12 @@ class InfractionControllerITests {
     private lateinit var api: MockMvc
 
     @MockBean
-    private lateinit var getFishingAndSecurityInfractions: GetFishingAndSecurityInfractions
+    private lateinit var getAllInfractions: GetAllInfractions
 
     @Test
     fun `Should get all fishing infractions`() {
         // Given
-        given(this.getFishingAndSecurityInfractions.execute()).willReturn(
+        given(this.getAllInfractions.execute()).willReturn(
             listOf(
                 Infraction(natinfCode = 7059, infractionCategory = InfractionCategory.FISHING),
                 Infraction(natinfCode = 7065, infractionCategory = InfractionCategory.FISHING),

backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaInfractionRepositoryITests.kt

@@ -41,7 +41,7 @@ class JpaInfractionRepositoryITests : AbstractDBTests() {
     @Transactional
     fun `findFishingInfractions Should return all fishing and security infractions`() {
         // When
-        val infractions = jpaInfractionRepository.findFishingAndSecurityInfractions()
+        val infractions = jpaInfractionRepository.findAll()
 
         // Then
         assertThat(infractions).hasSize(8)