fix sort order of highscore

Author: pstorch

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

@@ -186,7 +186,6 @@ class StationAdapter(private val dsl: DSLContext) : StationPort {
             .join(UserTable).on(UserTable.id.eq(PhotoTable.photographerid))
             .where(value(countryCode).isNull.or(StationTable.countrycode.eq(countryCode)))
             .groupBy(UserTable.name)
-            .orderBy(count())
             .fetch { it.value1()!! to it.value2() }.toMap()
 
     @Transactional

adapter/src/main/kotlin/org/railwaystations/rsapi/adapter/web/controller/PhotographersController.kt

@@ -8,7 +8,10 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 class PhotographersController(private val loadPhotographersUseCase: LoadPhotographersUseCase) : PhotographersApi {
     override fun getPhotographers(country: String?): ResponseEntity<Any> {
-        return ResponseEntity.ok(loadPhotographersUseCase.getPhotographersPhotocountMap(country))
+        return ResponseEntity.ok(
+            loadPhotographersUseCase.getPhotographersPhotocountMap(country)
+                .entries.sortedByDescending { it.value }.associate { it.toPair() }
+        )
     }
 
 }

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

@@ -110,18 +110,26 @@ class StationAdapterTest : AbstractPostgreSqlTest() {
 
         assertThat(photographers).isEqualTo(
             mapOf<String, Int>(
-                "@user0" to 10, "@user10" to 17, "@user2" to 6, "@user27" to 31, "@user4" to 1, "@user8" to 29
+                "@user27" to 31,
+                "@user8" to 29,
+                "@user10" to 17,
+                "@user0" to 10,
+                "@user2" to 6,
+                "@user4" to 1,
             )
         )
     }
 
     @Test
-    fun getPhotographerMapAllDe() {
+    fun getPhotographerMapDe() {
         val photographers = sut.getPhotographerMap("de")
 
         assertThat(photographers).isEqualTo(
             mapOf<String, Int>(
-                "@user0" to 9, "@user10" to 16, "@user27" to 31, "@user8" to 29
+                "@user27" to 31,
+                "@user8" to 29,
+                "@user10" to 16,
+                "@user0" to 9,
             )
         )
     }

adapter/src/test/kotlin/org/railwaystations/rsapi/adapter/web/controller/PhotographersControllerTest.kt

@@ -18,7 +18,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
 @WebMvcTest(controllers = [PhotographersController::class])
@@ -50,32 +50,26 @@ internal class PhotographersControllerTest {
 
     @Test
     fun getPhotographersOfCountryDe() {
-        every { stationAdapter.getPhotographerMap("de") } returns createPhotographersResponse()
+        every { stationAdapter.getPhotographerMap("de") } returns photographersMap
 
         mvc.perform(get("/photographers?country=de"))
             .andExpect(status().isOk())
-            .andExpect(jsonPath("$.@user27").value(31))
-            .andExpect(jsonPath("$.@user8").value(29))
-            .andExpect(jsonPath("$.@user10").value(15))
-            .andExpect(jsonPath("$.@user0").value(9))
+            .andExpect(content().string(photographersResponse)) // use string comparison because of ordering
             .andExpect(validOpenApiResponse())
     }
 
     @Test
     fun getPhotographersOfAllCountries() {
-        every { stationAdapter.getPhotographerMap(null) } returns createPhotographersResponse()
+        every { stationAdapter.getPhotographerMap(null) } returns photographersMap
 
         mvc.perform(get("/photographers"))
             .andExpect(status().isOk())
-            .andExpect(jsonPath("$.@user27").value(31))
-            .andExpect(jsonPath("$.@user8").value(29))
-            .andExpect(jsonPath("$.@user10").value(15))
-            .andExpect(jsonPath("$.@user0").value(9))
+            .andExpect(content().string(photographersResponse)) // use string comparison because of ordering
             .andExpect(validOpenApiResponse())
     }
 
-    private fun createPhotographersResponse(): Map<String, Int> {
-        return mapOf("@user27" to 31, "@user8" to 29, "@user10" to 15, "@user0" to 9)
-    }
-    
-}
+}
+
+private val photographersMap = mapOf("@user8" to 29, "@user0" to 9, "@user10" to 15, "@user27" to 31)
+
+private const val photographersResponse = """{"@user27":31,"@user8":29,"@user10":15,"@user0":9}"""