[MS-408] Fixing the lack of tokenization once the project is refreshed

.github/workflows/pr-checks.yml

@@ -31,6 +31,7 @@ jobs:
                 infra:realm
                 infra:recent-user-activity
                 infra:config-store
+                infra:config-sync
                 infra:sync
                 infra:auth-store
                 infra:auth-logic

face/capture/build.gradle.kts

@@ -19,6 +19,7 @@ dependencies {
 
     implementation(project(":infra:orchestrator-data"))
     implementation(project(":infra:config-store"))
+    implementation(project(":infra:config-sync"))
     implementation(project(":infra:enrolment-records-store"))
     implementation(project(":infra:events"))
     implementation(project(":infra:images"))

face/capture/src/main/java/com/simprints/face/capture/screens/FaceCaptureViewModel.kt

@@ -14,8 +14,8 @@ import com.simprints.face.capture.models.FaceDetection
 import com.simprints.face.capture.usecases.BitmapToByteArrayUseCase
 import com.simprints.face.capture.usecases.SaveFaceImageUseCase
 import com.simprints.face.capture.usecases.SimpleCaptureEventReporter
-import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.config.store.models.FaceConfiguration
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.facebiosdk.initialization.FaceBioSdkInitializer
 import com.simprints.infra.license.LicenseRepository
 import com.simprints.infra.license.LicenseStatus
@@ -31,7 +31,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 internal class FaceCaptureViewModel @Inject constructor(
-    private val configRepository: ConfigRepository,
+    private val configManager: ConfigManager,
     private val saveFaceImage: SaveFaceImageUseCase,
     private val eventReporter: SimpleCaptureEventReporter,
     private val bitmapToByteArray: BitmapToByteArrayUseCase,
@@ -99,7 +99,7 @@ internal class FaceCaptureViewModel @Inject constructor(
 
     fun flowFinished() {
         viewModelScope.launch {
-            val projectConfiguration = configRepository.getProjectConfiguration()
+            val projectConfiguration = configManager.getProjectConfiguration()
             if (projectConfiguration.face?.imageSavingStrategy == FaceConfiguration.ImageSavingStrategy.ONLY_GOOD_SCAN) {
                 saveFaceDetections()
             }

face/capture/src/main/java/com/simprints/face/capture/screens/livefeedback/LiveFeedbackFragmentViewModel.kt

@@ -13,7 +13,7 @@ import com.simprints.face.capture.models.FaceDetection
 import com.simprints.face.capture.models.FaceTarget
 import com.simprints.face.capture.models.SymmetricTarget
 import com.simprints.face.capture.usecases.SimpleCaptureEventReporter
-import com.simprints.infra.config.store.ConfigRepository
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.facebiosdk.detection.Face
 import com.simprints.infra.facebiosdk.detection.FaceDetector
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -28,7 +28,7 @@ import javax.inject.Inject
 internal class LiveFeedbackFragmentViewModel @Inject constructor(
     private val frameProcessor: FrameProcessor,
     private val faceDetector: FaceDetector,
-    private val configRepository: ConfigRepository,
+    private val configManager: ConfigManager,
     private val eventReporter: SimpleCaptureEventReporter,
     private val timeHelper: TimeHelper,
 ) : ViewModel() {
@@ -101,7 +101,7 @@ internal class LiveFeedbackFragmentViewModel @Inject constructor(
      */
     private fun finishCapture(attemptNumber: Int) {
         viewModelScope.launch {
-            val projectConfiguration = configRepository.getProjectConfiguration()
+            val projectConfiguration = configManager.getProjectConfiguration()
             sortedQualifyingCaptures = userCaptures
                 .filter { it.hasValidStatus() && it.isAboveQualityThreshold(projectConfiguration.face!!.qualityThreshold) }
                 .sortedByDescending { it.face?.quality }
@@ -207,7 +207,7 @@ internal class LiveFeedbackFragmentViewModel @Inject constructor(
 
     private suspend fun sendCaptureEvent(faceDetection: FaceDetection, attemptNumber: Int) {
         val qualityThreshold =
-            configRepository.getProjectConfiguration().face!!.qualityThreshold.toFloat()
+            configManager.getProjectConfiguration().face!!.qualityThreshold.toFloat()
         eventReporter.addCaptureEvents(faceDetection, attemptNumber, qualityThreshold)
     }
 

face/capture/src/test/java/com/simprints/face/capture/screens/FaceCaptureViewModelTest.kt

@@ -7,8 +7,8 @@ import com.simprints.face.capture.models.FaceDetection
 import com.simprints.face.capture.usecases.BitmapToByteArrayUseCase
 import com.simprints.face.capture.usecases.SaveFaceImageUseCase
 import com.simprints.face.capture.usecases.SimpleCaptureEventReporter
-import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.config.store.models.FaceConfiguration.ImageSavingStrategy
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.facebiosdk.initialization.FaceBioSdkInitializer
 import com.simprints.infra.license.LicenseRepository
 import com.simprints.infra.license.LicenseStatus
@@ -41,7 +41,7 @@ class FaceCaptureViewModelTest {
     val testCoroutineRule = TestCoroutineRule()
 
     @MockK
-    private lateinit var configRepository: ConfigRepository
+    private lateinit var configManager: ConfigManager
 
     @MockK
     private lateinit var faceImageUseCase: SaveFaceImageUseCase
@@ -77,7 +77,7 @@ class FaceCaptureViewModelTest {
         every { bitmapToByteArrayUseCase.invoke(any()) } returns byteArrayOf()
 
         viewModel = FaceCaptureViewModel(
-            configRepository,
+            configManager,
             faceImageUseCase,
             eventReporter,
             bitmapToByteArrayUseCase,
@@ -89,7 +89,7 @@ class FaceCaptureViewModelTest {
 
     @Test
     fun `Save face detections should not be called when image saving strategy set to NEVER`() {
-        coEvery { configRepository.getProjectConfiguration().face?.imageSavingStrategy } returns ImageSavingStrategy.NEVER
+        coEvery { configManager.getProjectConfiguration().face?.imageSavingStrategy } returns ImageSavingStrategy.NEVER
 
         viewModel.captureFinished(faceDetections)
         viewModel.flowFinished()
@@ -98,7 +98,7 @@ class FaceCaptureViewModelTest {
 
     @Test
     fun `Save face detections should be called when image saving strategy set to ONLY_GOO_SCAN`() {
-        coEvery { configRepository.getProjectConfiguration().face?.imageSavingStrategy } returns ImageSavingStrategy.ONLY_GOOD_SCAN
+        coEvery { configManager.getProjectConfiguration().face?.imageSavingStrategy } returns ImageSavingStrategy.ONLY_GOOD_SCAN
 
         viewModel.captureFinished(faceDetections)
         viewModel.flowFinished()

face/capture/src/test/java/com/simprints/face/capture/screens/livefeedback/LiveFeedbackFragmentViewModelTest.kt

@@ -11,20 +11,23 @@ import com.simprints.core.tools.time.TimeHelper
 import com.simprints.core.tools.time.Timestamp
 import com.simprints.face.capture.models.FaceDetection
 import com.simprints.face.capture.usecases.SimpleCaptureEventReporter
-import com.simprints.infra.config.store.ConfigRepository
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.facebiosdk.detection.Face
 import com.simprints.infra.facebiosdk.detection.FaceDetector
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
 import com.simprints.testtools.common.livedata.testObserver
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.justRun
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import java.util.*
 import kotlin.random.Random
 
 @RunWith(RobolectricTestRunner::class)
@@ -52,7 +55,7 @@ internal class LiveFeedbackFragmentViewModelTest {
     lateinit var rectF: RectF
 
     @MockK
-    lateinit var configRepository: ConfigRepository
+    lateinit var configManager: ConfigManager
 
     @MockK
     lateinit var eventReporter: SimpleCaptureEventReporter
@@ -68,7 +71,7 @@ internal class LiveFeedbackFragmentViewModelTest {
     fun setUp() {
         MockKAnnotations.init(this, relaxed = true)
 
-        coEvery { configRepository.getProjectConfiguration().face?.qualityThreshold } returns QUALITY_THRESHOLD
+        coEvery { configManager.getProjectConfiguration().face?.qualityThreshold } returns QUALITY_THRESHOLD
         every { timeHelper.now() } returnsMany (0..100L).map { Timestamp(it) }
         justRun { frameProcessor.init(any(), any()) }
         justRun { frame.close() }
@@ -78,7 +81,7 @@ internal class LiveFeedbackFragmentViewModelTest {
         viewModel = LiveFeedbackFragmentViewModel(
             frameProcessor,
             faceDetector,
-            configRepository,
+            configManager,
             eventReporter,
             timeHelper
         )

feature/client-api/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
 
     implementation(project(":infra:auth-store"))
     implementation(project(":infra:config-store"))
+    implementation(project(":infra:config-sync"))
     implementation(project(":infra:events"))
     implementation(project(":infra:enrolment-records-store"))
     implementation(project(":infra:orchestrator-data"))

feature/client-api/src/main/java/com/simprints/feature/clientapi/ClientApiViewModel.kt

@@ -21,7 +21,7 @@ import com.simprints.feature.clientapi.usecases.GetEventsForCoSyncUseCase
 import com.simprints.feature.clientapi.usecases.IsFlowCompletedWithErrorUseCase
 import com.simprints.feature.clientapi.usecases.SimpleEventReporter
 import com.simprints.infra.authstore.AuthStore
-import com.simprints.infra.config.store.ConfigRepository
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.logging.Simber
 import com.simprints.infra.orchestration.data.ActionRequest
 import com.simprints.infra.orchestration.data.ActionRequestIdentifier
@@ -48,7 +48,7 @@ class ClientApiViewModel @Inject internal constructor(
     private val deleteSessionEventsIfNeeded: DeleteSessionEventsIfNeededUseCase,
     private val isFlowCompletedWithError: IsFlowCompletedWithErrorUseCase,
     private val authStore: AuthStore,
-    private val configRepository: ConfigRepository,
+    private val configManager: ConfigManager,
 ) : ViewModel() {
 
     val returnResponse: LiveData<LiveDataEventWithContent<Bundle>>
@@ -64,7 +64,7 @@ class ClientApiViewModel @Inject internal constructor(
     private val _showAlert = MutableLiveData<LiveDataEventWithContent<ClientApiError>>()
 
     private suspend fun getProject() =
-        runCatching { configRepository.getProject(authStore.signedInProjectId) }.getOrNull()
+        runCatching { configManager.getProject(authStore.signedInProjectId) }.getOrNull()
 
     suspend fun handleIntent(action: String, extras: Bundle): ActionRequest? {
         val extrasMap = extras.toMap()

feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/DeleteSessionEventsIfNeededUseCase.kt

@@ -1,21 +1,21 @@
 package com.simprints.feature.clientapi.usecases
 
 import com.simprints.core.ExternalScope
-import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.config.store.models.canSyncDataToSimprints
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.events.EventRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 internal class DeleteSessionEventsIfNeededUseCase @Inject constructor(
-    private val configRepository: ConfigRepository,
+    private val configManager: ConfigManager,
     private val eventRepository: EventRepository,
     @ExternalScope private val externalScope: CoroutineScope,
 ) {
 
     suspend operator fun invoke(sessionId: String) = externalScope.launch {
-        if (!configRepository.getProjectConfiguration().canSyncDataToSimprints()) {
+        if (!configManager.getProjectConfiguration().canSyncDataToSimprints()) {
             eventRepository.deleteEventScope(sessionId)
         }
     }

feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForSubjectUseCase.kt

@@ -2,24 +2,24 @@ package com.simprints.feature.clientapi.usecases
 
 import com.simprints.core.tools.json.JsonHelper
 import com.simprints.core.tools.utils.EncodingUtils
-import com.simprints.infra.events.event.cosync.CoSyncEnrolmentRecordEvents
-import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.config.store.models.canCoSyncAllData
 import com.simprints.infra.config.store.models.canCoSyncBiometricData
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository
 import com.simprints.infra.enrolment.records.store.domain.models.Subject
 import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery
+import com.simprints.infra.events.event.cosync.CoSyncEnrolmentRecordEvents
 import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent
 import javax.inject.Inject
 
 internal class GetEnrolmentCreationEventForSubjectUseCase @Inject constructor(
-    private val configRepository: ConfigRepository,
+    private val configManager: ConfigManager,
     private val enrolmentRecordRepository: EnrolmentRecordRepository,
     private val encoder: EncodingUtils,
     private val jsonHelper: JsonHelper,
 ) {
     suspend operator fun invoke(projectId: String, subjectId: String): String? {
-        val config = configRepository.getProjectConfiguration()
+        val config = configManager.getProjectConfiguration()
 
         if (!config.canCoSyncAllData() && !config.canCoSyncBiometricData()) {
             return null

feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEventsForCoSyncUseCase.kt

@@ -4,15 +4,15 @@ import com.fasterxml.jackson.databind.module.SimpleModule
 import com.simprints.core.domain.tokenization.TokenizableString
 import com.simprints.core.domain.tokenization.serialization.TokenizationAsStringSerializer
 import com.simprints.core.tools.json.JsonHelper
-import com.simprints.infra.events.event.cosync.CoSyncEvents
-import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.config.store.models.Project
 import com.simprints.infra.config.store.models.canCoSyncAllData
 import com.simprints.infra.config.store.models.canCoSyncAnalyticsData
 import com.simprints.infra.config.store.models.canCoSyncBiometricData
 import com.simprints.infra.config.store.models.canCoSyncData
 import com.simprints.infra.config.store.tokenization.TokenizationProcessor
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.events.EventRepository
+import com.simprints.infra.events.event.cosync.CoSyncEvents
 import com.simprints.infra.events.event.domain.models.EnrolmentEventV2
 import com.simprints.infra.events.event.domain.models.Event
 import com.simprints.infra.events.event.domain.models.PersonCreationEvent
@@ -21,14 +21,14 @@ import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCap
 import javax.inject.Inject
 
 internal class GetEventsForCoSyncUseCase @Inject constructor(
-    private val configRepository: ConfigRepository,
+    private val configManager: ConfigManager,
     private val eventRepository: EventRepository,
     private val jsonHelper: JsonHelper,
     private val tokenizationProcessor: TokenizationProcessor,
 ) {
 
     suspend operator fun invoke(sessionId: String, project: Project?): String? {
-        val config = configRepository.getProjectConfiguration()
+        val config = configManager.getProjectConfiguration()
 
         if (!config.canCoSyncData()) {
             return null

feature/client-api/src/test/java/com/simprints/feature/clientapi/ClientApiViewModelTest.kt

@@ -15,7 +15,7 @@ import com.simprints.feature.clientapi.usecases.GetEventsForCoSyncUseCase
 import com.simprints.feature.clientapi.usecases.IsFlowCompletedWithErrorUseCase
 import com.simprints.feature.clientapi.usecases.SimpleEventReporter
 import com.simprints.infra.authstore.AuthStore
-import com.simprints.infra.config.store.ConfigRepository
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.orchestration.data.ActionRequest
 import com.simprints.infra.orchestration.data.ActionRequestIdentifier
 import com.simprints.infra.orchestration.data.ActionResponse
@@ -73,7 +73,7 @@ internal class ClientApiViewModelTest {
     lateinit var authStore: AuthStore
 
     @MockK
-    lateinit var configRepository: ConfigRepository
+    lateinit var configManager: ConfigManager
 
     private lateinit var viewModel: ClientApiViewModel
 
@@ -100,7 +100,7 @@ internal class ClientApiViewModelTest {
             deleteSessionEventsIfNeeded = deleteSessionEventsIfNeeded,
             isFlowCompletedWithError = isFlowCompletedWithError,
             authStore = authStore,
-            configRepository = configRepository
+            configManager = configManager
         )
     }
 

feature/client-api/src/test/java/com/simprints/feature/clientapi/usecases/DeleteSessionEventsIfNeededUseCaseTest.kt

@@ -1,7 +1,7 @@
 package com.simprints.feature.clientapi.usecases
 
-import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.config.store.models.UpSynchronizationConfiguration
+import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.events.EventRepository
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
 import io.mockk.MockKAnnotations
@@ -21,7 +21,7 @@ class DeleteSessionEventsIfNeededUseCaseTest {
     val testCoroutineRule = TestCoroutineRule()
 
     @MockK
-    private lateinit var configRepository: ConfigRepository
+    private lateinit var configManager: ConfigManager
 
     @MockK
     private lateinit var eventRepository: EventRepository
@@ -33,15 +33,15 @@ class DeleteSessionEventsIfNeededUseCaseTest {
         MockKAnnotations.init(this, relaxed = true)
 
         deleteUseCase = DeleteSessionEventsIfNeededUseCase(
-            configRepository,
+            configManager,
             eventRepository,
             CoroutineScope(testCoroutineRule.testCoroutineDispatcher),
         )
     }
 
     @Test
     fun `deletes session events if data sync disabled`() = runTest {
-        coEvery { configRepository.getProjectConfiguration() } returns mockk {
+        coEvery { configManager.getProjectConfiguration() } returns mockk {
             coEvery { synchronization.up.simprints.kind } returns UpSynchronizationConfiguration.UpSynchronizationKind.NONE
         }
 
@@ -54,7 +54,7 @@ class DeleteSessionEventsIfNeededUseCaseTest {
     @Test
     fun `does not delete session events if data sync enabled`() = runTest {
 
-        coEvery { configRepository.getProjectConfiguration() } returns mockk {
+        coEvery { configManager.getProjectConfiguration() } returns mockk {
             coEvery { synchronization.up.simprints.kind } returns UpSynchronizationConfiguration.UpSynchronizationKind.ALL
         }