Merge pull request #1870 from HedvigInsurance/cleanup/octopus_redeed_…

…campaign

Use octopus for redeeming a campaign code

app/data/data-forever/build.gradle.kts

@@ -1,17 +1,25 @@
 plugins {
   id("hedvig.android.ktlint")
   id("hedvig.android.library")
+  alias(libs.plugins.apollo)
   alias(libs.plugins.squareSortDependencies)
 }
 
 dependencies {
+  apolloMetadata(projects.apolloOctopusPublic)
+
   implementation(libs.apollo.normalizedCache)
   implementation(libs.arrow.core)
   implementation(libs.koin.core)
   implementation(projects.apolloCore)
-  implementation(projects.apolloGiraffePublic)
   implementation(projects.apolloOctopusPublic)
   implementation(projects.coreCommonPublic)
   implementation(projects.coreDemoMode)
   implementation(projects.languageCore)
 }
+
+apollo {
+  service("octopus") {
+    packageName.set("octopus")
+  }
+}

app/data/data-forever/src/main/graphql/MutationRedeemCampaignCode.graphql

@@ -0,0 +1,10 @@
+mutation RedeemCampaignCode($campaignCode: String!) {
+  memberCampaignsRedeem(code: $campaignCode) {
+    member {
+      id
+    }
+    userError {
+      message
+    }
+  }
+}

app/data/data-forever/src/main/kotlin/com/hedvig/android/data/forever/ForeverRepository.kt

@@ -2,12 +2,14 @@ package com.hedvig.android.data.forever
 
 import arrow.core.Either
 import com.hedvig.android.core.common.ErrorMessage
-import giraffe.RedeemReferralCodeMutation
 import octopus.ReferralsQuery
 
 interface ForeverRepository {
   suspend fun getReferralsData(): Either<ErrorMessage, ReferralsQuery.Data>
   suspend fun updateCode(newCode: String): Either<ReferralError, String>
-  suspend fun redeemReferralCode(campaignCode: CampaignCode): Either<ErrorMessage, RedeemReferralCodeMutation.Data?>
+  suspend fun redeemReferralCode(campaignCode: CampaignCode): Either<ErrorMessage, Unit>
   data class ReferralError(val message: String?)
 }
+
+@JvmInline
+value class CampaignCode(val code: String)

app/data/data-forever/src/main/kotlin/com/hedvig/android/data/forever/ForeverRepositoryDemo.kt

@@ -4,7 +4,6 @@ import arrow.core.Either
 import arrow.core.raise.either
 import arrow.core.right
 import com.hedvig.android.core.common.ErrorMessage
-import giraffe.RedeemReferralCodeMutation
 import octopus.ReferralsQuery
 import octopus.type.CurrencyCode
 import octopus.type.MemberReferralStatus
@@ -76,5 +75,5 @@ internal class ForeverRepositoryDemo : ForeverRepository {
 
   override suspend fun redeemReferralCode(
     campaignCode: CampaignCode,
-  ): Either<ErrorMessage, RedeemReferralCodeMutation.Data?> = either { null }
+  ): Either<ErrorMessage, Unit> = either { Unit }
 }

app/data/data-forever/src/main/kotlin/com/hedvig/android/data/forever/ForeverRepositoryImpl.kt

@@ -9,29 +9,25 @@ import com.hedvig.android.apollo.safeExecute
 import com.hedvig.android.apollo.toEither
 import com.hedvig.android.core.common.ErrorMessage
 import com.hedvig.android.data.forever.ForeverRepository.ReferralError
-import com.hedvig.android.language.LanguageService
-import giraffe.RedeemReferralCodeMutation
+import com.hedvig.android.logger.LogPriority
+import com.hedvig.android.logger.logcat
 import octopus.MemberReferralInformationCodeUpdateMutation
+import octopus.RedeemCampaignCodeMutation
 import octopus.ReferralsQuery
 
-@JvmInline
-value class CampaignCode(val code: String)
-
 internal class ForeverRepositoryImpl(
-  private val apolloClientOctopus: ApolloClient,
-  private val apolloClientGiraffe: ApolloClient,
-  private val languageService: LanguageService,
+  private val apolloClient: ApolloClient,
 ) : ForeverRepository {
   private val referralsQuery = ReferralsQuery()
 
-  override suspend fun getReferralsData(): Either<ErrorMessage, ReferralsQuery.Data> = apolloClientOctopus
+  override suspend fun getReferralsData(): Either<ErrorMessage, ReferralsQuery.Data> = apolloClient
     .query(referralsQuery)
     .fetchPolicy(FetchPolicy.NetworkOnly)
     .safeExecute()
     .toEither(::ErrorMessage)
 
   override suspend fun updateCode(newCode: String): Either<ReferralError, String> = either {
-    val result = apolloClientOctopus
+    val result = apolloClient
       .mutation(MemberReferralInformationCodeUpdateMutation(newCode))
       .safeExecute()
       .toEither { message, _ -> ReferralError(message) }
@@ -52,10 +48,18 @@ internal class ForeverRepositoryImpl(
   // TODO Move to payments module
   override suspend fun redeemReferralCode(
     campaignCode: CampaignCode,
-  ): Either<ErrorMessage, RedeemReferralCodeMutation.Data?> {
-    return apolloClientGiraffe
-      .mutation(RedeemReferralCodeMutation(campaignCode.code, languageService.getGraphQLLocale()))
+  ): Either<ErrorMessage, Unit> {
+    return apolloClient
+      .mutation(RedeemCampaignCodeMutation(campaignCode.code))
       .safeExecute()
       .toEither(::ErrorMessage)
+      .onLeft { logcat(LogPriority.WARN, it.throwable) { "redeemReferralCode failed. Message:${it.message}" } }
+      .onRight {
+        val userError = it.memberCampaignsRedeem.userError
+        if (userError != null) {
+          logcat(LogPriority.ERROR) { "redeemReferralCode failed. User error:${userError.message}" }
+        }
+      }
+      .map { Unit }
   }
 }

app/data/data-forever/src/main/kotlin/com/hedvig/android/data/forever/di/ForeverRepositoryProvider.kt → app/data/data-forever/src/main/kotlin/com/hedvig/android/data/forever/ForeverRepositoryProvider.kt

@@ -1,8 +1,7 @@
-package com.hedvig.android.data.forever.di
+package com.hedvig.android.data.forever
 
 import com.hedvig.android.core.demomode.DemoManager
 import com.hedvig.android.core.demomode.ProdOrDemoProvider
-import com.hedvig.android.data.forever.ForeverRepository
 
 class ForeverRepositoryProvider(
   override val demoManager: DemoManager,

app/data/data-forever/src/main/kotlin/com/hedvig/android/data/forever/di/ForeverDataModule.kt

@@ -1,21 +1,16 @@
 package com.hedvig.android.data.forever.di
 
 import com.apollographql.apollo3.ApolloClient
-import com.hedvig.android.apollo.giraffe.di.giraffeClient
 import com.hedvig.android.apollo.octopus.di.octopusClient
 import com.hedvig.android.core.demomode.DemoManager
 import com.hedvig.android.data.forever.ForeverRepositoryDemo
 import com.hedvig.android.data.forever.ForeverRepositoryImpl
-import com.hedvig.android.language.LanguageService
+import com.hedvig.android.data.forever.ForeverRepositoryProvider
 import org.koin.dsl.module
 
 val foreverDataModule = module {
   single<ForeverRepositoryImpl> {
-    ForeverRepositoryImpl(
-      apolloClientOctopus = get<ApolloClient>(octopusClient),
-      apolloClientGiraffe = get<ApolloClient>(giraffeClient),
-      languageService = get<LanguageService>(),
-    )
+    ForeverRepositoryImpl(apolloClient = get<ApolloClient>(octopusClient))
   }
   single<ForeverRepositoryDemo> {
     ForeverRepositoryDemo()

app/feature/feature-forever/src/main/kotlin/com/hedvig/android/feature/forever/di/ForeverModule.kt

@@ -1,6 +1,6 @@
 package com.hedvig.android.feature.forever.di
 
-import com.hedvig.android.data.forever.di.ForeverRepositoryProvider
+import com.hedvig.android.data.forever.ForeverRepositoryProvider
 import com.hedvig.android.feature.forever.ForeverViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module

app/feature/feature-profile/src/main/kotlin/com/hedvig/android/feature/profile/di/ProfileModule.kt

@@ -7,7 +7,7 @@ import com.hedvig.android.apollo.giraffe.di.giraffeClient
 import com.hedvig.android.apollo.octopus.di.octopusClient
 import com.hedvig.android.auth.LogoutUseCase
 import com.hedvig.android.core.demomode.DemoManager
-import com.hedvig.android.data.forever.di.ForeverRepositoryProvider
+import com.hedvig.android.data.forever.ForeverRepositoryProvider
 import com.hedvig.android.data.settings.datastore.SettingsDataStore
 import com.hedvig.android.feature.profile.aboutapp.AboutAppViewModel
 import com.hedvig.android.feature.profile.data.ProfileRepositoryDemo

app/feature/feature-profile/src/main/kotlin/com/hedvig/android/feature/profile/payment/PaymentPresenter.kt

@@ -42,8 +42,8 @@ internal class PaymentPresenter(
     }
 
     LaunchedEffect(newDiscountCodeBeingSubmitted) {
-      val newCode = newDiscountCodeBeingSubmitted ?: return@LaunchedEffect
-      referralsRepositoryProvider.provide().redeemReferralCode(newCode).fold(
+      val newCampaignCode = newDiscountCodeBeingSubmitted ?: return@LaunchedEffect
+      referralsRepositoryProvider.provide().redeemReferralCode(newCampaignCode).fold(
         ifLeft = { error -> paymentUiState = paymentUiState.copy(discountError = error.message) },
         ifRight = { loadIteration++ },
       )