filter to route in FilteredRouteView constructor

mbta · Apr 10, 2024 · 769914b · 769914b
1 parent 9a431f7
commit 769914b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/iosApp/iosApp/Pages/StopDetails/StopDetailsFilteredRouteView.swift b/iosApp/iosApp/Pages/StopDetails/StopDetailsFilteredRouteView.swift
@@ -39,12 +39,14 @@ struct StopDetailsFilteredRouteView: View {
 
     let rows: [RowData]
 
-    init(patternsByStop: PatternsByStop, now: Instant, filter: Binding<StopDetailsFilter?>) {
+    init(departures: StopDetailsDepartures, now: Instant, filter filterBinding: Binding<StopDetailsFilter?>) {
+        _filter = filterBinding
+        let filter = filterBinding.wrappedValue
+        let patternsByStop = departures.routes.first(where: { $0.route.id == filter?.routeId })!
         self.patternsByStop = patternsByStop
         self.now = now
-        _filter = filter
 
-        let expectedDirection: Int32? = filter.wrappedValue?.directionId
+        let expectedDirection: Int32? = filter?.directionId
         rows = patternsByStop.allUpcomingTrips().compactMap {
             RowData(trip: $0, route: patternsByStop.route, expectedDirection: expectedDirection, now: now)
         }

diff --git a/iosApp/iosApp/Pages/StopDetails/StopDetailsRoutesView.swift b/iosApp/iosApp/Pages/StopDetails/StopDetailsRoutesView.swift
@@ -17,8 +17,7 @@ struct StopDetailsRoutesView: View {
 
     var body: some View {
         if let filter {
-            let selectedData = departures.routes.first(where: { $0.route.id == filter.routeId })!
-            StopDetailsFilteredRouteView(patternsByStop: selectedData, now: now, filter: $filter)
+            StopDetailsFilteredRouteView(departures: departures, now: now, filter: $filter)
         } else {
             List(departures.routes, id: \.route.id) { patternsByStop in
                 StopDetailsRouteView(patternsByStop: patternsByStop, now: now, filter: $filter)

diff --git a/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredRouteViewTests.swift b/iosApp/iosAppTests/Pages/StopDetails/StopDetailsFilteredRouteViewTests.swift
@@ -13,7 +13,7 @@ import ViewInspector
 import XCTest
 
 final class StopDetailsFilteredRouteViewTests: XCTestCase {
-    private func testData() -> (patternsByStop: PatternsByStop, routeId: String, now: Instant) {
+    private func testData() -> (departures: StopDetailsDepartures, routeId: String, now: Instant) {
         let objects = ObjectCollectionBuilder()
         let route = objects.route()
         let stop = objects.stop { _ in }
@@ -45,14 +45,16 @@ final class StopDetailsFilteredRouteViewTests: XCTestCase {
             .init(route: route, headsign: "South", patterns: [patternSouth], upcomingTrips: [objects.upcomingTrip(prediction: predictionSouth)], alertsHere: nil),
         ])
 
-        return (patternsByStop: patternsByStop, routeId: route.id, now: now.toKotlinInstant())
+        let departures = StopDetailsDepartures(routes: [patternsByStop])
+
+        return (departures: departures, routeId: route.id, now: now.toKotlinInstant())
     }
 
     func testAppliesFilter() throws {
-        let (patternsByStop: patternsByStop, routeId: routeId, now: now) = testData()
+        let (departures: departures, routeId: routeId, now: now) = testData()
 
         let sut = StopDetailsFilteredRouteView(
-            patternsByStop: patternsByStop,
+            departures: departures,
             now: now,
             filter: .constant(.init(routeId: routeId, directionId: 0))
         )
@@ -62,11 +64,11 @@ final class StopDetailsFilteredRouteViewTests: XCTestCase {
     }
 
     func testClearsFilter() throws {
-        let (patternsByStop: patternsByStop, routeId: routeId, now: now) = testData()
+        let (departures: departures, routeId: routeId, now: now) = testData()
 
         let filter = Binding<StopDetailsFilter?>(wrappedValue: .init(routeId: routeId, directionId: 1))
 
-        let sut = StopDetailsFilteredRouteView(patternsByStop: patternsByStop, now: now, filter: filter)
+        let sut = StopDetailsFilteredRouteView(departures: departures, now: now, filter: filter)
 
         try sut.inspect().find(button: "Clear Filter").tap()