Fiche navire - Afficher le type de réseau dans la liste des positions…

… VMS (#3550) ## Linked issues - Resolve #3222 ---- - [ ] Tests E2E (Cypress)
MTES-MCT · Aug 19, 2024 · eb1dfb8 · eb1dfb8
2 parents d0763f1 + a9e0e7e
commit eb1dfb8
Show file tree

Hide file tree

Showing 18 changed files with 186 additions and 8 deletions.
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/position/NetworkType.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/position/NetworkType.kt
@@ -0,0 +1,17 @@
+package fr.gouv.cnsp.monitorfish.domain.entities.position
+
+enum class NetworkType(val code: String) {
+    CELLULAR("CEL"),
+    SATELLITE("SAT"),
+    ;
+
+    companion object {
+        infix fun from(code: String): NetworkType {
+            return try {
+                NetworkType.entries.first { it.code == code }
+            } catch (e: NoSuchElementException) {
+                throw NoSuchElementException("NetworkType $code not found.", e)
+            }
+        }
+    }
+}
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/position/Position.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/position/Position.kt
@@ -31,4 +31,5 @@ data class Position(
     val from: CountryCode? = null,
     val destination: CountryCode? = null,
     val tripNumber: String? = null,
+    val networkType: NetworkType? = null,
 )
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/mappers/NAFCode.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/mappers/NAFCode.kt
@@ -25,6 +25,7 @@ enum class NAFCode(val code: String) {
     TRIP_NUMBER("TN"),
     LATITUDE("LA"),
     LONGITUDE("LO"),
+    NETWORK_TYPE("MS"),
 
     ;
 

diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/mappers/NAFMessageMapper.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/mappers/NAFMessageMapper.kt
@@ -1,6 +1,7 @@
 package fr.gouv.cnsp.monitorfish.domain.mappers
 
 import com.neovisionaries.i18n.CountryCode
+import fr.gouv.cnsp.monitorfish.domain.entities.position.NetworkType
 import fr.gouv.cnsp.monitorfish.domain.entities.position.Position
 import fr.gouv.cnsp.monitorfish.domain.entities.position.PositionType
 import fr.gouv.cnsp.monitorfish.domain.exceptions.NAFMessageParsingException
@@ -33,6 +34,7 @@ class NAFMessageMapper(private val naf: String) {
     private var speed: Double? = null
     private var tripNumber: String? = null
     private var isManual: Boolean = false
+    private var networkType: NetworkType? = null
 
     private val noCountry = "X"
     private val positionMessageType = "POS"
@@ -83,11 +85,17 @@ class NAFMessageMapper(private val naf: String) {
                         NAFCode.LONGITUDE_DECIMAL -> this.longitude = value.toDouble()
                         NAFCode.SPEED -> this.speed = value.toDouble().div(10)
                         NAFCode.COURSE -> this.course = value.toDouble()
+                        NAFCode.NETWORK_TYPE -> {
+                            when (value.isNotEmpty()) {
+                                true -> this.networkType = NetworkType.from(value)
+                                false -> this.networkType = null
+                            }
+                        }
                         else -> {
                             logger.debug("VMS parsing: NAF code \"$it\" of value \"$value\" not handled")
                         }
                     }
-                } catch (e: NumberFormatException) {
+                } catch (e: Exception) {
                     throw NAFMessageParsingException("Incorrect value at field $it", naf, e)
                 }
             }.run {
@@ -152,6 +160,7 @@ class NAFMessageMapper(private val naf: String) {
             from = from,
             tripNumber = tripNumber,
             positionType = PositionType.VMS,
+            networkType = networkType,
             isManual = isManual,
         )
     }

diff --git a/...src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/outputs/PositionDataOutput.kt b/...src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/outputs/PositionDataOutput.kt
@@ -1,6 +1,7 @@
 package fr.gouv.cnsp.monitorfish.infrastructure.api.outputs
 
 import com.neovisionaries.i18n.CountryCode
+import fr.gouv.cnsp.monitorfish.domain.entities.position.NetworkType
 import fr.gouv.cnsp.monitorfish.domain.entities.position.Position
 import fr.gouv.cnsp.monitorfish.domain.entities.position.PositionType
 import java.time.ZonedDateTime
@@ -24,6 +25,7 @@ data class PositionDataOutput(
     val isManual: Boolean? = null,
     val isFishing: Boolean? = null,
     val isAtPort: Boolean? = null,
+    val networkType: NetworkType? = null,
 ) {
     companion object {
         fun fromPosition(position: Position): PositionDataOutput {
@@ -46,6 +48,7 @@ data class PositionDataOutput(
                 isManual = position.isManual,
                 isFishing = position.isFishing,
                 isAtPort = position.isAtPort,
+                networkType = position.networkType,
             )
         }
     }

diff --git a/...c/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/entities/PositionEntity.kt b/...c/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/entities/PositionEntity.kt
@@ -1,6 +1,7 @@
 package fr.gouv.cnsp.monitorfish.infrastructure.database.entities
 
 import com.neovisionaries.i18n.CountryCode
+import fr.gouv.cnsp.monitorfish.domain.entities.position.NetworkType
 import fr.gouv.cnsp.monitorfish.domain.entities.position.Position
 import fr.gouv.cnsp.monitorfish.domain.entities.position.PositionType
 import fr.gouv.cnsp.monitorfish.infrastructure.database.entities.converters.CountryCodeConverter
@@ -44,6 +45,9 @@ data class PositionEntity(
     val isFishing: Boolean? = false,
     @Column(name = "is_at_port")
     val isAtPort: Boolean? = null,
+    @Column(name = "network_type")
+    @Enumerated(EnumType.STRING)
+    val networkType: NetworkType? = null,
 
     // Mandatory fields
     @Enumerated(EnumType.STRING)
@@ -81,6 +85,7 @@ data class PositionEntity(
         isManual = isManual,
         isFishing = isFishing,
         isAtPort = isAtPort,
+        networkType = networkType,
     )
 
     companion object {
@@ -103,6 +108,7 @@ data class PositionEntity(
                 positionType = position.positionType,
                 isManual = position.isManual,
                 isFishing = position.isFishing,
+                networkType = position.networkType,
             )
         }
     }

diff --git a/.../cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBPositionRepository.kt b/.../cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBPositionRepository.kt
@@ -29,7 +29,8 @@ interface DBPositionRepository : CrudRepository<PositionEntity, Long> {
             "p.position_type, " +
             "p.is_manual, " +
             "p.is_fishing, " +
-            "p.is_at_port " +
+            "p.is_at_port, " +
+            "p.network_type " +
             "from positions p " +
             "where p.internal_reference_number = :internalReferenceNumber " +
             "and p.date_time >= :from " +
@@ -63,7 +64,8 @@ interface DBPositionRepository : CrudRepository<PositionEntity, Long> {
             "p.position_type, " +
             "p.is_manual, " +
             "p.is_fishing, " +
-            "p.is_at_port " +
+            "p.is_at_port, " +
+            "p.network_type " +
             "from positions p " +
             "where p.external_reference_number = :externalReferenceNumber " +
             "and p.date_time >= :from " +
@@ -97,7 +99,8 @@ interface DBPositionRepository : CrudRepository<PositionEntity, Long> {
             "p.position_type, " +
             "p.is_manual, " +
             "p.is_fishing, " +
-            "p.is_at_port " +
+            "p.is_at_port, " +
+            "p.network_type " +
             "from positions p " +
             "where p.ircs = :ircs " +
             "and p.date_time >= :from " +

diff --git a/backend/src/main/resources/db/migration/internal/V0.276__Update_positions_table.sql b/backend/src/main/resources/db/migration/internal/V0.276__Update_positions_table.sql
@@ -0,0 +1,4 @@
+ALTER TABLE
+    public.positions
+ADD COLUMN
+    network_type varchar(50);
diff --git a/backend/src/main/resources/db/testdata/V666.1__Insert_dummy_positions.sql b/backend/src/main/resources/db/testdata/V666.1__Insert_dummy_positions.sql
@@ -69281,3 +69281,11 @@ INSERT INTO POSITIONS (INTERNAL_REFERENCE_NUMBER, EXTERNAL_REFERENCE_NUMBER, MMS
 update positions
 set is_at_port = true
 where INTERNAL_REFERENCE_NUMBER = 'FAK000999999' and date_time < (now() AT TIME ZONE 'UTC')::TIMESTAMP - interval '22 hours';
+
+update positions
+set network_type = 'CELLULAR'
+where INTERNAL_REFERENCE_NUMBER = 'FAK000999999' and date_time < (now() AT TIME ZONE 'UTC')::TIMESTAMP - interval '22 hours';
+
+update positions
+set network_type = 'SATELLITE'
+where INTERNAL_REFERENCE_NUMBER = 'FAK000999999' and date_time > (now() AT TIME ZONE 'UTC')::TIMESTAMP - interval '22 hours';
diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/mappers/NAFMessageMapperUTests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/mappers/NAFMessageMapperUTests.kt
@@ -1,6 +1,7 @@
 package fr.gouv.cnsp.monitorfish.domain.mappers
 
 import com.neovisionaries.i18n.CountryCode
+import fr.gouv.cnsp.monitorfish.domain.entities.position.NetworkType
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.catchThrowable
 import org.junit.jupiter.api.Test
@@ -205,4 +206,16 @@ internal class NAFMessageMapperUTests {
         assertThat(position.speed).isNull()
         assertThat(position.course).isNull()
     }
+
+    @Test
+    internal fun `init Should parse the network type When given`() {
+        // Given
+        val naf = "//SR//TM/POS//IR/FRA000123456//NA/MANUEL//RC/FT6951//FS/FRA//XR/TL326095//DA/20200814//TI/0911//LT/+43.0789//LG/+006.1549//SP/000//CO/0//FR/FRA//RD/20200814//RT/0912//MS/SAT//ER//"
+
+        // When
+        val position = NAFMessageMapper(naf).toPosition()
+
+        // Then
+        assertThat(position.networkType).isEqualTo(NetworkType.SATELLITE)
+    }
 }
diff --git a/frontend/cypress/e2e/vessel_sidebar/control_buttons.spec.ts b/frontend/cypress/e2e/vessel_sidebar/control_buttons.spec.ts
@@ -45,6 +45,37 @@ context('Vessel sidebar controls buttons', () => {
     cy.get('[data-id="0"] > td').eq(2).contains('8.7 nds')
     cy.get('[data-id="0"] > td').eq(1).find('[title="Position au port"]').should('exist')
     cy.get('[data-id="0"] > td').eq(1).find('[title="Position manuelle (4h-report)"]').should('exist')
+    cy.get('[data-id="0"] > td').eq(1).find('[title="Réseau CELLULAR"]').should('exist')
+    cy.get('[data-id="0"] > td').eq(1).contains('CEL')
+  })
+
+  it('Vessel track Should be downloaded', () => {
+    // Given
+    cy.get('*[data-cy^="vessel-search-input"]', { timeout: 10000 }).type('Pheno')
+    cy.get('*[data-cy^="vessel-search-item"]').eq(0).click()
+    cy.wait(200)
+    cy.get('*[data-cy^="vessel-sidebar"]').should('be.visible')
+    cy.get('*[data-cy^="vessel-track-depth-selection"]').click()
+    cy.fill('Afficher la piste VMS depuis', '3 jours')
+    cy.wait(500)
+
+    // When
+    cy.clickButton('Exporter la piste')
+
+    // Then
+    cy.wait(400)
+    cy.exec('cd cypress/downloads && ls').then(result => {
+      const downloadedCSVFilename = result.stdout
+
+      return cy
+        .readFile(`cypress/downloads/${downloadedCSVFilename}`)
+        .should(
+          'contains',
+          'Nom,Marq. Ext.,C/S,MMSI,CFR,Pavillon,GDH (UTC),Latitude,Longitude,Cap,Vitesse,Au port,Type de réseau'
+        )
+        .should('contains', '"PHENOMENE","DONTSINK","CALLME","","FAK000999999"')
+        .should('contains', '"45° 55′ 12″ N","008° 45′ 54″ W",13,8.7,"Oui","Cellulaire"')
+    })
   })
 
   it('Vessel track dates Should be changed When walking in fishing trips', () => {