Exclude extension from file UUIDs (#173)

Signed-off-by: Arnau Mora Gras <[email protected]>

Author: ArnyminerZ

src/main/kotlin/database/entity/Sector.kt

@@ -30,12 +30,18 @@ class Sector(id: EntityID<Int>): BaseEntity(id), ResponseData {
     var walkingTime: UInt? by Sectors.walkingTime
     var weight: String by Sectors.weight
 
+    private fun findFileByUUID(uuid: String, dir: File): File {
+        return dir.listFiles { _, name -> name.startsWith(uuid) }
+            ?.firstOrNull()
+            ?: throw IllegalArgumentException("File ($uuid) not found in $dir")
+    }
+
     var image: File
-        get() = File(Storage.ImagesDir, _image)
+        get() = findFileByUUID(_image, Storage.ImagesDir)
         set(value) { _image = value.toRelativeString(Storage.ImagesDir) }
 
     var gpx: File?
-        get() = _gpx?.let { File(Storage.TracksDir, it) }
+        get() = _gpx?.let { findFileByUUID(it, Storage.TracksDir) }
         set(value) { _gpx = value?.toRelativeString(Storage.TracksDir) }
 
     var point: LatLng?

src/main/kotlin/database/serialization/SectorSerializer.kt

@@ -47,8 +47,17 @@ object SectorSerializer : KSerializer<Sector> {
             encodeBooleanElement(descriptor, idx++, value.kidsApt)
             encodeSerializableElement(descriptor, idx++, Sector.SunTime.serializer(), value.sunTime)
             encodeNullableSerializableElement(descriptor, idx++, Long.serializer(), value.walkingTime?.toLong())
-            encodeStringElement(descriptor, idx++, value.image.toRelativeString(Storage.ImagesDir))
-            encodeNullableSerializableElement(descriptor, idx++, String.serializer(), value.gpx?.toRelativeString(Storage.TracksDir))
+            encodeStringElement(
+                descriptor,
+                idx++,
+                value.image.toRelativeString(Storage.ImagesDir).substringBeforeLast('.')
+            )
+            encodeNullableSerializableElement(
+                descriptor,
+                idx++,
+                String.serializer(),
+                value.gpx?.toRelativeString(Storage.TracksDir)?.substringBeforeLast('.')
+            )
             encodeNullableSerializableElement(descriptor, idx++, LatLng.serializer(), value.point)
             encodeStringElement(descriptor, idx++, value.weight)
             encodeIntElement(descriptor, idx++, value.zone.id.value)

src/test/kotlin/database/entity/DatabaseHelper.kt

@@ -10,23 +10,31 @@ import data.Grade
 import data.LatLng
 import data.PitchInfo
 import java.io.File
+import java.net.URI
 import java.net.URL
 import java.time.Instant
 import java.time.LocalDateTime
 import server.DataProvider
 import storage.Storage
 
 object DatabaseHelper {
+    fun createTestFile(dir: File, name: String): File {
+        return File(dir, name)
+            .also { it.parentFile.mkdirs() }
+            .also(File::createNewFile)
+            .also(File::deleteOnExit)
+    }
+
     suspend fun createTestArea(
         displayName: String = DataProvider.SampleArea.displayName,
         webUrl: String = DataProvider.SampleArea.webUrl
     ): Area = ServerDatabase.instance.query {
         Area.new {
             this.displayName = displayName
-            this.webUrl = URL(webUrl)
+            this.webUrl = URI.create(webUrl).toURL()
 
             // Required, but not used
-            image = File(Storage.ImagesDir, "abc")
+            image = createTestFile(Storage.ImagesDir, "abc")
         }
     }
 
@@ -44,8 +52,8 @@ object DatabaseHelper {
             this.points = points
 
             // Required, but not used
-            image = File(Storage.ImagesDir, "abc")
-            kmz = File(Storage.TracksDir, "abc")
+            image = createTestFile(Storage.ImagesDir, "abc")
+            kmz = createTestFile(Storage.TracksDir, "abc")
 
             // Must specify a parent
             this.area = area
@@ -68,8 +76,8 @@ object DatabaseHelper {
             this.walkingTime = walkingTime
 
             // Required, but not used
-            image = File(Storage.ImagesDir, "abc")
-            gpx = File(Storage.TracksDir, "abc")
+            image = createTestFile(Storage.ImagesDir, "abc")
+            gpx = createTestFile(Storage.TracksDir, "abc")
 
             // Must specify a parent
             this.zone = zone
@@ -133,8 +141,8 @@ object DatabaseHelper {
             this.description = description
 
             this.images = listOf(
-                File(Storage.ImagesDir, "abc"),
-                File(Storage.ImagesDir, "def")
+                createTestFile(Storage.ImagesDir, "abc"),
+                createTestFile(Storage.ImagesDir, "def")
             )
 
             // Must specify a parent

src/test/kotlin/database/entity/TestSector.kt

@@ -45,6 +45,7 @@ class TestSector: ApplicationTestBase() {
         assertTrue(json.containsKey("image"))
         assertTrue(json.containsKey("gpx"))
         assertTrue(json.containsKey("point"))
+        assertTrue(json.containsKey("weight"))
         assertTrue(json.containsKey("zone_id"))
     }
 }

src/test/kotlin/server/base/delete/SingleFileRemoval.kt

@@ -6,8 +6,10 @@ import java.io.File
 class SingleFileRemoval<EntityType : BaseEntity>(
     val fileAccessor: (EntityType) -> File?
 ) : FileRemoval<EntityType> {
+    private val entities = mutableMapOf<Int, File?>()
+
     override fun exists(entity: EntityType): Boolean {
-        val file = fileAccessor(entity)
+        val file = entities.getOrPut(entity.id.value) { fileAccessor(entity) }
         return file?.exists() != false
     }
 }

src/test/kotlin/server/endpoints/delete/TestDeleteSectorEndpoint.kt

@@ -1,7 +1,6 @@
 package server.endpoints.delete
 
 import database.EntityTypes
-import database.entity.Sector
 import kotlin.test.Test
 import server.base.ApplicationTestBase
 import server.base.delete.SingleFileRemoval
@@ -12,7 +11,7 @@ class TestDeleteSectorEndpoint: ApplicationTestBase() {
     @Test
     fun `test deleting Sector`() = testDeleting(
         EntityTypes.SECTOR,
-        listOf(SingleFileRemoval(Sector::image), SingleFileRemoval(Sector::gpx))
+        listOf(SingleFileRemoval { it.image }, SingleFileRemoval { it.gpx })
     )
 
     @Test