Feature: xsell addon recommendation [GEN-5439]

.github/workflows/staging.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - develop
-      - eng/metro-nav3-pr2-nav2-to-nav3
+      - feat/xsell-addon-rec
   workflow_dispatch:
 
 concurrency:

app/apollo/apollo-octopus-public/src/commonMain/graphql/com/hedvig/android/apollo/octopus/graphql/FragmentClaimFragment.graphql

@@ -33,4 +33,5 @@ fragment ClaimFragment on Claim {
     displayTitle
     displayValue
   }
+  contractId
 }

app/data/data-changetier/src/main/kotlin/com/hedvig/android/data/changetier/data/ChangeTierRepository.kt

@@ -28,7 +28,7 @@ interface ChangeTierRepository {
 
   suspend fun addQuotesToStorage(quotes: List<TierDeductibleQuote>)
 
-  suspend fun submitChangeTierQuote(quoteId: String): Either<ErrorMessage, Unit>
+  suspend fun submitChangeTierQuote(quoteId: String, contractId: String): Either<ErrorMessage, Unit>
 
   suspend fun getCurrentQuoteId(): String
 }
@@ -74,7 +74,7 @@ internal class ChangeTierRepositoryImpl(
     changeTierQuoteStorage.insertAll(quotes)
   }
 
-  override suspend fun submitChangeTierQuote(quoteId: String): Either<ErrorMessage, Unit> {
+  override suspend fun submitChangeTierQuote(quoteId: String, contractId: String): Either<ErrorMessage, Unit> {
     return either {
       apolloClient
         .mutation(ChangeTierDeductibleCommitIntentMutation(quoteId))
@@ -84,7 +84,9 @@ internal class ChangeTierRepositoryImpl(
           logcat(ERROR) { "Tried to submit change tier quoteId: $quoteId but got error: $left" }
         }
         .bind()
-      crossSellAfterFlowRepository.completedCrossSellTriggeringSelfServiceSuccessfully(CrossSellInfoType.ChangeTier)
+      crossSellAfterFlowRepository.completedCrossSellTriggeringSelfServiceSuccessfully(
+        CrossSellInfoType.ChangeTier(contractId),
+      )
     }
   }
 

app/data/data-changetier/src/test/kotlin/data/ChangeTierRepositoryImplTest.kt

@@ -45,6 +45,7 @@ class ChangeTierRepositoryImplTest {
   val testApolloClientRule = TestApolloClientRule(TestNetworkTransportType.MAP)
 
   private val testId = "testId"
+  private val testContractId = "testContractId"
 
   private val apolloClientWithBadResponseToSubmit: ApolloClient
     get() = testApolloClientRule.apolloClient.apply {
@@ -74,7 +75,7 @@ class ChangeTierRepositoryImplTest {
       crossSellAfterFlowRepository = CrossSellAfterFlowRepositoryImpl(),
       changeTierQuoteStorage = storage,
     )
-    val result = repository.submitChangeTierQuote(testId)
+    val result = repository.submitChangeTierQuote(testId, testContractId)
     assertThat(result)
       .isLeft()
   }
@@ -98,10 +99,10 @@ class ChangeTierRepositoryImplTest {
         }
       },
     )
-    val result = repository.submitChangeTierQuote(testId)
+    val result = repository.submitChangeTierQuote(testId, testContractId)
     assertThat(result).isRight().isEqualTo(Unit)
     assertThat(crossSellAfterFlowRepository.shouldShowCrossSellSheetWithInfo().first())
-      .isEqualTo(CrossSellInfoType.ChangeTier)
+      .isEqualTo(CrossSellInfoType.ChangeTier(testContractId))
   }
 
   @Test

app/data/data-cross-sell-after-claim-closed/src/main/kotlin/com/hedvig/android/data/cross/sell/after/claim/closed/CrossSellAfterClaimClosedRepository.kt

@@ -50,6 +50,7 @@ internal class CrossSellAfterClaimClosedRepositoryImpl(
                 type = claim.claimType,
                 typeOfContract = claim.productVariant?.typeOfContract,
               ),
+              contractId = claim.contractId,
             ),
           )
         }

app/data/data-cross-sell-after-flow/src/main/kotlin/com/hedvig/android/data/cross/sell/after/flow/CrossSellAfterFlowRepository.kt

@@ -20,6 +20,8 @@ interface CrossSellAfterFlowRepository {
 
 sealed class CrossSellInfoType() {
   abstract val source: String
+
+  abstract val contractId: String?
   protected abstract val extraInfo: Map<String, Any?>?
   val attributes: Map<String, Any?>
     get() = buildMap {
@@ -31,6 +33,7 @@ sealed class CrossSellInfoType() {
 
   data class ClosedClaim(
     val info: ClaimInfo,
+    override val contractId: String?,
   ) : CrossSellInfoType() {
     override val source: String = "closedClaim"
     override val extraInfo: Map<String, Any?> = with(info) {
@@ -52,22 +55,28 @@ sealed class CrossSellInfoType() {
     )
   }
 
-  data object ChangeTier : CrossSellInfoType() {
+  data class ChangeTier(
+    override val contractId: String?,
+  ) : CrossSellInfoType() {
     override val source: String = "changeTier"
     override val extraInfo: Map<String, Any?>? = null
   }
 
   data object Addon : CrossSellInfoType() {
     override val source: String = "addon"
     override val extraInfo: Map<String, Any?>? = null
+    override val contractId: String? = null
   }
 
   data object EditCoInsured : CrossSellInfoType() {
     override val source: String = "editCoInsured"
     override val extraInfo: Map<String, Any?>? = null
+    override val contractId: String? = null
   }
 
-  data object MovingFlow : CrossSellInfoType() {
+  data class MovingFlow(
+    override val contractId: String?,
+  ) : CrossSellInfoType() {
     override val source: String = "movingFlow"
     override val extraInfo: Map<String, Any?>? = null
   }

app/feature/feature-choose-tier/src/main/kotlin/com/hedvig/android/feature/change/tier/ui/stepsummary/SummaryViewModel.kt

@@ -81,7 +81,7 @@ private class SummaryPresenter(
       if (submitIteration > 0) {
         val previousState = currentState
         currentState = MakingChanges
-        tierRepository.submitChangeTierQuote(params.quoteIdToSubmit).fold(
+        tierRepository.submitChangeTierQuote(params.quoteIdToSubmit, params.insuranceId).fold(
           ifLeft = {
             currentState = previousState
             backstack.add(SubmitFailureKey)

app/feature/feature-choose-tier/src/test/kotlin/CommonTestdata.kt

@@ -47,7 +47,7 @@ internal class FakeChangeTierRepository() : ChangeTierRepository {
   override suspend fun addQuotesToStorage(quotes: List<TierDeductibleQuote>) {
   }
 
-  override suspend fun submitChangeTierQuote(quoteId: String): Either<ErrorMessage, Unit> {
+  override suspend fun submitChangeTierQuote(quoteId: String, contractId: String): Either<ErrorMessage, Unit> {
     return either {}
   }
 

app/feature/feature-cross-sell-sheet/build.gradle.kts

@@ -9,8 +9,13 @@ hedvig {
   viewModels()
 }
 
+android {
+  testOptions.unitTests.isReturnDefaultValues = true
+}
+
 dependencies {
   implementation(libs.apollo.runtime)
+  implementation(libs.apollo.normalizedCache)
   implementation(libs.arrow.core)
   implementation(libs.arrow.fx)
   implementation(projects.apolloCore)
@@ -23,4 +28,10 @@ dependencies {
   implementation(projects.dataCrossSellAfterFlow)
   implementation(projects.designSystemHedvig)
   implementation(projects.moleculePublic)
+
+  testImplementation(libs.assertK)
+  testImplementation(libs.coroutines.test)
+  testImplementation(libs.junit)
+  testImplementation(libs.turbine)
+  testImplementation(projects.moleculeTest)
 }

app/feature/feature-cross-sell-sheet/src/main/graphql/QueryBottomSheetCrossSells.graphql

@@ -1,6 +1,19 @@
 query BottomSheetCrossSells($input: CrossSellInput!) {
   currentMember {
     crossSellV2(input: $input) {
+      recommendedAddon {
+        id
+        title
+        description
+        buttonTitle
+        deepLink
+        pillowImageLarge {
+          src
+        }
+        pillowImageSmall {
+          src
+        }
+      }
       recommendedCrossSell {
         crossSell {
           ...CrossSellFragment

app/feature/feature-cross-sell-sheet/src/main/kotlin/com/hedvig/android/feature/cross/sell/sheet/CrossSellSheetViewModel.kt

@@ -11,6 +11,8 @@ import arrow.core.left
 import arrow.core.raise.either
 import com.apollographql.apollo.ApolloClient
 import com.apollographql.apollo.api.Optional
+import com.apollographql.apollo.cache.normalized.FetchPolicy
+import com.apollographql.apollo.cache.normalized.fetchPolicy
 import com.hedvig.android.apollo.ErrorMessage
 import com.hedvig.android.apollo.safeFlow
 import com.hedvig.android.core.common.ErrorMessage
@@ -21,6 +23,7 @@ import com.hedvig.android.core.demomode.DemoManager
 import com.hedvig.android.core.demomode.DemoSwitcher
 import com.hedvig.android.crosssells.BundleProgress
 import com.hedvig.android.crosssells.CrossSellSheetData
+import com.hedvig.android.crosssells.RecommendedAddon
 import com.hedvig.android.crosssells.RecommendedCrossSell
 import com.hedvig.android.data.contract.CrossSell
 import com.hedvig.android.data.contract.ImageAsset
@@ -71,7 +74,7 @@ internal sealed interface CrossSellSheetState {
   data class Content(val crossSellSheetData: CrossSellSheetData, val infoType: CrossSellInfoType) : CrossSellSheetState
 }
 
-private class CrossSellSheetPresenter(
+internal class CrossSellSheetPresenter(
   private val getCrossSellSheetDataUseCase: GetCrossSellSheetDataUseCase,
   private val crossSellAfterFlowRepository: CrossSellAfterFlowRepository,
 ) : MoleculePresenter<CrossSellSheetEvent, CrossSellSheetState> {
@@ -100,7 +103,13 @@ private class CrossSellSheetPresenter(
             .mapLatest { result ->
               result.fold(
                 ifLeft = { error -> CrossSellSheetState.Error(error) },
-                ifRight = { data -> CrossSellSheetState.Content(data, infoType) },
+                ifRight = { data ->
+                  if (data.isEmpty) {
+                    CrossSellSheetState.DontShow
+                  } else {
+                    CrossSellSheetState.Content(data, infoType)
+                  }
+                },
               )
             },
         )
@@ -118,14 +127,15 @@ internal fun CrossSellInfoType.toCrossSellSource(): CrossSellInput {
       userFlow = UserFlow.SMART_X_SELL,
       flowSource = Optional.present(flowSource),
       experiments = emptyList(),
+      contractId = Optional.presentIfNotNull(this.contractId),
     )
   }
   return when (this) {
     CrossSellInfoType.Addon -> smartCrossSellInput(FlowSource.ADDON)
-    CrossSellInfoType.ChangeTier -> smartCrossSellInput(FlowSource.CHANGE_TIER)
+    is CrossSellInfoType.ChangeTier -> smartCrossSellInput(FlowSource.CHANGE_TIER)
     is CrossSellInfoType.ClosedClaim -> smartCrossSellInput(FlowSource.CLOSED_CLAIM)
     CrossSellInfoType.EditCoInsured -> smartCrossSellInput(FlowSource.EDIT_COINSURED)
-    CrossSellInfoType.MovingFlow -> smartCrossSellInput(FlowSource.MOVING)
+    is CrossSellInfoType.MovingFlow -> smartCrossSellInput(FlowSource.MOVING)
   }
 }
 
@@ -151,6 +161,7 @@ internal class GetCrossSellSheetDataUseCaseImpl(
   override suspend fun invoke(source: CrossSellInput): Flow<Either<ErrorMessage, CrossSellSheetData>> {
     return apolloClient
       .query(BottomSheetCrossSellsQuery(source))
+      .fetchPolicy(FetchPolicy.NetworkOnly)
       .safeFlow(::ErrorMessage)
       .map { response ->
         either {
@@ -178,9 +189,21 @@ internal class GetCrossSellSheetDataUseCaseImpl(
           val otherCrossSellsData = allData.otherCrossSells.map {
             it.toCrossSell()
           }
+          val recommendedAddon = allData.recommendedAddon?.let {
+            RecommendedAddon(
+              id = it.id,
+              title = it.title,
+              buttonTitle = it.buttonTitle,
+              description = it.description,
+              deepLink = it.deepLink,
+              pillowImageSmall = it.pillowImageSmall.src,
+              pillowImageLarge = it.pillowImageLarge.src,
+            )
+          }
           CrossSellSheetData(
             recommendedCrossSell = recommendedData,
             otherCrossSells = otherCrossSellsData,
+            recommendedAddon = recommendedAddon,
           )
         }
       }

app/feature/feature-cross-sell-sheet/src/test/kotlin/com/hedvig/android/feature/cross/sell/sheet/CrossSellInfoTypeToCrossSellInputTest.kt

@@ -0,0 +1,36 @@
+package com.hedvig.android.feature.cross.sell.sheet
+
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import com.apollographql.apollo.api.Optional
+import com.hedvig.android.data.cross.sell.after.flow.CrossSellInfoType
+import octopus.type.FlowSource
+import octopus.type.UserFlow
+import org.junit.Test
+
+class CrossSellInfoTypeToCrossSellInputTest {
+  @Test
+  fun `a flow that changed a contract passes that contract id to the cross sell input`() {
+    val input = CrossSellInfoType.ChangeTier("contractId").toCrossSellSource()
+
+    assertThat(input.userFlow).isEqualTo(UserFlow.SMART_X_SELL)
+    assertThat(input.flowSource).isEqualTo(Optional.present(FlowSource.CHANGE_TIER))
+    assertThat(input.contractId).isEqualTo(Optional.present("contractId"))
+  }
+
+  @Test
+  fun `a flow without an associated contract leaves the contract id absent in the cross sell input`() {
+    val input = CrossSellInfoType.Addon.toCrossSellSource()
+
+    assertThat(input.flowSource).isEqualTo(Optional.present(FlowSource.ADDON))
+    assertThat(input.contractId).isEqualTo(Optional.absent())
+  }
+
+  @Test
+  fun `a moving flow which did not report a new contract id leaves the contract id absent`() {
+    val input = CrossSellInfoType.MovingFlow(null).toCrossSellSource()
+
+    assertThat(input.flowSource).isEqualTo(Optional.present(FlowSource.MOVING))
+    assertThat(input.contractId).isEqualTo(Optional.absent())
+  }
+}