Merge pull request #412 from skedgo/feature/20495-server-booking-erro…

…rs-handling

[20495] Handle outbound and return trip booking failures from server DRT. Revisit and revamp certain logics within the DRT feature.

CommonCoreLegacy/build.gradle

@@ -28,6 +28,9 @@ android {
         release {
             consumerProguardFile 'proguard-rules.pro'
         }
+        staging {
+            debuggable true
+        }
     }
 
     lintOptions {
@@ -71,6 +74,7 @@ dependencies {
     implementation 'com.github.skedgo:commons-collections:v1.0'
 
     debugImplementation project(':TripKitDomain')
+    stagingImplementation project(':TripKitDomain')
     releaseImplementation project(':TripKitDomain')
 
     implementation libs.kotlin

CommonCoreLegacy/src/main/java/com/skedgo/tripkit/common/util/TransportModeUtils.java

@@ -7,12 +7,12 @@
 
 import android.util.DisplayMetrics;
 
-import com.skedgo.tripkit.configuration.Server;
+import com.skedgo.tripkit.configuration.ServerManager;
 import com.skedgo.tripkit.routing.ModeInfo;
 import com.skedgo.tripkit.common.model.TransportMode;
 
 public final class TransportModeUtils {
-    public static final String ICON_URL_TEMPLATE = Server.ApiTripGo.getValue() + "modeicons/android/%s/ic_transport_%s.png";
+    public static final String ICON_URL_TEMPLATE = ServerManager.INSTANCE.getConfiguration().getApiTripGoUrl() + "modeicons/android/%s/ic_transport_%s.png";
 
     private TransportModeUtils() {
     }

CommonCoreLegacy/src/main/java/com/skedgo/tripkit/routing/TripSegmentExtensions.kt

@@ -41,3 +41,6 @@ val TripSegment.noActionAlerts
 val TripSegment.actionAlert
   get() =
     alerts?.firstOrNull { it.alertAction() != null }
+
+val TripSegment?.bookingHasConfirmation
+    get() = this?.booking?.confirmation?.status() != null

TripKitAndroid/build.gradle

@@ -19,6 +19,12 @@ android {
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 
+  buildTypes {
+    staging {
+      debuggable true
+    }
+  }
+
   packagingOptions {
     // To avoid conflicts with ASL.
     // We don't utilize ServiceLoader, so this is unneeded.
@@ -113,14 +119,23 @@ dependencies {
   testImplementation libs.mockk
 
   debugApi project(':CommonCoreLegacy')
+  stagingApi project(':CommonCoreLegacy')
   releaseApi project(':CommonCoreLegacy')
+
   debugApi project(':TripKitDomain')
+  stagingApi project(':TripKitDomain')
   releaseApi project(':TripKitDomain')
+
   debugApi project(':TripKitDomainLegacy')
+  stagingApi project(':TripKitDomainLegacy')
   releaseApi project(':TripKitDomainLegacy')
+
   debugApi project(':TripKitData')
+  stagingApi project(':TripKitData')
   releaseApi project(':TripKitData')
+
   debugApi project(':sqliteutils')
+  stagingApi project(':sqliteutils')
   releaseApi project(':sqliteutils')
   //api project(':SnapshotTaker') Uncomment when using in TripGo-v5
 

TripKitAndroid/src/main/java/com/skedgo/tripkit/HttpClientModule.kt

@@ -2,13 +2,11 @@ package com.skedgo.tripkit
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.webkit.URLUtil
 import com.google.gson.Gson
 import com.haroldadmin.cnradapter.NetworkResponseAdapterFactory
 import com.skedgo.tripkit.configuration.AppVersionNameRepository
 import com.skedgo.tripkit.configuration.GetAppVersion
-import com.skedgo.tripkit.configuration.Server
-import com.skedgo.tripkit.data.HttpClientCustomDataStore
+import com.skedgo.tripkit.configuration.ServerManager
 import com.skedgo.tripkit.data.regions.RegionService
 import com.skedgo.tripkit.regionrouting.RegionRoutingRepository
 import com.skedgo.tripkit.regionrouting.RegionRoutingApi
@@ -107,7 +105,7 @@ open class HttpClientModule(
     @Provides
     open fun retrofitBuilder(gson: Gson): Retrofit.Builder {
         return Retrofit.Builder()
-                .baseUrl(Server.ApiTripGo.value)
+                .baseUrl(ServerManager.configuration.apiTripGoUrl)
                 .addCallAdapterFactory(NetworkResponseAdapterFactory())
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                 .addConverterFactory(GsonConverterFactory.create(gson))

TripKitAndroid/src/main/java/com/skedgo/tripkit/MainModule.java

@@ -16,6 +16,7 @@
 import com.skedgo.tripkit.common.util.LowercaseEnumTypeAdapterFactory;
 import com.skedgo.tripkit.bookingproviders.BookingResolver;
 import com.skedgo.tripkit.bookingproviders.BookingResolverImpl;
+import com.skedgo.tripkit.configuration.ServerManager;
 import com.skedgo.tripkit.data.regions.RegionService;
 import com.skedgo.tripkit.data.tsp.GsonAdaptersRegionInfo;
 import com.skedgo.tripkit.tsp.GsonAdaptersRegionInfoBody;
@@ -43,7 +44,6 @@
 import com.skedgo.tripkit.a2brouting.RouteService;
 import com.skedgo.TripKit;
 import com.skedgo.tripkit.configuration.AppVersionNameRepository;
-import com.skedgo.tripkit.configuration.Server;
 
 @Module
 public class MainModule {
@@ -63,7 +63,7 @@ Configs configs() {
     @Provides
     RegionsApi getRegionsApi(OkHttpClient httpClient) {
         return new Retrofit.Builder()
-                .baseUrl(Server.ApiTripGo.getValue())
+                .baseUrl(ServerManager.INSTANCE.getConfiguration().getApiTripGoUrl())
                 .addConverterFactory(GsonConverterFactory.create(Gsons.createForRegion()))
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
                 .client(httpClient)
@@ -167,7 +167,7 @@ BookingResolver getBookingResolver() {
     LocationInfoApi getLocationInfoApi(Gson gson, OkHttpClient httpClient) {
         return new Retrofit.Builder()
                 /* This base url is ignored as the api relies on @Url. */
-                .baseUrl(Server.ApiTripGo.getValue())
+                .baseUrl(ServerManager.INSTANCE.getConfiguration().getApiTripGoUrl())
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .client(httpClient)

TripKitAndroid/src/main/java/com/skedgo/tripkit/a2brouting/A2bRoutingDataModule.kt

@@ -8,7 +8,7 @@ import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import io.reactivex.schedulers.Schedulers
-import com.skedgo.tripkit.configuration.Server
+import com.skedgo.tripkit.configuration.ServerManager
 import java.util.concurrent.TimeUnit
 
 @Module
@@ -22,7 +22,7 @@ class A2bRoutingDataModule {
     return Retrofit.Builder()
         .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
         .addConverterFactory(GsonConverterFactory.create(gson))
-        .baseUrl(Server.ApiTripGo.value)
+        .baseUrl(ServerManager.configuration.apiTripGoUrl)
         .client(client)
         .build()
         .create(A2bRoutingApi::class.java)

TripKitAndroid/src/main/java/com/skedgo/tripkit/analytics/AnalyticsDataModule.kt

@@ -9,7 +9,7 @@ import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import io.reactivex.schedulers.Schedulers
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
-import com.skedgo.tripkit.configuration.Server
+import com.skedgo.tripkit.configuration.ServerManager
 
 /**
  * @suppress
@@ -27,7 +27,7 @@ class AnalyticsDataModule {
   private fun reportingApi(gson: Gson, httpClient: OkHttpClient): MarkTripAsPlannedApi
       = Retrofit.Builder()
       /* This base url is ignored as the api relies on @Url. */
-      .baseUrl(Server.ApiTripGo.value)
+      .baseUrl(ServerManager.configuration.apiTripGoUrl)
       .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
       .addConverterFactory(GsonConverterFactory.create(gson))
       .client(httpClient)

TripKitAndroid/src/main/java/com/skedgo/tripkit/tsp/TspModule.java

@@ -1,22 +1,22 @@
 package com.skedgo.tripkit.tsp;
 
 import com.google.gson.Gson;
+import com.skedgo.tripkit.configuration.ServerManager;
 
 import dagger.Module;
 import dagger.Provides;
 import io.reactivex.schedulers.Schedulers;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
-import com.skedgo.tripkit.configuration.Server;
 
 @Module
 public class TspModule {
   @Provides RegionInfoApi regionInfoApi(
       Gson gson,
       okhttp3.OkHttpClient httpClient) {
     return new Retrofit.Builder()
-        .baseUrl(Server.ApiTripGo.getValue())
+        .baseUrl(ServerManager.INSTANCE.getConfiguration().getApiTripGoUrl())
         .client(httpClient)
         .addConverterFactory(GsonConverterFactory.create(gson))
         .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))

TripKitData/build.gradle

@@ -23,6 +23,12 @@ android {
     }
   }
 
+  buildTypes {
+    staging {
+      debuggable true
+    }
+  }
+
   lintOptions {
     // Changing to warning because of https://github.com/square/okio/issues/58.
     warning "InvalidPackage"
@@ -59,12 +65,19 @@ dependencies {
   implementation 'com.github.skedgo:commons-collections:v1.0'
 
   debugImplementation project(":CommonCoreLegacy")
+  stagingImplementation project(":CommonCoreLegacy")
   releaseImplementation project(":CommonCoreLegacy")
+
   debugImplementation project(":TripKitDomain")
+  stagingImplementation project(":TripKitDomain")
   releaseImplementation project(":TripKitDomain")
+
   debugImplementation project(":TripKitDomainLegacy")
+  stagingImplementation project(":TripKitDomainLegacy")
   releaseImplementation project(":TripKitDomainLegacy")
+
   debugApi project(":route-persistence")
+  stagingApi project(":route-persistence")
   releaseApi project(":route-persistence")
 
   implementation libs.dagger
@@ -115,6 +128,7 @@ dependencies {
   compileOnly 'com.github.pengrad:jdk9-deps:1.0'
 
   debugApi project(':sqliteutils')
+  stagingApi project(':sqliteutils')
   releaseApi project(':sqliteutils')
 }
 

TripKitData/src/main/java/com/skedgo/tripkit/account/data/AccountDataModule.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import com.skedgo.tripkit.account.domain.UserKeyRepository
 import com.skedgo.tripkit.account.domain.UserTokenRepository
-import com.skedgo.tripkit.configuration.Server
+import com.skedgo.tripkit.configuration.ServerManager
 import dagger.Module
 import dagger.Provides
 import io.reactivex.schedulers.Schedulers
@@ -26,15 +26,15 @@ class AccountDataModule {
       httpClient: OkHttpClient, @Named(UserTokenPreferences) prefs: SharedPreferences
   ): UserTokenRepository {
     val silentLoginApi = Retrofit.Builder()
-        .baseUrl(Server.ApiTripGo.value)
+        .baseUrl(ServerManager.configuration.apiTripGoUrl)
         .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
         .addConverterFactory(GsonConverterFactory.create())
         .client(httpClient)
         .build()
         .create(SilentLoginApi::class.java)
 
     val accountApi = Retrofit.Builder()
-        .baseUrl(Server.ApiTripGo.value)
+        .baseUrl(ServerManager.configuration.apiTripGoUrl)
         .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
         .addConverterFactory(GsonConverterFactory.create())
         .client(httpClient)

TripKitDomain/src/main/java/com/skedgo/tripkit/configuration/Server.kt

@@ -1,9 +1,46 @@
 package com.skedgo.tripkit.configuration
 
-enum class Server(val value: String) {
+enum class DefaultServer(val value: String) {
     ApiTripGo("https://api.tripgo.com/v1/"),
-//    ApiTripGo("https://galaxies.skedgo.com/lab/beta/satapp/"),
-    //  BigBang("https://bigbang.buzzhives.com/satapp/")
-//    BigBang("https://api-beta.tripgo.com/v1/")
     BigBang("https://galaxies.skedgo.com/lab/beta/satapp/")
 }
+
+open class ServerConfiguration(
+    var apiTripGoUrl: String = DefaultServer.ApiTripGo.value,
+    var bigBangUrl: String = DefaultServer.BigBang.value
+)
+
+/**
+ * Singleton object that manages server configurations for the application.
+ *
+ * This manager allows for setting and retrieving server URLs throughout the application.
+ * It provides a centralized point of configuration, making it easy to adjust server URLs
+ * for different environments (e.g., development, staging, production) or build variants.
+ *
+ * Usage:
+ * - Access default server URLs via `ServerManager.configuration`.
+ * - Customize server URLs using `ServerManager.customizeConfiguration(...)`.
+ *
+ * Example:
+ * ```
+ * // Accessing default URLs
+ * val defaultApiUrl = ServerManager.configuration.apiTripGoUrl
+ * val defaultBigBangUrl = ServerManager.configuration.bigBangUrl
+ *
+ * // Customizing URLs
+ * ServerManager.customizeConfiguration(apiTripGoUrl = "https://api.newtripgo.com/v2/", bigBangUrl = "https://new.bigbang.url/")
+ * ```
+ *
+ * Note: Customizations to the server URLs should ideally be done during application initialization
+ * to ensure consistent use of the URLs throughout the application lifecycle.
+ */
+object ServerManager {
+
+    var configuration: ServerConfiguration = ServerConfiguration()
+
+    fun setCustomConfiguration(apiTripGoUrl: String? = null, bigBangUrl: String? = null) {
+        apiTripGoUrl?.let { configuration.apiTripGoUrl = it }
+        bigBangUrl?.let { configuration.bigBangUrl = it }
+    }
+
+}

TripKitDomainLegacy/build.gradle

@@ -16,6 +16,12 @@ android {
     targetSdkVersion versions.targetSdkVersion
   }
 
+  buildTypes {
+    staging {
+      debuggable true
+    }
+  }
+
   lintOptions {
     // Changing to warning because of https://github.com/square/okio/issues/58.
     warning 'InvalidPackage'
@@ -39,9 +45,13 @@ android {
 }
 
 dependencies {
+
   debugImplementation project(":TripKitDomain")
+  stagingImplementation project(":TripKitDomain")
   releaseImplementation project(":TripKitDomain")
+
   debugImplementation project(':CommonCoreLegacy')
+  stagingImplementation project(':CommonCoreLegacy')
   releaseImplementation project(':CommonCoreLegacy')
 
   implementation libs.dagger

TripKitSamples/build.gradle

@@ -53,7 +53,10 @@ dependencies {
 
     implementation libs.bindingCollectionAdapterRecyclerView
     debugImplementation project(':TripKitAndroid')
+    stagingImplementation project(':TripKitAndroid')
     releaseImplementation project(':TripKitAndroid')
+
     debugImplementation project(':rxlifecyclecomponents')
+    stagingImplementation project(':rxlifecyclecomponents')
     releaseImplementation project(':rxlifecyclecomponents')
 }

ValidBookingCountData/build.gradle

@@ -14,6 +14,12 @@ android {
     targetSdkVersion versions.targetSdkVersion
   }
 
+  buildTypes {
+    staging {
+      debuggable true
+    }
+  }
+
   lintOptions {
     // Changing to warning because of https://github.com/square/okio/issues/58.
     warning 'InvalidPackage'
@@ -60,8 +66,11 @@ dependencies {
 
   implementation libs.kotlin
   debugImplementation project(':TripKitDomain')
+  stagingImplementation project(':TripKitDomain')
   releaseImplementation project(':TripKitDomain')
+
   debugImplementation project(':ValidBookingCountDomain')
+  stagingImplementation project(':ValidBookingCountDomain')
   releaseImplementation project(':ValidBookingCountDomain')
 
   implementation libs.javaxAnnotation

ValidBookingCountData/src/main/java/com/skedgo/tripkit/validbookingcount/data/ValidBookingCountDataModule.kt

@@ -8,7 +8,7 @@ import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import io.reactivex.schedulers.Schedulers
-import com.skedgo.tripkit.configuration.Server
+import com.skedgo.tripkit.configuration.ServerManager
 import com.skedgo.tripkit.validbookingcount.domain.ValidBookingCountRepository
 
 @Module
@@ -19,7 +19,7 @@ class ValidBookingCountDataModule {
   ): ValidBookingCountRepository {
     val api = Retrofit.Builder()
         .client(httpClient)
-        .baseUrl(Server.ApiTripGo.value)
+        .baseUrl(ServerManager.configuration.apiTripGoUrl)
         .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
         .addConverterFactory(GsonConverterFactory.create())
         .build()