- validate certificate data; (eu-digital-green-certificates#33)

Author: MykhailoNester

app/src/main/java/dgca/verifier/app/android/model/CertificateModel.kt

@@ -61,9 +61,15 @@ data class TestModel(
     val testingCentre: String,
     val countryOfVaccination: String,
     val certificateIssuer: String,
-    val certificateIdentifier: String
+    val certificateIdentifier: String,
+    val resultType: TestResult
 ) : CertificateData
 
+enum class TestResult(val value: String) {
+    DETECTED("DETECTED"),
+    NOT_DETECTED("NOT DETECTED")
+}
+
 data class RecoveryModel(
     override val disease: String,
     val dateOfFirstPositiveTest: String,

app/src/main/java/dgca/verifier/app/android/model/Mapper.kt

@@ -62,10 +62,18 @@ fun Test.toTestModel(): TestModel {
         testingCentre,
         countryOfVaccination,
         certificateIssuer,
-        certificateIdentifier
+        certificateIdentifier,
+        getTestResultType().toTestResult()
     )
 }
 
+fun Test.TestResult.toTestResult(): TestResult {
+    return when (this) {
+        Test.TestResult.DETECTED -> TestResult.DETECTED
+        Test.TestResult.NOT_DETECTED -> TestResult.NOT_DETECTED
+    }
+}
+
 fun Vaccination.toVaccinationModel(): VaccinationModel {
     return VaccinationModel(
         disease,

app/src/main/java/dgca/verifier/app/android/verification/TestViewHolder.kt

@@ -34,7 +34,7 @@ import dgca.verifier.app.android.parseFromTo
 class TestViewHolder(private val binding: ItemTestBinding) : RecyclerView.ViewHolder(binding.root) {
 
     fun bind(data: TestModel) {
-        binding.testResultValue.text = data.testResult
+        binding.testResultValue.text = data.resultType.value
         binding.dateOfCollectionValue.text = data.dateTimeOfCollection.parseFromTo(DATE_TIME, FORMATTED_DATE_TIME)
         binding.dateOfTestResultValue.text = data.dateTimeOfTestResult?.parseFromTo(DATE_TIME, FORMATTED_DATE_TIME)
         binding.diseaseValue.text = data.disease

app/src/main/java/dgca/verifier/app/android/verification/VerificationDialogFragment.kt

@@ -135,6 +135,7 @@ class VerificationDialogFragment : BottomSheetDialogFragment() {
         binding.actionBtn.isVisible = true
         binding.actionBtn.backgroundTintList = statusColor
         binding.actionBtn.text = actionBtnText
+        binding.actionBtn.isVisible = true
     }
 
     private fun getCertificateListData(certificate: CertificateModel): List<CertificateData> {

app/src/main/java/dgca/verifier/app/android/verification/VerificationViewModel.kt

@@ -36,6 +36,7 @@ import dgca.verifier.app.decoder.compression.CompressorService
 import dgca.verifier.app.decoder.cose.CoseService
 import dgca.verifier.app.decoder.cose.CryptoService
 import dgca.verifier.app.decoder.model.GreenCertificate
+import dgca.verifier.app.decoder.model.TestVerificationResult
 import dgca.verifier.app.decoder.model.VerificationResult
 import dgca.verifier.app.decoder.prefixvalidation.PrefixValidationService
 import dgca.verifier.app.decoder.schema.SchemaValidator
@@ -96,6 +97,7 @@ class VerificationViewModel @Inject constructor(
 
                 schemaValidator.validate(coseData.cbor, verificationResult)
                 greenCertificate = cborService.decode(coseData.cbor, verificationResult)
+                validateCertData(greenCertificate, verificationResult)
 
                 val certificate = verifierRepository.getCertificate(kid.toBase64())
                 if (certificate == null) {
@@ -110,4 +112,12 @@ class VerificationViewModel @Inject constructor(
             _certificate.value = greenCertificate?.toCertificateModel()
         }
     }
+
+    private fun validateCertData(certificate: GreenCertificate?, verificationResult: VerificationResult) {
+        certificate?.tests?.let {
+            if (it.isNotEmpty()) {
+                verificationResult.testVerification = TestVerificationResult(it.first().isTestValid())
+            }
+        }
+    }
 }

app/src/main/res/layout/dialog_fragment_verification.xml

@@ -211,7 +211,7 @@
             android:text="@string/done"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:visibility="visible" />
+            android:visibility="gone" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/logo"