Added tracks adding when patching sectors

Author: ArnyminerZ

src/main/kotlin/server/endpoints/patch/PatchSectorEndpoint.kt

@@ -1,6 +1,7 @@
 package server.endpoints.patch
 
 import ServerDatabase
+import data.ExternalTrack
 import data.LatLng
 import database.EntityTypes
 import database.entity.Sector
@@ -43,6 +44,7 @@ object PatchSectorEndpoint : SecureEndpointBase("/sector/{sectorId}") {
         var sunTime: Sector.SunTime? = null
         var walkingTime: UInt? = null
         var weight: String? = null
+        var tracks: List<ExternalTrack>? = null
         var zone: Zone? = null
 
         var removePoint = false
@@ -63,6 +65,7 @@ object PatchSectorEndpoint : SecureEndpointBase("/sector/{sectorId}") {
                     "kidsApt" -> kidsApt = partData.value.toBoolean()
                     "sunTime" -> sunTime = partData.value.let { Sector.SunTime.valueOf(it) }
                     "weight" -> weight = partData.value
+                    "tracks" -> tracks = ExternalTrack.decodeFromPart(partData)
                     "zone" -> ServerDatabase.instance.query {
                         zone = Zone.findById(partData.value.toInt())
                             ?: return@query Errors.ParentNotFound.let { error = it }
@@ -116,7 +119,7 @@ object PatchSectorEndpoint : SecureEndpointBase("/sector/{sectorId}") {
 
         if (invalidFile) return respondFailure(Errors.InvalidFileType)
 
-        if (areAllNull(displayName, imageFile, gpxFile, kidsApt, point, sunTime, walkingTime, weight, zone) &&
+        if (areAllNull(displayName, imageFile, gpxFile, kidsApt, point, sunTime, walkingTime, weight, tracks, zone) &&
             areAllFalse(removePoint, removeWalkingTime, deleteGpx)
         ) {
             return respondSuccess(httpStatusCode = HttpStatusCode.NoContent)
@@ -131,6 +134,7 @@ object PatchSectorEndpoint : SecureEndpointBase("/sector/{sectorId}") {
             point?.let { sector.point = it }
             walkingTime?.let { sector.walkingTime = it }
             weight?.let { sector.weight = it }
+            tracks?.let { sector.tracks = it }
             zone?.let { sector.zone = it }
 
             if (removePoint) sector.point = null

src/test/kotlin/server/DataProvider.kt

@@ -8,6 +8,7 @@ import data.DataPoint
 import data.Ending
 import data.EndingInclination
 import data.EndingInfo
+import data.ExternalTrack
 import data.Grade
 import data.LatLng
 import data.PitchInfo
@@ -27,6 +28,7 @@ import java.time.Instant
 import java.time.LocalDateTime
 import java.time.Month
 import kotlin.test.assertNotNull
+import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.encodeToString
 import server.base.ApplicationTestBase.Companion.AUTH_TOKEN
 import server.base.StubApplicationTestBuilder
@@ -160,6 +162,9 @@ object DataProvider {
         val kidsApt = true
         val sunTime = Sector.SunTime.Afternoon
         val walkingTime = 12U
+        val tracks = listOf(
+            ExternalTrack(ExternalTrack.Type.Wikiloc, "https://example.com")
+        )
     }
 
     suspend fun provideSampleSector(
@@ -169,6 +174,7 @@ object DataProvider {
         skipKidsApt: Boolean = false,
         skipSunTime: Boolean = false,
         skipImage: Boolean = false,
+        skipTracks: Boolean = false,
         skipGpx: Boolean = false,
         assertion: suspend HttpResponse.() -> Int? = {
             var sectorId: Int? = null
@@ -200,6 +206,8 @@ object DataProvider {
                     append("kidsApt", SampleSector.kidsApt)
                 if (!skipSunTime)
                     append("sunTime", SampleSector.sunTime.name)
+                if (!skipTracks)
+                    append("tracks", SampleSector.tracks.joinToString("\n") { "${it.type.name};${it.url}" })
                 append("walkingTime", SampleSector.walkingTime.toInt())
                 append("point", Json.encodeToString(SampleSector.point))
                 if (!skipImage)

src/test/kotlin/server/endpoints/create/TestSectorCreationEndpoint.kt

@@ -38,6 +38,7 @@ class TestSectorCreationEndpoint : ApplicationTestBase() {
             assertEquals(DataProvider.SampleSector.kidsApt, sector.kidsApt)
             assertEquals(DataProvider.SampleSector.walkingTime, sector.walkingTime)
             assertEquals(DataProvider.SampleSector.sunTime, sector.sunTime)
+            assertEquals(DataProvider.SampleSector.tracks, sector.tracks)
 
             val imageFile = sector.image
             assertTrue(imageFile.exists())

src/test/kotlin/server/endpoints/patch/TestPatchSectorEndpoint.kt

@@ -1,9 +1,12 @@
 package server.endpoints.patch
 
+import data.ExternalTrack
 import data.LatLng
 import database.EntityTypes
 import database.entity.Sector
+import database.serialization.Json
 import kotlin.test.Test
+import kotlinx.serialization.builtins.ListSerializer
 import server.base.ApplicationTestBase
 import server.base.testPatching
 import server.base.testPatchingFile
@@ -54,6 +57,16 @@ class TestPatchSectorEndpoint : ApplicationTestBase() {
         "0123"
     ) { it.weight }
 
+    @Test
+    fun `test patching Sector - update tracks`() = testPatching(
+        EntityTypes.SECTOR,
+        "tracks",
+        Json.encodeToString(
+            ListSerializer(ExternalTrack.serializer()),
+            listOf(ExternalTrack(ExternalTrack.Type.Wikiloc, "https://example.com"))
+        )
+    ) { it.tracks }
+
     @Test
     fun `test patching Sector - update image`() = testPatchingFile(
         EntityTypes.SECTOR,