Merge pull request #1826 from HedvigInsurance/fix/backend_breaking_ch…

…anges Fix breaking GQL changes
HedvigInsurance · Oct 12, 2023 · 55c7adb · 55c7adb
2 parents 17b06ff + 9354478
commit 55c7adb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 28 deletions.
diff --git a/...aphql/com/hedvig/android/apollo/octopus/graphql/insurance/InsuranceContractsQuery.graphql b/...aphql/com/hedvig/android/apollo/octopus/graphql/insurance/InsuranceContractsQuery.graphql
@@ -15,10 +15,7 @@ fragment ContractFragment on Contract {
   masterInceptionDate
   terminationDate
   exposureDisplayName
-  supportsAddressChange
-  upcomingRenewal {
-    renewalDate
-  }
+  supportsMoving
   currentAgreement {
     ...AgreementFragment
   }

diff --git a/...m/hedvig/android/apollo/octopus/graphql/insurance/QueryGetUpcomingRenewalReminder.graphql b/...m/hedvig/android/apollo/octopus/graphql/insurance/QueryGetUpcomingRenewalReminder.graphql
@@ -6,9 +6,9 @@ query GetUpcomingRenewalReminder {
           displayName
         }
       }
-      upcomingRenewal {
-        renewalDate
-        draftCertificateUrl
+      upcomingChangedAgreement {
+        activeFrom
+        certificateUrl
       }
     }
   }

diff --git a/...phql/com/hedvig/android/apollo/octopus/graphql/notifications/MemberDeviceRegister.graphql b/...phql/com/hedvig/android/apollo/octopus/graphql/notifications/MemberDeviceRegister.graphql
@@ -1,3 +1,3 @@
 mutation MemberDeviceRegister($token: String!) {
-  memberDeviceRegister(input: {type: "ANDROID", token: $token})
+  memberDeviceRegister(input: {platform: ANDROID, token: $token})
 }
diff --git a/...rc/main/kotlin/com/hedvig/android/feature/insurances/data/GetInsuranceContractsUseCase.kt b/...rc/main/kotlin/com/hedvig/android/feature/insurances/data/GetInsuranceContractsUseCase.kt
@@ -43,7 +43,7 @@ private fun ContractFragment.toContract(isTerminated: Boolean = false): Insuranc
     displayName = currentAgreement.productVariant.displayName,
     exposureDisplayName = exposureDisplayName,
     inceptionDate = masterInceptionDate,
-    renewalDate = upcomingRenewal.renewalDate,
+    renewalDate = upcomingChangedAgreement?.activeFrom,
     terminationDate = terminationDate,
     currentAgreement = Agreement(
       activeFrom = currentAgreement.activeFrom,

diff --git a/.../src/main/kotlin/com/hedvig/android/memberreminders/GetUpcomingRenewalRemindersUseCase.kt b/.../src/main/kotlin/com/hedvig/android/memberreminders/GetUpcomingRenewalRemindersUseCase.kt
@@ -35,11 +35,12 @@ internal class GetUpcomingRenewalRemindersUseCaseImpl(
         .activeContracts
 
       val upcomingRenewals: NonEmptyList<UpcomingRenewal>? = contracts
-        .map { contract ->
+        .mapNotNull { contract ->
+          val upcomingChangedAgreement = contract.upcomingChangedAgreement ?: return@mapNotNull null
           UpcomingRenewal(
             contract.currentAgreement.productVariant.displayName,
-            contract.upcomingRenewal.renewalDate,
-            contract.upcomingRenewal.draftCertificateUrl,
+            upcomingChangedAgreement.activeFrom,
+            upcomingChangedAgreement.certificateUrl,
           )
         }
         .filter { upcomingRenewal ->

diff --git a/.../test/kotlin/com/hedvig/android/memberreminders/GetUpcomingRenewalRemindersUseCaseTest.kt b/.../test/kotlin/com/hedvig/android/memberreminders/GetUpcomingRenewalRemindersUseCaseTest.kt
@@ -21,7 +21,6 @@ import kotlinx.datetime.toLocalDateTime
 import octopus.GetUpcomingRenewalReminderQuery
 import octopus.type.buildAgreement
 import octopus.type.buildContract
-import octopus.type.buildContractRenewal
 import octopus.type.buildMember
 import octopus.type.buildProductVariant
 import org.junit.Rule
@@ -56,9 +55,9 @@ class GetUpcomingRenewalRemindersUseCaseTest {
                   displayName = "display name"
                 }
               }
-              upcomingRenewal = buildContractRenewal {
-                renewalDate = upcomingRenewalLocalDate
-                draftCertificateUrl = "draftUrl"
+              upcomingChangedAgreement = buildAgreement {
+                activeFrom = upcomingRenewalLocalDate
+                certificateUrl = "draftUrl"
               }
             },
           )
@@ -91,9 +90,9 @@ class GetUpcomingRenewalRemindersUseCaseTest {
                   displayName = "#$index"
                 }
               }
-              upcomingRenewal = buildContractRenewal {
-                renewalDate = clock.now().plus((index + 1).days).toLocalDateTime(TimeZone.UTC).date
-                draftCertificateUrl = "url#$index"
+              upcomingChangedAgreement = buildAgreement {
+                activeFrom = clock.now().plus((index + 1).days).toLocalDateTime(TimeZone.UTC).date
+                certificateUrl = "url#$index"
               }
             }
           }
@@ -133,9 +132,9 @@ class GetUpcomingRenewalRemindersUseCaseTest {
                   displayName = "display name"
                 }
               }
-              upcomingRenewal = buildContractRenewal {
-                renewalDate = upcomingRenewalLocalDate
-                draftCertificateUrl = "draftUrl"
+              upcomingChangedAgreement = buildAgreement {
+                activeFrom = upcomingRenewalLocalDate
+                certificateUrl = "draftUrl"
               }
             }
           }
@@ -166,9 +165,9 @@ class GetUpcomingRenewalRemindersUseCaseTest {
                   displayName = "#$index"
                 }
               }
-              upcomingRenewal = buildContractRenewal {
-                renewalDate = clock.now().minus(index.days).toLocalDateTime(TimeZone.UTC).date
-                draftCertificateUrl = "url#$index"
+              upcomingChangedAgreement = buildAgreement {
+                activeFrom = clock.now().minus(index.days).toLocalDateTime(TimeZone.UTC).date
+                certificateUrl = "url#$index"
               }
             }
           }
@@ -206,9 +205,9 @@ class GetUpcomingRenewalRemindersUseCaseTest {
                   displayName = "#$index"
                 }
               }
-              upcomingRenewal = buildContractRenewal {
-                renewalDate = (clock.now() + renewalOffsets[index]!!).toLocalDateTime(TimeZone.UTC).date
-                draftCertificateUrl = "url#$index"
+              upcomingChangedAgreement = buildAgreement {
+                activeFrom = (clock.now() + renewalOffsets[index]!!).toLocalDateTime(TimeZone.UTC).date
+                certificateUrl = "url#$index"
               }
             }
           }