CORE-3187 Dismantle ConfigManager

face/capture/build.gradle.kts

@@ -19,7 +19,6 @@ 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

@@ -12,8 +12,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.logging.LoggingConstants.CrashReportTag
 import com.simprints.infra.logging.Simber
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -23,10 +23,10 @@ import javax.inject.Inject
 
 @HiltViewModel
 internal class FaceCaptureViewModel @Inject constructor(
-    private val configManager: ConfigManager,
+    private val configRepository: ConfigRepository,
     private val saveFaceImage: SaveFaceImageUseCase,
     private val eventReporter: SimpleCaptureEventReporter,
-    private val bitmapToByteArray: BitmapToByteArrayUseCase
+    private val bitmapToByteArray: BitmapToByteArrayUseCase,
 ) : ViewModel() {
 
     // Updated in live feedback screen
@@ -63,7 +63,7 @@ internal class FaceCaptureViewModel @Inject constructor(
 
     fun flowFinished() {
         viewModelScope.launch {
-            val projectConfiguration = configManager.getProjectConfiguration()
+            val projectConfiguration = configRepository.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.sync.ConfigManager
+import com.simprints.infra.config.store.ConfigRepository
 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 configManager: ConfigManager,
+    private val configRepository: ConfigRepository,
     private val eventReporter: SimpleCaptureEventReporter,
     private val timeHelper: TimeHelper,
 ) : ViewModel() {
@@ -85,7 +85,7 @@ internal class LiveFeedbackFragmentViewModel @Inject constructor(
         samplesToCapture: Int,
         attemptNumber: Int,
         cropRect: RectF,
-        previewSize: Size
+        previewSize: Size,
     ) {
         this.samplesToCapture = samplesToCapture
         this.attemptNumber = attemptNumber
@@ -101,7 +101,7 @@ internal class LiveFeedbackFragmentViewModel @Inject constructor(
      */
     private fun finishCapture(attemptNumber: Int) {
         viewModelScope.launch {
-            val projectConfiguration = configManager.getProjectConfiguration()
+            val projectConfiguration = configRepository.getProjectConfiguration()
             sortedQualifyingCaptures = userCaptures
                 .filter { it.hasValidStatus() && it.isAboveQualityThreshold(projectConfiguration.face!!.qualityThreshold) }
                 .sortedByDescending { it.face?.quality }
@@ -115,7 +115,7 @@ internal class LiveFeedbackFragmentViewModel @Inject constructor(
 
     private fun getFaceDetectionFromPotentialFace(
         bitmap: Bitmap,
-        potentialFace: Face?
+        potentialFace: Face?,
     ): FaceDetection {
         return if (potentialFace == null) {
             bitmap.recycle()
@@ -187,7 +187,8 @@ internal class LiveFeedbackFragmentViewModel @Inject constructor(
     }
 
     private suspend fun sendCaptureEvent(faceDetection: FaceDetection, attemptNumber: Int) {
-        val qualityThreshold = configManager.getProjectConfiguration().face!!.qualityThreshold.toFloat()
+        val qualityThreshold =
+            configRepository.getProjectConfiguration().face!!.qualityThreshold.toFloat()
         eventReporter.addCaptureEvents(faceDetection, attemptNumber, qualityThreshold)
     }
 

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

@@ -6,7 +6,7 @@ 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.sync.ConfigManager
+import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.config.store.models.FaceConfiguration.ImageSavingStrategy
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
 import com.simprints.testtools.common.livedata.getOrAwaitValue
@@ -31,7 +31,7 @@ class FaceCaptureViewModelTest {
     val testCoroutineRule = TestCoroutineRule()
 
     @MockK
-    private lateinit var configManager: ConfigManager
+    private lateinit var configRepository: ConfigRepository
 
     @MockK
     private lateinit var faceImageUseCase: SaveFaceImageUseCase
@@ -59,7 +59,7 @@ class FaceCaptureViewModelTest {
 
 
         viewModel = FaceCaptureViewModel(
-            configManager,
+            configRepository,
             faceImageUseCase,
             eventReporter,
             bitmapToByteArrayUseCase,
@@ -68,7 +68,7 @@ class FaceCaptureViewModelTest {
 
     @Test
     fun `Save face detections should not be called when image saving strategy set to NEVER`() = runTest {
-        coEvery { configManager.getProjectConfiguration().face?.imageSavingStrategy } returns ImageSavingStrategy.NEVER
+        coEvery { configRepository.getProjectConfiguration().face?.imageSavingStrategy } returns ImageSavingStrategy.NEVER
 
         viewModel.captureFinished(faceDetections)
         viewModel.flowFinished()
@@ -77,7 +77,7 @@ class FaceCaptureViewModelTest {
 
     @Test
     fun `Save face detections should be called when image saving strategy set to ONLY_GOO_SCAN`() = runTest {
-        coEvery { configManager.getProjectConfiguration().face?.imageSavingStrategy } returns ImageSavingStrategy.ONLY_GOOD_SCAN
+        coEvery { configRepository.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

@@ -10,7 +10,7 @@ import com.google.common.truth.Truth.assertThat
 import com.simprints.core.tools.time.TimeHelper
 import com.simprints.face.capture.models.FaceDetection
 import com.simprints.face.capture.usecases.SimpleCaptureEventReporter
-import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.facebiosdk.detection.Face
 import com.simprints.infra.facebiosdk.detection.FaceDetector
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
@@ -51,7 +51,7 @@ internal class LiveFeedbackFragmentViewModelTest {
     lateinit var rectF: RectF
 
     @MockK
-    lateinit var configManager: ConfigManager
+    lateinit var configRepository: ConfigRepository
 
     @MockK
     lateinit var eventReporter: SimpleCaptureEventReporter
@@ -68,7 +68,7 @@ internal class LiveFeedbackFragmentViewModelTest {
     fun setUp() {
         MockKAnnotations.init(this, relaxed = true)
 
-        coEvery { configManager.getProjectConfiguration().face?.qualityThreshold } returns QUALITY_THRESHOLD
+        coEvery { configRepository.getProjectConfiguration().face?.qualityThreshold } returns QUALITY_THRESHOLD
         every { timeHelper.now() } returnsMany (0..100L).toList()
         justRun { frameProcessor.init(any(), any()) }
         justRun { frame.close() }
@@ -78,7 +78,7 @@ internal class LiveFeedbackFragmentViewModelTest {
         viewModel = LiveFeedbackFragmentViewModel(
             frameProcessor,
             faceDetector,
-            configManager,
+            configRepository,
             eventReporter,
             timeHelper
         )

feature/client-api/build.gradle.kts

@@ -10,7 +10,6 @@ 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

@@ -20,9 +20,8 @@ import com.simprints.feature.clientapi.usecases.GetEnrolmentCreationEventForSubj
 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.orchestration.data.responses.AppVerifyResponse
 import com.simprints.infra.authstore.AuthStore
-import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.logging.Simber
 import com.simprints.infra.orchestration.data.ActionRequest
 import com.simprints.infra.orchestration.data.ActionRequestIdentifier
@@ -32,6 +31,7 @@ import com.simprints.infra.orchestration.data.responses.AppEnrolResponse
 import com.simprints.infra.orchestration.data.responses.AppErrorResponse
 import com.simprints.infra.orchestration.data.responses.AppIdentifyResponse
 import com.simprints.infra.orchestration.data.responses.AppRefusalResponse
+import com.simprints.infra.orchestration.data.responses.AppVerifyResponse
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -48,7 +48,7 @@ class ClientApiViewModel @Inject internal constructor(
     private val deleteSessionEventsIfNeeded: DeleteSessionEventsIfNeededUseCase,
     private val isFlowCompletedWithError: IsFlowCompletedWithErrorUseCase,
     private val authStore: AuthStore,
-    private val configManager: ConfigManager
+    private val configRepository: ConfigRepository,
 ) : 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 { configManager.getProject(authStore.signedInProjectId) }.getOrNull()
+        runCatching { configRepository.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 configManager: ConfigManager,
+    private val configRepository: ConfigRepository,
     private val eventRepository: EventRepository,
-    @ExternalScope private val externalScope: CoroutineScope
+    @ExternalScope private val externalScope: CoroutineScope,
 ) {
 
     suspend operator fun invoke(sessionId: String) = externalScope.launch {
-        if (!configManager.getProjectConfiguration().canSyncDataToSimprints()) {
+        if (!configRepository.getProjectConfiguration().canSyncDataToSimprints()) {
             eventRepository.deleteSessionEvents(sessionId)
         }
     }

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

@@ -3,23 +3,23 @@ package com.simprints.feature.clientapi.usecases
 import com.simprints.core.tools.json.JsonHelper
 import com.simprints.core.tools.utils.EncodingUtils
 import com.simprints.feature.clientapi.models.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.domain.models.subject.EnrolmentRecordCreationEvent
 import javax.inject.Inject
 
 internal class GetEnrolmentCreationEventForSubjectUseCase @Inject constructor(
-    private val configManager: ConfigManager,
+    private val configRepository: ConfigRepository,
     private val enrolmentRecordRepository: EnrolmentRecordRepository,
     private val encoder: EncodingUtils,
     private val jsonHelper: JsonHelper,
 ) {
     suspend operator fun invoke(projectId: String, subjectId: String): String? {
-        val config = configManager.getProjectConfiguration()
+        val config = configRepository.getProjectConfiguration()
 
         if (!config.canCoSyncAllData() && !config.canCoSyncBiometricData()) {
             return null

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

@@ -5,13 +5,13 @@ 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.feature.clientapi.models.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.domain.models.EnrolmentEventV2
 import com.simprints.infra.events.event.domain.models.Event
@@ -25,13 +25,14 @@ import kotlinx.coroutines.flow.toList
 import javax.inject.Inject
 
 internal class GetEventsForCoSyncUseCase @Inject constructor(
-    private val configManager: ConfigManager,
+    private val configRepository: ConfigRepository,
     private val eventRepository: EventRepository,
     private val jsonHelper: JsonHelper,
-    private val tokenizationProcessor: TokenizationProcessor
+    private val tokenizationProcessor: TokenizationProcessor,
 ) {
+
     suspend operator fun invoke(sessionId: String, project: Project?): String? {
-        val config = configManager.getProjectConfiguration()
+        val config = configRepository.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.sync.ConfigManager
+import com.simprints.infra.config.store.ConfigRepository
 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 configManager: ConfigManager
+    lateinit var configRepository: ConfigRepository
 
     private lateinit var viewModel: ClientApiViewModel
 
@@ -100,7 +100,7 @@ internal class ClientApiViewModelTest {
             deleteSessionEventsIfNeeded = deleteSessionEventsIfNeeded,
             isFlowCompletedWithError = isFlowCompletedWithError,
             authStore = authStore,
-            configManager = configManager
+            configRepository = configRepository
         )
     }
 

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

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