From f322c9e00f92f378d9fbe671f99ce356c67f24b1 Mon Sep 17 00:00:00 2001
From: Milen Marinov <milen.danchev.marinov@gmail.com>
Date: Tue, 4 Mar 2025 15:28:07 +0200
Subject: [PATCH] [MS-925] Run modality migrations only if modality is present
 in configuration

---
 .../ProjectConfigFaceBioSdkMigration.kt          |  4 ++--
 .../ProjectConfigFaceEmptyVersionMigration.kt    |  4 ++--
 .../ProjectConfigFingerprintBioSdkMigration.kt   |  4 ++--
 .../migrations/ProjectConfigLedsModeMigration.kt |  5 +++--
 .../ProjectConfigFaceBioSdkMigrationTest.kt      | 10 ++++++++++
 ...ProjectConfigFaceEmptyVersionMigrationTest.kt | 11 +++++++++++
 ...rojectConfigFingerprintBioSdkMigrationTest.kt | 11 +++++++++++
 .../ProjectConfigLedsModeMigrationTest.kt        | 16 ++++++++++++++++
 8 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceBioSdkMigration.kt b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceBioSdkMigration.kt
index d11c53847c..0e73d72f37 100644
--- a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceBioSdkMigration.kt
+++ b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceBioSdkMigration.kt
@@ -15,8 +15,8 @@ class ProjectConfigFaceBioSdkMigration @Inject constructor() : DataMigration<Pro
         Simber.i("Migration of project configuration face bio sdk is done", tag = MIGRATION)
     }
 
-    override suspend fun shouldMigrate(currentData: ProtoProjectConfiguration) = with(currentData.face) {
-        !hasRankOne() || allowedSdksCount == 0
+    override suspend fun shouldMigrate(currentData: ProtoProjectConfiguration) = with(currentData) {
+        hasFace() && (!face.hasRankOne() || face.allowedSdksCount == 0)
     }
 
     override suspend fun migrate(currentData: ProtoProjectConfiguration): ProtoProjectConfiguration {
diff --git a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceEmptyVersionMigration.kt b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceEmptyVersionMigration.kt
index 6fe727de13..b3cf18a5ae 100644
--- a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceEmptyVersionMigration.kt
+++ b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceEmptyVersionMigration.kt
@@ -11,8 +11,8 @@ class ProjectConfigFaceEmptyVersionMigration @Inject constructor() : DataMigrati
         Simber.i("Migration of project configuration face bio sdk empty version is done", tag = MIGRATION)
     }
 
-    override suspend fun shouldMigrate(currentData: ProtoProjectConfiguration) = with(currentData.face) {
-        rankOne.version.isEmpty()
+    override suspend fun shouldMigrate(currentData: ProtoProjectConfiguration) = with(currentData) {
+        hasFace() && face.rankOne.version.isEmpty()
     }
 
     override suspend fun migrate(currentData: ProtoProjectConfiguration): ProtoProjectConfiguration {
diff --git a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFingerprintBioSdkMigration.kt b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFingerprintBioSdkMigration.kt
index b090e69b6c..6b6fdc609b 100644
--- a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFingerprintBioSdkMigration.kt
+++ b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFingerprintBioSdkMigration.kt
@@ -15,8 +15,8 @@ class ProjectConfigFingerprintBioSdkMigration @Inject constructor() : DataMigrat
         Simber.i("Migration of project configuration fingerprint bio sdk is done", tag = MIGRATION)
     }
 
-    override suspend fun shouldMigrate(currentData: ProtoProjectConfiguration) = with(currentData.fingerprint) {
-        !(hasNec() || hasSecugenSimMatcher())
+    override suspend fun shouldMigrate(currentData: ProtoProjectConfiguration) = with(currentData) {
+        hasFingerprint() && !(fingerprint.hasNec() || fingerprint.hasSecugenSimMatcher())
     }
 
     override suspend fun migrate(currentData: ProtoProjectConfiguration): ProtoProjectConfiguration {
diff --git a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigLedsModeMigration.kt b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigLedsModeMigration.kt
index ceeb89dab9..370954fd2b 100644
--- a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigLedsModeMigration.kt
+++ b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectConfigLedsModeMigration.kt
@@ -15,8 +15,9 @@ class ProjectConfigLedsModeMigration @Inject constructor() : DataMigration<Proto
         Simber.i("Migration of project configuration displayLiveFeedback to leds mode is done", tag = MIGRATION)
     }
 
-    override suspend fun shouldMigrate(currentData: ProtoProjectConfiguration) =
-        currentData.fingerprint.secugenSimMatcher.vero2.displayLiveFeedback
+    override suspend fun shouldMigrate(currentData: ProtoProjectConfiguration) = with(currentData) {
+        hasFingerprint() && fingerprint.secugenSimMatcher.vero2.displayLiveFeedback
+    }
 
     override suspend fun migrate(currentData: ProtoProjectConfiguration): ProtoProjectConfiguration {
         Simber.i("Start migration of project configuration displayLiveFeedback to leds mode ", tag = MIGRATION)
diff --git a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceBioSdkMigrationTest.kt b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceBioSdkMigrationTest.kt
index 0dc767e73b..83a70bb8c2 100644
--- a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceBioSdkMigrationTest.kt
+++ b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceBioSdkMigrationTest.kt
@@ -9,6 +9,16 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class ProjectConfigFaceBioSdkMigrationTest {
+    @Test
+    fun `should not migrate if doesn't have face`() = runTest {
+        val currentData = ProtoProjectConfiguration
+            .newBuilder()
+            .build()
+        val shouldMigrate = ProjectConfigFaceBioSdkMigration().shouldMigrate(currentData)
+
+        assertThat(shouldMigrate).isFalse()
+    }
+
     @Test
     fun `should migrate if face has no rankone config`() = runTest {
         val currentData = ProtoProjectConfiguration
diff --git a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceEmptyVersionMigrationTest.kt b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceEmptyVersionMigrationTest.kt
index 3e8b2ff180..38f98e4428 100644
--- a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceEmptyVersionMigrationTest.kt
+++ b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFaceEmptyVersionMigrationTest.kt
@@ -8,6 +8,17 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class ProjectConfigFaceEmptyVersionMigrationTest {
+    @Test
+    fun `should not migrate if doesn't have face`() = runTest {
+        val currentData = ProtoProjectConfiguration
+            .newBuilder()
+            .build()
+
+        val shouldMigrate = ProjectConfigFaceEmptyVersionMigration().shouldMigrate(currentData)
+
+        assertThat(shouldMigrate).isFalse()
+    }
+
     @Test
     fun `should migrate if face has empty version`() = runTest {
         val currentData = ProtoProjectConfiguration
diff --git a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFingerprintBioSdkMigrationTest.kt b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFingerprintBioSdkMigrationTest.kt
index 7a9d4b3d39..0ef5fc2eb7 100644
--- a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFingerprintBioSdkMigrationTest.kt
+++ b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigFingerprintBioSdkMigrationTest.kt
@@ -27,6 +27,17 @@ class ProjectConfigFingerprintBioSdkMigrationTest {
         Truth.assertThat(shouldMigrate).isTrue()
     }
 
+    @Test
+    fun `should not migrate if doesn't have fingerprint`() = runTest {
+        val currentData = ProtoProjectConfiguration
+            .newBuilder()
+            .build()
+
+        val shouldMigrate = ProjectConfigFingerprintBioSdkMigration().shouldMigrate(currentData)
+
+        Truth.assertThat(shouldMigrate).isFalse()
+    }
+
     @Test
     fun `should not migrate if fingerprint has nec`() = runTest {
         val currentData = ProtoProjectConfiguration
diff --git a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigLedsModeMigrationTest.kt b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigLedsModeMigrationTest.kt
index adbceda90d..dd34bbd2c0 100644
--- a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigLedsModeMigrationTest.kt
+++ b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigLedsModeMigrationTest.kt
@@ -34,9 +34,23 @@ class ProjectConfigLedsModeMigrationTest {
         every { mockSecugenSimMatcher.vero2 } returns mockVero2
     }
 
+    @Test
+    fun `test doesn't have fingerprint, then shouldMigrate should return false`() = runBlocking {
+        // Given
+        every { mockProtoConfig.fingerprint } returns null
+
+        // When
+        val result = migration.shouldMigrate(mockProtoConfig)
+
+        // Then
+        assertThat(result).isFalse()
+    }
+
     @Test
     fun `test displayLiveFeedback is enabled, then shouldMigrate should return true`() = runBlocking {
         // Given
+        every { mockProtoConfig.hasFingerprint() } returns true
+        every { mockProtoConfig.fingerprint } returns mockFingerprint
         val mockVero2 = mockk<ProtoVero2Configuration>(relaxed = true)
         every { mockProtoConfig.fingerprint.secugenSimMatcher.vero2 } returns mockVero2
         every { mockVero2.displayLiveFeedback } returns true
@@ -51,6 +65,8 @@ class ProjectConfigLedsModeMigrationTest {
     @Test
     fun `test displayLiveFeedback is disabled, then shouldMigrate should return false`() = runBlocking {
         // Given
+        every { mockProtoConfig.hasFingerprint() } returns true
+        every { mockProtoConfig.fingerprint } returns mockFingerprint
         val mockVero2 = mockk<ProtoVero2Configuration>(relaxed = true)
         every { mockProtoConfig.fingerprint.secugenSimMatcher.vero2 } returns mockVero2
         every { mockVero2.displayLiveFeedback } returns false