tech: change position db type

Author: maximeperraultdev

backend/build.gradle.kts

@@ -61,7 +61,7 @@ tasks.withType<KotlinCompile> {
 }
 
 val ktorVersion = "3.3.2"
-val testcontainersVersion = "1.21.3"
+val testcontainersVersion = "1.21.4"
 val sentryVersion = "8.26.0"
 val flywayVersion = "11.17.0"
 

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/AISPositionModel.kt

@@ -13,6 +13,7 @@ import org.n52.jackson.datatype.jts.GeometryDeserializer
 import org.n52.jackson.datatype.jts.GeometrySerializer
 import java.io.Serializable
 import java.time.ZonedDateTime
+import kotlin.math.roundToInt
 
 @Entity
 @Table(name = "ais_positions")
@@ -23,19 +24,19 @@ data class AISPositionModel(
     @JsonDeserialize(contentUsing = GeometryDeserializer::class)
     val coord: Geometry?,
     val status: String?,
-    val course: Double?,
-    val heading: Double?,
-    val speed: Double?,
+    val course: Short?,
+    val heading: Short?,
+    val speed: Short?,
 ) {
     companion object {
         fun toAISPositionModel(aisPosition: AISPayload): AISPositionModel =
             AISPositionModel(
                 id = AISPositionPK(mmsi = aisPosition.mmsi, ts = aisPosition.ts),
                 coord = aisPosition.coord.let { WKTReader().read(it) },
                 status = aisPosition.status,
-                course = aisPosition.course,
-                speed = aisPosition.speed,
-                heading = aisPosition.heading,
+                course = aisPosition.course?.let { (it * 100).roundToInt().toShort() },
+                speed = aisPosition.speed?.let { (it * 100).roundToInt().toShort() },
+                heading = aisPosition.heading?.let { (it * 100).roundToInt().toShort() },
             )
     }
 }

…l/V0.199__create_table_ais_positions.sql …l/V0.202__create_table_ais_positions.sqlbackend/src/main/resources/db/migration/internal/V0.199__create_table_ais_positions.sql renamed to backend/src/main/resources/db/migration/internal/V0.202__create_table_ais_positions.sql backend/src/main/resources/db/migration/internal/V0.199__create_table_ais_positions.sql renamed to backend/src/main/resources/db/migration/internal/V0.202__create_table_ais_positions.sql

@@ -2,12 +2,13 @@ CREATE EXTENSION IF NOT EXISTS timescaledb;
 
 CREATE TABLE public.ais_positions
 (
+    id      SERIAL,
     mmsi    INT,
     coord   GEOMETRY,
     status  TEXT,
-    course  DOUBLE PRECISION,
-    heading DOUBLE PRECISION,
-    speed   DOUBLE PRECISION,
+    course  SMALLINT,
+    heading SMALLINT,
+    speed   SMALLINT,
     ts      TIMESTAMPTZ,
     PRIMARY KEY (mmsi, ts)
 );

backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/kafka/AISListenerITests.kt

@@ -58,9 +58,9 @@ class AISListenerITests : AbstractKafkaTests() {
                 assertThat(saved?.id?.ts).isEqualTo(aisPosition.ts)
                 assertThat(saved?.coord).isEqualTo(WKTReader().read(coord) as Point)
                 assertThat(saved?.status).isEqualTo(aisPosition.status)
-                assertThat(saved?.course).isEqualTo(aisPosition.course)
-                assertThat(saved?.heading).isEqualTo(aisPosition.heading)
-                assertThat(saved?.speed).isEqualTo(aisPosition.speed)
+                assertThat(saved?.course).isEqualTo(1212)
+                assertThat(saved?.heading).isEqualTo(1012)
+                assertThat(saved?.speed).isEqualTo(1012)
             }
     }
 }

backend/src/test/resources/application.yml

@@ -8,6 +8,7 @@ monitorenv:
   kafka:
     ais:
       batch-size: 1
+      timeout: 5000
 
 logging:
   level: