Add is at port flag on vessel positions

MTES-MCT · Aug 14, 2024 · e051752 · e051752
1 parent 924fbc1
commit e051752
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 9 deletions.
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
@@ -21,6 +21,7 @@ data class Position(
     val positionType: PositionType,
     val isManual: Boolean? = null,
     val isFishing: Boolean? = null,
+    val isAtPort: Boolean? = null,
 
     val latitude: Double,
     val longitude: Double,

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
@@ -23,6 +23,7 @@ data class PositionDataOutput(
     val positionType: PositionType,
     val isManual: Boolean? = null,
     val isFishing: Boolean? = null,
+    val isAtPort: Boolean? = null,
 ) {
     companion object {
         fun fromPosition(position: Position): PositionDataOutput {
@@ -44,6 +45,7 @@ data class PositionDataOutput(
                 positionType = position.positionType,
                 isManual = position.isManual,
                 isFishing = position.isFishing,
+                isAtPort = position.isAtPort,
             )
         }
     }

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
@@ -42,6 +42,8 @@ data class PositionEntity(
     val isManual: Boolean? = false,
     @Column(name = "is_fishing")
     val isFishing: Boolean? = false,
+    @Column(name = "is_at_port")
+    val isAtPort: Boolean? = null,
 
     // Mandatory fields
     @Enumerated(EnumType.STRING)
@@ -78,6 +80,7 @@ data class PositionEntity(
         positionType = positionType,
         isManual = isManual,
         isFishing = isFishing,
+        isAtPort = isAtPort,
     )
 
     companion object {

diff --git a/.../cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBPositionRepository.kt b/.../cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBPositionRepository.kt
@@ -28,7 +28,8 @@ interface DBPositionRepository : CrudRepository<PositionEntity, Long> {
             "p.course, " +
             "p.position_type, " +
             "p.is_manual, " +
-            "p.is_fishing " +
+            "p.is_fishing, " +
+            "p.is_at_port " +
             "from positions p " +
             "where p.internal_reference_number = :internalReferenceNumber " +
             "and p.date_time >= :from " +
@@ -61,7 +62,8 @@ interface DBPositionRepository : CrudRepository<PositionEntity, Long> {
             "p.course, " +
             "p.position_type, " +
             "p.is_manual, " +
-            "p.is_fishing " +
+            "p.is_fishing, " +
+            "p.is_at_port " +
             "from positions p " +
             "where p.external_reference_number = :externalReferenceNumber " +
             "and p.date_time >= :from " +
@@ -94,7 +96,8 @@ interface DBPositionRepository : CrudRepository<PositionEntity, Long> {
             "p.course, " +
             "p.position_type, " +
             "p.is_manual, " +
-            "p.is_fishing " +
+            "p.is_fishing, " +
+            "p.is_at_port " +
             "from positions p " +
             "where p.ircs = :ircs " +
             "and p.date_time >= :from " +

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
@@ -69278,3 +69278,6 @@ INSERT INTO POSITIONS (INTERNAL_REFERENCE_NUMBER, EXTERNAL_REFERENCE_NUMBER, MMS
 ('U_W0NTFINDME','ABC123456',null,'TALK2ME','MALOTRU','FR','FR','DE',null,57.348,-21.219,7.5,11,(now() AT TIME ZONE 'UTC')::TIMESTAMP - interval '20 days 9 hours','VMS'),
 ('U_W0NTFINDME','ABC123456',null,'TALK2ME','MALOTRU','FR','FR','DE',null,57.64,-21.117,8.6,17,(now() AT TIME ZONE 'UTC')::TIMESTAMP - interval '20 days 3 hours','VMS');
 
+update positions
+set is_at_port = true
+where INTERNAL_REFERENCE_NUMBER = 'FAK000999999' and date_time < (now() AT TIME ZONE 'UTC')::TIMESTAMP - interval '22 hours';
diff --git a/frontend/cypress/e2e/vessel_sidebar/control_buttons.spec.ts b/frontend/cypress/e2e/vessel_sidebar/control_buttons.spec.ts
@@ -43,6 +43,8 @@ context('Vessel sidebar controls buttons', () => {
     // The table should be sorted in ascending datetime order
     cy.get('.Table-SimpleTable').contains('GDH').click()
     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')
   })
 
   it('Vessel track dates Should be changed When walking in fishing trips', () => {

diff --git a/frontend/cypress/e2e/vessels/vessels_list.spec.ts b/frontend/cypress/e2e/vessels/vessels_list.spec.ts
@@ -93,7 +93,7 @@ context('Vessels list', () => {
 
       return cy
         .readFile(`cypress/downloads/${downloadedCSVFilename}`)
-        .should('contains', 'Quartier,CFR,C/S,Nom,GDH (UTC),MMSI,Latitude,Longitude,Cap,Vitesse')
+        .should('contains', 'Quartier,CFR,C/S,Nom,GDH (UTC),MMSI,Latitude,Longitude,Cap,Vitesse,Au port')
         .should('contains', '"Duval","ABC000021309","","GENS SAISON PARMI"')
         .should('contains', '"","48°43′41″N","002°44′53″W"')
     })

diff --git a/frontend/src/domain/entities/vessel/track/__tests__/__mocks__/vesselTrack.ts b/frontend/src/domain/entities/vessel/track/__tests__/__mocks__/vesselTrack.ts
@@ -8,6 +8,7 @@ export const DUMMY_VESSEL_TRACK = [
     from: 'FR',
     internalReferenceNumber: 'ABC000898396',
     ircs: 'ZBRI',
+    isAtPort: false,
     isFishing: true,
     isManual: null,
     latitude: 46.386,
@@ -27,6 +28,7 @@ export const DUMMY_VESSEL_TRACK = [
     from: 'FR',
     internalReferenceNumber: 'ABC000898396',
     ircs: 'ZBRI',
+    isAtPort: false,
     isFishing: true,
     isManual: null,
     latitude: 46.43,
@@ -46,6 +48,7 @@ export const DUMMY_VESSEL_TRACK = [
     from: 'FR',
     internalReferenceNumber: 'ABC000898396',
     ircs: 'ZBRI',
+    isAtPort: false,
     isFishing: null,
     isManual: null,
     latitude: 46.458,
@@ -65,6 +68,7 @@ export const DUMMY_VESSEL_TRACK = [
     from: 'FR',
     internalReferenceNumber: 'ABC000898396',
     ircs: 'ZBRI',
+    isAtPort: false,
     isFishing: null,
     isManual: null,
     latitude: 46.486,
@@ -84,6 +88,7 @@ export const DUMMY_VESSEL_TRACK = [
     from: 'FR',
     internalReferenceNumber: 'ABC000898396',
     ircs: 'ZBRI',
+    isAtPort: false,
     isFishing: null,
     isManual: null,
     latitude: 46.471,
@@ -103,6 +108,7 @@ export const DUMMY_VESSEL_TRACK = [
     from: 'FR',
     internalReferenceNumber: 'ABC000898396',
     ircs: 'ZBRI',
+    isAtPort: false,
     isFishing: null,
     isManual: null,
     latitude: 46.45,
@@ -125,6 +131,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -144,6 +151,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -163,6 +171,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -182,6 +191,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -201,6 +211,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -220,6 +231,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -239,6 +251,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -258,6 +271,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -277,6 +291,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -296,6 +311,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -315,6 +331,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -334,6 +351,7 @@ export const VESSEL_TRACK_ALL_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -356,6 +374,7 @@ export const VESSEL_TRACK_FEW_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2948,
@@ -375,6 +394,7 @@ export const VESSEL_TRACK_FEW_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -394,6 +414,7 @@ export const VESSEL_TRACK_FEW_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -413,6 +434,7 @@ export const VESSEL_TRACK_FEW_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2942,
@@ -432,6 +454,7 @@ export const VESSEL_TRACK_FEW_SAME_COORDINATES = [
     from: 'FR',
     internalReferenceNumber: 'FRA000915733',
     ircs: 'FW7667',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 43.2953,

diff --git a/...src/domain/entities/vessel/track/__tests__/__mocks__/vesselTrackWithDuplicatePositions.ts b/...src/domain/entities/vessel/track/__tests__/__mocks__/vesselTrackWithDuplicatePositions.ts
@@ -8,6 +8,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7936,
@@ -27,6 +28,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7936,
@@ -46,6 +48,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7941,
@@ -65,6 +68,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7936,
@@ -84,6 +88,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7936,
@@ -103,6 +108,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7936,
@@ -122,6 +128,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7936,
@@ -141,6 +148,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7936,
@@ -160,6 +168,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7936,
@@ -179,6 +188,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7936,
@@ -198,6 +208,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7481,
@@ -217,6 +228,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: false,
     isManual: false,
     latitude: 47.7048,
@@ -236,6 +248,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: true,
     isManual: false,
     latitude: 47.6723,
@@ -255,6 +268,7 @@ export const DUMMY_VESSEL_TRACK_WITH_DUPLICATE_POSITIONS = [
     from: 'FR',
     internalReferenceNumber: 'FRA000703653',
     ircs: 'FLIM',
+    isAtPort: false,
     isFishing: true,
     isManual: false,
     latitude: 47.6432,

diff --git a/frontend/src/domain/entities/vessel/track/__tests__/index.test.ts b/frontend/src/domain/entities/vessel/track/__tests__/index.test.ts
@@ -44,6 +44,7 @@ describe('vessel/track', () => {
         from: 'FR',
         internalReferenceNumber: 'ABC000898396',
         ircs: 'ZBRI',
+        isAtPort: null,
         isFishing: null,
         isManual: null,
         latitude: 46.386,