Implement onModeSelectionChanged

ksharma-xyz · Feb 12, 2025 · 3ca37fe · 3ca37fe
1 parent ea7c5c7
commit 3ca37fe
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 8 deletions.
diff --git a/...Main/kotlin/xyz/ksharma/krail/trip/planner/network/api/service/RealTripPlanningService.kt b/...Main/kotlin/xyz/ksharma/krail/trip/planner/network/api/service/RealTripPlanningService.kt
@@ -3,14 +3,15 @@ package xyz.ksharma.krail.trip.planner.network.api.service
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.request.get
+import io.ktor.http.ParametersBuilder
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
-import xyz.ksharma.krail.core.di.DispatchersComponent
 import xyz.ksharma.krail.trip.planner.network.api.model.StopFinderResponse
 import xyz.ksharma.krail.trip.planner.network.api.model.StopType
 import xyz.ksharma.krail.trip.planner.network.api.model.TripResponse
 import xyz.ksharma.krail.trip.planner.network.api.service.stop_finder.StopFinderRequestParams
 import xyz.ksharma.krail.trip.planner.network.api.service.trip.TripRequestParams
+import kotlin.math.log
 
 class RealTripPlanningService(
     private val httpClient: HttpClient,
@@ -23,6 +24,7 @@ class RealTripPlanningService(
         depArr: DepArr,
         date: String?,
         time: String?,
+        excludeProductClassSet: Set<Int>,
     ): TripResponse = withContext(ioDispatcher) {
 
         httpClient.get("$NSW_TRANSPORT_BASE_URL/v1/tp/trip") {
@@ -45,10 +47,43 @@ class RealTripPlanningService(
                 parameters.append(TripRequestParams.cycleSpeed, "16")
                 parameters.append(TripRequestParams.useElevationData, "1")
                 parameters.append(TripRequestParams.outputFormat, "rapidJSON")
+
+                addExcludedTransportModes(
+                    excludeProductClassSet = excludeProductClassSet,
+                    parameters = parameters,
+                )
             }
         }.body()
     }
 
+    private inline fun addExcludedTransportModes(
+        excludeProductClassSet: Set<Int>,
+        parameters: ParametersBuilder,
+    ) {
+        println("Exclude - $excludeProductClassSet")
+        parameters.append(TripRequestParams.excludedMeans, "checkbox")
+
+        if (excludeProductClassSet.contains(1)) {
+            parameters.append(TripRequestParams.exclMOT1, "1")
+        }
+        if (excludeProductClassSet.contains(2)) {
+            parameters.append(TripRequestParams.exclMOT2, "2")
+        }
+        if (excludeProductClassSet.contains(4)) {
+            parameters.append(TripRequestParams.exclMOT4, "4")
+        }
+        if (excludeProductClassSet.contains(5) || excludeProductClassSet.contains(11)) {
+            parameters.append(TripRequestParams.exclMOT5, "5")
+            parameters.append(TripRequestParams.exclMOT11, "11")
+        }
+        if (excludeProductClassSet.contains(7)) {
+            parameters.append(TripRequestParams.exclMOT7, "7")
+        }
+        if (excludeProductClassSet.contains(9)) {
+            parameters.append(TripRequestParams.exclMOT9, "9")
+        }
+    }
+
     override suspend fun stopFinder(
         stopSearchQuery: String,
         stopType: StopType,

diff --git a/...mmonMain/kotlin/xyz/ksharma/krail/trip/planner/network/api/service/TripPlanningService.kt b/...mmonMain/kotlin/xyz/ksharma/krail/trip/planner/network/api/service/TripPlanningService.kt
@@ -27,6 +27,13 @@ interface TripPlanningService {
          * E.g. 0830 means 8:30am and 2030 means 8:30pm.
          */
         time: String? = null,
+
+        /**
+         * List of product classes to exclude from the response.
+         * Only those journeys will be returned which are different modes of transport to the excluded
+         * product classes.
+         */
+        excludeProductClassSet: Set<Int>,
     ): TripResponse
 
     suspend fun stopFinder(

diff --git a/...c/commonMain/kotlin/xyz/ksharma/krail/trip/planner/ui/state/timetable/TimeTableUiEvent.kt b/...c/commonMain/kotlin/xyz/ksharma/krail/trip/planner/ui/state/timetable/TimeTableUiEvent.kt
@@ -21,5 +21,5 @@ sealed interface TimeTableUiEvent {
 
     data class JourneyLegClicked(val expanded: Boolean) : TimeTableUiEvent
 
-    data class ModeSelectionChanged(val x: String) : TimeTableUiEvent
+    data class ModeSelectionChanged(val unselectedModes: Set<Int>) : TimeTableUiEvent
 }
diff --git a/...src/commonMain/kotlin/xyz/ksharma/krail/trip/planner/ui/timetable/TimeTableDestination.kt b/...src/commonMain/kotlin/xyz/ksharma/krail/trip/planner/ui/timetable/TimeTableDestination.kt
@@ -81,8 +81,8 @@ internal fun NavGraphBuilder.timeTableDestination(navController: NavHostControll
                 viewModel.onEvent(TimeTableUiEvent.JourneyLegClicked(journeyId))
             },
             onModeSelectionChanged = { unselectedModes ->
-                log(unselectedModes.toString())
-                viewModel.onEvent(TimeTableUiEvent.ModeSelectionChanged(""))
+                log("onModeSelectionChanged Exclude :$unselectedModes")
+                viewModel.onEvent(TimeTableUiEvent.ModeSelectionChanged(unselectedModes))
             }
         )
     }

diff --git a/...r/ui/src/commonMain/kotlin/xyz/ksharma/krail/trip/planner/ui/timetable/TimeTableScreen.kt b/...r/ui/src/commonMain/kotlin/xyz/ksharma/krail/trip/planner/ui/timetable/TimeTableScreen.kt
@@ -47,6 +47,7 @@ import krail.feature.trip_planner.ui.generated.resources.ic_star
 import krail.feature.trip_planner.ui.generated.resources.ic_check
 import krail.feature.trip_planner.ui.generated.resources.ic_star_filled
 import org.jetbrains.compose.resources.painterResource
+import xyz.ksharma.krail.core.log.log
 import xyz.ksharma.krail.taj.LocalThemeColor
 import xyz.ksharma.krail.taj.components.Button
 import xyz.ksharma.krail.taj.components.ButtonDefaults
@@ -226,10 +227,11 @@ fun TimeTableScreen(
                                 onClick = {
                                     // Toggle / Set behavior
                                     if (unselectedModesProductClass.contains(it.productClass)) {
-                                        unselectedModesProductClass.remove(it.productClass)
+                                        unselectedModesProductClass.removeAll(listOf(it.productClass))
                                     } else {
                                         unselectedModesProductClass.add(it.productClass)
                                     }
+                                    log("After operation Exclude - : $unselectedModesProductClass")
                                 },
                             )
                         }

diff --git a/...i/src/commonMain/kotlin/xyz/ksharma/krail/trip/planner/ui/timetable/TimeTableViewModel.kt b/...i/src/commonMain/kotlin/xyz/ksharma/krail/trip/planner/ui/timetable/TimeTableViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -105,6 +106,7 @@ class TimeTableViewModel(
     val expandedJourneyId: StateFlow<String?> = _expandedJourneyId
 
     private var tripInfo: Trip? = null
+    private val unselectedModes: MutableSet<Int> = mutableSetOf() // all are selected by default
 
     @VisibleForTesting
     var dateTimeSelectionItem: DateTimeSelectionItem? = null
@@ -149,12 +151,27 @@ class TimeTableViewModel(
                 analytics.track(AnalyticsEvent.JourneyLegClickEvent(expanded = event.expanded))
             }
 
-            is TimeTableUiEvent.ModeSelectionChanged -> onModeSelectionChanged()
+            is TimeTableUiEvent.ModeSelectionChanged -> onModeSelectionChanged(event.unselectedModes)
         }
     }
 
-    private fun onModeSelectionChanged() {
+    private fun onModeSelectionChanged(unselectedModes: Set<Int>) {
+        if (hasModeSelectionChanged(unselectedModes)) {
+            this.unselectedModes.clear()
+            this.unselectedModes.addAll(unselectedModes)
 
+            // call api
+            rateLimiter.triggerEvent()
+            updateUiState { copy(isLoading = true) }
+        } else {
+            // do nothing.
+            log("Mode selection not changed")
+        }
+    }
+
+    private fun hasModeSelectionChanged(unselectedModes: Set<Int>): Boolean {
+        log("hasModeSelectionChanged - OLD: ${this.unselectedModes} NEW: $unselectedModes")
+        return this.unselectedModes != unselectedModes
     }
 
     private fun onDateTimeSelectionChanged(item: DateTimeSelectionItem?) {
@@ -279,7 +296,8 @@ class TimeTableViewModel(
                     JourneyTimeOptions.LEAVE -> DepArr.DEP
                     JourneyTimeOptions.ARRIVE -> DepArr.ARR
                     else -> DepArr.DEP
-                }
+                },
+                excludeProductClassSet = unselectedModes,
             )
             Result.success(tripResponse)
         }.getOrElse { error ->
@@ -454,6 +472,7 @@ class TimeTableViewModel(
 
     companion object {
         private const val ANR_TIMEOUT = 5000L
+
         @VisibleForTesting
         val REFRESH_TIME_TEXT_DURATION = 10.seconds
         private val AUTO_REFRESH_TIME_TABLE_DURATION = 30.seconds