chore: refactoring

* refactor: adjust code * chore: rename variable Co-authored-by: Kaizen <42545336+Kaizen-7@users.noreply.github.com>
ministero-salute · Mar 7, 2022 · 7880b5d · 7880b5d
1 parent cf5f413
commit 7880b5d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/sdk/src/main/java/it/ministerodellasalute/verificaC19sdk/model/CertificateModel.kt b/sdk/src/main/java/it/ministerodellasalute/verificaC19sdk/model/CertificateModel.kt
@@ -45,7 +45,6 @@ data class CertificateModel(
     var exemptions: List<Exemption>? = null,
     var isBlackListed: Boolean = false,
     var scanMode: ScanMode? = null,
-    var isPreviousScanModeBooster: Boolean = false,
     var certificateIdentifier: String = "",
     var certificate: Certificate? = null
 ) {
@@ -115,7 +114,8 @@ data class TestModel(
     val countryOfVaccination: String,
     val certificateIssuer: String,
     val certificateIdentifier: String,
-    val resultType: TestResult
+    val resultType: TestResult,
+    var isPreviousScanModeBooster: Boolean = false
 ) : CertificateData
 
 enum class TestResult(val value: String) {

diff --git a/sdk/src/main/java/it/ministerodellasalute/verificaC19sdk/model/VerificationViewModel.kt b/sdk/src/main/java/it/ministerodellasalute/verificaC19sdk/model/VerificationViewModel.kt
@@ -57,7 +57,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import java.security.cert.Certificate
-import java.security.cert.X509Certificate
 import java.util.*
 import javax.inject.Inject
 
@@ -205,7 +204,9 @@ class VerificationViewModel @Inject constructor(
             val certificateModel = greenCertificate.toCertificateModel(verificationResult).apply {
                 isBlackListed = blackListCheckResult
                 isRevoked = isCertificateRevoked(certificateIdentifier.sha256())
-                this.isPreviousScanModeBooster = scanMode == ScanMode.BOOSTER
+                tests?.let {
+                    it.last().isPreviousScanModeBooster = scanMode == ScanMode.BOOSTER
+                }
                 this.scanMode = if (getDoubleScanFlag()) ScanMode.DOUBLE_SCAN else scanMode
                 this.certificateIdentifier = certificateIdentifier
                 this.certificate = certificate

diff --git a/...in/java/it/ministerodellasalute/verificaC19sdk/model/validation/TestValidationStrategy.kt b/...in/java/it/ministerodellasalute/verificaC19sdk/model/validation/TestValidationStrategy.kt
@@ -42,7 +42,7 @@ class TestValidationStrategy : ValidationStrategy {
     override fun checkCertificate(certificateModel: CertificateModel, ruleSet: RuleSet): CertificateStatus {
         val test: TestModel = certificateModel.tests!!.first()
         val scanMode = certificateModel.scanMode
-        val isPreviousScanModeBooster = certificateModel.isPreviousScanModeBooster
+        val isADoubleScanBoosterTest = test.isPreviousScanModeBooster
         val isTestNotAllowed = (scanMode == ScanMode.BOOSTER) || scanMode == ScanMode.STRENGTHENED || scanMode == ScanMode.SCHOOL
 
         if (test.resultType == TestResult.DETECTED) {
@@ -61,7 +61,7 @@ class TestValidationStrategy : ValidationStrategy {
                 TestType.MOLECULAR.value -> {
                     startDate = ldtDateTimeOfCollection.plusHours(ruleSet.getMolecularTestStartHour())
                     endDate =
-                        if (scanMode == ScanMode.DOUBLE_SCAN && isPreviousScanModeBooster)
+                        if (scanMode == ScanMode.DOUBLE_SCAN && isADoubleScanBoosterTest)
                             ldtDateTimeOfCollection.plusHours(ruleSet.getRapidTestEndHour())
                         else
                             ldtDateTimeOfCollection.plusHours(ruleSet.getMolecularTestEndHour())