- add vaccination date check to verification result; (eu-digital-gree…

…n-certificates#64)
ascheibal · Sep 17, 2021 · 11429c0 · 11429c0
1 parent 1558ee9
commit 11429c0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/decoder/src/main/java/dgca/verifier/app/decoder/model/RecoveryStatement.kt b/decoder/src/main/java/dgca/verifier/app/decoder/model/RecoveryStatement.kt
@@ -23,10 +23,8 @@
 package dgca.verifier.app.decoder.model
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import org.joda.time.DateTime
 import java.io.Serializable
 import java.time.*
-import java.time.format.DateTimeFormatter
 
 data class RecoveryStatement(
 

diff --git a/decoder/src/main/java/dgca/verifier/app/decoder/model/Vaccination.kt b/decoder/src/main/java/dgca/verifier/app/decoder/model/Vaccination.kt
@@ -23,7 +23,9 @@
 package dgca.verifier.app.decoder.model
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import org.joda.time.DateTime
 import java.io.Serializable
+import java.time.OffsetDateTime
 
 data class Vaccination(
 
@@ -57,4 +59,12 @@ data class Vaccination(
     @JsonProperty("ci")
     val certificateIdentifier: String
 
-) : Serializable
+) : Serializable {
+
+    fun isDateInThePast(): Boolean =
+        try {
+            DateTime.parse(dateOfVaccination).millis < OffsetDateTime.now().toEpochSecond() * 1000
+        } catch (ex: Exception) {
+            false
+        }
+}
diff --git a/decoder/src/main/java/dgca/verifier/app/decoder/model/VerificationResult.kt b/decoder/src/main/java/dgca/verifier/app/decoder/model/VerificationResult.kt
@@ -32,15 +32,17 @@ data class VerificationResult(
     var isIssuedTimeCorrect: Boolean = false,
     var isNotExpired: Boolean = false,
     var rulesValidationFailed: Boolean = false,
+    var vaccinationVerification: VaccinationVerificationResult? = null,
     var testVerification: TestVerificationResult? = null,
     var recoveryVerification: RecoveryVerificationResult? = null
 ) {
 
     fun isValid(): Boolean {
+        val isVaccinationValid = vaccinationVerification?.isVaccinationValid() ?: true
         val isTestValid = testVerification?.isTestValid() ?: true
-        val isRecoveryValid = recoveryVerification?.isRecoveryValid() ?: true;
+        val isRecoveryValid = recoveryVerification?.isRecoveryValid() ?: true
         return base45Decoded && zlibDecoded && coseVerified && cborDecoded && isSchemaValid && isTestValid &&
-                isIssuedTimeCorrect && isNotExpired && !rulesValidationFailed && isRecoveryValid
+                isIssuedTimeCorrect && isNotExpired && !rulesValidationFailed && isRecoveryValid && isVaccinationValid
     }
 
     /**
@@ -73,6 +75,15 @@ data class VerificationResult(
         recoveryVerification!!.isNotValidSoFar
     }
 
+    /**
+     * Checks if vaccination date is valid.
+     */
+    fun isVaccinationDateInTheFuture(): Boolean = if (vaccinationVerification == null) {
+        false
+    } else {
+        !vaccinationVerification!!.isVaccinationDateInThePast
+    }
+
     override fun toString(): String {
         return "VerificationResult: \n" +
                 "base45Decoded: $base45Decoded \n" +
@@ -84,6 +95,10 @@ data class VerificationResult(
     }
 }
 
+data class VaccinationVerificationResult(val isVaccinationDateInThePast: Boolean) {
+    fun isVaccinationValid(): Boolean = isVaccinationDateInThePast
+}
+
 data class TestVerificationResult(val isTestResultNegative: Boolean, val isTestDateInThePast: Boolean) {
     fun isTestValid(): Boolean = isTestResultNegative && isTestDateInThePast
 }