fix: show alert instead of trips if both exist (#125)

mbta · Apr 11, 2024 · 671b0a8 · 671b0a8
1 parent 2b54ead
commit 671b0a8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/model/StopAssociatedRoute.kt b/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/model/StopAssociatedRoute.kt
@@ -128,6 +128,8 @@ data class PatternsByHeadsign(
     }
 
     fun format(now: Instant): Format {
+        val alert = alertsHere?.firstOrNull()
+        if (alert != null) return Format.NoService(alert)
         if (this.upcomingTrips == null) return Format.Loading
         val tripsToShow =
             upcomingTrips
@@ -138,12 +140,7 @@ data class PatternsByHeadsign(
                         (this.route.type.isSubway() && it.format is UpcomingTrip.Format.Schedule)
                 }
                 .take(2)
-        if (tripsToShow.isEmpty()) {
-            this.alertsHere?.firstOrNull()?.let {
-                return Format.NoService(it)
-            }
-            return Format.None
-        }
+        if (tripsToShow.isEmpty()) return Format.None
         return Format.Some(tripsToShow)
     }
 }

diff --git a/shared/src/commonTest/kotlin/com/mbta/tid/mbta_app/model/PatternsByHeadsignTest.kt b/shared/src/commonTest/kotlin/com/mbta/tid/mbta_app/model/PatternsByHeadsignTest.kt
@@ -35,6 +35,30 @@ class PatternsByHeadsignTest {
         )
     }
 
+    @Test
+    fun `formats as alert with trip and alert`() {
+        val now = Clock.System.now()
+
+        val objects = ObjectCollectionBuilder()
+        val route = objects.route()
+
+        val trip = objects.trip()
+        val prediction =
+            objects.prediction {
+                this.trip = trip
+                departureTime = now + 1.minutes
+            }
+        val upcomingTrip = objects.upcomingTrip(prediction)
+
+        val alert = objects.alert {}
+
+        assertEquals(
+            PatternsByHeadsign.Format.NoService(alert),
+            PatternsByHeadsign(route, "", emptyList(), listOf(upcomingTrip), listOf(alert))
+                .format(now)
+        )
+    }
+
     @Test
     fun `formats as none with no trips and no alert`() {
         val now = Clock.System.now()