feat: remove entry to italy scan mode

* feat: remove entry to italy scan mode * fix: remove dokka classpath * feat: remove italy entry scan mode change sdk version Co-authored-by: Light2288 <davide.aliti@gmail.com>
ministero-salute · Jun 13, 2022 · b438e9f · b438e9f
1 parent 32fdf90
commit b438e9f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 39 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,6 @@ buildscript {
         classpath Deps.androidx_navigation
         classpath Deps.hilt_plugin
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.5.0"
         classpath "io.realm:realm-gradle-plugin:10.8.0"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
     id 'jacoco'
-    id 'org.jetbrains.dokka'
+    id 'org.jetbrains.dokka' version '1.6.21'
     id 'realm-android'
 }
 
@@ -103,15 +103,15 @@ android {
             buildConfigField "String", "SERVER_HOST", "\"testaka4.sogei.it\""
             buildConfigField "String", "LEAF_CERTIFICATE", "\"sha256/R0d+cI8vTcJ3sCbpfQCH0OmdBbulPH3deYhngzOqJVA=\""
             buildConfigField "String", "BACKUP_CERTIFICATE", "\"sha256/KpZtVwF9rcXdbBMB/Poep8h3VSYXA/ZSFMkkWlQ0ZNk=\""
-            buildConfigField "String", "SDK_VERSION", "\"1.1.9\""
+            buildConfigField "String", "SDK_VERSION", "\"1.1.10\""
         }
 
         release {
             buildConfigField "String", "BASE_URL", "\"https://get.dgc.gov.it/v1/dgc/\""
             buildConfigField "String", "SERVER_HOST", "\"get.dgc.gov.it\""
             buildConfigField "String", "LEAF_CERTIFICATE", "\"sha256/7cZJIDPacG8FS3pq6Mvxg+7yBDM/VYc2alOcbVe/e74=\""
             buildConfigField "String", "BACKUP_CERTIFICATE", "\"sha256/095kxU9rqrJ3f+YM1pG+Y2YCgAUvR1f5blSuZYXvEy8=\""
-            buildConfigField "String", "SDK_VERSION", "\"1.1.9\""
+            buildConfigField "String", "SDK_VERSION", "\"1.1.10\""
 
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

diff --git a/...va/it/ministerodellasalute/verificaC19sdk/model/validation/ExemptionValidationStrategy.kt b/...va/it/ministerodellasalute/verificaC19sdk/model/validation/ExemptionValidationStrategy.kt
@@ -54,7 +54,6 @@ class ExemptionValidationStrategy : ValidationStrategy {
                 }
             }
             return when (scanMode) {
-                ScanMode.ENTRY_ITALY -> return CertificateStatus.NOT_VALID
                 ScanMode.BOOSTER -> return CertificateStatus.TEST_NEEDED
                 else -> CertificateStatus.VALID
             }

diff --git a/...ava/it/ministerodellasalute/verificaC19sdk/model/validation/RecoveryValidationStrategy.kt b/...ava/it/ministerodellasalute/verificaC19sdk/model/validation/RecoveryValidationStrategy.kt
@@ -36,7 +36,7 @@ class RecoveryValidationStrategy : ValidationStrategy {
         val scanMode = certificateModel.scanMode
         val certificate = certificateModel.certificate
 
-        val countryCode = if (scanMode == ScanMode.ENTRY_ITALY) recovery.country else Country.IT.value
+        val countryCode = Country.IT.value
 
         val recoveryBis = recovery.isRecoveryBis(certificate)
         val startDaysToAdd = if (recoveryBis) ruleSet.getRecoveryCertPVStartDay() else ruleSet.getRecoveryCertStartDayUnified(countryCode)

diff --git a/...java/it/ministerodellasalute/verificaC19sdk/model/validation/VaccineValidationStrategy.kt b/...java/it/ministerodellasalute/verificaC19sdk/model/validation/VaccineValidationStrategy.kt
@@ -55,7 +55,6 @@ class VaccineValidationStrategy : ValidationStrategy {
             ScanMode.STANDARD -> vaccineStandardStrategy(certificateModel, ruleSet)
             ScanMode.STRENGTHENED -> vaccineStrengthenedStrategy(certificateModel, ruleSet)
             ScanMode.BOOSTER -> vaccineBoosterStrategy(certificateModel, ruleSet)
-            ScanMode.ENTRY_ITALY -> vaccineEntryItalyStrategy(certificateModel, ruleSet)
             else -> {
                 CertificateStatus.NOT_EU_DCC
             }
@@ -212,36 +211,4 @@ class VaccineValidationStrategy : ValidationStrategy {
         }
     }
 
-    private fun vaccineEntryItalyStrategy(certificateModel: CertificateModel, ruleSet: RuleSet): CertificateStatus {
-        val vaccination = certificateModel.vaccinations?.last()!!
-        val dateOfVaccination = vaccination.dateOfVaccination.toLocalDate()
-        val birthDate = (certificateModel.dateOfBirth?.toValidDateOfBirth())?.plusDays(ruleSet.getVaccineCompleteUnder18Offset())
-        val isUserUnderage = birthDate?.getAge()!! < Const.VACCINE_UNDERAGE_AGE
-
-        val startDaysToAdd =
-            when {
-                vaccination.isBooster() -> ruleSet.getVaccineStartDayBoosterUnified(Country.NOT_IT.value)
-                vaccination.isNotComplete() -> ruleSet.getVaccineStartDayNotComplete(vaccination.medicinalProduct)
-                else -> ruleSet.getVaccineStartDayCompleteUnified(Country.NOT_IT.value, vaccination.medicinalProduct)
-            }
-
-        val endDaysToAdd =
-            when {
-                vaccination.isComplete() && isUserUnderage -> ruleSet.getVaccineEndDayCompleteUnder18()
-                vaccination.isBooster() -> ruleSet.getVaccineEndDayBoosterUnified(Country.NOT_IT.value)
-                vaccination.isNotComplete() -> ruleSet.getVaccineEndDayNotComplete(vaccination.medicinalProduct)
-                else -> ruleSet.getVaccineEndDayCompleteUnified(Country.NOT_IT.value)
-            }
-
-        startDate = dateOfVaccination.plusDays(startDaysToAdd)
-        endDate = dateOfVaccination.plusDays(endDaysToAdd)
-
-        return when {
-            LocalDate.now().isBefore(startDate) -> CertificateStatus.NOT_VALID_YET
-            LocalDate.now().isAfter(endDate) -> CertificateStatus.EXPIRED
-            !ruleSet.isEMA(vaccination.medicinalProduct, vaccination.countryOfVaccination) -> CertificateStatus.NOT_VALID
-            vaccination.isNotComplete() -> CertificateStatus.NOT_VALID
-            else -> CertificateStatus.VALID
-        }
-    }
 }