Remove term "Auffrischimpfung" from booster certificate (EXPOSUREAPP-…

…9244) (#4002) * Adjusted booster display logic. * Removed translated texts from 2.9 merge. * Priority is determined only by latest date. * Removed line of code by mistake. Co-authored-by: Juraj Kusnier <jurajkusnier@users.noreply.github.com>
corona-warn-app · Aug 31, 2021 · 84d8ccd · 84d8ccd
1 parent 6930608
commit 84d8ccd
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 38 deletions.
diff --git a/...java/de/rki/coronawarnapp/covidcertificate/person/ui/details/PersonDetailsFragmentTest.kt b/...java/de/rki/coronawarnapp/covidcertificate/person/ui/details/PersonDetailsFragmentTest.kt
@@ -248,7 +248,6 @@ class PersonDetailsFragmentTest : BaseUITest() {
             every { isFinalShot } returns final
             every { qrCodeToDisplay } returns CoilQrCode(ScreenshotCertificateTestData.vaccinationCertificate)
             every { isValid } returns true
-            every { isBooster } returns booster
             every { getState() } returns CwaCovidCertificate.State.Valid(Instant.now().plus(20))
         }
 

diff --git a/...in/java/de/rki/coronawarnapp/covidcertificate/person/core/PersonCertificatesExtensions.kt b/...in/java/de/rki/coronawarnapp/covidcertificate/person/core/PersonCertificatesExtensions.kt
@@ -75,9 +75,6 @@ private fun Collection<CwaCovidCertificate>.rule3FindRecentLastShot(
     nowUtc: Instant
 ): CwaCovidCertificate? = this
     .filterIsInstance<VaccinationCertificate>()
-    .filter {
-        with(it.rawCertificate.vaccination) { doseNumber == totalSeriesOfDoses }
-    }
     .filter {
         Days.daysBetween(it.rawCertificate.vaccination.vaccinatedOn, nowUtc.toLocalDateUtc()).days > 14
     }
@@ -113,9 +110,6 @@ private fun Collection<CwaCovidCertificate>.rule5findTooRecentFinalShot(
     nowUtc: Instant
 ): CwaCovidCertificate? = this
     .filterIsInstance<VaccinationCertificate>()
-    .filter {
-        with(it.rawCertificate.vaccination) { doseNumber == totalSeriesOfDoses }
-    }
     .filter {
         Days.daysBetween(it.rawCertificate.vaccination.vaccinatedOn, nowUtc.toLocalDateUtc()).days <= 14
     }

diff --git a/.../rki/coronawarnapp/covidcertificate/person/ui/details/items/VaccinationCertificateCard.kt b/.../rki/coronawarnapp/covidcertificate/person/ui/details/items/VaccinationCertificateCard.kt
@@ -31,14 +31,11 @@ class VaccinationCertificateCard(parent: ViewGroup) :
         val curItem = payloads.filterIsInstance<Item>().singleOrNull() ?: item
         val certificate = curItem.certificate
         root.setOnClickListener { curItem.onClick() }
-        vaccinationDosesInfo.text = when (certificate.isBooster) {
-            true -> context.getString(R.string.vaccination_booster_certificate_title)
-            else -> context.getString(
-                R.string.vaccination_certificate_doses,
-                certificate.doseNumber,
-                certificate.totalSeriesOfDoses
-            )
-        }
+        vaccinationDosesInfo.text = context.getString(
+            R.string.vaccination_certificate_doses,
+            certificate.doseNumber,
+            certificate.totalSeriesOfDoses
+        )
 
         certificateDate.text = context.getString(
             R.string.vaccination_certificate_vaccinated_on,
@@ -57,9 +54,6 @@ class VaccinationCertificateCard(parent: ViewGroup) :
             // Invalid state first
             !certificate.isValid -> R.drawable.ic_certificate_invalid
 
-            // Booster Vaccination
-            certificate.isBooster -> R.drawable.ic_vaccination_immune
-
             // Final shot
             certificate.isFinalShot -> when (curItem.status) {
                 IMMUNITY -> R.drawable.ic_vaccination_immune

diff --git a/.../src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPerson.kt b/.../src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPerson.kt
@@ -53,8 +53,7 @@ data class VaccinatedPerson(
     fun getVaccinationStatus(nowUTC: Instant = Instant.now()): Status {
         val daysToImmunity = getDaysUntilImmunity(nowUTC) ?: return Status.INCOMPLETE
 
-        val isImmune = daysToImmunity <= 0 || isFirstVaccinationDoseAfterRecovery() ||
-            getNewestFullDose()?.isBooster == true
+        val isImmune = daysToImmunity <= 0 || isFirstVaccinationDoseAfterRecovery() || isBooster()
         return when {
             isImmune -> Status.IMMUNITY
             else -> Status.COMPLETE
@@ -81,6 +80,16 @@ data class VaccinatedPerson(
         }
     }
 
+    private fun isBooster(): Boolean {
+        val boosterVaccination = getNewestFullDose()?.rawCertificate?.vaccination
+        return if (boosterVaccination != null) {
+            when (boosterVaccination.medicalProductId) {
+                BIONTECH, ASTRA, MODERNA -> boosterVaccination.doseNumber > 2
+                else -> boosterVaccination.doseNumber > 1
+            }
+        } else false
+    }
+
     enum class Status {
         INCOMPLETE,
         COMPLETE,

diff --git a/...ain/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationCertificate.kt b/...ain/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationCertificate.kt
@@ -25,6 +25,4 @@ interface VaccinationCertificate : CwaCovidCertificate {
     override val rawCertificate: VaccinationDccV1
 
     val isFinalShot get() = doseNumber == totalSeriesOfDoses
-
-    val isBooster get() = doseNumber > totalSeriesOfDoses
 }
diff --git a/Corona-Warn-App/src/main/res/values-bg/covid_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-bg/covid_certificate_strings.xml
@@ -68,8 +68,6 @@
     <string name="vaccination_certificate_doses">"Ваксинация %1$d от %2$d"</string>
     <!-- XTXT: Vaccination card name-->
     <string name="vaccination_certificate_name">"Сертификат за ваксинация"</string>
-    <!-- XTXT: Booster Vaccination title-->
-    <string name="vaccination_booster_certificate_title">"Ваксиниране с бустерна доза"</string>
 
     <!-- XTXT: Vaccination card immunity information card body-->
     <plurals name="vaccination_certificate_days_unti_immunity" tools:ignore="UnusedQuantity">

diff --git a/Corona-Warn-App/src/main/res/values-de/covid_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-de/covid_certificate_strings.xml
@@ -69,8 +69,6 @@
     <string name="vaccination_certificate_doses">Impfung %1$d von %2$d</string>
     <!-- XTXT: Vaccination card name-->
     <string name="vaccination_certificate_name">Impfzertifikat</string>
-    <!-- XTXT: Booster Vaccination title-->
-    <string name="vaccination_booster_certificate_title">Auffrischungsimpfung</string>
 
     <!-- XTXT: Vaccination card immunity information card body-->
     <plurals name="vaccination_certificate_days_unti_immunity" tools:ignore="UnusedQuantity">

diff --git a/Corona-Warn-App/src/main/res/values-pl/covid_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-pl/covid_certificate_strings.xml
@@ -68,8 +68,6 @@
     <string name="vaccination_certificate_doses">"Szczepienie %1$d %2$d"</string>
     <!-- XTXT: Vaccination card name-->
     <string name="vaccination_certificate_name">"Certyfikat szczepienia"</string>
-    <!-- XTXT: Booster Vaccination title-->
-    <string name="vaccination_booster_certificate_title">"Szczepienie przypominające"</string>
 
     <!-- XTXT: Vaccination card immunity information card body-->
     <plurals name="vaccination_certificate_days_unti_immunity" tools:ignore="UnusedQuantity">

diff --git a/Corona-Warn-App/src/main/res/values-ro/covid_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-ro/covid_certificate_strings.xml
@@ -68,8 +68,6 @@
     <string name="vaccination_certificate_doses">"Vaccinarea %1$d din %2$d"</string>
     <!-- XTXT: Vaccination card name-->
     <string name="vaccination_certificate_name">"Certificat de vaccinare"</string>
-    <!-- XTXT: Booster Vaccination title-->
-    <string name="vaccination_booster_certificate_title">"Vaccinarea de rapel"</string>
 
     <!-- XTXT: Vaccination card immunity information card body-->
     <plurals name="vaccination_certificate_days_unti_immunity" tools:ignore="UnusedQuantity">

diff --git a/Corona-Warn-App/src/main/res/values-tr/covid_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-tr/covid_certificate_strings.xml
@@ -68,8 +68,6 @@
     <string name="vaccination_certificate_doses">"Aşı %1$d / %2$d"</string>
     <!-- XTXT: Vaccination card name-->
     <string name="vaccination_certificate_name">"Aşı Sertifikası"</string>
-    <!-- XTXT: Booster Vaccination title-->
-    <string name="vaccination_booster_certificate_title">"Hatırlatma Aşısı"</string>
 
     <!-- XTXT: Vaccination card immunity information card body-->
     <plurals name="vaccination_certificate_days_unti_immunity" tools:ignore="UnusedQuantity">

diff --git a/Corona-Warn-App/src/main/res/values/covid_certificate_strings.xml b/Corona-Warn-App/src/main/res/values/covid_certificate_strings.xml
@@ -68,8 +68,6 @@
     <string name="vaccination_certificate_doses">"Vaccination %1$d of %2$d"</string>
     <!-- XTXT: Vaccination card name-->
     <string name="vaccination_certificate_name">"Vaccination Certificate"</string>
-    <!-- XTXT: Booster Vaccination title-->
-    <string name="vaccination_booster_certificate_title">"Booster Vaccination"</string>
 
     <!-- XTXT: Vaccination card immunity information card body-->
     <plurals name="vaccination_certificate_days_unti_immunity" tools:ignore="UnusedQuantity">

diff --git a/...ava/de/rki/coronawarnapp/covidcertificate/person/core/PersonCertificatesExtensionsTest.kt b/...ava/de/rki/coronawarnapp/covidcertificate/person/core/PersonCertificatesExtensionsTest.kt
@@ -149,10 +149,10 @@ class PersonCertificatesExtensionsTest : BaseTest() {
         certificates.remove(third)
         certificates.findHighestPriorityCertificate(time) shouldBe fourth
         certificates.remove(fourth)
-        certificates.findHighestPriorityCertificate(time) shouldBe fifth
-        certificates.remove(fifth)
         certificates.findHighestPriorityCertificate(time) shouldBe sixth
         certificates.remove(sixth)
+        certificates.findHighestPriorityCertificate(time) shouldBe fifth
+        certificates.remove(fifth)
         certificates.findHighestPriorityCertificate(time) shouldBe seventh
         certificates.remove(seventh)
         certificates.findHighestPriorityCertificate(time) shouldBe eighth

diff --git a/.../test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPersonTest.kt b/.../test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPersonTest.kt
@@ -186,7 +186,6 @@ class VaccinatedPersonTest : BaseTest() {
                         every { totalSeriesOfDoses } returns 2
                         every { rawCertificate.vaccination.doseNumber } returns doseNumber
                         every { rawCertificate.vaccination.medicalProductId } returns "EU/1/20/1528"
-                        every { isBooster } returns false
                     }
                     every { containerId } returns VaccinationCertificateContainerId("VaccinationCertificateContainerId")
                 }
@@ -231,7 +230,6 @@ class VaccinatedPersonTest : BaseTest() {
                         every { totalSeriesOfDoses } returns 2
                         every { rawCertificate.vaccination.doseNumber } returns doseNumber
                         every { rawCertificate.vaccination.medicalProductId } returns "EU/1/20/1528"
-                        every { isBooster } returns false
                     }
 
                     every { containerId } returns VaccinationCertificateContainerId("VaccinationCertificateContainerId")