Don't cache selected stop name

Author: jdamcd

macOS/Arrivals/Settings/TflSettingsView.swift

@@ -140,7 +140,6 @@ private class TflSettingsViewModel: ObservableObject {
     }
 
     func save(stopPoint: StopResult, platformFilter: String, directionFilter: String) {
-        settings.tflStopName = stopPoint.name
         settings.tflStopId = stopPoint.id
         settings.tflPlatform = platformFilter
         settings.tflDirection = directionFilter

shared/src/commonMain/kotlin/com/jdamcd/arrivals/Settings.kt

@@ -2,7 +2,6 @@ package com.jdamcd.arrivals
 
 expect class Settings() {
     var mode: String
-    var tflStopName: String
     var tflStopId: String
     var tflPlatform: String
     var tflDirection: String
@@ -19,8 +18,6 @@ object SettingsConfig {
     const val MODE_TFL = "tfl"
     const val MODE_GTFS = "gtfs"
 
-    const val TFL_STOP_NAME = "selected_stop_name"
-    const val TFL_STOP_NAME_DEFAULT = "Shoreditch High Street"
     const val TFL_STOP_ID = "selected_stop_id"
     const val TFL_STOP_ID_DEFAULT = "910GSHRDHST"
     const val TFL_PLATFORM = "tfl_platform"

shared/src/commonMain/kotlin/com/jdamcd/arrivals/tfl/TflArrivals.kt

@@ -51,6 +51,7 @@ internal class TflArrivals(
     }
 
     private fun formatArrivals(apiArrivals: List<ApiArrival>): ArrivalsInfo {
+        val station = stationInfo(apiArrivals.firstOrNull()?.stationName ?: "")
         val arrivals =
             apiArrivals
                 .asSequence()
@@ -73,14 +74,16 @@ internal class TflArrivals(
                 }
                 .toList()
         return ArrivalsInfo(
-            station = stationInfo(),
+            station = station,
             arrivals = arrivals
         )
     }
 
-    private fun stationInfo(): String {
-        val station = formatStation(settings.tflStopName)
-        return if (settings.tflPlatform.isNotEmpty()) {
+    private fun stationInfo(name: String): String {
+        val station = formatStation(name)
+        return if (station.isEmpty()) {
+            station
+        } else if (settings.tflPlatform.isNotEmpty()) {
             "$station: ${settings.tflPlatform}"
         } else if (settings.tflDirection != SettingsConfig.TFL_DIRECTION_DEFAULT) {
             "$station: ${formatDirection(settings.tflDirection)}"

shared/src/jvmMain/kotlin/com/jdamcd/arrivals/Settings.jvm.kt

@@ -2,7 +2,6 @@ package com.jdamcd.arrivals
 
 actual class Settings actual constructor() {
     actual var mode = SettingsConfig.MODE_TFL
-    actual var tflStopName = SettingsConfig.TFL_STOP_NAME_DEFAULT
     actual var tflStopId = SettingsConfig.TFL_STOP_ID_DEFAULT
     actual var tflPlatform = SettingsConfig.TFL_PLATFORM_DEFAULT
     actual var tflDirection = SettingsConfig.TFL_DIRECTION_DEFAULT

shared/src/jvmTest/kotlin/com/jdamcd/arrivals/tfl/TflArrivalsTest.kt

@@ -19,16 +19,15 @@ class TflArrivalsTest {
     private val arrivals = TflArrivals(api, settings)
 
     private val response = listOf(
-        ApiArrival(123, "", "Platform 2", "outbound", "New Cross", 456),
-        ApiArrival(124, "", "Platform 2", "outbound", "Crystal Palace Rail Station", 10),
-        ApiArrival(125, "", "Platform 1", "inbound", "Dalston Junction", 10),
-        ApiArrival(126, "", "Platform 1", "inbound", "Highbury & Islington Underground Station", 456)
+        ApiArrival(123, "Test Stop", "Platform 2", "outbound", "New Cross", 456),
+        ApiArrival(124, "Test Stop", "Platform 2", "outbound", "Crystal Palace Rail Station", 10),
+        ApiArrival(125, "Test Stop", "Platform 1", "inbound", "Dalston Junction", 10),
+        ApiArrival(126, "Test Stop", "Platform 1", "inbound", "Highbury & Islington Underground Station", 456)
     )
 
     @BeforeTest
     fun setup() {
         settings.tflStopId = "123"
-        settings.tflStopName = "Test Stop"
         settings.tflPlatform = "Platform 2"
         settings.tflDirection = "all"
     }
@@ -78,7 +77,7 @@ class TflArrivalsTest {
     }
 
     @Test
-    fun `throws NoDataException if results are empty`() = runBlocking<Unit> {
+    fun `throws NoDataException on empty results`() = runBlocking<Unit> {
         coEvery { api.fetchArrivals("123") } returns emptyList()
 
         assertFailsWith<NoDataException> {

shared/src/macOSMain/kotlin/com/jdamcd/arrivals/Settings.kt

@@ -11,12 +11,6 @@ actual class Settings actual constructor() {
             defaults.setObject(value, SettingsConfig.MODE)
         }
 
-    actual var tflStopName: String
-        get() = defaults.stringForKey(SettingsConfig.TFL_STOP_NAME) ?: SettingsConfig.TFL_STOP_NAME_DEFAULT
-        set(value) {
-            defaults.setObject(value, SettingsConfig.TFL_STOP_NAME)
-        }
-
     actual var tflStopId: String
         get() = defaults.stringForKey(SettingsConfig.TFL_STOP_ID) ?: SettingsConfig.TFL_STOP_ID_DEFAULT
         set(value) {