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 942fe20bd7096d0eb936facb7a8e867abfc99c8c..9b751fc6ae731ab6ed5ebc1be8e89469830ebca3 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 bd02d7face41c0a7a78cd705544b2e474caba389..f6b1d884f3e86404ec0b1f77a27b5c76ebabf91b 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 } }