fix(android.StopDetailsPage): Separate errorKeys from NearbyTransitVi…

…ew fetchces
mbta · Jan 10, 2025 · 4feec5b · 4feec5b
1 parent 9d1182c
commit 4feec5b
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 28 deletions.
diff --git a/androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/state/GetGlobalDataTest.kt b/androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/state/GetGlobalDataTest.kt
@@ -1,10 +1,13 @@
 package com.mbta.tid.mbta_app.android.state
 
 import androidx.compose.ui.test.junit4.createComposeRule
+import com.mbta.tid.mbta_app.model.ErrorBannerState
 import com.mbta.tid.mbta_app.model.ObjectCollectionBuilder
 import com.mbta.tid.mbta_app.model.response.ApiResult
 import com.mbta.tid.mbta_app.model.response.GlobalResponse
 import com.mbta.tid.mbta_app.repositories.IGlobalRepository
+import com.mbta.tid.mbta_app.repositories.MockErrorBannerStateRepository
+import com.mbta.tid.mbta_app.repositories.MockGlobalRepository
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -39,7 +42,7 @@ class GetGlobalDataTest {
             }
 
         var actualData: GlobalResponse? = globalData
-        composeTestRule.setContent { actualData = getGlobalData(globalRepo) }
+        composeTestRule.setContent { actualData = getGlobalData("errorKey", globalRepo) }
 
         composeTestRule.awaitIdle()
         assertNull(actualData)
@@ -49,4 +52,20 @@ class GetGlobalDataTest {
         composeTestRule.waitUntil { globalData == actualData }
         assertEquals(globalData, actualData)
     }
+
+    @Test
+    fun testApiError() = runTest {
+        val globalRepo = MockGlobalRepository(ApiResult.Error(500, "oops"))
+
+        val errorRepo = MockErrorBannerStateRepository()
+
+        composeTestRule.setContent { getGlobalData("errorKey", globalRepo, errorRepo) }
+
+        composeTestRule.waitUntil {
+            when (val errorState = errorRepo.state.value) {
+                is ErrorBannerState.DataError -> errorState.messages == setOf("errorKey")
+                else -> false
+            }
+        }
+    }
 }
diff --git a/androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/state/GetScheduleTest.kt b/androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/state/GetScheduleTest.kt
@@ -4,10 +4,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.test.junit4.createComposeRule
+import com.mbta.tid.mbta_app.model.ErrorBannerState
 import com.mbta.tid.mbta_app.model.ObjectCollectionBuilder
 import com.mbta.tid.mbta_app.model.response.ApiResult
 import com.mbta.tid.mbta_app.model.response.ScheduleResponse
 import com.mbta.tid.mbta_app.repositories.ISchedulesRepository
+import com.mbta.tid.mbta_app.repositories.MockErrorBannerStateRepository
 import com.mbta.tid.mbta_app.repositories.MockScheduleRepository
 import kotlin.test.assertNotNull
 import kotlinx.coroutines.test.runTest
@@ -53,7 +55,7 @@ class GetScheduleTest {
         var stopIds by mutableStateOf(stops1)
         var actualSchedules: ScheduleResponse? = expectedSchedules1
         composeTestRule.setContent {
-            actualSchedules = getSchedule(stopIds = stopIds, schedulesRepo)
+            actualSchedules = getSchedule(stopIds = stopIds, "errorKey", schedulesRepo)
         }
 
         composeTestRule.awaitIdle()
@@ -73,10 +75,28 @@ class GetScheduleTest {
         var actualSchedules: ScheduleResponse? = null
 
         composeTestRule.setContent {
-            actualSchedules = getSchedule(stopIds = emptyList(), schedulesRepo)
+            actualSchedules = getSchedule(stopIds = emptyList(), "errorKey", schedulesRepo)
         }
 
         composeTestRule.waitUntil { actualSchedules != null }
         assertNotNull(actualSchedules)
     }
+
+    @Test
+    fun testErrorCase() {
+        val schedulesRepo = MockScheduleRepository(ApiResult.Error(500, "oops"))
+
+        val errorRepo = MockErrorBannerStateRepository()
+
+        composeTestRule.setContent {
+            getSchedule(stopIds = listOf("stop1"), "errorKey", schedulesRepo, errorRepo)
+        }
+
+        composeTestRule.waitUntil {
+            when (val errorState = errorRepo.state.value) {
+                is ErrorBannerState.DataError -> errorState.messages == setOf("errorKey")
+                else -> false
+            }
+        }
+    }
 }
diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/ContentView.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/ContentView.kt
@@ -44,7 +44,7 @@ fun ContentView(
 ) {
     val navController = rememberNavController()
     val alertData: AlertsStreamDataResponse? = subscribeToAlerts()
-    val globalResponse = getGlobalData()
+    val globalResponse = getGlobalData("ContentView.getGlobalData")
     val hideMaps by viewModel.hideMaps.collectAsState()
     val pendingOnboarding = viewModel.pendingOnboarding.collectAsState().value
     val locationDataManager = rememberLocationDataManager()

diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitView.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitView.kt
@@ -66,15 +66,15 @@ fun NearbyTransitView(
     }
     val now = timer(updateInterval = 5.seconds)
     val stopIds = remember(nearbyVM.nearby) { nearbyVM.nearby?.stopIds()?.toList() }
-    val schedules = getSchedule(stopIds)
+    val schedules = getSchedule(stopIds, "NearbyTransitView.getSchedule")
     val predictionsVM = subscribeToPredictions(stopIds, errorBannerViewModel = errorBannerViewModel)
     val predictions by predictionsVM.predictionsFlow.collectAsState(initial = null)
+
     LaunchedEffect(targetLocation == null) {
         if (targetLocation == null) {
             predictionsVM.reset()
         }
     }
-
     val (pinnedRoutes, togglePinnedRoute) = managePinnedRoutes()
 
     val nearbyWithRealtimeInfo =

diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/pages/StopDetailsPage.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/pages/StopDetailsPage.kt
@@ -36,7 +36,7 @@ fun StopDetailsPage(
     updateDepartures: (StopDetailsDepartures?) -> Unit,
     errorBannerViewModel: ErrorBannerViewModel
 ) {
-    val globalResponse = getGlobalData()
+    val globalResponse = getGlobalData("StopDetailsPage.getGlobalData")
 
     val predictionsVM =
         subscribeToPredictions(
@@ -47,7 +47,7 @@ fun StopDetailsPage(
 
     val now = timer(updateInterval = 5.seconds)
 
-    val schedulesResponse = getSchedule(stopIds = listOf(stop.id))
+    val schedulesResponse = getSchedule(stopIds = listOf(stop.id), "StopDetailsPage.getSchedule")
 
     val (pinnedRoutes, togglePinnedRoute) = managePinnedRoutes()
 

diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/search/SearchBarOverlay.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/search/SearchBarOverlay.kt
@@ -59,7 +59,7 @@ fun SearchBarOverlay(
         }
     var expanded by rememberSaveable { mutableStateOf(false) }
     var searchInputState by rememberSaveable { mutableStateOf("") }
-    val globalResponse = getGlobalData()
+    val globalResponse = getGlobalData("SearchBar.getGlobalData")
     val searchResultsVm = getSearchResultsVm(globalResponse = globalResponse)
     val searchResults = searchResultsVm.searchResults.collectAsState(initial = null).value
 

diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/state/getGlobalData.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/state/getGlobalData.kt
@@ -24,14 +24,14 @@ class GlobalDataViewModel(
     private val _globalResponse = MutableStateFlow<GlobalResponse?>(null)
     var globalResponse: StateFlow<GlobalResponse?> = _globalResponse
 
-    fun getGlobalData() {
+    fun getGlobalData(errorKey: String) {
         CoroutineScope(Dispatchers.IO).launch {
             fetchApi(
                 errorBannerRepo = errorBannerRepository,
-                errorKey = "GlobalDataViewModel.getGlobalData",
+                errorKey = errorKey,
                 getData = { globalRepository.getGlobalData() },
                 onSuccess = { _globalResponse.emit(it) },
-                onRefreshAfterError = { getGlobalData() }
+                onRefreshAfterError = { getGlobalData(errorKey) }
             )
         }
     }
@@ -48,12 +48,13 @@ class GlobalDataViewModel(
 
 @Composable
 fun getGlobalData(
+    errorKey: String,
     globalRepository: IGlobalRepository = koinInject(),
     errorBannerRepository: IErrorBannerStateRepository = koinInject()
 ): GlobalResponse? {
     val viewModel: GlobalDataViewModel =
         viewModel(factory = GlobalDataViewModel.Factory(globalRepository, errorBannerRepository))
 
-    LaunchedEffect(key1 = null) { viewModel.getGlobalData() }
+    LaunchedEffect(key1 = null) { viewModel.getGlobalData(errorKey) }
     return viewModel.globalResponse.collectAsState(initial = null).value
 }
diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/state/getSchedule.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/state/getSchedule.kt
@@ -25,15 +25,15 @@ class ScheduleViewModel(
     private val _schedule = MutableStateFlow<ScheduleResponse?>(null)
     val schedule: StateFlow<ScheduleResponse?> = _schedule
 
-    fun getSchedule(stopIds: List<String>) {
+    fun getSchedule(stopIds: List<String>, errorKey: String) {
         if (stopIds.isNotEmpty()) {
             CoroutineScope(Dispatchers.IO).launch {
                 fetchApi(
                     errorBannerRepo = errorBannerRepository,
-                    errorKey = "ScheduleViewModel.getSchedule",
+                    errorKey = errorKey,
                     getData = { schedulesRepository.getSchedule(stopIds, Clock.System.now()) },
                     onSuccess = { _schedule.value = it },
-                    onRefreshAfterError = { getSchedule(stopIds) }
+                    onRefreshAfterError = { getSchedule(stopIds, errorKey) }
                 )
             }
         } else {
@@ -54,13 +54,14 @@ class ScheduleViewModel(
 @Composable
 fun getSchedule(
     stopIds: List<String>?,
+    errorKey: String,
     schedulesRepository: ISchedulesRepository = koinInject(),
     errorBannerRepository: IErrorBannerStateRepository = koinInject(),
 ): ScheduleResponse? {
     var viewModel: ScheduleViewModel =
         viewModel(factory = ScheduleViewModel.Factory(schedulesRepository, errorBannerRepository))
 
-    LaunchedEffect(key1 = stopIds) { viewModel.getSchedule(stopIds ?: emptyList()) }
+    LaunchedEffect(key1 = stopIds) { viewModel.getSchedule(stopIds ?: emptyList(), errorKey) }
 
     return viewModel?.schedule?.collectAsState(initial = null)?.value
 }
diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsView.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsView.kt
@@ -33,7 +33,7 @@ fun StopDetailsView(
     updateStopFilter: (StopDetailsFilter?) -> Unit,
     errorBannerViewModel: ErrorBannerViewModel
 ) {
-    val globalResponse = getGlobalData()
+    val globalResponse = getGlobalData("SopDetailsView.getGlobalData")
 
     val now = timer(updateInterval = 5.seconds)
 

diff --git a/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/repositories/GlobalRepository.kt b/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/repositories/GlobalRepository.kt
@@ -39,16 +39,25 @@ class GlobalRepository(
 
 class MockGlobalRepository
 @DefaultArgumentInterop.Enabled
-constructor(
-    val response: GlobalResponse =
-        GlobalResponse(emptyMap(), emptyMap(), emptyMap(), emptyMap(), emptyMap(), emptyMap()),
-    val onGet: () -> Unit = {}
-) : IGlobalRepository {
-    override val state = MutableStateFlow(response)
+constructor(val result: ApiResult<GlobalResponse>, val onGet: () -> Unit = {}) : IGlobalRepository {
+
+    constructor(
+        response: GlobalResponse =
+            GlobalResponse(emptyMap(), emptyMap(), emptyMap(), emptyMap(), emptyMap(), emptyMap()),
+        onGet: () -> Unit = {}
+    ) : this(ApiResult.Ok(response), onGet)
+
+    override val state =
+        MutableStateFlow(
+            when (result) {
+                is ApiResult.Error -> null
+                is ApiResult.Ok -> result.data
+            }
+        )
 
     override suspend fun getGlobalData(): ApiResult<GlobalResponse> {
         onGet()
-        return ApiResult.Ok(response)
+        return result
     }
 }
 

diff --git a/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/repositories/SchedulesRepository.kt b/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/repositories/SchedulesRepository.kt
@@ -1,5 +1,6 @@
 package com.mbta.tid.mbta_app.repositories
 
+import co.touchlab.skie.configuration.annotations.DefaultArgumentInterop
 import com.mbta.tid.mbta_app.model.response.ApiResult
 import com.mbta.tid.mbta_app.model.response.ScheduleResponse
 import com.mbta.tid.mbta_app.network.MobileBackendClient
@@ -43,9 +44,16 @@ class SchedulesRepository : ISchedulesRepository, KoinComponent {
 }
 
 class MockScheduleRepository(
-    private val scheduleResponse: ScheduleResponse = ScheduleResponse(listOf(), mapOf()),
+    private val response: ApiResult<ScheduleResponse>,
     private val callback: (stopIds: List<String>) -> Unit = {}
 ) : ISchedulesRepository {
+
+    @DefaultArgumentInterop.Enabled
+    constructor(
+        scheduleResponse: ScheduleResponse = ScheduleResponse(listOf(), mapOf()),
+        callback: (stopIds: List<String>) -> Unit = {}
+    ) : this(ApiResult.Ok(scheduleResponse), callback)
+
     constructor() :
         this(
             scheduleResponse = ScheduleResponse(schedules = listOf(), trips = mapOf()),
@@ -57,12 +65,12 @@ class MockScheduleRepository(
         now: Instant
     ): ApiResult<ScheduleResponse> {
         callback(stopIds)
-        return ApiResult.Ok(scheduleResponse)
+        return response
     }
 
     override suspend fun getSchedule(stopIds: List<String>): ApiResult<ScheduleResponse> {
         callback(stopIds)
-        return ApiResult.Ok(scheduleResponse)
+        return response
     }
 }