feat(app): group by metro endpoint query

krystxf · Jun 21, 2024 · 08a089f · 08a089f
1 parent 6b45cad
commit 08a089f
Show file tree

Hide file tree

Showing 6 changed files with 157 additions and 120 deletions.
diff --git a/app/Common/Utils/networkUtils.swift b/app/Common/Utils/networkUtils.swift
@@ -18,50 +18,69 @@ enum FetchError:
     case InvalidaData
 }
 
-typealias DeparturesByGtfsIDs = [String: [ApiDeparture]]
+typealias GroupedDepartures = [String: [ApiDeparture]]
 
-func getStationDepartures(station: String) async throws -> [ApiDeparture] {
-    let endpoint = "\(METRO_NOW_API)/metro?station=\(station)&ungrouped=true"
+enum GroupBy: String {
+    case platform
+    case heading
+}
+
+func getDepartures(stations: [String] = [], gtfsIDs: [String] = [], groupBy: GroupBy) async throws -> GroupedDepartures {
+    if stations.count == 0, gtfsIDs.count == 0 {
+        print("No station & No GtfsID")
+        return [:]
+    }
+
+    let platformParam = (gtfsIDs.map { "platform=\($0)" }).joined(separator: "&")
+    let stationParam = (stations.map { "station=\($0)" }).joined(separator: "&")
+    let endpoint = "\(METRO_NOW_API)/metro?\(platformParam)&\(stationParam)&groupBy=\(groupBy.rawValue)"
+    print(endpoint)
     guard let url = URL(string: endpoint) else { throw FetchError.InvalidURL }
     let (data, response) = try await URLSession.shared.data(from: url)
 
     guard let response = response as? HTTPURLResponse, response.statusCode == 200 else {
         print("Response not 200")
-        return []
+        return [:]
     }
 
     do {
         let decoder = JSONDecoder()
         decoder.keyDecodingStrategy = .convertFromSnakeCase
         decoder.dateDecodingStrategy = .iso8601
-        return try decoder.decode([ApiDeparture].self, from: data)
+
+        return try decoder.decode(GroupedDepartures.self, from: data)
+
     } catch {
         throw FetchError.InvalidaData
     }
 }
 
-func getDeparturesByGtfsID(gtfsIDs: [String]) async throws -> DeparturesByGtfsIDs {
-    let params = (gtfsIDs.map { "platform=\($0)" }).joined(separator: "&")
-    let endpoint = "\(METRO_NOW_API)/metro?\(params)"
+func getDepartures(stations: [String] = [], gtfsIDs: [String] = []) async throws -> [ApiDeparture] {
+    if stations.count == 0, gtfsIDs.count == 0 {
+        print("No station & No GtfsID")
+        return []
+    }
+    let platformParam = (gtfsIDs.map { "platform=\($0)" }).joined(separator: "&")
+    let stationParam = (stations.map { "station=\($0)" }).joined(separator: "&")
+    let endpoint = "\(METRO_NOW_API)/metro?\(platformParam)&\(stationParam)"
+    print(endpoint)
     guard let url = URL(string: endpoint) else { throw FetchError.InvalidURL }
+
     let (data, response) = try await URLSession.shared.data(from: url)
 
     guard let response = response as? HTTPURLResponse, response.statusCode == 200 else {
         print("Response not 200")
-        return [:]
+        return []
     }
 
     do {
         let decoder = JSONDecoder()
         decoder.keyDecodingStrategy = .convertFromSnakeCase
         decoder.dateDecodingStrategy = .iso8601
-        return try decoder.decode(DeparturesByGtfsIDs.self, from: data)
+
+        return try decoder.decode([ApiDeparture].self, from: data)
+
     } catch {
         throw FetchError.InvalidaData
     }
 }
-
-func getDeparturesByGtfsID(_ gtfsID: String) async throws -> [ApiDeparture]? {
-    let res = try await (getDeparturesByGtfsID(gtfsIDs: [gtfsID]))
-    return res[gtfsID]
-}
diff --git a/app/metro-now-widgets/Core/Provider.swift b/app/metro-now-widgets/Core/Provider.swift
@@ -19,7 +19,7 @@ struct Provider: TimelineProvider {
 
         Task {
             let gtfsIDs = closestStation.properties.platforms.map(\.gtfsId)
-            let departures = try! await getDeparturesByGtfsID(gtfsIDs: gtfsIDs)
+            let departures = await (try! getDepartures(gtfsIDs: gtfsIDs, groupBy: .platform))
 
             var parsedDepartures: [WidgetEntryDeparture] = []
 
@@ -66,7 +66,7 @@ struct Provider: TimelineProvider {
 
         Task {
             let gtfsIDs = closestStation.properties.platforms.map(\.gtfsId)
-            let departures = try! await getDeparturesByGtfsID(gtfsIDs: gtfsIDs)
+            let departures = await (try! getDepartures(gtfsIDs: gtfsIDs, groupBy: .platform))
 
             var entries: [WidgetEntry] = []
             var parsedDepartures: [WidgetEntryDeparture] = []

diff --git a/app/metro-now/Core/Map/StationLocationMapView.swift b/app/metro-now/Core/Map/StationLocationMapView.swift
@@ -9,7 +9,7 @@ struct StationLocationMapView: View {
     let mapUrl: URL
     @StateObject private var locationModel = LocationModel()
     @State var distance: Double = -1
-    @State private var departures: [ApiDeparture] = []
+    @State private var departures: GroupedDepartures = [:]
     @State private var errorMessage: String?
     @State private var cameraPosition: MapCameraPosition
 
@@ -101,14 +101,16 @@ struct StationLocationMapView: View {
                         Spacer()
                     }
 
-                    ForEach(departures, id: \.departure) { departure in
-                        let departureDates = [departure.departure]
+                    ForEach(Array(departures.keys), id: \.self) { k in
+                        let d = departures[k]!
 
-                        PlatformListItemView(
-                            direction: departure.heading,
-                            departureDates: departureDates,
-                            metroLine: departure.line
-                        )
+                        if d.count > 0 {
+                            PlatformListItemView(
+                                direction: d[0].heading,
+                                departureDates: d.map(\.departure),
+                                metroLine: d[0].line
+                            )
+                        }
                     }
                 }
             }
@@ -119,7 +121,6 @@ struct StationLocationMapView: View {
         .toolbarBackground(.thinMaterial, for: .navigationBar)
         .toolbarBackground(.automatic, for: .navigationBar)
         .onReceive(locationModel.$location) { location in
-
             guard let location else {
                 print("Unknown location")
                 return
@@ -137,15 +138,16 @@ struct StationLocationMapView: View {
             distance = userLocation.distance(from: stationLocation)
         }.refreshable {
             do {
-                departures = try await getStationDepartures(station: stationName)
+                departures = try await getDepartures(stations: [stationName], groupBy: .heading)
             } catch {
                 errorMessage = "Failed to fetch departures: \(error)"
             }
         }
         .onAppear {
             Task {
                 do {
-                    departures = try await getStationDepartures(station: stationName)
+                    departures = try await (getDepartures(stations: [stationName], groupBy: .heading))
+
                 } catch {
                     errorMessage = "Failed to fetch departures: \(error)"
                 }

diff --git a/app/metro-now/Core/PlatformDetail/PlatformDetailView.swift b/app/metro-now/Core/PlatformDetail/PlatformDetailView.swift
@@ -42,15 +42,15 @@ struct PlatformDetailView: View {
             .padding(.top, 50)
             .task {
                 do {
-                    departures = try await getDeparturesByGtfsID(gtfsID)
+                    departures = try await (getDepartures(gtfsIDs: [gtfsID], groupBy: .platform))[gtfsID]
 
                 } catch {
                     print(error)
                 }
             }
             .refreshable {
                 do {
-                    departures = try await getDeparturesByGtfsID(gtfsID)
+                    departures = try await (getDepartures(gtfsIDs: [gtfsID], groupBy: .platform))[gtfsID]
 
                 } catch {
                     print(error)