diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 4be69f8c18..a022edc27f 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -30,13 +30,12 @@ jobs: with: modules: | infra:orchestrator-data - infra:realm + infra:enrolment-records:repository + infra:enrolment-records:realm-store infra:recent-user-activity infra:config-store infra:config-sync infra:sync - infra:auth-store - infra:auth-logic reportsId: infra1 infra-unit-tests-2: @@ -46,10 +45,11 @@ jobs: with: modules: | infra:events - infra:event-sync - infra:enrolment-records-store + infra:event-sync infra:license infra:images + infra:auth-store + infra:auth-logic reportsId: infra2 feature-unit-tests1: diff --git a/README.md b/README.md index 64aeee8120..eb5f4d9109 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Following the guidelines above the end goal of SID should look roughly like: - infralogging (com.simprints.infra.logging) - infralogin (com.simprints.infra.login) - infranetwork (com.simprints.infra.networking) -- infrarealm (com.simprints.infra.realm) +- infrarealm (com.simprints.infra.enrolment.records.realm.store) - infrasecurity (com.simprints.infra.security) *Note: There is no longer a core module. There should be no "catch all" module, because it will just become a graveyard / completely overused, like the previous ID module. Every module should have a clear singular purpose.*
diff --git a/face/capture/build.gradle.kts b/face/capture/build.gradle.kts index e8010df44a..adc4666678 100644 --- a/face/capture/build.gradle.kts +++ b/face/capture/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { implementation(project(":infra:auth-store")) implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:events")) implementation(project(":infra:images")) implementation(project(":infra:resources")) @@ -29,7 +29,7 @@ dependencies { implementation(project(":infra:license")) implementation(project(":feature:alert")) - //BIO SDK + // BIO SDK implementation(project(":face:infra:bio-sdk-resolver")) implementation(libs.androidX.cameraX.core) diff --git a/feature/client-api/build.gradle.kts b/feature/client-api/build.gradle.kts index 7e8f2b2656..e7e46967e7 100644 --- a/feature/client-api/build.gradle.kts +++ b/feature/client-api/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) implementation(project(":infra:events")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:orchestrator-data")) implementation(project(":infra:logging-persistent")) diff --git a/feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForSubjectUseCase.kt b/feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForSubjectUseCase.kt index 355f117d9f..2d4e1bec59 100644 --- a/feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForSubjectUseCase.kt +++ b/feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForSubjectUseCase.kt @@ -9,9 +9,9 @@ import com.simprints.core.tools.utils.EncodingUtils 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.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.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 diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForSubjectUseCaseTest.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForSubjectUseCaseTest.kt index 3d0b70f208..992cf81fa2 100644 --- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForSubjectUseCaseTest.kt +++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForSubjectUseCaseTest.kt @@ -5,7 +5,7 @@ import com.simprints.core.tools.json.JsonHelper import com.simprints.core.tools.utils.EncodingUtils import com.simprints.infra.config.store.models.UpSynchronizationConfiguration import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import com.simprints.testtools.common.coroutines.TestCoroutineRule import io.mockk.MockKAnnotations import io.mockk.coEvery diff --git a/feature/dashboard/build.gradle.kts b/feature/dashboard/build.gradle.kts index 1eb13c18c3..667db3814e 100644 --- a/feature/dashboard/build.gradle.kts +++ b/feature/dashboard/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) implementation(project(":infra:sync")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:images")) implementation(project(":infra:auth-store")) implementation(project(":infra:auth-logic")) diff --git a/feature/dashboard/src/main/java/com/simprints/feature/dashboard/debug/DebugFragment.kt b/feature/dashboard/src/main/java/com/simprints/feature/dashboard/debug/DebugFragment.kt index e3d966aae4..1ca121d97a 100644 --- a/feature/dashboard/src/main/java/com/simprints/feature/dashboard/debug/DebugFragment.kt +++ b/feature/dashboard/src/main/java/com/simprints/feature/dashboard/debug/DebugFragment.kt @@ -14,7 +14,7 @@ import com.simprints.core.DispatcherIO import com.simprints.feature.dashboard.R import com.simprints.feature.dashboard.databinding.FragmentDebugBinding import com.simprints.infra.authstore.AuthStore -import com.simprints.infra.enrolment.records.store.local.EnrolmentRecordLocalDataSource +import com.simprints.infra.enrolment.records.repository.local.EnrolmentRecordLocalDataSource import com.simprints.infra.events.EventRepository import com.simprints.infra.eventsync.EventSyncManager import com.simprints.infra.eventsync.status.models.EventSyncWorkerState diff --git a/feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModel.kt b/feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModel.kt index 242a161fd4..59d238cea5 100644 --- a/feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModel.kt +++ b/feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModel.kt @@ -20,8 +20,8 @@ import com.simprints.infra.config.store.models.TokenKeyType import com.simprints.infra.config.store.models.isEventDownSyncAllowed import com.simprints.infra.config.store.tokenization.TokenizationProcessor import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.eventsync.EventSyncManager import com.simprints.infra.eventsync.status.models.DownSyncCounts diff --git a/feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/moduleselection/repository/ModuleRepositoryImpl.kt b/feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/moduleselection/repository/ModuleRepositoryImpl.kt index e4e990400d..7563f041ed 100644 --- a/feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/moduleselection/repository/ModuleRepositoryImpl.kt +++ b/feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/moduleselection/repository/ModuleRepositoryImpl.kt @@ -2,8 +2,8 @@ package com.simprints.feature.dashboard.settings.syncinfo.moduleselection.reposi import com.simprints.core.domain.tokenization.values import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.eventsync.EventSyncManager import com.simprints.infra.logging.LoggingConstants.CrashReportTag.SETTINGS import com.simprints.infra.logging.LoggingConstants.CrashReportingCustomKeys.MODULE_IDS diff --git a/feature/dashboard/src/test/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModelTest.kt b/feature/dashboard/src/test/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModelTest.kt index 1f9331641b..c4c55f0229 100644 --- a/feature/dashboard/src/test/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModelTest.kt +++ b/feature/dashboard/src/test/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModelTest.kt @@ -15,8 +15,8 @@ import com.simprints.infra.config.store.models.SynchronizationConfiguration import com.simprints.infra.config.store.models.TokenKeyType import com.simprints.infra.config.store.tokenization.TokenizationProcessor import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.eventsync.EventSyncManager import com.simprints.infra.eventsync.status.models.DownSyncCounts diff --git a/feature/dashboard/src/test/java/com/simprints/feature/dashboard/settings/syncinfo/moduleselection/repository/ModuleRepositoryImplTest.kt b/feature/dashboard/src/test/java/com/simprints/feature/dashboard/settings/syncinfo/moduleselection/repository/ModuleRepositoryImplTest.kt index d502dd875a..603f856a72 100644 --- a/feature/dashboard/src/test/java/com/simprints/feature/dashboard/settings/syncinfo/moduleselection/repository/ModuleRepositoryImplTest.kt +++ b/feature/dashboard/src/test/java/com/simprints/feature/dashboard/settings/syncinfo/moduleselection/repository/ModuleRepositoryImplTest.kt @@ -8,7 +8,7 @@ import com.simprints.infra.config.store.models.DownSynchronizationConfiguration import com.simprints.infra.config.store.models.GeneralConfiguration import com.simprints.infra.config.store.models.ProjectConfiguration import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import com.simprints.infra.eventsync.EventSyncManager import io.mockk.MockKAnnotations import io.mockk.coEvery diff --git a/feature/enrol-last-biometric/build.gradle.kts b/feature/enrol-last-biometric/build.gradle.kts index 8cf1870191..dec9378420 100644 --- a/feature/enrol-last-biometric/build.gradle.kts +++ b/feature/enrol-last-biometric/build.gradle.kts @@ -14,6 +14,5 @@ dependencies { implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) implementation(project(":infra:events")) - implementation(project(":infra:enrolment-records-store")) - + implementation(project(":infra:enrolment-records:repository")) } diff --git a/feature/enrol-last-biometric/src/main/java/com/simprints/feature/enrollast/screen/EnrolLastBiometricViewModel.kt b/feature/enrol-last-biometric/src/main/java/com/simprints/feature/enrollast/screen/EnrolLastBiometricViewModel.kt index 1c4342d16c..0e26782c12 100644 --- a/feature/enrol-last-biometric/src/main/java/com/simprints/feature/enrollast/screen/EnrolLastBiometricViewModel.kt +++ b/feature/enrol-last-biometric/src/main/java/com/simprints/feature/enrollast/screen/EnrolLastBiometricViewModel.kt @@ -14,9 +14,9 @@ import com.simprints.feature.enrollast.screen.EnrolLastState.ErrorType.GENERAL_E import com.simprints.feature.enrollast.screen.usecase.BuildSubjectUseCase import com.simprints.feature.enrollast.screen.usecase.HasDuplicateEnrolmentsUseCase 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.SubjectAction +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction import com.simprints.infra.events.event.domain.models.EnrolmentEventV2 import com.simprints.infra.events.event.domain.models.PersonCreationEvent import com.simprints.infra.events.session.SessionEventRepository diff --git a/feature/enrol-last-biometric/src/main/java/com/simprints/feature/enrollast/screen/usecase/BuildSubjectUseCase.kt b/feature/enrol-last-biometric/src/main/java/com/simprints/feature/enrollast/screen/usecase/BuildSubjectUseCase.kt index 6508550295..75ab358dd4 100644 --- a/feature/enrol-last-biometric/src/main/java/com/simprints/feature/enrollast/screen/usecase/BuildSubjectUseCase.kt +++ b/feature/enrol-last-biometric/src/main/java/com/simprints/feature/enrollast/screen/usecase/BuildSubjectUseCase.kt @@ -9,7 +9,7 @@ import com.simprints.feature.enrollast.EnrolLastBiometricStepResult import com.simprints.feature.enrollast.FaceTemplateCaptureResult import com.simprints.feature.enrollast.FingerTemplateCaptureResult import com.simprints.infra.config.store.models.Finger -import com.simprints.infra.enrolment.records.store.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.Subject import com.simprints.infra.eventsync.sync.down.tasks.SubjectFactory import java.util.Date import java.util.UUID diff --git a/feature/enrol-last-biometric/src/test/java/com/simprints/feature/enrollast/screen/EnrolLastBiometricViewModelTest.kt b/feature/enrol-last-biometric/src/test/java/com/simprints/feature/enrollast/screen/EnrolLastBiometricViewModelTest.kt index 5da2ef70c7..34affcfd60 100644 --- a/feature/enrol-last-biometric/src/test/java/com/simprints/feature/enrollast/screen/EnrolLastBiometricViewModelTest.kt +++ b/feature/enrol-last-biometric/src/test/java/com/simprints/feature/enrollast/screen/EnrolLastBiometricViewModelTest.kt @@ -12,8 +12,8 @@ import com.simprints.feature.enrollast.screen.usecase.BuildSubjectUseCase import com.simprints.feature.enrollast.screen.usecase.HasDuplicateEnrolmentsUseCase import com.simprints.infra.config.store.models.ProjectConfiguration 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.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.Subject import com.simprints.infra.events.event.domain.models.EnrolmentEventV2 import com.simprints.infra.events.event.domain.models.PersonCreationEvent import com.simprints.infra.events.event.domain.models.PersonCreationEvent.PersonCreationPayload diff --git a/feature/fetch-subject/build.gradle.kts b/feature/fetch-subject/build.gradle.kts index e7860c6c5d..1e7a5946c6 100644 --- a/feature/fetch-subject/build.gradle.kts +++ b/feature/fetch-subject/build.gradle.kts @@ -12,10 +12,9 @@ dependencies { implementation(project(":feature:alert")) implementation(project(":feature:exit-form")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:event-sync")) implementation(project(":infra:events")) implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) - } diff --git a/feature/fetch-subject/src/main/java/com/simprints/feature/fetchsubject/screen/usecase/FetchSubjectUseCase.kt b/feature/fetch-subject/src/main/java/com/simprints/feature/fetchsubject/screen/usecase/FetchSubjectUseCase.kt index 6be82fc8b8..712e4f82b9 100644 --- a/feature/fetch-subject/src/main/java/com/simprints/feature/fetchsubject/screen/usecase/FetchSubjectUseCase.kt +++ b/feature/fetch-subject/src/main/java/com/simprints/feature/fetchsubject/screen/usecase/FetchSubjectUseCase.kt @@ -1,8 +1,8 @@ package com.simprints.feature.fetchsubject.screen.usecase import com.simprints.feature.fetchsubject.screen.FetchSubjectState -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.eventsync.EventSyncManager import com.simprints.infra.logging.Simber import com.simprints.infra.network.ConnectivityTracker diff --git a/feature/fetch-subject/src/test/java/com/simprints/feature/fetchsubject/screen/usecase/FetchSubjectUseCaseTest.kt b/feature/fetch-subject/src/test/java/com/simprints/feature/fetchsubject/screen/usecase/FetchSubjectUseCaseTest.kt index 95c53c1cc5..ee34edac5e 100644 --- a/feature/fetch-subject/src/test/java/com/simprints/feature/fetchsubject/screen/usecase/FetchSubjectUseCaseTest.kt +++ b/feature/fetch-subject/src/test/java/com/simprints/feature/fetchsubject/screen/usecase/FetchSubjectUseCaseTest.kt @@ -2,9 +2,9 @@ package com.simprints.feature.fetchsubject.screen.usecase import com.google.common.truth.Truth.assertThat import com.simprints.feature.fetchsubject.screen.FetchSubjectState -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.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.eventsync.EventSyncManager import com.simprints.infra.network.ConnectivityTracker import io.mockk.MockKAnnotations diff --git a/feature/login-check/build.gradle.kts b/feature/login-check/build.gradle.kts index 8bba4d117c..aed6bacb2d 100644 --- a/feature/login-check/build.gradle.kts +++ b/feature/login-check/build.gradle.kts @@ -19,5 +19,5 @@ dependencies { implementation(project(":infra:auth-store")) implementation(project(":infra:auth-logic")) implementation(project(":infra:recent-user-activity")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) } diff --git a/feature/login-check/src/main/java/com/simprints/feature/logincheck/usecases/UpdateSessionScopePayloadUseCase.kt b/feature/login-check/src/main/java/com/simprints/feature/logincheck/usecases/UpdateSessionScopePayloadUseCase.kt index a597bdf91b..24054a814a 100644 --- a/feature/login-check/src/main/java/com/simprints/feature/logincheck/usecases/UpdateSessionScopePayloadUseCase.kt +++ b/feature/login-check/src/main/java/com/simprints/feature/logincheck/usecases/UpdateSessionScopePayloadUseCase.kt @@ -1,7 +1,7 @@ package com.simprints.feature.logincheck.usecases import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import com.simprints.infra.events.session.SessionEventRepository import javax.inject.Inject diff --git a/feature/login-check/src/test/java/com/simprints/feature/logincheck/usecases/UpdateSessionScopePayloadUseCaseTest.kt b/feature/login-check/src/test/java/com/simprints/feature/logincheck/usecases/UpdateSessionScopePayloadUseCaseTest.kt index 90a70f51e0..43ea759562 100644 --- a/feature/login-check/src/test/java/com/simprints/feature/logincheck/usecases/UpdateSessionScopePayloadUseCaseTest.kt +++ b/feature/login-check/src/test/java/com/simprints/feature/logincheck/usecases/UpdateSessionScopePayloadUseCaseTest.kt @@ -3,7 +3,7 @@ package com.simprints.feature.logincheck.usecases import com.google.common.truth.Truth.assertThat import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import com.simprints.infra.events.event.domain.models.scope.DatabaseInfo import com.simprints.infra.events.event.domain.models.scope.Device import com.simprints.infra.events.event.domain.models.scope.EventScope diff --git a/feature/matcher/build.gradle.kts b/feature/matcher/build.gradle.kts index 0ab1b89c14..e6a34a307d 100644 --- a/feature/matcher/build.gradle.kts +++ b/feature/matcher/build.gradle.kts @@ -11,7 +11,7 @@ android { dependencies { implementation(project(":infra:orchestrator-data")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:events")) implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) diff --git a/feature/matcher/src/main/java/com/simprints/matcher/MatchContract.kt b/feature/matcher/src/main/java/com/simprints/matcher/MatchContract.kt index edebfbbdf9..ef9d263025 100644 --- a/feature/matcher/src/main/java/com/simprints/matcher/MatchContract.kt +++ b/feature/matcher/src/main/java/com/simprints/matcher/MatchContract.kt @@ -2,8 +2,8 @@ package com.simprints.matcher import com.simprints.core.domain.common.FlowType import com.simprints.infra.config.store.models.FingerprintConfiguration -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.matcher.screen.MatchFragmentArgs object MatchContract { diff --git a/feature/matcher/src/main/java/com/simprints/matcher/MatchParams.kt b/feature/matcher/src/main/java/com/simprints/matcher/MatchParams.kt index 844c854a49..497ad40088 100644 --- a/feature/matcher/src/main/java/com/simprints/matcher/MatchParams.kt +++ b/feature/matcher/src/main/java/com/simprints/matcher/MatchParams.kt @@ -5,8 +5,8 @@ import androidx.annotation.Keep import com.simprints.core.domain.common.FlowType import com.simprints.core.domain.fingerprint.IFingerIdentifier import com.simprints.infra.config.store.models.FingerprintConfiguration -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports import kotlinx.parcelize.Parcelize diff --git a/feature/matcher/src/main/java/com/simprints/matcher/usecases/FaceMatcherUseCase.kt b/feature/matcher/src/main/java/com/simprints/matcher/usecases/FaceMatcherUseCase.kt index 89a68ec3cc..a151aca006 100644 --- a/feature/matcher/src/main/java/com/simprints/matcher/usecases/FaceMatcherUseCase.kt +++ b/feature/matcher/src/main/java/com/simprints/matcher/usecases/FaceMatcherUseCase.kt @@ -6,9 +6,9 @@ import com.simprints.face.infra.basebiosdk.matching.FaceMatcher import com.simprints.face.infra.basebiosdk.matching.FaceSample import com.simprints.face.infra.biosdkresolver.ResolveFaceBioSdkUseCase import com.simprints.infra.config.store.models.Project -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.logging.LoggingConstants import com.simprints.infra.logging.Simber import com.simprints.matcher.FaceMatchResult diff --git a/feature/matcher/src/main/java/com/simprints/matcher/usecases/FingerprintMatcherUseCase.kt b/feature/matcher/src/main/java/com/simprints/matcher/usecases/FingerprintMatcherUseCase.kt index af87226abd..0153fd45d7 100644 --- a/feature/matcher/src/main/java/com/simprints/matcher/usecases/FingerprintMatcherUseCase.kt +++ b/feature/matcher/src/main/java/com/simprints/matcher/usecases/FingerprintMatcherUseCase.kt @@ -12,9 +12,9 @@ import com.simprints.infra.config.store.models.FingerprintConfiguration import com.simprints.infra.config.store.models.FingerprintConfiguration.FingerComparisonStrategy.CROSS_FINGER_USING_MEAN_OF_MAX import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.logging.LoggingConstants import com.simprints.infra.logging.Simber import com.simprints.matcher.FingerprintMatchResult diff --git a/feature/matcher/src/main/java/com/simprints/matcher/usecases/SaveMatchEventUseCase.kt b/feature/matcher/src/main/java/com/simprints/matcher/usecases/SaveMatchEventUseCase.kt index db4243bcad..24c65d4830 100644 --- a/feature/matcher/src/main/java/com/simprints/matcher/usecases/SaveMatchEventUseCase.kt +++ b/feature/matcher/src/main/java/com/simprints/matcher/usecases/SaveMatchEventUseCase.kt @@ -5,7 +5,7 @@ import com.simprints.core.domain.common.FlowType import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.FingerprintConfiguration import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.events.event.domain.models.FingerComparisonStrategy import com.simprints.infra.events.event.domain.models.MatchEntry import com.simprints.infra.events.event.domain.models.OneToManyMatchEvent diff --git a/feature/matcher/src/test/java/com/simprints/matcher/screen/MatchViewModelTest.kt b/feature/matcher/src/test/java/com/simprints/matcher/screen/MatchViewModelTest.kt index fa5db616ee..8629422436 100644 --- a/feature/matcher/src/test/java/com/simprints/matcher/screen/MatchViewModelTest.kt +++ b/feature/matcher/src/test/java/com/simprints/matcher/screen/MatchViewModelTest.kt @@ -10,7 +10,7 @@ import com.simprints.core.tools.time.Timestamp import com.simprints.infra.authstore.AuthStore import com.simprints.infra.config.store.models.FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource import com.simprints.matcher.FaceMatchResult import com.simprints.matcher.FingerprintMatchResult import com.simprints.matcher.MatchParams diff --git a/feature/matcher/src/test/java/com/simprints/matcher/usecases/FaceMatcherUseCaseTest.kt b/feature/matcher/src/test/java/com/simprints/matcher/usecases/FaceMatcherUseCaseTest.kt index 6edddd17d8..1ab631ad2b 100644 --- a/feature/matcher/src/test/java/com/simprints/matcher/usecases/FaceMatcherUseCaseTest.kt +++ b/feature/matcher/src/test/java/com/simprints/matcher/usecases/FaceMatcherUseCaseTest.kt @@ -7,21 +7,17 @@ import com.simprints.core.domain.face.FaceSample import com.simprints.face.infra.basebiosdk.matching.FaceMatcher import com.simprints.face.infra.biosdkresolver.ResolveFaceBioSdkUseCase import com.simprints.infra.config.store.models.Project -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.FaceIdentity -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.FaceIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.matcher.FaceMatchResult import com.simprints.matcher.MatchParams -import com.simprints.matcher.MatchResultItem import com.simprints.testtools.common.coroutines.TestCoroutineRule import io.mockk.MockKAnnotations import io.mockk.coEvery import io.mockk.coVerify import io.mockk.impl.annotations.MockK -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.first -import kotlinx.coroutines.flow.last import kotlinx.coroutines.flow.toList import kotlinx.coroutines.test.runTest import org.junit.Before diff --git a/feature/matcher/src/test/java/com/simprints/matcher/usecases/FingerprintMatcherUseCaseTest.kt b/feature/matcher/src/test/java/com/simprints/matcher/usecases/FingerprintMatcherUseCaseTest.kt index e9bd2e0885..02547326f1 100644 --- a/feature/matcher/src/test/java/com/simprints/matcher/usecases/FingerprintMatcherUseCaseTest.kt +++ b/feature/matcher/src/test/java/com/simprints/matcher/usecases/FingerprintMatcherUseCaseTest.kt @@ -10,10 +10,10 @@ import com.simprints.fingerprint.infra.biosdk.ResolveBioSdkWrapperUseCase import com.simprints.infra.config.store.models.FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.FingerprintIdentity -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.FingerprintIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.matcher.MatchParams import com.simprints.testtools.common.coroutines.TestCoroutineRule import io.mockk.MockKAnnotations diff --git a/feature/matcher/src/test/java/com/simprints/matcher/usecases/SaveMatchEventUseCaseTest.kt b/feature/matcher/src/test/java/com/simprints/matcher/usecases/SaveMatchEventUseCaseTest.kt index 92578e1059..3169497cb7 100644 --- a/feature/matcher/src/test/java/com/simprints/matcher/usecases/SaveMatchEventUseCaseTest.kt +++ b/feature/matcher/src/test/java/com/simprints/matcher/usecases/SaveMatchEventUseCaseTest.kt @@ -8,8 +8,8 @@ import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER import com.simprints.infra.config.store.models.FingerprintConfiguration.FingerComparisonStrategy import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.events.event.domain.models.OneToManyMatchEvent import com.simprints.infra.events.event.domain.models.OneToOneMatchEvent import com.simprints.infra.events.session.SessionEventRepository diff --git a/feature/orchestrator/build.gradle.kts b/feature/orchestrator/build.gradle.kts index ac0a8aa4b6..b301c2a3de 100644 --- a/feature/orchestrator/build.gradle.kts +++ b/feature/orchestrator/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { implementation(project(":fingerprint:capture")) implementation(project(":infra:orchestrator-data")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:recent-user-activity")) implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/MatchStepStubPayload.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/MatchStepStubPayload.kt index 9ceb1cc959..2d9d2601cd 100644 --- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/MatchStepStubPayload.kt +++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/MatchStepStubPayload.kt @@ -4,8 +4,8 @@ import android.os.Parcelable import androidx.core.os.bundleOf import com.simprints.core.domain.common.FlowType import com.simprints.infra.config.store.models.FingerprintConfiguration -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.matcher.MatchContract import com.simprints.matcher.MatchParams import kotlinx.parcelize.Parcelize diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/EnrolSubjectUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/EnrolSubjectUseCase.kt index 2ef9cd2d28..f0522293d9 100644 --- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/EnrolSubjectUseCase.kt +++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/EnrolSubjectUseCase.kt @@ -2,9 +2,9 @@ package com.simprints.feature.orchestrator.usecases.response import com.simprints.core.tools.time.TimeHelper import com.simprints.infra.config.store.models.Project -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.SubjectAction +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction import com.simprints.infra.events.event.domain.models.EnrolmentEventV2 import com.simprints.infra.events.event.domain.models.PersonCreationEvent import com.simprints.infra.events.session.SessionEventRepository diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildMatcherSubjectQueryUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildMatcherSubjectQueryUseCase.kt index 40a2d1c13a..c695d7d979 100644 --- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildMatcherSubjectQueryUseCase.kt +++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildMatcherSubjectQueryUseCase.kt @@ -3,7 +3,7 @@ package com.simprints.feature.orchestrator.usecases.steps import com.simprints.core.ExcludedFromGeneratedTestCoverageReports import com.simprints.infra.config.store.models.IdentificationConfiguration import com.simprints.infra.config.store.models.ProjectConfiguration -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.orchestration.data.ActionRequest import javax.inject.Inject diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt index c8b6fb6fae..d0336a6617 100644 --- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt +++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt @@ -29,8 +29,8 @@ import com.simprints.infra.config.store.models.experimental import com.simprints.infra.config.store.models.fromDomainToModuleApi import com.simprints.infra.config.store.models.isAgeRestricted import com.simprints.infra.config.store.models.sortedUniqueAgeGroups -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.orchestration.data.ActionRequest import com.simprints.matcher.MatchContract import javax.inject.Inject diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/OrchestratorViewModelTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/OrchestratorViewModelTest.kt index 50eef0b1f3..1555e1c9bd 100644 --- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/OrchestratorViewModelTest.kt +++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/OrchestratorViewModelTest.kt @@ -37,8 +37,8 @@ import com.simprints.infra.config.store.models.FingerprintConfiguration.BioSdk.N import com.simprints.infra.config.store.models.FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER import com.simprints.infra.config.store.models.GeneralConfiguration import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.infra.orchestration.data.responses.AppErrorResponse import com.simprints.matcher.MatchParams import com.simprints.testtools.common.coroutines.TestCoroutineRule diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/EnrolSubjectUseCaseTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/EnrolSubjectUseCaseTest.kt index a41189e623..d3a101c468 100644 --- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/EnrolSubjectUseCaseTest.kt +++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/EnrolSubjectUseCaseTest.kt @@ -5,9 +5,9 @@ import com.simprints.core.domain.tokenization.asTokenizableRaw import com.simprints.core.tools.time.TimeHelper import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.Project -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.SubjectAction +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction import com.simprints.infra.events.event.domain.models.EnrolmentEventV2 import com.simprints.infra.events.event.domain.models.PersonCreationEvent import com.simprints.infra.events.event.domain.models.PersonCreationEvent.PersonCreationPayload diff --git a/feature/validate-subject-pool/build.gradle.kts b/feature/validate-subject-pool/build.gradle.kts index 58c306dc9e..2bdef73325 100644 --- a/feature/validate-subject-pool/build.gradle.kts +++ b/feature/validate-subject-pool/build.gradle.kts @@ -9,7 +9,7 @@ android { dependencies { - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:config-store")) implementation(project(":infra:event-sync")) implementation(project(":infra:events")) diff --git a/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/ValidateSubjectPoolContract.kt b/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/ValidateSubjectPoolContract.kt index b35d5e2be7..08d2c99fee 100644 --- a/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/ValidateSubjectPoolContract.kt +++ b/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/ValidateSubjectPoolContract.kt @@ -2,7 +2,7 @@ package com.simprints.feature.validatepool import android.os.Bundle import com.simprints.feature.validatepool.screen.ValidateSubjectPoolFragmentArgs -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery object ValidateSubjectPoolContract { fun getArgs(subjectQuery: SubjectQuery): Bundle = ValidateSubjectPoolFragmentArgs(subjectQuery).toBundle() diff --git a/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/screen/ValidateSubjectPoolViewModel.kt b/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/screen/ValidateSubjectPoolViewModel.kt index 6cca65ab27..76948c5d4a 100644 --- a/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/screen/ValidateSubjectPoolViewModel.kt +++ b/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/screen/ValidateSubjectPoolViewModel.kt @@ -10,7 +10,7 @@ import com.simprints.feature.validatepool.usecase.HasRecordsUseCase import com.simprints.feature.validatepool.usecase.IsModuleIdNotSyncedUseCase import com.simprints.feature.validatepool.usecase.RunBlockingEventSyncUseCase import com.simprints.feature.validatepool.usecase.ShouldSuggestSyncUseCase -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/usecase/HasRecordsUseCase.kt b/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/usecase/HasRecordsUseCase.kt index a5b22f310a..a5d70febdc 100644 --- a/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/usecase/HasRecordsUseCase.kt +++ b/feature/validate-subject-pool/src/main/java/com/simprints/feature/validatepool/usecase/HasRecordsUseCase.kt @@ -1,7 +1,7 @@ package com.simprints.feature.validatepool.usecase -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import javax.inject.Inject internal class HasRecordsUseCase @Inject constructor( diff --git a/feature/validate-subject-pool/src/main/res/navigation/graph_validate_subject_pool.xml b/feature/validate-subject-pool/src/main/res/navigation/graph_validate_subject_pool.xml index d3f23dbe36..b56395e2de 100644 --- a/feature/validate-subject-pool/src/main/res/navigation/graph_validate_subject_pool.xml +++ b/feature/validate-subject-pool/src/main/res/navigation/graph_validate_subject_pool.xml @@ -13,7 +13,7 @@ + app:argType="com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery" /> diff --git a/feature/validate-subject-pool/src/test/java/com/simprints/feature/validatepool/screen/ValidateSubjectPoolViewModelTest.kt b/feature/validate-subject-pool/src/test/java/com/simprints/feature/validatepool/screen/ValidateSubjectPoolViewModelTest.kt index 5edc6f8e04..97e21c95c6 100644 --- a/feature/validate-subject-pool/src/test/java/com/simprints/feature/validatepool/screen/ValidateSubjectPoolViewModelTest.kt +++ b/feature/validate-subject-pool/src/test/java/com/simprints/feature/validatepool/screen/ValidateSubjectPoolViewModelTest.kt @@ -8,7 +8,7 @@ import com.simprints.feature.validatepool.usecase.HasRecordsUseCase import com.simprints.feature.validatepool.usecase.IsModuleIdNotSyncedUseCase import com.simprints.feature.validatepool.usecase.RunBlockingEventSyncUseCase import com.simprints.feature.validatepool.usecase.ShouldSuggestSyncUseCase -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import com.simprints.testtools.common.coroutines.TestCoroutineRule import io.mockk.MockKAnnotations import io.mockk.coEvery diff --git a/feature/validate-subject-pool/src/test/java/com/simprints/feature/validatepool/usecase/HasRecordsUseCaseTest.kt b/feature/validate-subject-pool/src/test/java/com/simprints/feature/validatepool/usecase/HasRecordsUseCaseTest.kt index 02a71df3aa..4d7a5bd06a 100644 --- a/feature/validate-subject-pool/src/test/java/com/simprints/feature/validatepool/usecase/HasRecordsUseCaseTest.kt +++ b/feature/validate-subject-pool/src/test/java/com/simprints/feature/validatepool/usecase/HasRecordsUseCaseTest.kt @@ -1,8 +1,8 @@ package com.simprints.feature.validatepool.usecase import com.google.common.truth.Truth.assertThat -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery import io.mockk.MockKAnnotations import io.mockk.coEvery import io.mockk.impl.annotations.MockK diff --git a/fingerprint/capture/build.gradle.kts b/fingerprint/capture/build.gradle.kts index 568f8f486b..e67b4ed4bd 100644 --- a/fingerprint/capture/build.gradle.kts +++ b/fingerprint/capture/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { // Simprints implementation(project(":infra:orchestrator-data")) implementation(project(":infra:events")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":fingerprint:infra:scanner")) implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) diff --git a/infra/auth-logic/build.gradle.kts b/infra/auth-logic/build.gradle.kts index 161d5916c0..20f6f8930c 100644 --- a/infra/auth-logic/build.gradle.kts +++ b/infra/auth-logic/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { implementation(project(":infra:config-sync")) implementation(project(":infra:events")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:images")) implementation(project(":infra:recent-user-activity")) implementation(project(":infra:license")) diff --git a/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/authenticator/SignerManager.kt b/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/authenticator/SignerManager.kt index ee92933da3..db53ef9f58 100644 --- a/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/authenticator/SignerManager.kt +++ b/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/authenticator/SignerManager.kt @@ -5,7 +5,7 @@ import com.simprints.fingerprint.infra.scanner.ScannerManager import com.simprints.infra.authstore.AuthStore import com.simprints.infra.authstore.domain.models.Token import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import com.simprints.infra.events.EventRepository import com.simprints.infra.images.ImageRepository import com.simprints.infra.license.LicenseRepository diff --git a/infra/auth-logic/src/test/java/com/simprints/infra/authlogic/authenticator/SignerManagerTest.kt b/infra/auth-logic/src/test/java/com/simprints/infra/authlogic/authenticator/SignerManagerTest.kt index f6981f6f62..5ba9343990 100644 --- a/infra/auth-logic/src/test/java/com/simprints/infra/authlogic/authenticator/SignerManagerTest.kt +++ b/infra/auth-logic/src/test/java/com/simprints/infra/authlogic/authenticator/SignerManagerTest.kt @@ -8,7 +8,7 @@ import com.simprints.infra.config.store.models.ProjectConfiguration import com.simprints.infra.config.store.models.ProjectState import com.simprints.infra.config.store.models.ProjectWithConfig import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import com.simprints.infra.events.EventRepository import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_PROJECT_ID import com.simprints.infra.images.ImageRepository diff --git a/infra/config-store/build.gradle.kts b/infra/config-store/build.gradle.kts index f236d94452..65221159f2 100644 --- a/infra/config-store/build.gradle.kts +++ b/infra/config-store/build.gradle.kts @@ -5,12 +5,11 @@ plugins { android { namespace = "com.simprints.infra.config.store" - } dependencies { implementation(project(":infra:auth-store")) - implementation(project(":infra:realm")) + implementation(project(":infra:enrolment-records:realm-store")) implementation(libs.datastore) diff --git a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectRealmMigration.kt b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectRealmMigration.kt index 576a896485..a222879b9e 100644 --- a/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectRealmMigration.kt +++ b/infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/ProjectRealmMigration.kt @@ -3,10 +3,10 @@ package com.simprints.infra.config.store.local.migrations import androidx.datastore.core.DataMigration import com.simprints.infra.authstore.AuthStore import com.simprints.infra.config.store.local.models.ProtoProject +import com.simprints.infra.enrolment.records.realm.store.RealmWrapper +import com.simprints.infra.enrolment.records.realm.store.models.DbProject import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MIGRATION import com.simprints.infra.logging.Simber -import com.simprints.infra.realm.RealmWrapper -import com.simprints.infra.realm.models.DbProject import javax.inject.Inject /** diff --git a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectRealmMigrationTest.kt b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectRealmMigrationTest.kt index 740505692c..64c0397a0c 100644 --- a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectRealmMigrationTest.kt +++ b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectRealmMigrationTest.kt @@ -4,8 +4,8 @@ import com.google.common.truth.Truth.assertThat import com.simprints.infra.authstore.AuthStore import com.simprints.infra.config.store.local.models.ProtoProject import com.simprints.infra.config.store.testtools.protoProject -import com.simprints.infra.realm.RealmWrapper -import com.simprints.infra.realm.models.DbProject +import com.simprints.infra.enrolment.records.realm.store.RealmWrapper +import com.simprints.infra.enrolment.records.realm.store.models.DbProject import io.mockk.CapturingSlot import io.mockk.MockKAnnotations import io.mockk.coEvery diff --git a/infra/config-sync/build.gradle.kts b/infra/config-sync/build.gradle.kts index cdf159f3b2..3b129eafa7 100644 --- a/infra/config-sync/build.gradle.kts +++ b/infra/config-sync/build.gradle.kts @@ -8,7 +8,7 @@ android { } dependencies { - + implementation(project(":infra:config-store")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) } diff --git a/infra/config-sync/src/main/java/com/simprints/infra/config/sync/ConfigManager.kt b/infra/config-sync/src/main/java/com/simprints/infra/config/sync/ConfigManager.kt index 7cabf1b198..7d257aa7e3 100644 --- a/infra/config-sync/src/main/java/com/simprints/infra/config/sync/ConfigManager.kt +++ b/infra/config-sync/src/main/java/com/simprints/infra/config/sync/ConfigManager.kt @@ -7,7 +7,7 @@ import com.simprints.infra.config.store.models.PrivacyNoticeResult import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.store.models.ProjectConfiguration import com.simprints.infra.config.store.models.ProjectWithConfig -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.onStart import javax.inject.Inject diff --git a/infra/config-sync/src/test/java/com/simprints/infra/config/sync/ConfigManagerTest.kt b/infra/config-sync/src/test/java/com/simprints/infra/config/sync/ConfigManagerTest.kt index 6eeadfdc9f..92ffbe74fa 100644 --- a/infra/config-sync/src/test/java/com/simprints/infra/config/sync/ConfigManagerTest.kt +++ b/infra/config-sync/src/test/java/com/simprints/infra/config/sync/ConfigManagerTest.kt @@ -6,7 +6,7 @@ import com.simprints.infra.config.store.models.DeviceConfiguration import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.store.models.ProjectConfiguration import com.simprints.infra.config.store.models.ProjectWithConfig -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import io.mockk.MockKAnnotations import io.mockk.coEvery import io.mockk.coVerify diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/EnrolmentRecordLocalDataSource.kt b/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/EnrolmentRecordLocalDataSource.kt deleted file mode 100644 index 15f5cab170..0000000000 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/EnrolmentRecordLocalDataSource.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.simprints.infra.enrolment.records.store.local - -import com.simprints.infra.config.store.models.Project -import com.simprints.infra.enrolment.records.store.IdentityDataSource -import com.simprints.infra.enrolment.records.store.domain.models.Subject -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery - -interface EnrolmentRecordLocalDataSource : IdentityDataSource { - suspend fun load(query: SubjectQuery): List - - suspend fun delete(queries: List) - - suspend fun deleteAll() - - suspend fun performActions(actions: List, project: Project) -} diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordRemoteDataSource.kt b/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordRemoteDataSource.kt deleted file mode 100644 index 584706a90d..0000000000 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordRemoteDataSource.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.simprints.infra.enrolment.records.store.remote - -import com.simprints.infra.enrolment.records.store.domain.models.Subject - -interface EnrolmentRecordRemoteDataSource { - suspend fun uploadRecords(subjects: List) -} diff --git a/infra/realm/.gitignore b/infra/enrolment-records/realm-store/.gitignore similarity index 100% rename from infra/realm/.gitignore rename to infra/enrolment-records/realm-store/.gitignore diff --git a/infra/realm/build.gradle.kts b/infra/enrolment-records/realm-store/build.gradle.kts similarity index 69% rename from infra/realm/build.gradle.kts rename to infra/enrolment-records/realm-store/build.gradle.kts index df5d1dc343..8bbe177cbc 100644 --- a/infra/realm/build.gradle.kts +++ b/infra/enrolment-records/realm-store/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } android { - namespace = "com.simprints.infra.realm" + namespace = "com.simprints.infra.enrolment.records.realm.store" } dependencies { diff --git a/infra/realm/src/main/AndroidManifest.xml b/infra/enrolment-records/realm-store/src/main/AndroidManifest.xml similarity index 63% rename from infra/realm/src/main/AndroidManifest.xml rename to infra/enrolment-records/realm-store/src/main/AndroidManifest.xml index e100076157..2d10029868 100644 --- a/infra/realm/src/main/AndroidManifest.xml +++ b/infra/enrolment-records/realm-store/src/main/AndroidManifest.xml @@ -1,4 +1,3 @@ - + - diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/RealmModule.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/RealmModule.kt similarity index 83% rename from infra/realm/src/main/java/com/simprints/infra/realm/RealmModule.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/RealmModule.kt index 898a260d9f..5ae229dc1f 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/RealmModule.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/RealmModule.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm +package com.simprints.infra.enrolment.records.realm.store import dagger.Binds import dagger.Module diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/RealmWrapper.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/RealmWrapper.kt similarity index 88% rename from infra/realm/src/main/java/com/simprints/infra/realm/RealmWrapper.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/RealmWrapper.kt index 2f21147247..c3d71bbb3b 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/RealmWrapper.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/RealmWrapper.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm +package com.simprints.infra.enrolment.records.realm.store import io.realm.kotlin.MutableRealm import io.realm.kotlin.Realm diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/RealmWrapperImpl.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/RealmWrapperImpl.kt similarity index 96% rename from infra/realm/src/main/java/com/simprints/infra/realm/RealmWrapperImpl.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/RealmWrapperImpl.kt index 8d198e4df9..0514544a8e 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/RealmWrapperImpl.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/RealmWrapperImpl.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm +package com.simprints.infra.enrolment.records.realm.store import android.content.ComponentName import android.content.Context @@ -6,11 +6,11 @@ import android.content.Intent import android.os.Build import com.simprints.core.DispatcherIO import com.simprints.infra.authstore.AuthStore +import com.simprints.infra.enrolment.records.realm.store.config.RealmConfig +import com.simprints.infra.enrolment.records.realm.store.exceptions.RealmUninitialisedException import com.simprints.infra.logging.LoggingConstants.CrashReportTag.DB_CORRUPTION import com.simprints.infra.logging.LoggingConstants.CrashReportTag.REALM_DB import com.simprints.infra.logging.Simber -import com.simprints.infra.realm.config.RealmConfig -import com.simprints.infra.realm.exceptions.RealmUninitialisedException import com.simprints.infra.security.SecurityManager import com.simprints.infra.security.keyprovider.LocalDbKey import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/config/RealmConfig.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/config/RealmConfig.kt similarity index 67% rename from infra/realm/src/main/java/com/simprints/infra/realm/config/RealmConfig.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/config/RealmConfig.kt index e7ac0eb41e..4c01402903 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/config/RealmConfig.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/config/RealmConfig.kt @@ -1,13 +1,13 @@ -package com.simprints.infra.realm.config +package com.simprints.infra.enrolment.records.realm.store.config import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports -import com.simprints.infra.realm.BuildConfig -import com.simprints.infra.realm.migration.RealmMigrations -import com.simprints.infra.realm.models.DbFaceSample -import com.simprints.infra.realm.models.DbFingerprintSample -import com.simprints.infra.realm.models.DbProject -import com.simprints.infra.realm.models.DbSubject +import com.simprints.infra.enrolment.records.realm.store.BuildConfig +import com.simprints.infra.enrolment.records.realm.store.migration.RealmMigrations +import com.simprints.infra.enrolment.records.realm.store.models.DbFaceSample +import com.simprints.infra.enrolment.records.realm.store.models.DbFingerprintSample +import com.simprints.infra.enrolment.records.realm.store.models.DbProject +import com.simprints.infra.enrolment.records.realm.store.models.DbSubject import io.realm.kotlin.RealmConfiguration import javax.inject.Inject import javax.inject.Singleton diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/exceptions/RealmUninitialisedException.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/exceptions/RealmUninitialisedException.kt similarity index 63% rename from infra/realm/src/main/java/com/simprints/infra/realm/exceptions/RealmUninitialisedException.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/exceptions/RealmUninitialisedException.kt index a7979ca013..045303d6a9 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/exceptions/RealmUninitialisedException.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/exceptions/RealmUninitialisedException.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.exceptions +package com.simprints.infra.enrolment.records.realm.store.exceptions class RealmUninitialisedException( message: String = "RealmUninitialisedException", diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/migration/RealmMigrations.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/RealmMigrations.kt similarity index 88% rename from infra/realm/src/main/java/com/simprints/infra/realm/migration/RealmMigrations.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/RealmMigrations.kt index 1cd2ced44d..add23befc5 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/migration/RealmMigrations.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/RealmMigrations.kt @@ -1,15 +1,14 @@ -package com.simprints.infra.realm.migration +package com.simprints.infra.enrolment.records.realm.store.migration -import com.simprints.infra.realm.migration.oldschemas.SubjectsSchemaV10 -import com.simprints.infra.realm.migration.oldschemas.SubjectsSchemaV11 -import com.simprints.infra.realm.migration.oldschemas.SubjectsSchemaV12 -import com.simprints.infra.realm.migration.oldschemas.SubjectsSchemaV13 -import com.simprints.infra.realm.models.DbFaceSample -import com.simprints.infra.realm.models.DbFingerprintSample -import com.simprints.infra.realm.models.toRealmInstant +import com.simprints.infra.enrolment.records.realm.store.migration.oldschemas.SubjectsSchemaV10 +import com.simprints.infra.enrolment.records.realm.store.migration.oldschemas.SubjectsSchemaV11 +import com.simprints.infra.enrolment.records.realm.store.migration.oldschemas.SubjectsSchemaV12 +import com.simprints.infra.enrolment.records.realm.store.migration.oldschemas.SubjectsSchemaV13 +import com.simprints.infra.enrolment.records.realm.store.models.DbFaceSample +import com.simprints.infra.enrolment.records.realm.store.models.DbFingerprintSample +import com.simprints.infra.enrolment.records.realm.store.models.toRealmInstant import io.realm.kotlin.dynamic.DynamicMutableRealmObject import io.realm.kotlin.dynamic.getValue -import io.realm.kotlin.dynamic.getValueList import io.realm.kotlin.migration.AutomaticSchemaMigration import io.realm.kotlin.types.RealmUUID import java.util.Date diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV10.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV10.kt similarity index 90% rename from infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV10.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV10.kt index 671a4552e8..3bab9c67fc 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV10.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV10.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.migration.oldschemas +package com.simprints.infra.enrolment.records.realm.store.migration.oldschemas // Starting from V10, we would referring Person/People as Subject/Subjects internal object SubjectsSchemaV10 { diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV11.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV11.kt similarity index 82% rename from infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV11.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV11.kt index 525c083e29..804abb9a34 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV11.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV11.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.migration.oldschemas +package com.simprints.infra.enrolment.records.realm.store.migration.oldschemas /** * Should add field format to new DbFaceSample and DbFingerprintSample diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV12.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV12.kt similarity index 62% rename from infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV12.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV12.kt index c68f47b99b..497ee015f4 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV12.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV12.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.migration.oldschemas +package com.simprints.infra.enrolment.records.realm.store.migration.oldschemas internal object SubjectsSchemaV12 { const val FINGERPRINT_FIELD_ID: String = "id" diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV13.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV13.kt similarity index 61% rename from infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV13.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV13.kt index 3f83471df7..b898f59bc6 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV13.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV13.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.migration.oldschemas +package com.simprints.infra.enrolment.records.realm.store.migration.oldschemas internal object SubjectsSchemaV13 { const val SUBJECT_TABLE = "DbSubject" diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV14.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV14.kt similarity index 75% rename from infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV14.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV14.kt index 1c50f6dd18..532368ce46 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/migration/oldschemas/SubjectsSchemaV14.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/migration/oldschemas/SubjectsSchemaV14.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.migration.oldschemas +package com.simprints.infra.enrolment.records.realm.store.migration.oldschemas internal object SubjectsSchemaV14 { const val SUBJECT_TABLE = "DbSubject" diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/models/DbFaceSample.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbFaceSample.kt similarity index 86% rename from infra/realm/src/main/java/com/simprints/infra/realm/models/DbFaceSample.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbFaceSample.kt index 3a90688dbd..b8b85674eb 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/models/DbFaceSample.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbFaceSample.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.models +package com.simprints.infra.enrolment.records.realm.store.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/models/DbFingerprintSample.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbFingerprintSample.kt similarity index 88% rename from infra/realm/src/main/java/com/simprints/infra/realm/models/DbFingerprintSample.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbFingerprintSample.kt index 62de7cccb9..cb109a80f6 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/models/DbFingerprintSample.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbFingerprintSample.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.models +package com.simprints.infra.enrolment.records.realm.store.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/models/DbProject.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbProject.kt similarity index 88% rename from infra/realm/src/main/java/com/simprints/infra/realm/models/DbProject.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbProject.kt index a8c836fb77..594f9428b2 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/models/DbProject.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbProject.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.models +package com.simprints.infra.enrolment.records.realm.store.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/models/DbSubject.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbSubject.kt similarity index 94% rename from infra/realm/src/main/java/com/simprints/infra/realm/models/DbSubject.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbSubject.kt index f8991c4259..ff507dec32 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/models/DbSubject.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/DbSubject.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.models +package com.simprints.infra.enrolment.records.realm.store.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports diff --git a/infra/realm/src/main/java/com/simprints/infra/realm/models/RealmInstanceExt.kt b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/RealmInstanceExt.kt similarity index 90% rename from infra/realm/src/main/java/com/simprints/infra/realm/models/RealmInstanceExt.kt rename to infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/RealmInstanceExt.kt index 4d8437f965..ed5c4b13ef 100644 --- a/infra/realm/src/main/java/com/simprints/infra/realm/models/RealmInstanceExt.kt +++ b/infra/enrolment-records/realm-store/src/main/java/com/simprints/infra/enrolment/records/realm/store/models/RealmInstanceExt.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.realm.models +package com.simprints.infra.enrolment.records.realm.store.models import io.realm.kotlin.types.RealmInstant import java.util.Date diff --git a/infra/realm/src/test/java/com/simprints/infra/realm/RealmWrapperImplTest.kt b/infra/enrolment-records/realm-store/src/test/java/com/simprints/infra/enrolment/records/realm/store/RealmWrapperImplTest.kt similarity index 94% rename from infra/realm/src/test/java/com/simprints/infra/realm/RealmWrapperImplTest.kt rename to infra/enrolment-records/realm-store/src/test/java/com/simprints/infra/enrolment/records/realm/store/RealmWrapperImplTest.kt index 2471958ff4..6c90d11cb4 100644 --- a/infra/realm/src/test/java/com/simprints/infra/realm/RealmWrapperImplTest.kt +++ b/infra/enrolment-records/realm-store/src/test/java/com/simprints/infra/enrolment/records/realm/store/RealmWrapperImplTest.kt @@ -1,11 +1,11 @@ -package com.simprints.infra.realm +package com.simprints.infra.enrolment.records.realm.store import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import com.simprints.infra.authstore.AuthStore -import com.simprints.infra.realm.config.RealmConfig -import com.simprints.infra.realm.exceptions.RealmUninitialisedException +import com.simprints.infra.enrolment.records.realm.store.config.RealmConfig +import com.simprints.infra.enrolment.records.realm.store.exceptions.RealmUninitialisedException import com.simprints.infra.security.SecurityManager import com.simprints.infra.security.keyprovider.LocalDbKey import com.simprints.testtools.common.coroutines.TestCoroutineRule diff --git a/infra/realm/src/test/java/com/simprints/infra/realm/migration/RealmMigrationsTest.kt b/infra/enrolment-records/realm-store/src/test/java/com/simprints/infra/enrolment/records/realm/store/migration/RealmMigrationsTest.kt similarity index 93% rename from infra/realm/src/test/java/com/simprints/infra/realm/migration/RealmMigrationsTest.kt rename to infra/enrolment-records/realm-store/src/test/java/com/simprints/infra/enrolment/records/realm/store/migration/RealmMigrationsTest.kt index aaacaa77a0..4a803e16d8 100644 --- a/infra/realm/src/test/java/com/simprints/infra/realm/migration/RealmMigrationsTest.kt +++ b/infra/enrolment-records/realm-store/src/test/java/com/simprints/infra/enrolment/records/realm/store/migration/RealmMigrationsTest.kt @@ -1,12 +1,12 @@ -package com.simprints.infra.realm.migration +package com.simprints.infra.enrolment.records.realm.store.migration import com.google.common.truth.Truth.assertThat -import com.simprints.infra.realm.migration.oldschemas.SubjectsSchemaV10 -import com.simprints.infra.realm.migration.oldschemas.SubjectsSchemaV11 -import com.simprints.infra.realm.migration.oldschemas.SubjectsSchemaV12 -import com.simprints.infra.realm.migration.oldschemas.SubjectsSchemaV13 -import com.simprints.infra.realm.models.DbFaceSample -import com.simprints.infra.realm.models.DbFingerprintSample +import com.simprints.infra.enrolment.records.realm.store.migration.oldschemas.SubjectsSchemaV10 +import com.simprints.infra.enrolment.records.realm.store.migration.oldschemas.SubjectsSchemaV11 +import com.simprints.infra.enrolment.records.realm.store.migration.oldschemas.SubjectsSchemaV12 +import com.simprints.infra.enrolment.records.realm.store.migration.oldschemas.SubjectsSchemaV13 +import com.simprints.infra.enrolment.records.realm.store.models.DbFaceSample +import com.simprints.infra.enrolment.records.realm.store.models.DbFingerprintSample import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/infra/enrolment-records-store/.gitignore b/infra/enrolment-records/repository/.gitignore similarity index 100% rename from infra/enrolment-records-store/.gitignore rename to infra/enrolment-records/repository/.gitignore diff --git a/infra/enrolment-records-store/build.gradle.kts b/infra/enrolment-records/repository/build.gradle.kts similarity index 72% rename from infra/enrolment-records-store/build.gradle.kts rename to infra/enrolment-records/repository/build.gradle.kts index bb95959674..17bcdc6f6e 100644 --- a/infra/enrolment-records-store/build.gradle.kts +++ b/infra/enrolment-records/repository/build.gradle.kts @@ -4,13 +4,13 @@ plugins { } android { - namespace = "com.simprints.infra.enrolment.records.store" + namespace = "com.simprints.infra.enrolment.records.repository" } dependencies { implementation(project(":infra:config-store")) implementation(project(":infra:auth-store")) - implementation(project(":infra:realm")) + implementation(project(":infra:enrolment-records:realm-store")) implementation(project(":infra:events")) implementation(libs.libsimprints) diff --git a/infra/enrolment-records-store/src/main/AndroidManifest.xml b/infra/enrolment-records/repository/src/main/AndroidManifest.xml similarity index 100% rename from infra/enrolment-records-store/src/main/AndroidManifest.xml rename to infra/enrolment-records/repository/src/main/AndroidManifest.xml diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordRepository.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepository.kt similarity index 66% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordRepository.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepository.kt index b371a40dda..5db9c23c68 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordRepository.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepository.kt @@ -1,12 +1,12 @@ -package com.simprints.infra.enrolment.records.store +package com.simprints.infra.enrolment.records.repository import com.simprints.core.ExcludedFromGeneratedTestCoverageReports import com.simprints.infra.config.store.models.Project -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.FaceIdentity -import com.simprints.infra.enrolment.records.store.domain.models.FingerprintIdentity -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery -import com.simprints.infra.enrolment.records.store.local.EnrolmentRecordLocalDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.FaceIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.FingerprintIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.local.EnrolmentRecordLocalDataSource @ExcludedFromGeneratedTestCoverageReports("This is an interface with no logic") interface EnrolmentRecordRepository : EnrolmentRecordLocalDataSource { diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordRepositoryImpl.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImpl.kt similarity index 85% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordRepositoryImpl.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImpl.kt index b80dfeec0c..9fbd8460b1 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordRepositoryImpl.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImpl.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store +package com.simprints.infra.enrolment.records.repository import android.content.Context import com.simprints.core.DispatcherIO @@ -6,15 +6,15 @@ import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.store.models.TokenKeyType import com.simprints.infra.config.store.tokenization.TokenizationProcessor -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.FaceIdentity -import com.simprints.infra.enrolment.records.store.domain.models.FingerprintIdentity -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery -import com.simprints.infra.enrolment.records.store.local.EnrolmentRecordLocalDataSource -import com.simprints.infra.enrolment.records.store.remote.EnrolmentRecordRemoteDataSource +import com.simprints.infra.enrolment.records.realm.store.exceptions.RealmUninitialisedException +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.FaceIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.FingerprintIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.local.EnrolmentRecordLocalDataSource +import com.simprints.infra.enrolment.records.repository.remote.EnrolmentRecordRemoteDataSource import com.simprints.infra.logging.Simber -import com.simprints.infra.realm.exceptions.RealmUninitialisedException import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext @@ -129,7 +129,8 @@ internal class EnrolmentRecordRepositoryImpl( dataSource: BiometricDataSource, project: Project, onCandidateLoaded: () -> Unit, - ): List = fromIdentityDataSource(dataSource).loadFingerprintIdentities(query, range, dataSource, project, onCandidateLoaded) + ): List = + fromIdentityDataSource(dataSource).loadFingerprintIdentities(query, range, dataSource, project, onCandidateLoaded) override suspend fun loadFaceIdentities( query: SubjectQuery, diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordsStoreModule.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordsStoreModule.kt similarity index 73% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordsStoreModule.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordsStoreModule.kt index c7bda99058..7074fd5388 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordsStoreModule.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordsStoreModule.kt @@ -1,15 +1,15 @@ -package com.simprints.infra.enrolment.records.store +package com.simprints.infra.enrolment.records.repository import android.content.Context import com.simprints.core.DispatcherIO import com.simprints.core.tools.json.JsonHelper import com.simprints.core.tools.utils.EncodingUtils -import com.simprints.infra.enrolment.records.store.commcare.CommCareIdentityDataSource -import com.simprints.infra.enrolment.records.store.local.EnrolmentRecordLocalDataSource -import com.simprints.infra.enrolment.records.store.local.EnrolmentRecordLocalDataSourceImpl -import com.simprints.infra.enrolment.records.store.remote.EnrolmentRecordRemoteDataSource -import com.simprints.infra.enrolment.records.store.remote.EnrolmentRecordRemoteDataSourceImpl -import com.simprints.infra.enrolment.records.store.usecases.CompareImplicitTokenizedStringsUseCase +import com.simprints.infra.enrolment.records.repository.commcare.CommCareIdentityDataSource +import com.simprints.infra.enrolment.records.repository.local.EnrolmentRecordLocalDataSource +import com.simprints.infra.enrolment.records.repository.local.EnrolmentRecordLocalDataSourceImpl +import com.simprints.infra.enrolment.records.repository.remote.EnrolmentRecordRemoteDataSource +import com.simprints.infra.enrolment.records.repository.remote.EnrolmentRecordRemoteDataSourceImpl +import com.simprints.infra.enrolment.records.repository.usecases.CompareImplicitTokenizedStringsUseCase import dagger.Binds import dagger.Module import dagger.Provides diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/IdentityDataSource.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/IdentityDataSource.kt similarity index 65% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/IdentityDataSource.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/IdentityDataSource.kt index 5749a4e9c5..32c6c7dd12 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/IdentityDataSource.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/IdentityDataSource.kt @@ -1,10 +1,10 @@ -package com.simprints.infra.enrolment.records.store +package com.simprints.infra.enrolment.records.repository import com.simprints.infra.config.store.models.Project -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.FaceIdentity -import com.simprints.infra.enrolment.records.store.domain.models.FingerprintIdentity -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.FaceIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.FingerprintIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery interface IdentityDataSource { suspend fun count( diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/commcare/CommCareIdentityDataSource.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareIdentityDataSource.kt similarity index 94% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/commcare/CommCareIdentityDataSource.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareIdentityDataSource.kt index 0c8d4b9baf..1f204c9f9e 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/commcare/CommCareIdentityDataSource.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareIdentityDataSource.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.commcare +package com.simprints.infra.enrolment.records.repository.commcare import android.content.Context import android.database.Cursor @@ -15,12 +15,12 @@ import com.simprints.core.tools.json.JsonHelper import com.simprints.core.tools.utils.EncodingUtils import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.enrolment.records.store.IdentityDataSource -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.FaceIdentity -import com.simprints.infra.enrolment.records.store.domain.models.FingerprintIdentity -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery -import com.simprints.infra.enrolment.records.store.usecases.CompareImplicitTokenizedStringsUseCase +import com.simprints.infra.enrolment.records.repository.IdentityDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.FaceIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.FingerprintIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.usecases.CompareImplicitTokenizedStringsUseCase import com.simprints.infra.events.event.cosync.CoSyncEnrolmentRecordCreationEventDeserializer import com.simprints.infra.events.event.cosync.CoSyncEnrolmentRecordEvents import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/BiometricDataSource.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/BiometricDataSource.kt similarity index 92% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/BiometricDataSource.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/BiometricDataSource.kt index b72052808a..c1d9e7de23 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/BiometricDataSource.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/BiometricDataSource.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.domain.models +package com.simprints.infra.enrolment.records.repository.domain.models import android.os.Parcelable import androidx.annotation.Keep diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/FaceIdentity.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/FaceIdentity.kt similarity index 75% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/FaceIdentity.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/FaceIdentity.kt index eb055b81df..32881787b5 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/FaceIdentity.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/FaceIdentity.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.domain.models +package com.simprints.infra.enrolment.records.repository.domain.models import android.os.Parcelable import com.simprints.core.domain.face.FaceSample diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/FingerIdentifier.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/FingerIdentifier.kt similarity index 96% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/FingerIdentifier.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/FingerIdentifier.kt index 79954cde25..f47e72f45d 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/FingerIdentifier.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/FingerIdentifier.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.domain.models +package com.simprints.infra.enrolment.records.repository.domain.models import androidx.annotation.Keep import com.simprints.core.domain.fingerprint.IFingerIdentifier diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/FingerprintIdentity.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/FingerprintIdentity.kt similarity index 78% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/FingerprintIdentity.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/FingerprintIdentity.kt index d175a18048..968bc90d23 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/FingerprintIdentity.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/FingerprintIdentity.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.domain.models +package com.simprints.infra.enrolment.records.repository.domain.models import android.os.Parcelable import com.simprints.core.domain.fingerprint.FingerprintSample diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/Subject.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/Subject.kt similarity index 91% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/Subject.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/Subject.kt index 97912f1c76..9270a5c566 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/Subject.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/Subject.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.domain.models +package com.simprints.infra.enrolment.records.repository.domain.models import android.os.Parcelable import com.simprints.core.domain.face.FaceSample diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/SubjectAction.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/SubjectAction.kt similarity index 76% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/SubjectAction.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/SubjectAction.kt index f87619b5b8..5134ada84e 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/SubjectAction.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/SubjectAction.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.domain.models +package com.simprints.infra.enrolment.records.repository.domain.models import androidx.annotation.Keep diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/SubjectQuery.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/SubjectQuery.kt similarity index 89% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/SubjectQuery.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/SubjectQuery.kt index cbd2a654c1..c16b6693c9 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/domain/models/SubjectQuery.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/domain/models/SubjectQuery.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.domain.models +package com.simprints.infra.enrolment.records.repository.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString diff --git a/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/EnrolmentRecordLocalDataSource.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/EnrolmentRecordLocalDataSource.kt new file mode 100644 index 0000000000..621ae9b7f0 --- /dev/null +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/EnrolmentRecordLocalDataSource.kt @@ -0,0 +1,20 @@ +package com.simprints.infra.enrolment.records.repository.local + +import com.simprints.infra.config.store.models.Project +import com.simprints.infra.enrolment.records.repository.IdentityDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery + +interface EnrolmentRecordLocalDataSource : IdentityDataSource { + suspend fun load(query: SubjectQuery): List + + suspend fun delete(queries: List) + + suspend fun deleteAll() + + suspend fun performActions( + actions: List, + project: Project, + ) +} diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/EnrolmentRecordLocalDataSourceImpl.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/EnrolmentRecordLocalDataSourceImpl.kt similarity index 88% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/EnrolmentRecordLocalDataSourceImpl.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/EnrolmentRecordLocalDataSourceImpl.kt index d98f0c374e..7456378937 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/EnrolmentRecordLocalDataSourceImpl.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/EnrolmentRecordLocalDataSourceImpl.kt @@ -1,23 +1,23 @@ -package com.simprints.infra.enrolment.records.store.local +package com.simprints.infra.enrolment.records.repository.local import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.store.models.TokenKeyType import com.simprints.infra.config.store.tokenization.TokenizationProcessor -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.FaceIdentity -import com.simprints.infra.enrolment.records.store.domain.models.FingerprintIdentity -import com.simprints.infra.enrolment.records.store.domain.models.Subject -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery -import com.simprints.infra.enrolment.records.store.local.models.fromDbToDomain -import com.simprints.infra.enrolment.records.store.local.models.fromDomainToDb +import com.simprints.infra.enrolment.records.realm.store.RealmWrapper +import com.simprints.infra.enrolment.records.realm.store.models.DbFaceSample +import com.simprints.infra.enrolment.records.realm.store.models.DbFingerprintSample +import com.simprints.infra.enrolment.records.realm.store.models.DbSubject +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.FaceIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.FingerprintIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.local.models.fromDbToDomain +import com.simprints.infra.enrolment.records.repository.local.models.fromDomainToDb import com.simprints.infra.logging.LoggingConstants.CrashReportTag.REALM_DB import com.simprints.infra.logging.Simber -import com.simprints.infra.realm.RealmWrapper -import com.simprints.infra.realm.models.DbFaceSample -import com.simprints.infra.realm.models.DbFingerprintSample -import com.simprints.infra.realm.models.DbSubject import io.realm.kotlin.UpdatePolicy import io.realm.kotlin.query.RealmQuery import io.realm.kotlin.query.Sort diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/models/DbFaceSample.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/models/DbFaceSample.kt similarity index 70% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/models/DbFaceSample.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/models/DbFaceSample.kt index 2742a5bde7..e115efce86 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/models/DbFaceSample.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/models/DbFaceSample.kt @@ -1,7 +1,7 @@ -package com.simprints.infra.enrolment.records.store.local.models +package com.simprints.infra.enrolment.records.repository.local.models import com.simprints.core.domain.face.FaceSample -import com.simprints.infra.realm.models.DbFaceSample +import com.simprints.infra.enrolment.records.realm.store.models.DbFaceSample internal fun DbFaceSample.fromDbToDomain(): FaceSample = FaceSample( id = id, diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/models/DbFingerprintSample.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/models/DbFingerprintSample.kt similarity index 73% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/models/DbFingerprintSample.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/models/DbFingerprintSample.kt index 34b0235bcd..74acd52c72 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/models/DbFingerprintSample.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/models/DbFingerprintSample.kt @@ -1,12 +1,12 @@ -package com.simprints.infra.enrolment.records.store.local.models +package com.simprints.infra.enrolment.records.repository.local.models import com.simprints.core.domain.fingerprint.FingerprintSample import com.simprints.core.domain.fingerprint.IFingerIdentifier -import com.simprints.infra.realm.models.DbFingerprintSample +import com.simprints.infra.enrolment.records.realm.store.models.DbFingerprintSample internal fun DbFingerprintSample.fromDbToDomain(): FingerprintSample = FingerprintSample( id = id, - fingerIdentifier = IFingerIdentifier.values()[fingerIdentifier], + fingerIdentifier = IFingerIdentifier.entries[fingerIdentifier], template = template, templateQualityScore = templateQualityScore, format = format, diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/models/DbSubject.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/models/DbSubject.kt similarity index 77% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/models/DbSubject.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/models/DbSubject.kt index 5e14b2a634..daaa1be6c0 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/local/models/DbSubject.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/local/models/DbSubject.kt @@ -1,16 +1,16 @@ -package com.simprints.infra.enrolment.records.store.local.models +package com.simprints.infra.enrolment.records.repository.local.models import com.simprints.core.domain.face.FaceSample import com.simprints.core.domain.fingerprint.FingerprintSample import com.simprints.core.domain.tokenization.asTokenizableEncrypted import com.simprints.core.domain.tokenization.asTokenizableRaw import com.simprints.core.domain.tokenization.isTokenized -import com.simprints.infra.enrolment.records.store.domain.models.Subject -import com.simprints.infra.realm.models.DbFaceSample -import com.simprints.infra.realm.models.DbFingerprintSample -import com.simprints.infra.realm.models.DbSubject -import com.simprints.infra.realm.models.toDate -import com.simprints.infra.realm.models.toRealmInstant +import com.simprints.infra.enrolment.records.realm.store.models.DbFaceSample +import com.simprints.infra.enrolment.records.realm.store.models.DbFingerprintSample +import com.simprints.infra.enrolment.records.realm.store.models.DbSubject +import com.simprints.infra.enrolment.records.realm.store.models.toDate +import com.simprints.infra.enrolment.records.realm.store.models.toRealmInstant +import com.simprints.infra.enrolment.records.repository.domain.models.Subject import io.realm.kotlin.ext.toRealmList import io.realm.kotlin.types.RealmUUID diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordApiInterface.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordApiInterface.kt similarity index 74% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordApiInterface.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordApiInterface.kt index 62a8c09297..5a344ebcd9 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordApiInterface.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordApiInterface.kt @@ -1,6 +1,6 @@ -package com.simprints.infra.enrolment.records.store.remote +package com.simprints.infra.enrolment.records.repository.remote -import com.simprints.infra.enrolment.records.store.remote.models.ApiEnrolmentRecords +import com.simprints.infra.enrolment.records.repository.remote.models.ApiEnrolmentRecords import com.simprints.infra.network.SimRemoteInterface import retrofit2.http.Body import retrofit2.http.Headers diff --git a/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordRemoteDataSource.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordRemoteDataSource.kt new file mode 100644 index 0000000000..5af42f94fa --- /dev/null +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordRemoteDataSource.kt @@ -0,0 +1,7 @@ +package com.simprints.infra.enrolment.records.repository.remote + +import com.simprints.infra.enrolment.records.repository.domain.models.Subject + +fun interface EnrolmentRecordRemoteDataSource { + suspend fun uploadRecords(subjects: List) +} diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordRemoteDataSourceImpl.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordRemoteDataSourceImpl.kt similarity index 76% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordRemoteDataSourceImpl.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordRemoteDataSourceImpl.kt index 380f35a5a6..a0b6e8effc 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordRemoteDataSourceImpl.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordRemoteDataSourceImpl.kt @@ -1,11 +1,11 @@ -package com.simprints.infra.enrolment.records.store.remote +package com.simprints.infra.enrolment.records.repository.remote import com.simprints.core.tools.utils.EncodingUtils import com.simprints.core.tools.utils.EncodingUtilsImpl import com.simprints.infra.authstore.AuthStore -import com.simprints.infra.enrolment.records.store.domain.models.Subject -import com.simprints.infra.enrolment.records.store.remote.models.ApiEnrolmentRecords -import com.simprints.infra.enrolment.records.store.remote.models.toEnrolmentRecord +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.remote.models.ApiEnrolmentRecords +import com.simprints.infra.enrolment.records.repository.remote.models.toEnrolmentRecord import com.simprints.infra.network.SimNetwork import javax.inject.Inject diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/ApiBiometricReference.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/ApiBiometricReference.kt similarity index 62% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/ApiBiometricReference.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/ApiBiometricReference.kt index e076caccea..1a819411a4 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/ApiBiometricReference.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/ApiBiometricReference.kt @@ -1,12 +1,12 @@ -package com.simprints.infra.enrolment.records.store.remote.models +package com.simprints.infra.enrolment.records.repository.remote.models import androidx.annotation.Keep import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo -import com.simprints.infra.enrolment.records.store.remote.models.ApiBiometricReference.Companion.FACE_REFERENCE_KEY -import com.simprints.infra.enrolment.records.store.remote.models.ApiBiometricReference.Companion.FINGERPRINT_REFERENCE_KEY -import com.simprints.infra.enrolment.records.store.remote.models.face.ApiFaceReference -import com.simprints.infra.enrolment.records.store.remote.models.fingerprint.ApiFingerprintReference +import com.simprints.infra.enrolment.records.repository.remote.models.ApiBiometricReference.Companion.FACE_REFERENCE_KEY +import com.simprints.infra.enrolment.records.repository.remote.models.ApiBiometricReference.Companion.FINGERPRINT_REFERENCE_KEY +import com.simprints.infra.enrolment.records.repository.remote.models.face.ApiFaceReference +import com.simprints.infra.enrolment.records.repository.remote.models.fingerprint.ApiFingerprintReference @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/ApiEnrolmentRecord.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/ApiEnrolmentRecord.kt similarity index 77% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/ApiEnrolmentRecord.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/ApiEnrolmentRecord.kt index 165992e744..3ef913332e 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/ApiEnrolmentRecord.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/ApiEnrolmentRecord.kt @@ -1,12 +1,12 @@ -package com.simprints.infra.enrolment.records.store.remote.models +package com.simprints.infra.enrolment.records.repository.remote.models import androidx.annotation.Keep import com.simprints.core.domain.face.FaceSample import com.simprints.core.domain.fingerprint.FingerprintSample import com.simprints.core.tools.utils.EncodingUtils -import com.simprints.infra.enrolment.records.store.domain.models.Subject -import com.simprints.infra.enrolment.records.store.remote.models.face.toApi -import com.simprints.infra.enrolment.records.store.remote.models.fingerprint.toApi +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.remote.models.face.toApi +import com.simprints.infra.enrolment.records.repository.remote.models.fingerprint.toApi @Keep internal data class ApiEnrolmentRecord( diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/ApiEnrolmentRecords.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/ApiEnrolmentRecords.kt similarity index 63% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/ApiEnrolmentRecords.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/ApiEnrolmentRecords.kt index 3d9ee73915..bbed87830c 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/ApiEnrolmentRecords.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/ApiEnrolmentRecords.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.remote.models +package com.simprints.infra.enrolment.records.repository.remote.models import androidx.annotation.Keep diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/face/ApiFaceReference.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/face/ApiFaceReference.kt similarity index 82% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/face/ApiFaceReference.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/face/ApiFaceReference.kt index b6347a7f48..d15cb9b5cd 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/face/ApiFaceReference.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/face/ApiFaceReference.kt @@ -1,10 +1,10 @@ -package com.simprints.infra.enrolment.records.store.remote.models.face +package com.simprints.infra.enrolment.records.repository.remote.models.face import androidx.annotation.Keep import com.simprints.core.domain.face.FaceSample import com.simprints.core.domain.face.concatTemplates import com.simprints.core.tools.utils.EncodingUtils -import com.simprints.infra.enrolment.records.store.remote.models.ApiBiometricReference +import com.simprints.infra.enrolment.records.repository.remote.models.ApiBiometricReference import java.util.UUID @Keep diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/face/ApiFaceTemplate.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/face/ApiFaceTemplate.kt similarity index 58% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/face/ApiFaceTemplate.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/face/ApiFaceTemplate.kt index 66a904c15e..0c4b86f3a7 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/face/ApiFaceTemplate.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/face/ApiFaceTemplate.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.remote.models.face +package com.simprints.infra.enrolment.records.repository.remote.models.face import androidx.annotation.Keep diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFinger.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFinger.kt similarity index 92% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFinger.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFinger.kt index 8fff00fbf3..a28bdbe8eb 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFinger.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFinger.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.remote.models.fingerprint +package com.simprints.infra.enrolment.records.repository.remote.models.fingerprint import androidx.annotation.Keep import com.simprints.core.domain.fingerprint.IFingerIdentifier diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFingerprintReference.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFingerprintReference.kt similarity index 84% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFingerprintReference.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFingerprintReference.kt index 0c59b0d925..27d5dbcc5f 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFingerprintReference.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFingerprintReference.kt @@ -1,10 +1,10 @@ -package com.simprints.infra.enrolment.records.store.remote.models.fingerprint +package com.simprints.infra.enrolment.records.repository.remote.models.fingerprint import androidx.annotation.Keep import com.simprints.core.domain.fingerprint.FingerprintSample import com.simprints.core.domain.fingerprint.concatTemplates import com.simprints.core.tools.utils.EncodingUtils -import com.simprints.infra.enrolment.records.store.remote.models.ApiBiometricReference +import com.simprints.infra.enrolment.records.repository.remote.models.ApiBiometricReference import java.util.UUID @Keep diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFingerprintTemplate.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFingerprintTemplate.kt similarity index 65% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFingerprintTemplate.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFingerprintTemplate.kt index 88c39da8b4..2f7d2cecb3 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFingerprintTemplate.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFingerprintTemplate.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.remote.models.fingerprint +package com.simprints.infra.enrolment.records.repository.remote.models.fingerprint import androidx.annotation.Keep diff --git a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/usecases/CompareImplicitTokenizedStringsUseCase.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/usecases/CompareImplicitTokenizedStringsUseCase.kt similarity index 97% rename from infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/usecases/CompareImplicitTokenizedStringsUseCase.kt rename to infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/usecases/CompareImplicitTokenizedStringsUseCase.kt index 4291bf7412..edb4ab5d5a 100644 --- a/infra/enrolment-records-store/src/main/java/com/simprints/infra/enrolment/records/store/usecases/CompareImplicitTokenizedStringsUseCase.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/usecases/CompareImplicitTokenizedStringsUseCase.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.usecases +package com.simprints.infra.enrolment.records.repository.usecases import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.domain.tokenization.asTokenizableEncrypted diff --git a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordRepositoryImplTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImplTest.kt similarity index 95% rename from infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordRepositoryImplTest.kt rename to infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImplTest.kt index a86d3417ff..67b600aa85 100644 --- a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/EnrolmentRecordRepositoryImplTest.kt +++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImplTest.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store +package com.simprints.infra.enrolment.records.repository import android.content.Context import android.content.SharedPreferences @@ -7,14 +7,14 @@ import com.simprints.core.domain.tokenization.asTokenizableRaw import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.store.models.TokenKeyType import com.simprints.infra.config.store.tokenization.TokenizationProcessor -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.FaceIdentity -import com.simprints.infra.enrolment.records.store.domain.models.FingerprintIdentity -import com.simprints.infra.enrolment.records.store.domain.models.Subject -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery -import com.simprints.infra.enrolment.records.store.local.EnrolmentRecordLocalDataSource -import com.simprints.infra.enrolment.records.store.remote.EnrolmentRecordRemoteDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.FaceIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.FingerprintIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.local.EnrolmentRecordLocalDataSource +import com.simprints.infra.enrolment.records.repository.remote.EnrolmentRecordRemoteDataSource import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/commcare/CommCareIdentityDataSourceTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareIdentityDataSourceTest.kt similarity index 98% rename from infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/commcare/CommCareIdentityDataSourceTest.kt rename to infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareIdentityDataSourceTest.kt index 4374b1d527..6ed9d38faa 100644 --- a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/commcare/CommCareIdentityDataSourceTest.kt +++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareIdentityDataSourceTest.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.commcare +package com.simprints.infra.enrolment.records.repository.commcare import android.content.ContentResolver import android.content.Context @@ -12,12 +12,12 @@ import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.json.JsonHelper import com.simprints.core.tools.utils.EncodingUtils import com.simprints.infra.config.store.models.Project -import com.simprints.infra.enrolment.records.store.commcare.CommCareIdentityDataSource.Companion.COLUMN_DATUM_ID -import com.simprints.infra.enrolment.records.store.commcare.CommCareIdentityDataSource.Companion.COLUMN_VALUE -import com.simprints.infra.enrolment.records.store.domain.models.FaceIdentity -import com.simprints.infra.enrolment.records.store.domain.models.FingerprintIdentity -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery -import com.simprints.infra.enrolment.records.store.usecases.CompareImplicitTokenizedStringsUseCase +import com.simprints.infra.enrolment.records.repository.commcare.CommCareIdentityDataSource.Companion.COLUMN_DATUM_ID +import com.simprints.infra.enrolment.records.repository.commcare.CommCareIdentityDataSource.Companion.COLUMN_VALUE +import com.simprints.infra.enrolment.records.repository.domain.models.FaceIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.FingerprintIdentity +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.usecases.CompareImplicitTokenizedStringsUseCase import com.simprints.infra.logging.Simber import com.simprints.testtools.common.coroutines.TestCoroutineRule import io.mockk.* diff --git a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/domain/models/BiometricDataSourceTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/domain/models/BiometricDataSourceTest.kt similarity index 91% rename from infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/domain/models/BiometricDataSourceTest.kt rename to infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/domain/models/BiometricDataSourceTest.kt index b2351b0a6b..c3918dc9fd 100644 --- a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/domain/models/BiometricDataSourceTest.kt +++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/domain/models/BiometricDataSourceTest.kt @@ -1,5 +1,5 @@ import com.google.common.truth.Truth.assertThat -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource import org.junit.Test class BiometricDataSourceTest { diff --git a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/domain/models/FingerIdentifierTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/domain/models/FingerIdentifierTest.kt similarity index 94% rename from infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/domain/models/FingerIdentifierTest.kt rename to infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/domain/models/FingerIdentifierTest.kt index 823e473cf2..8c2791f54d 100644 --- a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/domain/models/FingerIdentifierTest.kt +++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/domain/models/FingerIdentifierTest.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.domain.models +package com.simprints.infra.enrolment.records.repository.domain.models import com.google.common.truth.Truth import com.simprints.core.domain.fingerprint.IFingerIdentifier diff --git a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/local/EnrolmentRecordLocalDataSourceImplTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/EnrolmentRecordLocalDataSourceImplTest.kt similarity index 90% rename from infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/local/EnrolmentRecordLocalDataSourceImplTest.kt rename to infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/EnrolmentRecordLocalDataSourceImplTest.kt index ce342d2cc5..0ee8f8f721 100644 --- a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/local/EnrolmentRecordLocalDataSourceImplTest.kt +++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/EnrolmentRecordLocalDataSourceImplTest.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.local +package com.simprints.infra.enrolment.records.repository.local import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.face.FaceSample @@ -6,17 +6,17 @@ import com.simprints.core.domain.tokenization.asTokenizableEncrypted import com.simprints.core.domain.tokenization.asTokenizableRaw import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.store.tokenization.TokenizationProcessor -import com.simprints.infra.enrolment.records.store.domain.models.BiometricDataSource -import com.simprints.infra.enrolment.records.store.domain.models.Subject -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction -import com.simprints.infra.enrolment.records.store.domain.models.SubjectQuery -import com.simprints.infra.enrolment.records.store.local.EnrolmentRecordLocalDataSourceImpl.Companion.FACE_SAMPLES_FIELD -import com.simprints.infra.enrolment.records.store.local.EnrolmentRecordLocalDataSourceImpl.Companion.FINGERPRINT_SAMPLES_FIELD -import com.simprints.infra.enrolment.records.store.local.EnrolmentRecordLocalDataSourceImpl.Companion.FORMAT_FIELD -import com.simprints.infra.enrolment.records.store.local.models.fromDbToDomain -import com.simprints.infra.enrolment.records.store.local.models.fromDomainToDb -import com.simprints.infra.realm.RealmWrapper -import com.simprints.infra.realm.models.DbSubject +import com.simprints.infra.enrolment.records.realm.store.RealmWrapper +import com.simprints.infra.enrolment.records.realm.store.models.DbSubject +import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery +import com.simprints.infra.enrolment.records.repository.local.EnrolmentRecordLocalDataSourceImpl.Companion.FACE_SAMPLES_FIELD +import com.simprints.infra.enrolment.records.repository.local.EnrolmentRecordLocalDataSourceImpl.Companion.FINGERPRINT_SAMPLES_FIELD +import com.simprints.infra.enrolment.records.repository.local.EnrolmentRecordLocalDataSourceImpl.Companion.FORMAT_FIELD +import com.simprints.infra.enrolment.records.repository.local.models.fromDbToDomain +import com.simprints.infra.enrolment.records.repository.local.models.fromDomainToDb import io.mockk.CapturingSlot import io.mockk.MockKAnnotations import io.mockk.coEvery diff --git a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/local/models/DbSubjectTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/models/DbSubjectTest.kt similarity index 90% rename from infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/local/models/DbSubjectTest.kt rename to infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/models/DbSubjectTest.kt index 6212e15e6e..e4a6e223cf 100644 --- a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/local/models/DbSubjectTest.kt +++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/local/models/DbSubjectTest.kt @@ -1,14 +1,14 @@ -package com.simprints.infra.enrolment.records.store.local.models +package com.simprints.infra.enrolment.records.repository.local.models import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.face.FaceSample import com.simprints.core.domain.fingerprint.FingerprintSample import com.simprints.core.domain.fingerprint.IFingerIdentifier import com.simprints.core.domain.tokenization.asTokenizableEncrypted -import com.simprints.infra.enrolment.records.store.domain.models.Subject -import com.simprints.infra.realm.models.DbFaceSample -import com.simprints.infra.realm.models.DbFingerprintSample -import com.simprints.infra.realm.models.DbSubject +import com.simprints.infra.enrolment.records.realm.store.models.DbFaceSample +import com.simprints.infra.enrolment.records.realm.store.models.DbFingerprintSample +import com.simprints.infra.enrolment.records.realm.store.models.DbSubject +import com.simprints.infra.enrolment.records.repository.domain.models.Subject import io.realm.kotlin.ext.realmListOf import io.realm.kotlin.types.RealmInstant import io.realm.kotlin.types.RealmUUID diff --git a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordRemoteDataSourceImplTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordRemoteDataSourceImplTest.kt similarity index 86% rename from infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordRemoteDataSourceImplTest.kt rename to infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordRemoteDataSourceImplTest.kt index 723017e11e..4d267117e3 100644 --- a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/remote/EnrolmentRecordRemoteDataSourceImplTest.kt +++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/remote/EnrolmentRecordRemoteDataSourceImplTest.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.remote +package com.simprints.infra.enrolment.records.repository.remote import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.face.FaceSample @@ -7,14 +7,14 @@ import com.simprints.core.domain.fingerprint.IFingerIdentifier import com.simprints.core.domain.tokenization.asTokenizableEncrypted import com.simprints.core.tools.utils.EncodingUtils import com.simprints.infra.authstore.AuthStore -import com.simprints.infra.enrolment.records.store.domain.models.Subject -import com.simprints.infra.enrolment.records.store.remote.models.ApiEnrolmentRecord -import com.simprints.infra.enrolment.records.store.remote.models.ApiEnrolmentRecords -import com.simprints.infra.enrolment.records.store.remote.models.face.ApiFaceReference -import com.simprints.infra.enrolment.records.store.remote.models.face.ApiFaceTemplate -import com.simprints.infra.enrolment.records.store.remote.models.fingerprint.ApiFinger -import com.simprints.infra.enrolment.records.store.remote.models.fingerprint.ApiFingerprintReference -import com.simprints.infra.enrolment.records.store.remote.models.fingerprint.ApiFingerprintTemplate +import com.simprints.infra.enrolment.records.repository.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.remote.models.ApiEnrolmentRecord +import com.simprints.infra.enrolment.records.repository.remote.models.ApiEnrolmentRecords +import com.simprints.infra.enrolment.records.repository.remote.models.face.ApiFaceReference +import com.simprints.infra.enrolment.records.repository.remote.models.face.ApiFaceTemplate +import com.simprints.infra.enrolment.records.repository.remote.models.fingerprint.ApiFinger +import com.simprints.infra.enrolment.records.repository.remote.models.fingerprint.ApiFingerprintReference +import com.simprints.infra.enrolment.records.repository.remote.models.fingerprint.ApiFingerprintTemplate import com.simprints.infra.network.SimNetwork import com.simprints.infra.network.exceptions.BackendMaintenanceException import com.simprints.infra.network.exceptions.SyncCloudIntegrationException diff --git a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFingerTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFingerTest.kt similarity index 93% rename from infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFingerTest.kt rename to infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFingerTest.kt index a84aa0d75c..3a63a07bd3 100644 --- a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/remote/models/fingerprint/ApiFingerTest.kt +++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/remote/models/fingerprint/ApiFingerTest.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.remote.models.fingerprint +package com.simprints.infra.enrolment.records.repository.remote.models.fingerprint import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.fingerprint.IFingerIdentifier diff --git a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/usecases/CompareImplicitTokenizedStringsUseCaseTest.kt b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/usecases/CompareImplicitTokenizedStringsUseCaseTest.kt similarity index 98% rename from infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/usecases/CompareImplicitTokenizedStringsUseCaseTest.kt rename to infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/usecases/CompareImplicitTokenizedStringsUseCaseTest.kt index 838e1bb6a9..0a4854bce4 100644 --- a/infra/enrolment-records-store/src/test/java/com/simprints/infra/enrolment/records/store/usecases/CompareImplicitTokenizedStringsUseCaseTest.kt +++ b/infra/enrolment-records/repository/src/test/java/com/simprints/infra/enrolment/records/repository/usecases/CompareImplicitTokenizedStringsUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.enrolment.records.store.usecases +package com.simprints.infra.enrolment.records.repository.usecases import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.domain.tokenization.asTokenizableEncrypted diff --git a/infra/event-sync/build.gradle.kts b/infra/event-sync/build.gradle.kts index 900dc452de..7737cab22e 100644 --- a/infra/event-sync/build.gradle.kts +++ b/infra/event-sync/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) implementation(project(":infra:auth-store")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:recent-user-activity")) implementation(libs.workManager.work) diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/EventDownSyncTask.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/EventDownSyncTask.kt index 4a576e5f6a..d3adc1b6a6 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/EventDownSyncTask.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/EventDownSyncTask.kt @@ -7,10 +7,10 @@ import com.simprints.core.tools.time.Timestamp import com.simprints.infra.authstore.exceptions.RemoteDbNotSignedInException import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction.Creation -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction.Deletion +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction.Creation +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction.Deletion import com.simprints.infra.events.EventRepository import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent import com.simprints.infra.events.event.domain.models.scope.EventScope diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/SubjectFactory.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/SubjectFactory.kt index 7cd2600ef8..1614518e8f 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/SubjectFactory.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/SubjectFactory.kt @@ -7,7 +7,7 @@ import com.simprints.core.tools.time.TimeHelper import com.simprints.core.tools.utils.EncodingUtils import com.simprints.face.capture.FaceCaptureResult import com.simprints.fingerprint.capture.FingerprintCaptureResult -import com.simprints.infra.enrolment.records.store.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.Subject import com.simprints.infra.events.event.domain.models.subject.BiometricReference import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent.EnrolmentRecordCreationPayload import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent.EnrolmentRecordCreationInMove diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/EventDownSyncTaskTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/EventDownSyncTaskTest.kt index c25433e8dc..5eae2b5f64 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/EventDownSyncTaskTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/EventDownSyncTaskTest.kt @@ -7,9 +7,9 @@ import com.simprints.infra.authstore.exceptions.RemoteDbNotSignedInException import com.simprints.infra.config.store.models.DeviceConfiguration import com.simprints.infra.config.store.models.Project import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction.Creation -import com.simprints.infra.enrolment.records.store.domain.models.SubjectAction.Deletion +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction.Creation +import com.simprints.infra.enrolment.records.repository.domain.models.SubjectAction.Deletion import com.simprints.infra.events.EventRepository import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent import com.simprints.infra.events.event.domain.models.scope.EventScope @@ -37,6 +37,7 @@ import io.mockk.MockKAnnotations import io.mockk.coEvery import io.mockk.coVerify import io.mockk.impl.annotations.MockK +import kotlinx.coroutines.CancellationException import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.toList import kotlinx.coroutines.test.runTest @@ -44,7 +45,6 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import java.util.UUID -import kotlin.coroutines.cancellation.CancellationException class EventDownSyncTaskTest { companion object { @@ -263,7 +263,7 @@ class EventDownSyncTaskTest { ), ), ), - project + project, ) } } @@ -338,7 +338,7 @@ class EventDownSyncTaskTest { Deletion(eventToMoveToModule2.payload.enrolmentRecordDeletion.subjectId), Creation(subjectFactory.buildSubjectFromMovePayload(eventToMoveToModule2.payload.enrolmentRecordCreation)), ), - project + project, ) } } @@ -366,7 +366,7 @@ class EventDownSyncTaskTest { Deletion(eventToMoveToModule2.payload.enrolmentRecordDeletion.subjectId), Creation(subjectFactory.buildSubjectFromMovePayload(eventToMoveToModule2.payload.enrolmentRecordCreation)), ), - project + project, ) } } @@ -388,7 +388,7 @@ class EventDownSyncTaskTest { listOf( Deletion(eventToMoveToModule2.payload.enrolmentRecordDeletion.subjectId), ), - project + project, ) } } @@ -416,7 +416,7 @@ class EventDownSyncTaskTest { Deletion(eventToMoveToModule2.payload.enrolmentRecordDeletion.subjectId), Creation(subjectFactory.buildSubjectFromMovePayload(eventToMoveToModule2.payload.enrolmentRecordCreation)), ), - project + project, ) } } @@ -444,7 +444,7 @@ class EventDownSyncTaskTest { Deletion(eventToMoveToModule2.payload.enrolmentRecordDeletion.subjectId), Creation(subjectFactory.buildSubjectFromMovePayload(eventToMoveToModule2.payload.enrolmentRecordCreation)), ), - project + project, ) } } @@ -461,7 +461,7 @@ class EventDownSyncTaskTest { listOf( Deletion(eventToMoveToAttendant2.payload.enrolmentRecordDeletion.subjectId), ), - project + project, ) } } @@ -479,7 +479,7 @@ class EventDownSyncTaskTest { Deletion(eventToMoveToAttendant2.payload.enrolmentRecordDeletion.subjectId), Creation(subjectFactory.buildSubjectFromMovePayload(eventToMoveToAttendant2.payload.enrolmentRecordCreation)), ), - project + project, ) } } @@ -497,7 +497,7 @@ class EventDownSyncTaskTest { Deletion(eventToMoveToModule2.payload.enrolmentRecordDeletion.subjectId), Creation(subjectFactory.buildSubjectFromMovePayload(eventToMoveToModule2.payload.enrolmentRecordCreation)), ), - project + project, ) } } diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/SubjectFactoryTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/SubjectFactoryTest.kt index 27576e78e8..0b09d66248 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/SubjectFactoryTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/SubjectFactoryTest.kt @@ -9,7 +9,7 @@ import com.simprints.core.tools.time.TimeHelper import com.simprints.core.tools.utils.EncodingUtils import com.simprints.face.capture.FaceCaptureResult import com.simprints.fingerprint.capture.FingerprintCaptureResult -import com.simprints.infra.enrolment.records.store.domain.models.Subject +import com.simprints.infra.enrolment.records.repository.domain.models.Subject import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent import com.simprints.infra.events.event.domain.models.subject.FaceReference diff --git a/infra/events/build.gradle.kts b/infra/events/build.gradle.kts index 787411b92a..d2474f9214 100644 --- a/infra/events/build.gradle.kts +++ b/infra/events/build.gradle.kts @@ -15,6 +15,5 @@ dependencies { implementation(libs.workManager.work) - androidTestImplementation(project(":infra:enrolment-records-store")) +// androidTestImplementation(project("infra:enrolment-records:repository")) } - diff --git a/infra/sync/build.gradle.kts b/infra/sync/build.gradle.kts index afbd4541ce..1e3c347ab3 100644 --- a/infra/sync/build.gradle.kts +++ b/infra/sync/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { implementation(project(":infra:auth-logic")) implementation(project(":infra:config-store")) implementation(project(":infra:config-sync")) - implementation(project(":infra:enrolment-records-store")) + implementation(project(":infra:enrolment-records:repository")) implementation(project(":infra:events")) implementation(project(":infra:event-sync")) implementation(project(":infra:images")) diff --git a/infra/sync/src/main/java/com/simprints/infra/sync/enrolments/EnrolmentRecordWorker.kt b/infra/sync/src/main/java/com/simprints/infra/sync/enrolments/EnrolmentRecordWorker.kt index c85e259bde..729022d32d 100644 --- a/infra/sync/src/main/java/com/simprints/infra/sync/enrolments/EnrolmentRecordWorker.kt +++ b/infra/sync/src/main/java/com/simprints/infra/sync/enrolments/EnrolmentRecordWorker.kt @@ -6,7 +6,7 @@ import androidx.work.WorkerParameters import com.simprints.core.DispatcherIO import com.simprints.core.workers.SimCoroutineWorker import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import com.simprints.infra.sync.SyncConstants import dagger.assisted.Assisted import dagger.assisted.AssistedInject diff --git a/infra/sync/src/test/java/com/simprints/infra/sync/enrolments/EnrolmentRecordWorkerTest.kt b/infra/sync/src/test/java/com/simprints/infra/sync/enrolments/EnrolmentRecordWorkerTest.kt index ea392647e4..c9a47c6558 100644 --- a/infra/sync/src/test/java/com/simprints/infra/sync/enrolments/EnrolmentRecordWorkerTest.kt +++ b/infra/sync/src/test/java/com/simprints/infra/sync/enrolments/EnrolmentRecordWorkerTest.kt @@ -5,7 +5,7 @@ import androidx.work.workDataOf import com.google.common.truth.Truth.assertThat import com.simprints.infra.config.store.models.DeviceConfiguration import com.simprints.infra.config.sync.ConfigManager -import com.simprints.infra.enrolment.records.store.EnrolmentRecordRepository +import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import com.simprints.infra.sync.SyncConstants import io.mockk.coEvery import io.mockk.coVerify diff --git a/settings.gradle.kts b/settings.gradle.kts index 9b70c8c645..d2ceae1541 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -122,7 +122,8 @@ include( ":infra:events", ":infra:config-store", ":infra:config-sync", - ":infra:enrolment-records-store", + ":infra:enrolment-records:repository", + ":infra:enrolment-records:realm-store", ":infra:images", ":infra:license", ":infra:logging", @@ -130,7 +131,6 @@ include( ":infra:auth-store", ":infra:auth-logic", ":infra:network", - ":infra:realm", ":infra:recent-user-activity", ":infra:resources", ":infra:security",