From 7b54efe5a1ee08f7a40e9fe64c524d387d32cfd8 Mon Sep 17 00:00:00 2001 From: Mohamed Metwalli <mohamed.metwalli@sap.com> Date: Wed, 16 Jun 2021 14:06:48 +0200 Subject: [PATCH] Immunity state after 14 days (#3467) --- .../covidcertificate/vaccination/core/VaccinatedPerson.kt | 2 +- .../vaccination/core/VaccinatedPersonTest.kt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPerson.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPerson.kt index 942fe20bd..9b751fc6a 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPerson.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPerson.kt @@ -39,7 +39,7 @@ data class VaccinatedPerson( val daysToImmunity = getTimeUntilImmunity(nowUTC)?.standardDays ?: return Status.INCOMPLETE return when { - daysToImmunity <= 0 -> Status.IMMUNITY + daysToImmunity < 0 -> Status.IMMUNITY else -> Status.COMPLETE } } diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPersonTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPersonTest.kt index bd02d7fac..f6b1d884f 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPersonTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPersonTest.kt @@ -85,14 +85,22 @@ class VaccinatedPersonTest : BaseTest() { ) vaccinatedPerson.apply { + // Less than 14 days getVaccinationStatus( Instant.parse("2021-04-27T12:00:00.000Z") ) shouldBe VaccinatedPerson.Status.COMPLETE getVaccinationStatus( Instant.parse("2021-05-10T12:00:00.000Z") ) shouldBe VaccinatedPerson.Status.COMPLETE + + // 14 days exactly getVaccinationStatus( Instant.parse("2021-05-11T12:00:00.000Z") + ) shouldBe VaccinatedPerson.Status.COMPLETE + + // More than 14 days + getVaccinationStatus( + Instant.parse("2021-05-12T12:00:00.000Z") ) shouldBe VaccinatedPerson.Status.IMMUNITY } } -- GitLab