Merge remote-tracking branch 'origin/develop' into security

sg-jsonjuliane · sg-jsonjuliane · commit d82b726c3948 · 2025-11-15T00:28:27.000+08:00
diff --git a/TripKitData/src/main/java/com/skedgo/tripkit/data/database/locations/facility/FacilityLocation.kt b/TripKitData/src/main/java/com/skedgo/tripkit/data/database/locations/facility/FacilityLocation.kt
@@ -0,0 +1,32 @@
+package com.skedgo.tripkit.data.database.locations.facility
+
+
+import androidx.annotation.Keep
+
+@Keep
+data class FacilityLocation(
+    var id: String = "",
+    var cellId: String? = null,
+    var lat: Double = 0.0,
+    var lng: Double = 0.0,
+    var address: String? = null,
+    var timezone: String? = null,
+    var city: String? = null,
+    var region: String? = null,
+    var name: String? = null,
+    var facilityType: String? = null,
+) {
+    fun toEntity(): FacilityLocationEntity =
+        FacilityLocationEntity().apply {
+            identifier = this@FacilityLocation.id
+            cellId = this@FacilityLocation.cellId
+            lat = this@FacilityLocation.lat
+            lng = this@FacilityLocation.lng
+            address = this@FacilityLocation.address
+            timezone = this@FacilityLocation.timezone
+            city = this@FacilityLocation.city
+            region = this@FacilityLocation.region
+            name = this@FacilityLocation.name
+            facilityType = this@FacilityLocation.facilityType
+        }
+}
diff --git a/TripKitData/src/main/java/com/skedgo/tripkit/data/database/locations/facility/FacilityRepositoryImpl.kt b/TripKitData/src/main/java/com/skedgo/tripkit/data/database/locations/facility/FacilityRepositoryImpl.kt
@@ -19,6 +19,8 @@ class FacilityRepositoryImpl(val tripGoDatabase2: TripKitDatabase) : FacilityRep
                     it.identifier = it.identifier
                 }
                 tripGoDatabase2.facilityDao().saveAll(facilities)
+            }.doOnError {
+                it.printStackTrace()
             }
             .subscribeOn(Schedulers.io())
     }
diff --git a/TripKitData/src/main/java/com/skedgo/tripkit/data/database/locations/facility/FacilityType.kt b/TripKitData/src/main/java/com/skedgo/tripkit/data/database/locations/facility/FacilityType.kt
@@ -0,0 +1,5 @@
+package com.skedgo.tripkit.data.database.locations.facility
+
+enum class FacilityType(val type: String) {
+    WATER_FOUNTAIN("Water-Fountain")
+}
diff --git a/TripKitData/src/main/java/com/skedgo/tripkit/data/locations/LocationsResponse.java b/TripKitData/src/main/java/com/skedgo/tripkit/data/locations/LocationsResponse.java
@@ -7,6 +7,7 @@
 import com.skedgo.tripkit.data.database.locations.carparks.CarParkLocation;
 import com.skedgo.tripkit.data.database.locations.carpods.CarPodLocation;
 import com.skedgo.tripkit.data.database.locations.carrentals.CarRentalLocation;
+import com.skedgo.tripkit.data.database.locations.facility.FacilityLocation;
 import com.skedgo.tripkit.data.database.locations.facility.FacilityLocationEntity;
 import com.skedgo.tripkit.data.database.locations.freefloating.FreeFloatingLocationEntity;
 import com.skedgo.tripkit.data.database.locations.onstreetparking.OnStreetParkingLocation;
@@ -42,7 +43,7 @@ public static class Group {
         List<CarPodLocation> carPods;
         @SerializedName("carRentals")
         List<CarRentalLocation> carRentals;
-        List<FacilityLocationEntity> facilities;
+        List<FacilityLocation> facilities;
         @SerializedName("stops")
         private ArrayList<ScheduledStop> stops;
         @SerializedName("hashCode")
@@ -109,7 +110,7 @@ public List<CarPodLocation> getCarPods() {
             return carPods;
         }
 
-        public List<FacilityLocationEntity> getFacilities() {
+        public List<FacilityLocation> getFacilities() {
             return facilities;
         }
     }
diff --git a/TripKitData/src/main/java/com/skedgo/tripkit/data/locations/StopsFetcher.kt b/TripKitData/src/main/java/com/skedgo/tripkit/data/locations/StopsFetcher.kt
@@ -1,5 +1,6 @@
 package com.skedgo.tripkit.data.locations
 
+import com.google.gson.Gson
 import com.skedgo.tripkit.agenda.ConfigRepository
 import com.skedgo.tripkit.common.model.region.Region
 import com.skedgo.tripkit.data.database.locations.bikepods.BikePodRepository
@@ -126,12 +127,20 @@ open class StopsFetcher(
     ): Observable<List<LocationsResponse.Group>> {
         return createRequestBodiesAsync(cellIds, region, level)
             .flatMap { body ->
-                val baseUrl = region.getURLs()!![0]
-                val url = baseUrl.toHttpUrlOrNull()!!
-                    .newBuilder()
-                    .addPathSegment("locations.json")
-                    .build()
-                fetchCellsAsync(url.toString(), body)
+                val urls = region.getURLs().orEmpty()
+                    .mapNotNull { baseUrl ->
+                        baseUrl.toHttpUrlOrNull()
+                            ?.newBuilder()
+                            ?.addPathSegment("locations.json")
+                            ?.build()
+                            ?.toString()
+                    }
+
+                if (urls.isEmpty()) {
+                    Observable.error<List<LocationsResponse.Group>>(IllegalStateException("Region ${region.name ?: ""} does not provide valid location endpoints."))
+                } else {
+                    fetchCellsFromAny(urls, body)
+                }
             }
     }
 
@@ -140,10 +149,28 @@ open class StopsFetcher(
         requestBody: LocationsRequestBody
     ): Observable<List<LocationsResponse.Group>> {
         return api.fetchLocationsAsync(url, requestBody)
-            .filter { response -> response != null && CollectionUtils.isNotEmpty(response.groups) }
+            .filter { response ->
+                response != null && CollectionUtils.isNotEmpty(response.groups)
+            }
             .map { it.groups }
     }
 
+    private fun fetchCellsFromAny(
+        urls: List<String>,
+        requestBody: LocationsRequestBody
+    ): Observable<List<LocationsResponse.Group>> {
+        val requests = urls.map { url ->
+            fetchCellsAsync(url, requestBody)
+                .onErrorResumeNext(Observable.empty())
+        }
+
+        return Observable.merge(requests)
+            .take(1)
+            .switchIfEmpty(
+                Observable.error(IllegalStateException("Failed to fetch locations from all region endpoints."))
+            )
+    }
+
     private fun saveCellsAsync(cells: List<LocationsResponse.Group>): Observable<List<LocationsResponse.Group>> {
         // Saving cell ids, hash codes and saving stops will be performed in parallel.
         return Observable.merge(
@@ -197,7 +224,9 @@ open class StopsFetcher(
                     .map { carPodRepository.saveCarPods(carPodMapper.toEntity(it.key, it.carPods)) }
             ).plus(
                 cells.filter { it.facilities != null && it.facilities.isNotEmpty() }
-                    .map { facilityRepository.saveFacilities(it.key, it.facilities) }
+                    .map {
+                        facilityRepository.saveFacilities(it.key, it.facilities.map { it.toEntity() })
+                    }
             )
             .toList()
             .let {
diff --git a/trip-kit-booking/src/main/java/com/skedgo/tripkit/booking/quickbooking/ConfirmPaymentUpdateResponse.kt b/trip-kit-booking/src/main/java/com/skedgo/tripkit/booking/quickbooking/ConfirmPaymentUpdateResponse.kt
@@ -1,18 +1,42 @@
 package com.skedgo.tripkit.booking.quickbooking
 
 import com.google.gson.annotations.SerializedName
+import com.skedgo.tripkit.common.model.booking.confirmation.BookingConfirmationAction
 
 data class ConfirmPaymentUpdateResponse(
     val updateURL: String? = null,
     val paymentIntentID: String? = null,
     val clientSecret: String? = null,
     val url: String? = null,
     val warning: String? = null,
+    val actionRequired: ActionRequired? = null
 )
 
 data class ConfirmPaymentError(
     val errorCode: Int,
     val title: String,
     val error: String,
     @SerializedName("usererror") val userError: Boolean
-)
+)
+
+data class ActionRequired(
+    val actions: List<BookingConfirmationAction>,
+    val differences: List<Difference>,
+    val message: String,
+    val title: String
+) {
+    data class Difference(
+        val bookingType: String,
+        val externalFrom: Location?,
+        val externalTo: Location?,
+        val from: Location,
+        val to: Location
+    ) {
+
+        data class Location(
+            val address: String,
+            val lat: Double,
+            val lng: Double
+        )
+    }
+}
diff --git a/trip-kit-booking/src/main/java/com/skedgo/tripkit/booking/quickbooking/QuickBookingApi.kt b/trip-kit-booking/src/main/java/com/skedgo/tripkit/booking/quickbooking/QuickBookingApi.kt
@@ -17,6 +17,9 @@ interface QuickBookingApi {
     @POST
     fun book(@Url url: String, @Body request: QuickBookRequest): Single<QuickBookResponse>
 
+    @GET
+    fun book(@Url url: String): Single<QuickBookResponse>
+
     @GET
     fun getBookingUpdate(@Url url: String): Single<RoutingResponse>
 
diff --git a/trip-kit-booking/src/main/java/com/skedgo/tripkit/booking/quickbooking/QuickBookingService.kt b/trip-kit-booking/src/main/java/com/skedgo/tripkit/booking/quickbooking/QuickBookingService.kt
@@ -8,6 +8,7 @@ import okhttp3.ResponseBody
 interface QuickBookingService {
     fun getQuickBooking(url: String): Single<List<QuickBooking>>
     fun quickBook(url: String, request: QuickBookRequest): Single<QuickBookResponse>
+    fun quickBook(url: String): Single<QuickBookResponse>
     fun getBookingUpdate(url: String): Single<RoutingResponse>
     fun executeBookingAction(url: String): Single<QuickBookResponse>
     fun getPaymentIntent(url: String): Single<QuickBookingPaymentIntent>
@@ -34,6 +35,9 @@ interface QuickBookingService {
         override fun quickBook(url: String, request: QuickBookRequest): Single<QuickBookResponse> =
             api.book(url, request)
 
+        override fun quickBook(url: String): Single<QuickBookResponse> =
+            api.book(url)
+
         override fun getBookingUpdate(url: String): Single<RoutingResponse> =
             api.getBookingUpdate(url)
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ class FacilityRepositoryImpl(val tripGoDatabase2: TripKitDatabase) : FacilityRep`
`19`	`19`	`it.identifier = it.identifier`
`20`	`20`	`}`
`21`	`21`	`tripGoDatabase2.facilityDao().saveAll(facilities)`
	`22`	`+ }.doOnError {`
	`23`	`+ it.printStackTrace()`
`22`	`24`	`}`
`23`	`25`	`.subscribeOn(Schedulers.io())`
`24`	`26`	`}`