fix coordinates and title

Author: pstorch

adapter/src/main/kotlin/org/railwaystations/rsapi/adapter/db/InboxAdapter.kt

@@ -15,6 +15,7 @@ import org.railwaystations.rsapi.core.model.Coordinates
 import org.railwaystations.rsapi.core.model.InboxEntry
 import org.railwaystations.rsapi.core.model.ProblemReportType
 import org.railwaystations.rsapi.core.model.PublicInboxEntry
+import org.railwaystations.rsapi.core.model.ZERO
 import org.railwaystations.rsapi.core.ports.outbound.InboxPort
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Transactional
@@ -82,9 +83,7 @@ class InboxAdapter(private val dsl: DSLContext) : InboxPort {
         )
 
     private fun createCoordinates(lat: Double?, lon: Double?): Coordinates? {
-        if (lat == null || lon == null) return null
-
-        return Coordinates(lat, lon)
+        return Coordinates(lat ?: ZERO, lon ?: ZERO)
     }
 
     override fun findPendingInboxEntries() =
@@ -124,7 +123,7 @@ class InboxAdapter(private val dsl: DSLContext) : InboxPort {
             coordinates = if (stationLat != null && stationLon != null) Coordinates(
                 stationLat,
                 stationLon
-            ) else Coordinates(lat ?: 0.0, lon ?: 0.0)
+            ) else Coordinates(lat ?: ZERO, lon ?: ZERO)
         )
 
     @Transactional

adapter/src/test/kotlin/org/railwaystations/rsapi/adapter/db/InboxAdapterTest.kt

@@ -42,18 +42,48 @@ class InboxAdapterTest : AbstractPostgreSqlTest() {
                 coordinates = stationDe8000.coordinates,
                 photographerNickname = user10.name,
                 photographerEmail = user10.email,
+                newCoordinates = Coordinates(),
             )
         )
     }
 
     @Test
     fun findPendingInboxEntries() {
-        val idPending = sut.insert(photoUploadDe8000.copy(done = false))
+        val idPending1 = sut.insert(photoUploadDe8000.copy(done = false))
         sut.insert(photoUploadDe8000.copy(done = true))
+        val idPending2 = sut.insert(problemReportDe8000.copy(done = false))
+        val idPending3 = sut.insert(photoUploadMissingStation.copy(done = false))
 
         val pendingEntries = sut.findPendingInboxEntries()
 
-        assertThat(pendingEntries.map { it.id }).containsExactly(idPending)
+        assertThat(pendingEntries).containsExactlyInAnyOrder(
+            photoUploadDe8000.copy(
+                id = idPending1,
+                title = "Offenburg Kreisschulzentrum",
+                coordinates = Coordinates(lat = 48.459376429721, lon = 7.95547485351562),
+                newCoordinates = Coordinates(),
+                photographerNickname = "@user10",
+                photographerEmail = "user10@example.com",
+            ),
+            problemReportDe8000.copy(
+                id = idPending2,
+                title = "Offenburg Kreisschulzentrum",
+                coordinates = Coordinates(lat = 48.459376429721, lon = 7.95547485351562),
+                newCoordinates = Coordinates(),
+                photographerNickname = "@user10",
+                photographerEmail = "user10@example.com",
+                existingPhotoUrlPath = null, // not in test db
+            ),
+            photoUploadMissingStation.copy(
+                id = idPending3,
+                photographerNickname = "@user10",
+                photographerEmail = "user10@example.com",
+                title = null,
+                newTitle = photoUploadMissingStation.title,
+                coordinates = Coordinates(),
+                newCoordinates = photoUploadMissingStation.coordinates,
+            ),
+        )
     }
 
     @Test

core/src/testFixtures/kotlin/org/railwaystations/rsapi/core/model/InboxEntryTestFixtures.kt

@@ -25,7 +25,7 @@ object InboxEntryTestFixtures {
         photographerId = user10.id,
         existingPhotoUrlPath = "de/4711.jpg",
         photoId = 4711,
-        createdAt = now(),
+        createdAt = now().truncatedTo(ChronoUnit.SECONDS),
         comment = "Photo outdated",
         problemReportType = ProblemReportType.PHOTO_OUTDATED,
     )
@@ -59,7 +59,7 @@ object InboxEntryTestFixtures {
             photographerNickname = user.name,
             extension = "jpg",
             rejectReason = rejectReason,
-            createdAt = now(),
+            createdAt = now().truncatedTo(ChronoUnit.SECONDS),
             done = done,
         )
     }