diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 0ffe6c8735..d3f6404585 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -252,8 +252,10 @@ jobs: fingerprint-unit-tests, testing-tools ] uses: ./.github/workflows/reusable-sonar-scan.yml - # Only run if the PR ready for review or triggered manually, and if tests passed or matched 'skipped' status (due to smart filter) + # Only run if the PR ready for review or triggered manually, and if tests passed or matched 'skipped' status (due to smart filter) + # always() calls is required to prevent a hidden success() check being added if: > + always() && (github.event.pull_request.draft == false || github.event_name == 'workflow_dispatch') && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') diff --git a/face/capture/src/main/java/com/simprints/face/capture/usecases/SimpleCaptureEventReporter.kt b/face/capture/src/main/java/com/simprints/face/capture/usecases/SimpleCaptureEventReporter.kt index 94b920b253..d345658b7a 100644 --- a/face/capture/src/main/java/com/simprints/face/capture/usecases/SimpleCaptureEventReporter.kt +++ b/face/capture/src/main/java/com/simprints/face/capture/usecases/SimpleCaptureEventReporter.kt @@ -6,13 +6,13 @@ import com.simprints.core.tools.time.Timestamp import com.simprints.core.tools.utils.EncodingUtils import com.simprints.face.capture.models.FaceDetection import com.simprints.infra.events.event.domain.models.BiometricReferenceCreationEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent.FaceCapturePayload -import com.simprints.infra.events.event.domain.models.face.FaceFallbackCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceOnboardingCompleteEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent.FaceCapturePayload +import com.simprints.infra.events.event.domain.models.FaceFallbackCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceOnboardingCompleteEvent import com.simprints.infra.events.session.SessionEventRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/face/capture/src/test/java/com/simprints/face/capture/usecases/SimpleCaptureEventReporterTest.kt b/face/capture/src/test/java/com/simprints/face/capture/usecases/SimpleCaptureEventReporterTest.kt index 4465a5f930..3d57fea91a 100644 --- a/face/capture/src/test/java/com/simprints/face/capture/usecases/SimpleCaptureEventReporterTest.kt +++ b/face/capture/src/test/java/com/simprints/face/capture/usecases/SimpleCaptureEventReporterTest.kt @@ -9,11 +9,11 @@ import com.simprints.face.capture.models.FaceDetection import com.simprints.face.infra.basebiosdk.detection.Face import com.simprints.infra.events.event.domain.models.BiometricReferenceCreationEvent import com.simprints.infra.events.event.domain.models.BiometricReferenceCreationEvent.BiometricReferenceCreationPayload -import com.simprints.infra.events.event.domain.models.face.FaceCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceFallbackCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceOnboardingCompleteEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceFallbackCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceOnboardingCompleteEvent import com.simprints.infra.events.session.SessionEventRepository import com.simprints.testtools.common.coroutines.TestCoroutineRule import io.mockk.MockKAnnotations diff --git a/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/request/validators/ConfirmIdentityValidator.kt b/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/request/validators/ConfirmIdentityValidator.kt index 725d3f7252..4140aeae87 100644 --- a/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/request/validators/ConfirmIdentityValidator.kt +++ b/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/request/validators/ConfirmIdentityValidator.kt @@ -6,7 +6,7 @@ import com.simprints.feature.clientapi.models.ClientApiError import com.simprints.infra.config.store.ConfigRepository import com.simprints.infra.config.store.models.experimental import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent import com.simprints.infra.logging.LoggingConstants.CrashReportTag.SESSION import com.simprints.infra.logging.Simber diff --git a/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/request/validators/EnrolLastBiometricsValidator.kt b/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/request/validators/EnrolLastBiometricsValidator.kt index 55e34b5935..56fefc4948 100644 --- a/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/request/validators/EnrolLastBiometricsValidator.kt +++ b/feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/request/validators/EnrolLastBiometricsValidator.kt @@ -4,7 +4,7 @@ import com.simprints.feature.clientapi.exceptions.InvalidRequestException import com.simprints.feature.clientapi.mappers.request.extractors.EnrolLastBiometricsRequestExtractor import com.simprints.feature.clientapi.models.ClientApiError import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent import com.simprints.infra.logging.LoggingConstants.CrashReportTag.SESSION import com.simprints.infra.logging.Simber diff --git a/feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForRecordUseCase.kt b/feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForRecordUseCase.kt index d3b9a1648f..6a6125a9e9 100644 --- a/feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForRecordUseCase.kt +++ b/feature/client-api/src/main/java/com/simprints/feature/clientapi/usecases/GetEnrolmentCreationEventForRecordUseCase.kt @@ -9,7 +9,7 @@ import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepositor import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecord import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecordQuery import com.simprints.infra.events.event.cosync.CoSyncEnrolmentRecordEvents -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent import com.simprints.infra.logging.Simber import javax.inject.Inject diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/IntentToActionMapperTest.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/IntentToActionMapperTest.kt index fcac083a98..04391ce56d 100644 --- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/IntentToActionMapperTest.kt +++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/IntentToActionMapperTest.kt @@ -9,7 +9,7 @@ import com.simprints.feature.clientapi.usecases.GetCurrentSessionIdUseCase import com.simprints.infra.config.store.ConfigRepository import com.simprints.infra.config.store.tokenization.TokenizationProcessor import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent import com.simprints.infra.orchestration.data.ActionRequest import com.simprints.libsimprints.Constants.SIMPRINTS_LIB_VERSION import com.simprints.libsimprints.Constants.SIMPRINTS_MODULE_ID diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/requestFactories/ConfirmIdentityActionFactory.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/requestFactories/ConfirmIdentityActionFactory.kt index 9ca0a27638..ad340d23a7 100644 --- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/requestFactories/ConfirmIdentityActionFactory.kt +++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/requestFactories/ConfirmIdentityActionFactory.kt @@ -7,7 +7,7 @@ import com.simprints.feature.clientapi.mappers.request.extractors.ConfirmIdentit import com.simprints.feature.clientapi.mappers.request.validators.ConfirmIdentityValidator import com.simprints.infra.config.store.ConfigRepository import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent import com.simprints.infra.orchestration.data.ActionConstants import com.simprints.infra.orchestration.data.ActionRequest import com.simprints.infra.orchestration.data.ActionRequestIdentifier diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/requestFactories/EnrolLastBiometricsActionFactory.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/requestFactories/EnrolLastBiometricsActionFactory.kt index e55ff4c3be..d588d7de68 100644 --- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/requestFactories/EnrolLastBiometricsActionFactory.kt +++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/requestFactories/EnrolLastBiometricsActionFactory.kt @@ -6,7 +6,7 @@ import com.simprints.feature.clientapi.mappers.request.extractors.ActionRequestE import com.simprints.feature.clientapi.mappers.request.extractors.EnrolLastBiometricsRequestExtractor import com.simprints.feature.clientapi.mappers.request.validators.EnrolLastBiometricsValidator import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent import com.simprints.infra.orchestration.data.ActionConstants import com.simprints.infra.orchestration.data.ActionRequest import com.simprints.infra.orchestration.data.ActionRequestIdentifier diff --git a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/validators/ConfirmIdentityValidatorTest.kt b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/validators/ConfirmIdentityValidatorTest.kt index eeced39c3a..a8019caf83 100644 --- a/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/validators/ConfirmIdentityValidatorTest.kt +++ b/feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/request/validators/ConfirmIdentityValidatorTest.kt @@ -6,8 +6,8 @@ import com.simprints.feature.clientapi.mappers.request.requestFactories.RequestA import com.simprints.infra.config.store.ConfigRepository import com.simprints.infra.config.store.models.ProjectConfiguration import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.callback.CallbackComparisonScore -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.CallbackComparisonScore +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent import com.simprints.testtools.common.syntax.assertThrows import io.mockk.MockKAnnotations import io.mockk.coEvery diff --git a/feature/login-check/src/main/java/com/simprints/feature/logincheck/usecases/ReportActionRequestEventsUseCase.kt b/feature/login-check/src/main/java/com/simprints/feature/logincheck/usecases/ReportActionRequestEventsUseCase.kt index ff3e9164c7..4e285a482f 100644 --- a/feature/login-check/src/main/java/com/simprints/feature/logincheck/usecases/ReportActionRequestEventsUseCase.kt +++ b/feature/login-check/src/main/java/com/simprints/feature/logincheck/usecases/ReportActionRequestEventsUseCase.kt @@ -3,14 +3,14 @@ package com.simprints.feature.logincheck.usecases import com.simprints.core.SessionCoroutineScope import com.simprints.core.tools.time.TimeHelper import com.simprints.core.tools.utils.SimNetworkUtils +import com.simprints.infra.events.event.domain.models.BiometricDataSource +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV3 import com.simprints.infra.events.event.domain.models.ConnectivitySnapshotEvent +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV3 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV3 +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV3 import com.simprints.infra.events.event.domain.models.SuspiciousIntentEvent -import com.simprints.infra.events.event.domain.models.callout.BiometricDataSource -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV3 +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV3 import com.simprints.infra.events.session.SessionEventRepository import com.simprints.infra.orchestration.data.ActionRequest import com.simprints.infra.recent.user.activity.RecentUserActivityManager diff --git a/feature/login-check/src/test/java/com/simprints/feature/logincheck/usecases/ReportActionRequestEventsUseCaseTest.kt b/feature/login-check/src/test/java/com/simprints/feature/logincheck/usecases/ReportActionRequestEventsUseCaseTest.kt index e2e6ddd869..abb66edbcc 100644 --- a/feature/login-check/src/test/java/com/simprints/feature/logincheck/usecases/ReportActionRequestEventsUseCaseTest.kt +++ b/feature/login-check/src/test/java/com/simprints/feature/logincheck/usecases/ReportActionRequestEventsUseCaseTest.kt @@ -3,13 +3,13 @@ package com.simprints.feature.logincheck.usecases import com.simprints.core.domain.tokenization.asTokenizableRaw import com.simprints.core.tools.time.TimeHelper import com.simprints.core.tools.utils.SimNetworkUtils +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV3 import com.simprints.infra.events.event.domain.models.ConnectivitySnapshotEvent +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV3 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV3 +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV3 import com.simprints.infra.events.event.domain.models.SuspiciousIntentEvent -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV3 +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV3 import com.simprints.infra.events.session.SessionEventRepository import com.simprints.infra.recent.user.activity.RecentUserActivityManager import com.simprints.infra.recent.user.activity.domain.RecentUserActivity diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCase.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCase.kt index 22b9bd48dc..e3626c4568 100644 --- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCase.kt +++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCase.kt @@ -3,13 +3,13 @@ package com.simprints.feature.orchestrator.usecases import com.simprints.core.SessionCoroutineScope import com.simprints.core.domain.response.AppMatchConfidence import com.simprints.core.tools.time.TimeHelper -import com.simprints.infra.events.event.domain.models.callback.CallbackComparisonScore -import com.simprints.infra.events.event.domain.models.callback.ConfirmationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.EnrolmentCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.RefusalCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.VerificationCallbackEvent +import com.simprints.infra.events.event.domain.models.CallbackComparisonScore +import com.simprints.infra.events.event.domain.models.ConfirmationCallbackEvent +import com.simprints.infra.events.event.domain.models.EnrolmentCallbackEvent +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.RefusalCallbackEvent +import com.simprints.infra.events.event.domain.models.VerificationCallbackEvent import com.simprints.infra.events.session.SessionEventRepository import com.simprints.infra.orchestration.data.responses.AppConfirmationResponse import com.simprints.infra.orchestration.data.responses.AppEnrolResponse diff --git a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCaseTest.kt b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCaseTest.kt index fae3556619..0c44669184 100644 --- a/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCaseTest.kt +++ b/feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/AddCallbackEventUseCaseTest.kt @@ -4,12 +4,12 @@ import com.google.common.truth.Truth.* import com.simprints.core.domain.response.AppErrorReason import com.simprints.core.domain.response.AppMatchConfidence import com.simprints.core.tools.time.TimeHelper -import com.simprints.infra.events.event.domain.models.callback.ConfirmationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.EnrolmentCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.RefusalCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.VerificationCallbackEvent +import com.simprints.infra.events.event.domain.models.ConfirmationCallbackEvent +import com.simprints.infra.events.event.domain.models.EnrolmentCallbackEvent +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.RefusalCallbackEvent +import com.simprints.infra.events.event.domain.models.VerificationCallbackEvent import com.simprints.infra.events.session.SessionEventRepository import com.simprints.infra.orchestration.data.responses.AppConfirmationResponse import com.simprints.infra.orchestration.data.responses.AppEnrolResponse diff --git a/fingerprint/capture/src/main/java/com/simprints/fingerprint/capture/usecase/AddCaptureEventsUseCase.kt b/fingerprint/capture/src/main/java/com/simprints/fingerprint/capture/usecase/AddCaptureEventsUseCase.kt index de5b9cb65a..742d280cde 100644 --- a/fingerprint/capture/src/main/java/com/simprints/fingerprint/capture/usecase/AddCaptureEventsUseCase.kt +++ b/fingerprint/capture/src/main/java/com/simprints/fingerprint/capture/usecase/AddCaptureEventsUseCase.kt @@ -7,10 +7,10 @@ import com.simprints.core.tools.utils.randomUUID import com.simprints.fingerprint.capture.state.CaptureState import com.simprints.fingerprint.capture.state.FingerState import com.simprints.fingerprint.capture.state.ScanResult -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent.FingerprintCapturePayload -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent.FingerprintCapturePayload.Result +import com.simprints.infra.events.event.domain.models.FingerprintCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent.FingerprintCapturePayload +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent.FingerprintCapturePayload.Result import com.simprints.infra.events.session.SessionEventRepository import javax.inject.Inject diff --git a/fingerprint/capture/src/test/java/com/simprints/fingerprint/capture/usecase/AddCaptureEventsUseCaseTest.kt b/fingerprint/capture/src/test/java/com/simprints/fingerprint/capture/usecase/AddCaptureEventsUseCaseTest.kt index f4383ca020..8d6952b657 100644 --- a/fingerprint/capture/src/test/java/com/simprints/fingerprint/capture/usecase/AddCaptureEventsUseCaseTest.kt +++ b/fingerprint/capture/src/test/java/com/simprints/fingerprint/capture/usecase/AddCaptureEventsUseCaseTest.kt @@ -7,8 +7,8 @@ import com.simprints.core.tools.utils.EncodingUtils import com.simprints.fingerprint.capture.state.CaptureState import com.simprints.fingerprint.capture.state.FingerState import com.simprints.fingerprint.capture.state.ScanResult -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent +import com.simprints.infra.events.event.domain.models.FingerprintCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent import com.simprints.infra.events.session.SessionEventRepository import io.mockk.MockKAnnotations import io.mockk.coJustRun diff --git a/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareCandidateRecordDataSource.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareCandidateRecordDataSource.kt index 52f02691e4..7340d6eff4 100644 --- a/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareCandidateRecordDataSource.kt +++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareCandidateRecordDataSource.kt @@ -27,9 +27,9 @@ import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentR 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 -import com.simprints.infra.events.event.domain.models.subject.FaceReference -import com.simprints.infra.events.event.domain.models.subject.FingerprintReference +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.FaceReference +import com.simprints.infra.events.event.domain.models.FingerprintReference import com.simprints.infra.logging.Simber import com.simprints.libsimprints.Constants.SIMPRINTS_COSYNC_SUBJECT_ACTIONS import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/commcare/CommCareEventDataSource.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/commcare/CommCareEventDataSource.kt index b237971968..fe92c675f6 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/commcare/CommCareEventDataSource.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/commcare/CommCareEventDataSource.kt @@ -6,9 +6,9 @@ import androidx.core.net.toUri import com.simprints.core.tools.json.JsonHelper import com.simprints.infra.config.store.LastCallingPackageStore import com.simprints.infra.events.event.cosync.CoSyncEnrolmentRecordEvents -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordDeletionEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordDeletionEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent import com.simprints.infra.eventsync.event.commcare.cache.CommCareSyncCache import com.simprints.infra.eventsync.event.commcare.cache.SyncedCaseEntity import com.simprints.infra.eventsync.status.down.domain.CommCareEventSyncResult diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiEnrolmentRecordEvent.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiEnrolmentRecordEvent.kt index 0134179a06..991b04362b 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiEnrolmentRecordEvent.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiEnrolmentRecordEvent.kt @@ -1,11 +1,11 @@ package com.simprints.infra.eventsync.event.remote import androidx.annotation.Keep -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordDeletionEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordUpdateEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordDeletionEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordUpdateEvent import com.simprints.infra.eventsync.event.remote.models.ApiEnrolmentRecordCreationPayload import com.simprints.infra.eventsync.event.remote.models.ApiEnrolmentRecordDeletionPayload import com.simprints.infra.eventsync.event.remote.models.ApiEnrolmentRecordEventPayload diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiEnrolmentRecordPayloadType.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiEnrolmentRecordPayloadType.kt index 33f394a9e3..fb4a034d14 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiEnrolmentRecordPayloadType.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiEnrolmentRecordPayloadType.kt @@ -1,7 +1,7 @@ package com.simprints.infra.eventsync.event.remote import androidx.annotation.Keep -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEventType +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEventType import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt index 406411124c..c94e235a1a 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt @@ -4,7 +4,7 @@ import androidx.annotation.VisibleForTesting import com.simprints.core.tools.json.JsonHelper import com.simprints.infra.authstore.AuthStore import com.simprints.infra.events.event.domain.EventCount -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent import com.simprints.infra.eventsync.event.remote.exceptions.TooManyRequestsException import com.simprints.infra.eventsync.status.down.domain.EventDownSyncResult import com.simprints.infra.eventsync.status.up.domain.EventUpSyncResult diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiBiometricDataSource.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiBiometricDataSource.kt index 541060a86e..1b6668ed92 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiBiometricDataSource.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiBiometricDataSource.kt @@ -1,7 +1,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep -import com.simprints.infra.events.event.domain.models.callout.BiometricDataSource +import com.simprints.infra.events.event.domain.models.BiometricDataSource import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiBiometricReference.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiBiometricReference.kt index e628ddea4c..b29a97ea30 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiBiometricReference.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiBiometricReference.kt @@ -3,12 +3,12 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports import com.simprints.core.domain.common.TemplateIdentifier -import com.simprints.infra.events.event.domain.models.subject.FaceTemplate -import com.simprints.infra.events.event.domain.models.subject.FingerprintTemplate +import com.simprints.infra.events.event.domain.models.FaceTemplate +import com.simprints.infra.events.event.domain.models.FingerprintTemplate import com.simprints.infra.eventsync.event.remote.ApiFingerprintTemplate import kotlinx.serialization.Serializable -import com.simprints.infra.events.event.domain.models.subject.FaceReference as DomainFaceReference -import com.simprints.infra.events.event.domain.models.subject.FingerprintReference as DomainFingerprintReference +import com.simprints.infra.events.event.domain.models.FaceReference as DomainFaceReference +import com.simprints.infra.events.event.domain.models.FingerprintReference as DomainFingerprintReference @ExcludedFromGeneratedTestCoverageReports("API model") @Serializable diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCallbackComparisonScore.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCallbackComparisonScore.kt index ce14678c1d..aa3c52365c 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCallbackComparisonScore.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCallbackComparisonScore.kt @@ -1,7 +1,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep -import com.simprints.infra.events.event.domain.models.callback.CallbackComparisonScore +import com.simprints.infra.events.event.domain.models.CallbackComparisonScore import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCallbackPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCallbackPayload.kt index 7aecc8473e..0ab8bd33e7 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCallbackPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCallbackPayload.kt @@ -2,12 +2,12 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.callback.ConfirmationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.EnrolmentCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.RefusalCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.VerificationCallbackEvent +import com.simprints.infra.events.event.domain.models.ConfirmationCallbackEvent +import com.simprints.infra.events.event.domain.models.EnrolmentCallbackEvent +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.RefusalCallbackEvent +import com.simprints.infra.events.event.domain.models.VerificationCallbackEvent import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCalloutPayloadV2.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCalloutPayloadV2.kt index 76d0ff7b08..c491f5e896 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCalloutPayloadV2.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCalloutPayloadV2.kt @@ -3,11 +3,11 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV2 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV2 +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV2 import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCalloutPayloadV3.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCalloutPayloadV3.kt index 761e64b3dd..383fb020cc 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCalloutPayloadV3.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCalloutPayloadV3.kt @@ -3,11 +3,11 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV3 +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV3 +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV3 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV3 +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV3 +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV3 import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordCreationPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordCreationPayload.kt index 701034863c..d12c7a9e04 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordCreationPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordCreationPayload.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.asTokenizableEncrypted -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent import com.simprints.infra.eventsync.event.remote.ApiEnrolmentRecordPayloadType import com.simprints.infra.eventsync.event.remote.ApiExternalCredential import com.simprints.infra.eventsync.event.remote.fromApiToDomain diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordDeletionPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordDeletionPayload.kt index 22689dcaa5..75a6a87752 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordDeletionPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordDeletionPayload.kt @@ -1,7 +1,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordDeletionEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordDeletionEvent import com.simprints.infra.eventsync.event.remote.ApiEnrolmentRecordPayloadType import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordMovePayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordMovePayload.kt index aba2234bbe..c459ae5275 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordMovePayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordMovePayload.kt @@ -2,9 +2,9 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.asTokenizableEncrypted -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent.EnrolmentRecordCreationInMove -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent.EnrolmentRecordDeletionInMove +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent.EnrolmentRecordCreationInMove +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent.EnrolmentRecordDeletionInMove import com.simprints.infra.eventsync.event.remote.ApiEnrolmentRecordPayloadType import com.simprints.infra.eventsync.event.remote.ApiExternalCredential import com.simprints.infra.eventsync.event.remote.fromApiToDomain diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordUpdatePayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordUpdatePayload.kt index 3f1787fd10..55ae917d06 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordUpdatePayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentRecordUpdatePayload.kt @@ -1,7 +1,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordUpdateEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordUpdateEvent import com.simprints.infra.eventsync.event.remote.ApiEnrolmentRecordPayloadType import com.simprints.infra.eventsync.event.remote.ApiExternalCredential import com.simprints.infra.eventsync.event.remote.fromApiToDomain diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiErrorCallback.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiErrorCallback.kt index c9018e4926..dbe5b47fdb 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiErrorCallback.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiErrorCallback.kt @@ -1,25 +1,25 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.AGE_GROUP_NOT_SUPPORTED +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.BACKEND_MAINTENANCE_ERROR +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.BLUETOOTH_NOT_SUPPORTED +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.BLUETOOTH_NO_PERMISSION +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.DIFFERENT_PROJECT_ID_SIGNED_IN +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.DIFFERENT_USER_ID_SIGNED_IN +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.ENROLMENT_LAST_BIOMETRICS_FAILED +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.FACE_CONFIGURATION_ERROR +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.FINGERPRINT_CONFIGURATION_ERROR +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.GUID_NOT_FOUND_OFFLINE +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.GUID_NOT_FOUND_ONLINE +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.LICENSE_INVALID +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.LICENSE_MISSING +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.LOGIN_NOT_COMPLETE +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.PROJECT_ENDING +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.PROJECT_PAUSED +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.UNEXPECTED_ERROR import com.simprints.infra.events.event.domain.models.EventType -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.AGE_GROUP_NOT_SUPPORTED -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.BACKEND_MAINTENANCE_ERROR -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.BLUETOOTH_NOT_SUPPORTED -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.BLUETOOTH_NO_PERMISSION -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.DIFFERENT_PROJECT_ID_SIGNED_IN -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.DIFFERENT_USER_ID_SIGNED_IN -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.ENROLMENT_LAST_BIOMETRICS_FAILED -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.FACE_CONFIGURATION_ERROR -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.FINGERPRINT_CONFIGURATION_ERROR -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.GUID_NOT_FOUND_OFFLINE -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.GUID_NOT_FOUND_ONLINE -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.LICENSE_INVALID -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.LICENSE_MISSING -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.LOGIN_NOT_COMPLETE -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.PROJECT_ENDING -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.PROJECT_PAUSED -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.UNEXPECTED_ERROR import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventDownSyncRequestPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventDownSyncRequestPayload.kt index 3d127df365..85950b6a83 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventDownSyncRequestPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventDownSyncRequestPayload.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventPayload.kt index 80392dcedf..bd7b5237ec 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventPayload.kt @@ -9,11 +9,21 @@ import com.simprints.infra.events.event.domain.models.AuthorizationEvent.Authori import com.simprints.infra.events.event.domain.models.BiometricReferenceCreationEvent.BiometricReferenceCreationPayload import com.simprints.infra.events.event.domain.models.CandidateReadEvent.CandidateReadPayload import com.simprints.infra.events.event.domain.models.CompletionCheckEvent.CompletionCheckPayload +import com.simprints.infra.events.event.domain.models.ConfirmationCallbackEvent.ConfirmationCallbackPayload +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV3 import com.simprints.infra.events.event.domain.models.ConnectivitySnapshotEvent.ConnectivitySnapshotPayload import com.simprints.infra.events.event.domain.models.ConsentEvent.ConsentPayload +import com.simprints.infra.events.event.domain.models.EnrolmentCallbackEvent.EnrolmentCallbackPayload +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV2 +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV3 import com.simprints.infra.events.event.domain.models.EnrolmentEventV2 import com.simprints.infra.events.event.domain.models.EnrolmentEventV4 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV2 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV3 import com.simprints.infra.events.event.domain.models.EnrolmentUpdateEvent.EnrolmentUpdatePayload +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent import com.simprints.infra.events.event.domain.models.EventPayload import com.simprints.infra.events.event.domain.models.EventType.AGE_GROUP_SELECTION import com.simprints.infra.events.event.domain.models.EventType.ALERT_SCREEN @@ -70,49 +80,39 @@ import com.simprints.infra.events.event.domain.models.EventType.SCANNER_CONNECTI import com.simprints.infra.events.event.domain.models.EventType.SCANNER_FIRMWARE_UPDATE import com.simprints.infra.events.event.domain.models.EventType.SUSPICIOUS_INTENT import com.simprints.infra.events.event.domain.models.EventType.VERO_2_INFO_SNAPSHOT +import com.simprints.infra.events.event.domain.models.EventUpSyncRequestEvent import com.simprints.infra.events.event.domain.models.ExternalCredentialCaptureEvent.ExternalCredentialCapturePayload import com.simprints.infra.events.event.domain.models.ExternalCredentialCaptureValueEvent.ExternalCredentialCaptureValuePayload import com.simprints.infra.events.event.domain.models.ExternalCredentialConfirmationEvent.ExternalCredentialConfirmationPayload import com.simprints.infra.events.event.domain.models.ExternalCredentialSearchEvent.ExternalCredentialSearchPayload import com.simprints.infra.events.event.domain.models.ExternalCredentialSelectionEvent.ExternalCredentialSelectionPayload +import com.simprints.infra.events.event.domain.models.FaceCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceFallbackCaptureEvent.FaceFallbackCapturePayload +import com.simprints.infra.events.event.domain.models.FaceOnboardingCompleteEvent.FaceOnboardingCompletePayload +import com.simprints.infra.events.event.domain.models.FingerprintCaptureBiometricsEvent.FingerprintCaptureBiometricsPayload +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent import com.simprints.infra.events.event.domain.models.GuidSelectionEvent.GuidSelectionPayload +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent.IdentificationCallbackPayload +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV3 import com.simprints.infra.events.event.domain.models.IntentParsingEvent.IntentParsingPayload import com.simprints.infra.events.event.domain.models.InvalidIntentEvent.InvalidIntentPayload import com.simprints.infra.events.event.domain.models.LicenseCheckEvent import com.simprints.infra.events.event.domain.models.OneToManyMatchEvent.OneToManyMatchPayload import com.simprints.infra.events.event.domain.models.OneToOneMatchEvent.OneToOneMatchPayload import com.simprints.infra.events.event.domain.models.PersonCreationEvent.PersonCreationPayload +import com.simprints.infra.events.event.domain.models.RefusalCallbackEvent.RefusalCallbackPayload import com.simprints.infra.events.event.domain.models.RefusalEvent.RefusalPayload +import com.simprints.infra.events.event.domain.models.SampleUpSyncRequestEvent import com.simprints.infra.events.event.domain.models.ScannerConnectionEvent.ScannerConnectionPayload import com.simprints.infra.events.event.domain.models.ScannerFirmwareUpdateEvent.ScannerFirmwareUpdatePayload import com.simprints.infra.events.event.domain.models.SuspiciousIntentEvent.SuspiciousIntentPayload +import com.simprints.infra.events.event.domain.models.VerificationCallbackEvent.VerificationCallbackPayload +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV3 import com.simprints.infra.events.event.domain.models.Vero2InfoSnapshotEvent.Vero2InfoSnapshotPayload -import com.simprints.infra.events.event.domain.models.callback.ConfirmationCallbackEvent.ConfirmationCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.EnrolmentCallbackEvent.EnrolmentCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent.IdentificationCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.RefusalCallbackEvent.RefusalCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.VerificationCallbackEvent.VerificationCallbackPayload -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceFallbackCaptureEvent.FaceFallbackCapturePayload -import com.simprints.infra.events.event.domain.models.face.FaceOnboardingCompleteEvent.FaceOnboardingCompletePayload -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureBiometricsEvent.FingerprintCaptureBiometricsPayload -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent -import com.simprints.infra.events.event.domain.models.samples.SampleUpSyncRequestEvent -import com.simprints.infra.events.event.domain.models.upsync.EventUpSyncRequestEvent import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.descriptors.buildClassSerialDescriptor diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventSampleUpSyncRequestPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventSampleUpSyncRequestPayload.kt index 4449f83626..0dadffbc20 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventSampleUpSyncRequestPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventSampleUpSyncRequestPayload.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.samples.SampleUpSyncRequestEvent +import com.simprints.infra.events.event.domain.models.SampleUpSyncRequestEvent import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventUpSyncRequestPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventUpSyncRequestPayload.kt index 40415313ea..983b58ced0 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventUpSyncRequestPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventUpSyncRequestPayload.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.upsync.EventUpSyncRequestEvent +import com.simprints.infra.events.event.domain.models.EventUpSyncRequestEvent import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCaptureBiometricsPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCaptureBiometricsPayload.kt index e5bdb1f683..bd8deb4901 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCaptureBiometricsPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCaptureBiometricsPayload.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.face.FaceCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureBiometricsEvent import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCaptureConfirmationPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCaptureConfirmationPayload.kt index 2a864a12a4..168288ccab 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCaptureConfirmationPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCaptureConfirmationPayload.kt @@ -2,9 +2,9 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.CONTINUE -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.RECAPTURE +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.CONTINUE +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.RECAPTURE import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCapturePayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCapturePayload.kt index a517befb63..28bea35423 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCapturePayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceCapturePayload.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent.FaceCapturePayload +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent.FaceCapturePayload import com.simprints.infra.eventsync.event.remote.models.ApiFaceCapturePayload.ApiFace import com.simprints.infra.eventsync.event.remote.models.ApiFaceCapturePayload.ApiResult.BAD_QUALITY import com.simprints.infra.eventsync.event.remote.models.ApiFaceCapturePayload.ApiResult.INVALID diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceFallbackCapturePayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceFallbackCapturePayload.kt index 8212258137..7adbe2fe41 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceFallbackCapturePayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceFallbackCapturePayload.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.face.FaceFallbackCaptureEvent.FaceFallbackCapturePayload +import com.simprints.infra.events.event.domain.models.FaceFallbackCaptureEvent.FaceFallbackCapturePayload import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceOnboardingCompletePayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceOnboardingCompletePayload.kt index 302a183568..fe2db6de5f 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceOnboardingCompletePayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFaceOnboardingCompletePayload.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.face.FaceOnboardingCompleteEvent.FaceOnboardingCompletePayload +import com.simprints.infra.events.event.domain.models.FaceOnboardingCompleteEvent.FaceOnboardingCompletePayload import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCaptureBiometricsPayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCaptureBiometricsPayload.kt index dfe6117900..106315a503 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCaptureBiometricsPayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCaptureBiometricsPayload.kt @@ -3,7 +3,7 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.core.domain.common.TemplateIdentifier import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FingerprintCaptureBiometricsEvent import kotlinx.serialization.Serializable @Keep diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCapturePayload.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCapturePayload.kt index bf74bd5753..19e1165d71 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCapturePayload.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCapturePayload.kt @@ -3,12 +3,12 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.core.domain.common.TemplateIdentifier import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent.FingerprintCapturePayload -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent.FingerprintCapturePayload.Result.BAD_QUALITY -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent.FingerprintCapturePayload.Result.FAILURE_TO_ACQUIRE -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent.FingerprintCapturePayload.Result.GOOD_SCAN -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent.FingerprintCapturePayload.Result.NO_FINGER_DETECTED -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent.FingerprintCapturePayload.Result.SKIPPED +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent.FingerprintCapturePayload +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent.FingerprintCapturePayload.Result.BAD_QUALITY +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent.FingerprintCapturePayload.Result.FAILURE_TO_ACQUIRE +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent.FingerprintCapturePayload.Result.GOOD_SCAN +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent.FingerprintCapturePayload.Result.NO_FINGER_DETECTED +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent.FingerprintCapturePayload.Result.SKIPPED import com.simprints.infra.eventsync.event.remote.models.ApiFingerprintCapturePayload.ApiResult import kotlinx.serialization.Serializable diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintReference.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintReference.kt index 3d2301b70c..fa96f4c028 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintReference.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintReference.kt @@ -2,7 +2,6 @@ package com.simprints.infra.eventsync.event.remote.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports -import com.simprints.infra.events.event.domain.models.subject.BiometricReferenceType.Companion.FINGERPRINT_REFERENCE_KEY import com.simprints.infra.eventsync.event.remote.ApiFingerprintTemplate import com.simprints.infra.eventsync.event.remote.models.ApiBiometricReferenceType.FingerprintReference import kotlinx.serialization.SerialName diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/CommCareEventSyncResult.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/CommCareEventSyncResult.kt index 94db9377fa..946e76460a 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/CommCareEventSyncResult.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/CommCareEventSyncResult.kt @@ -1,6 +1,6 @@ package com.simprints.infra.eventsync.status.down.domain -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent import kotlinx.coroutines.flow.Flow data class CommCareEventSyncResult( diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/EventDownSyncResult.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/EventDownSyncResult.kt index 69dc784a69..21709b06a5 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/EventDownSyncResult.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/EventDownSyncResult.kt @@ -1,6 +1,6 @@ package com.simprints.infra.eventsync.status.down.domain -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent import kotlinx.coroutines.channels.ReceiveChannel import kotlinx.serialization.Serializable diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/common/EnrolmentRecordFactory.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/common/EnrolmentRecordFactory.kt index f7e088b8e1..770f164ece 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/common/EnrolmentRecordFactory.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/common/EnrolmentRecordFactory.kt @@ -1,19 +1,19 @@ package com.simprints.infra.eventsync.sync.common +import com.simprints.core.domain.capture.BiometricReferenceCapture import com.simprints.core.domain.common.Modality import com.simprints.core.domain.externalcredential.ExternalCredential -import com.simprints.core.domain.capture.BiometricReferenceCapture import com.simprints.core.domain.reference.BiometricTemplate import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.TimeHelper import com.simprints.core.tools.utils.EncodingUtils import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecord -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 -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordUpdateEvent.EnrolmentRecordUpdatePayload -import com.simprints.infra.events.event.domain.models.subject.FaceReference -import com.simprints.infra.events.event.domain.models.subject.FingerprintReference +import com.simprints.infra.events.event.domain.models.BiometricReference +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent.EnrolmentRecordCreationPayload +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent.EnrolmentRecordCreationInMove +import com.simprints.infra.events.event.domain.models.EnrolmentRecordUpdateEvent.EnrolmentRecordUpdatePayload +import com.simprints.infra.events.event.domain.models.FaceReference +import com.simprints.infra.events.event.domain.models.FingerprintReference import java.util.Date import javax.inject.Inject import com.simprints.core.domain.reference.BiometricReference as CoreBiometricReference diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/BaseEventDownSyncTask.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/BaseEventDownSyncTask.kt index 3c558ee55c..14a7f783c2 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/BaseEventDownSyncTask.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/BaseEventDownSyncTask.kt @@ -10,15 +10,15 @@ import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentR import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecordAction.Creation import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecordAction.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.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordDeletionEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEventType +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent.EnrolmentRecordCreationInMove +import com.simprints.infra.events.event.domain.models.EnrolmentRecordUpdateEvent +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent import com.simprints.infra.events.event.domain.models.scope.EventScope -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordDeletionEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEventType -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent.EnrolmentRecordCreationInMove -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordUpdateEvent import com.simprints.infra.eventsync.status.down.EventDownSyncScopeRepository import com.simprints.infra.eventsync.status.down.domain.EventDownSyncOperation import com.simprints.infra.eventsync.status.down.domain.EventDownSyncOperation.DownSyncState.COMPLETE diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/CommCareEventSyncTask.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/CommCareEventSyncTask.kt index 85406d8f27..9733e8ce8b 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/CommCareEventSyncTask.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/CommCareEventSyncTask.kt @@ -4,7 +4,7 @@ import com.simprints.core.tools.time.TimeHelper import com.simprints.infra.config.store.ConfigRepository import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepository import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent import com.simprints.infra.eventsync.event.commcare.CommCareEventDataSource import com.simprints.infra.eventsync.status.down.EventDownSyncScopeRepository import com.simprints.infra.eventsync.status.down.domain.EventDownSyncOperation diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTask.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTask.kt index 69829b8e68..32330a8bcd 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTask.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTask.kt @@ -17,13 +17,13 @@ import com.simprints.infra.events.event.domain.models.EnrolmentEventV2 import com.simprints.infra.events.event.domain.models.EnrolmentEventV4 import com.simprints.infra.events.event.domain.models.EnrolmentUpdateEvent import com.simprints.infra.events.event.domain.models.Event +import com.simprints.infra.events.event.domain.models.EventUpSyncRequestEvent import com.simprints.infra.events.event.domain.models.ExternalCredentialCaptureValueEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FingerprintCaptureBiometricsEvent import com.simprints.infra.events.event.domain.models.PersonCreationEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureBiometricsEvent import com.simprints.infra.events.event.domain.models.scope.EventScope import com.simprints.infra.events.event.domain.models.scope.EventScopeType -import com.simprints.infra.events.event.domain.models.upsync.EventUpSyncRequestEvent import com.simprints.infra.eventsync.event.remote.ApiUploadEventsBody import com.simprints.infra.eventsync.event.remote.EventRemoteDataSource import com.simprints.infra.eventsync.event.remote.models.session.ApiEventScope diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/commcare/CommCareEventDataSourceTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/commcare/CommCareEventDataSourceTest.kt index 300e032d74..646a154d61 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/commcare/CommCareEventDataSourceTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/commcare/CommCareEventDataSourceTest.kt @@ -6,8 +6,8 @@ import android.database.Cursor import android.net.Uri import com.simprints.core.tools.json.JsonHelper import com.simprints.infra.config.store.LastCallingPackageStore -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordDeletionEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordDeletionEvent import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_PROJECT_ID import com.simprints.infra.eventsync.event.commcare.CommCareEventDataSource.Companion.BATCH_SIZE import com.simprints.infra.eventsync.event.commcare.CommCareEventDataSource.Companion.COLUMN_CASE_ID diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSourceTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSourceTest.kt index bb14183104..7b26d868ae 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSourceTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSourceTest.kt @@ -5,9 +5,9 @@ import com.simprints.core.tools.json.JsonHelper import com.simprints.infra.authstore.AuthStore import com.simprints.infra.config.store.models.Project import com.simprints.infra.events.event.domain.EventCount +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEventType import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEventType import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_PROJECT_ID import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_USER_ID diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/events/callback/ApiErrorCallbackTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/events/callback/ApiErrorCallbackTest.kt index e3f4ccd4c7..5848046cb2 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/events/callback/ApiErrorCallbackTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/events/callback/ApiErrorCallbackTest.kt @@ -6,7 +6,7 @@ import com.simprints.infra.eventsync.event.remote.models.ApiErrorCallback.ApiRea import com.simprints.infra.eventsync.event.remote.models.fromApiToDomain import com.simprints.infra.eventsync.event.remote.models.fromDomainToApi import org.junit.Test -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason as ErrorReason +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason as ErrorReason class ApiErrorCallbackTest { @Test diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCapturePayloadTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCapturePayloadTest.kt index f6a0da0a60..b7c389eb42 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCapturePayloadTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCapturePayloadTest.kt @@ -4,7 +4,7 @@ import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.common.TemplateIdentifier import com.simprints.core.tools.utils.randomUUID import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent import io.mockk.mockk import org.junit.Test diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/callback/ApiCallbackComparisonScoreTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/callback/ApiCallbackComparisonScoreTest.kt index 21325f6ea5..34c153aea9 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/callback/ApiCallbackComparisonScoreTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/callback/ApiCallbackComparisonScoreTest.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models.callback import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.response.AppMatchConfidence -import com.simprints.infra.events.event.domain.models.callback.CallbackComparisonScore +import com.simprints.infra.events.event.domain.models.CallbackComparisonScore import com.simprints.infra.eventsync.event.remote.models.ApiCallbackComparisonScore import com.simprints.infra.eventsync.event.remote.models.ApiConfidenceMatch import com.simprints.infra.eventsync.event.remote.models.ApiTier diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/face/ApiFaceCapturePayloadTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/face/ApiFaceCapturePayloadTest.kt index 81668f2ebb..e5ee640081 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/face/ApiFaceCapturePayloadTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/face/ApiFaceCapturePayloadTest.kt @@ -2,7 +2,7 @@ package com.simprints.infra.eventsync.event.remote.models.face import com.google.common.truth.Truth.assertThat import com.simprints.core.tools.utils.randomUUID -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent import com.simprints.infra.events.sampledata.FACE_TEMPLATE_FORMAT import com.simprints.infra.eventsync.event.remote.models.ApiFaceCapturePayload import com.simprints.infra.eventsync.event.remote.models.ApiTimestamp diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordCreationEventTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordCreationEventTest.kt index d496304472..30485d5dea 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordCreationEventTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordCreationEventTest.kt @@ -6,9 +6,9 @@ import com.simprints.core.domain.externalcredential.ExternalCredential import com.simprints.core.domain.externalcredential.ExternalCredentialType import com.simprints.core.domain.tokenization.asTokenizableEncrypted import com.simprints.infra.config.store.remote.models.ApiExternalCredentialType -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent -import com.simprints.infra.events.event.domain.models.subject.FingerprintReference -import com.simprints.infra.events.event.domain.models.subject.FingerprintTemplate +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.FingerprintReference +import com.simprints.infra.events.event.domain.models.FingerprintTemplate import com.simprints.infra.eventsync.event.remote.ApiExternalCredential import com.simprints.infra.eventsync.event.remote.ApiFingerprintTemplate import com.simprints.infra.eventsync.event.remote.models.ApiEnrolmentRecordCreationPayload diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordDeletionEventTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordDeletionEventTest.kt index 7534d9b955..e7fb630d4d 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordDeletionEventTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordDeletionEventTest.kt @@ -1,7 +1,7 @@ package com.simprints.infra.eventsync.event.remote.models.subject import com.google.common.truth.Truth.assertThat -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordDeletionEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordDeletionEvent import com.simprints.infra.eventsync.event.remote.models.ApiEnrolmentRecordDeletionPayload import com.simprints.infra.eventsync.event.remote.models.fromApiToDomain import org.junit.Test diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordMoveEventTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordMoveEventTest.kt index f1fde0d47e..889417cf53 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordMoveEventTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordMoveEventTest.kt @@ -6,9 +6,9 @@ import com.simprints.core.domain.externalcredential.ExternalCredential import com.simprints.core.domain.externalcredential.ExternalCredentialType import com.simprints.core.domain.tokenization.asTokenizableEncrypted import com.simprints.infra.config.store.remote.models.ApiExternalCredentialType -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent -import com.simprints.infra.events.event.domain.models.subject.FingerprintReference -import com.simprints.infra.events.event.domain.models.subject.FingerprintTemplate +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent +import com.simprints.infra.events.event.domain.models.FingerprintReference +import com.simprints.infra.events.event.domain.models.FingerprintTemplate import com.simprints.infra.eventsync.event.remote.ApiExternalCredential import com.simprints.infra.eventsync.event.remote.ApiFingerprintTemplate import com.simprints.infra.eventsync.event.remote.models.ApiEnrolmentRecordMovePayload diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordUpdateEventTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordUpdateEventTest.kt index 879ba96039..1cbda93d9c 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordUpdateEventTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/subject/ApiEnrolmentRecordUpdateEventTest.kt @@ -6,11 +6,11 @@ import com.simprints.core.domain.externalcredential.ExternalCredential import com.simprints.core.domain.externalcredential.ExternalCredentialType import com.simprints.core.domain.tokenization.asTokenizableEncrypted import com.simprints.infra.config.store.remote.models.ApiExternalCredentialType -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordUpdateEvent -import com.simprints.infra.events.event.domain.models.subject.FaceReference -import com.simprints.infra.events.event.domain.models.subject.FaceTemplate -import com.simprints.infra.events.event.domain.models.subject.FingerprintReference -import com.simprints.infra.events.event.domain.models.subject.FingerprintTemplate +import com.simprints.infra.events.event.domain.models.EnrolmentRecordUpdateEvent +import com.simprints.infra.events.event.domain.models.FaceReference +import com.simprints.infra.events.event.domain.models.FaceTemplate +import com.simprints.infra.events.event.domain.models.FingerprintReference +import com.simprints.infra.events.event.domain.models.FingerprintTemplate import com.simprints.infra.eventsync.event.remote.ApiExternalCredential import com.simprints.infra.eventsync.event.remote.ApiFingerprintTemplate import com.simprints.infra.eventsync.event.remote.models.ApiEnrolmentRecordUpdatePayload diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/CommCareEventSyncTaskTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/CommCareEventSyncTaskTest.kt index c346ca4d9a..5f2b930b7b 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/CommCareEventSyncTaskTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/CommCareEventSyncTaskTest.kt @@ -19,15 +19,15 @@ import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentR import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecordAction.Deletion import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecordAction.Update import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordDeletionEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordUpdateEvent +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent +import com.simprints.infra.events.event.domain.models.FaceReference +import com.simprints.infra.events.event.domain.models.FaceTemplate import com.simprints.infra.events.event.domain.models.scope.EventScope -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordDeletionEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordUpdateEvent -import com.simprints.infra.events.event.domain.models.subject.FaceReference -import com.simprints.infra.events.event.domain.models.subject.FaceTemplate import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID_2 import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_USER_ID diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/EnrolmentRecordFactoryTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/EnrolmentRecordFactoryTest.kt index 9955434998..04eaf73869 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/EnrolmentRecordFactoryTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/EnrolmentRecordFactoryTest.kt @@ -1,26 +1,26 @@ package com.simprints.infra.eventsync.sync.down.tasks import com.google.common.truth.Truth.* +import com.simprints.core.domain.capture.BiometricReferenceCapture +import com.simprints.core.domain.capture.BiometricTemplateCapture import com.simprints.core.domain.common.Modality +import com.simprints.core.domain.common.TemplateIdentifier import com.simprints.core.domain.externalcredential.ExternalCredential import com.simprints.core.domain.externalcredential.ExternalCredentialType import com.simprints.core.domain.reference.BiometricReference -import com.simprints.core.domain.capture.BiometricReferenceCapture import com.simprints.core.domain.reference.BiometricTemplate -import com.simprints.core.domain.capture.BiometricTemplateCapture -import com.simprints.core.domain.common.TemplateIdentifier import com.simprints.core.domain.tokenization.asTokenizableEncrypted import com.simprints.core.domain.tokenization.asTokenizableRaw import com.simprints.core.tools.time.TimeHelper import com.simprints.core.tools.utils.EncodingUtils import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecord -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.EnrolmentRecordUpdateEvent.EnrolmentRecordUpdatePayload -import com.simprints.infra.events.event.domain.models.subject.FaceReference -import com.simprints.infra.events.event.domain.models.subject.FaceTemplate -import com.simprints.infra.events.event.domain.models.subject.FingerprintReference -import com.simprints.infra.events.event.domain.models.subject.FingerprintTemplate +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordUpdateEvent.EnrolmentRecordUpdatePayload +import com.simprints.infra.events.event.domain.models.FaceReference +import com.simprints.infra.events.event.domain.models.FaceTemplate +import com.simprints.infra.events.event.domain.models.FingerprintReference +import com.simprints.infra.events.event.domain.models.FingerprintTemplate import com.simprints.infra.events.sampledata.SampleDefaults.GUID1 import com.simprints.infra.eventsync.sync.common.EnrolmentRecordFactory import io.mockk.* diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/SimprintsEventDownSyncTaskTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/SimprintsEventDownSyncTaskTest.kt index 76947659f6..1414e7e2d9 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/SimprintsEventDownSyncTaskTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/tasks/SimprintsEventDownSyncTaskTest.kt @@ -20,15 +20,15 @@ import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentR import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecordAction.Deletion import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecordAction.Update import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordDeletionEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordMoveEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordUpdateEvent +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent +import com.simprints.infra.events.event.domain.models.FaceReference +import com.simprints.infra.events.event.domain.models.FaceTemplate import com.simprints.infra.events.event.domain.models.scope.EventScope -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordDeletionEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordMoveEvent -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordUpdateEvent -import com.simprints.infra.events.event.domain.models.subject.FaceReference -import com.simprints.infra.events.event.domain.models.subject.FaceTemplate import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID_2 import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_USER_ID diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTaskTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTaskTest.kt index 22d9e1d33c..f757222faa 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTaskTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTaskTest.kt @@ -15,9 +15,9 @@ import com.simprints.infra.config.store.models.SynchronizationConfiguration import com.simprints.infra.config.store.models.UpSynchronizationConfiguration import com.simprints.infra.events.EventRepository import com.simprints.infra.events.event.domain.models.Event +import com.simprints.infra.events.event.domain.models.EventUpSyncRequestEvent import com.simprints.infra.events.event.domain.models.scope.EventScope import com.simprints.infra.events.event.domain.models.scope.EventScopeType -import com.simprints.infra.events.event.domain.models.upsync.EventUpSyncRequestEvent import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_PROJECT_ID import com.simprints.infra.events.sampledata.SampleDefaults.GUID1 import com.simprints.infra.events.sampledata.SampleDefaults.GUID2 diff --git a/infra/events/src/debug/java/com/simprints/infra/events/sampledata/EventFactoryUtils.kt b/infra/events/src/debug/java/com/simprints/infra/events/sampledata/EventFactoryUtils.kt index 7498072017..c5161c6e42 100644 --- a/infra/events/src/debug/java/com/simprints/infra/events/sampledata/EventFactoryUtils.kt +++ b/infra/events/src/debug/java/com/simprints/infra/events/sampledata/EventFactoryUtils.kt @@ -17,27 +17,51 @@ import com.simprints.infra.events.event.domain.models.AuthorizationEvent import com.simprints.infra.events.event.domain.models.AuthorizationEvent.AuthorizationPayload import com.simprints.infra.events.event.domain.models.AuthorizationEvent.AuthorizationPayload.AuthorizationResult.AUTHORIZED import com.simprints.infra.events.event.domain.models.BiometricReferenceCreationEvent +import com.simprints.infra.events.event.domain.models.CallbackComparisonScore import com.simprints.infra.events.event.domain.models.CandidateReadEvent import com.simprints.infra.events.event.domain.models.CandidateReadEvent.CandidateReadPayload.LocalResult.FOUND import com.simprints.infra.events.event.domain.models.CandidateReadEvent.CandidateReadPayload.RemoteResult.NOT_FOUND import com.simprints.infra.events.event.domain.models.CompletionCheckEvent +import com.simprints.infra.events.event.domain.models.ConfirmationCallbackEvent +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV3 import com.simprints.infra.events.event.domain.models.ConnectivitySnapshotEvent import com.simprints.infra.events.event.domain.models.ConsentEvent import com.simprints.infra.events.event.domain.models.ConsentEvent.ConsentPayload.Result.ACCEPTED import com.simprints.infra.events.event.domain.models.ConsentEvent.ConsentPayload.Type.INDIVIDUAL +import com.simprints.infra.events.event.domain.models.EnrolmentCallbackEvent +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV2 +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV3 import com.simprints.infra.events.event.domain.models.EnrolmentEventV2 import com.simprints.infra.events.event.domain.models.EnrolmentEventV4 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV2 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV3 import com.simprints.infra.events.event.domain.models.EnrolmentUpdateEvent +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.DIFFERENT_PROJECT_ID_SIGNED_IN import com.simprints.infra.events.event.domain.models.Event +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent import com.simprints.infra.events.event.domain.models.EventType +import com.simprints.infra.events.event.domain.models.EventUpSyncRequestEvent import com.simprints.infra.events.event.domain.models.ExternalCredentialCaptureEvent import com.simprints.infra.events.event.domain.models.ExternalCredentialCaptureValueEvent import com.simprints.infra.events.event.domain.models.ExternalCredentialConfirmationEvent import com.simprints.infra.events.event.domain.models.ExternalCredentialConfirmationEvent.ExternalCredentialConfirmationResult import com.simprints.infra.events.event.domain.models.ExternalCredentialSearchEvent import com.simprints.infra.events.event.domain.models.ExternalCredentialSelectionEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.CONTINUE +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceFallbackCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceOnboardingCompleteEvent import com.simprints.infra.events.event.domain.models.FingerComparisonStrategy +import com.simprints.infra.events.event.domain.models.FingerprintCaptureBiometricsEvent +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent import com.simprints.infra.events.event.domain.models.GuidSelectionEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV3 import com.simprints.infra.events.event.domain.models.IntentParsingEvent import com.simprints.infra.events.event.domain.models.IntentParsingEvent.IntentParsingPayload.IntegrationInfo.COMMCARE import com.simprints.infra.events.event.domain.models.InvalidIntentEvent @@ -48,51 +72,27 @@ import com.simprints.infra.events.event.domain.models.OneToManyMatchEvent.OneToM import com.simprints.infra.events.event.domain.models.OneToManyMatchEvent.OneToManyMatchPayload.MatchPoolType.PROJECT import com.simprints.infra.events.event.domain.models.OneToOneMatchEvent import com.simprints.infra.events.event.domain.models.PersonCreationEvent +import com.simprints.infra.events.event.domain.models.RefusalCallbackEvent import com.simprints.infra.events.event.domain.models.RefusalEvent import com.simprints.infra.events.event.domain.models.RefusalEvent.RefusalPayload.Answer.OTHER +import com.simprints.infra.events.event.domain.models.SampleUpSyncRequestEvent import com.simprints.infra.events.event.domain.models.ScannerConnectionEvent import com.simprints.infra.events.event.domain.models.ScannerConnectionEvent.ScannerConnectionPayload.ScannerGeneration.VERO_1 import com.simprints.infra.events.event.domain.models.ScannerConnectionEvent.ScannerConnectionPayload.ScannerInfo import com.simprints.infra.events.event.domain.models.ScannerFirmwareUpdateEvent import com.simprints.infra.events.event.domain.models.SuspiciousIntentEvent +import com.simprints.infra.events.event.domain.models.VerificationCallbackEvent +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV3 import com.simprints.infra.events.event.domain.models.Vero2InfoSnapshotEvent import com.simprints.infra.events.event.domain.models.Vero2InfoSnapshotEvent.BatteryInfo import com.simprints.infra.events.event.domain.models.Vero2InfoSnapshotEvent.Vero2Version -import com.simprints.infra.events.event.domain.models.callback.CallbackComparisonScore -import com.simprints.infra.events.event.domain.models.callback.ConfirmationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.EnrolmentCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.DIFFERENT_PROJECT_ID_SIGNED_IN -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.RefusalCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.VerificationCallbackEvent -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.CONTINUE -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceFallbackCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceOnboardingCompleteEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent -import com.simprints.infra.events.event.domain.models.samples.SampleUpSyncRequestEvent 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 import com.simprints.infra.events.event.domain.models.scope.EventScopePayload import com.simprints.infra.events.event.domain.models.scope.EventScopeType import com.simprints.infra.events.event.domain.models.scope.Location -import com.simprints.infra.events.event.domain.models.upsync.EventUpSyncRequestEvent import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.CREDENTIAL_ID import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_BIOMETRIC_DATA_SOURCE diff --git a/infra/events/src/debug/java/com/simprints/infra/events/sampledata/SampleDefaults.kt b/infra/events/src/debug/java/com/simprints/infra/events/sampledata/SampleDefaults.kt index b5f289f5f0..0fbcd206bb 100644 --- a/infra/events/src/debug/java/com/simprints/infra/events/sampledata/SampleDefaults.kt +++ b/infra/events/src/debug/java/com/simprints/infra/events/sampledata/SampleDefaults.kt @@ -6,7 +6,7 @@ import com.simprints.core.domain.externalcredential.ExternalCredentialType import com.simprints.core.domain.tokenization.asTokenizableEncrypted import com.simprints.core.domain.tokenization.asTokenizableRaw import com.simprints.core.tools.time.Timestamp -import com.simprints.infra.events.event.domain.models.callout.BiometricDataSource +import com.simprints.infra.events.event.domain.models.BiometricDataSource import java.util.UUID object SampleDefaults { diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordCreationEventDeserializer.kt b/infra/events/src/main/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordCreationEventDeserializer.kt index df5939165b..a9333487bb 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordCreationEventDeserializer.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordCreationEventDeserializer.kt @@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.DeserializationContext import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.deser.std.StdDeserializer import com.simprints.core.domain.tokenization.TokenizableString -import com.simprints.infra.events.event.domain.models.subject.BiometricReference -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordCreationEvent +import com.simprints.infra.events.event.domain.models.BiometricReference +import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent /** * Deserializer for [EnrolmentRecordCreationEvent] that reads the JSON node and constructs the @@ -56,7 +56,7 @@ class CoSyncEnrolmentRecordCreationEventDeserializer : attendantId = attendantId, biometricReferences = biometricReferences, // TODO [CORE-3421] Update when CoSync supports external credentials (MfID) - externalCredentials = emptyList() + externalCredentials = emptyList(), ), ) } diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordEvents.kt b/infra/events/src/main/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordEvents.kt index dbcd164e77..30f9ba851a 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordEvents.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordEvents.kt @@ -1,7 +1,7 @@ package com.simprints.infra.events.event.cosync import androidx.annotation.Keep -import com.simprints.infra.events.event.domain.models.subject.EnrolmentRecordEvent +import com.simprints.infra.events.event.domain.models.EnrolmentRecordEvent import kotlinx.serialization.Serializable @Keep diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/BiometricDataSource.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/BiometricDataSource.kt new file mode 100644 index 0000000000..86d859bb8d --- /dev/null +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/BiometricDataSource.kt @@ -0,0 +1,17 @@ +package com.simprints.infra.events.event.domain.models + +import androidx.annotation.Keep + +@Keep +enum class BiometricDataSource { + SIMPRINTS, + COMMCARE, + ; + + companion object { + fun fromString(value: String) = when (value.uppercase()) { + "COMMCARE" -> COMMCARE + else -> SIMPRINTS + } + } +} diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/BiometricReference.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/BiometricReference.kt similarity index 80% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/BiometricReference.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/BiometricReference.kt index 8c804edcae..fc790407c3 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/BiometricReference.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/BiometricReference.kt @@ -1,19 +1,17 @@ -package com.simprints.infra.events.event.domain.models.subject +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo import com.simprints.core.ExcludedFromGeneratedTestCoverageReports -import com.simprints.infra.events.event.domain.models.subject.BiometricReferenceType.Companion.FACE_REFERENCE_KEY -import com.simprints.infra.events.event.domain.models.subject.BiometricReferenceType.Companion.FINGERPRINT_REFERENCE_KEY import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @ExcludedFromGeneratedTestCoverageReports("Domain model") @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @JsonSubTypes( - JsonSubTypes.Type(value = FaceReference::class, name = FACE_REFERENCE_KEY), - JsonSubTypes.Type(value = FingerprintReference::class, name = FINGERPRINT_REFERENCE_KEY), + JsonSubTypes.Type(value = FaceReference::class, name = BiometricReferenceType.Companion.FACE_REFERENCE_KEY), + JsonSubTypes.Type(value = FingerprintReference::class, name = BiometricReferenceType.Companion.FINGERPRINT_REFERENCE_KEY), ) @Keep @Serializable @@ -25,7 +23,7 @@ sealed class BiometricReference { @ExcludedFromGeneratedTestCoverageReports("Domain model") @Serializable -@SerialName(FACE_REFERENCE_KEY) +@SerialName(BiometricReferenceType.Companion.FACE_REFERENCE_KEY) data class FaceReference( override val id: String, val templates: List, @@ -38,7 +36,7 @@ data class FaceReference( @ExcludedFromGeneratedTestCoverageReports("Domain model") @Serializable -@SerialName(FINGERPRINT_REFERENCE_KEY) +@SerialName(BiometricReferenceType.Companion.FINGERPRINT_REFERENCE_KEY) data class FingerprintReference( override val id: String, val templates: List, diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/CallbackComparisonScore.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/CallbackComparisonScore.kt similarity index 80% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/CallbackComparisonScore.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/CallbackComparisonScore.kt index ea319b0ffc..e45c479e05 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/CallbackComparisonScore.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/CallbackComparisonScore.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.events.event.domain.models.callback +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.response.AppMatchConfidence diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/ConfirmationCallbackEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ConfirmationCallbackEvent.kt similarity index 85% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/ConfirmationCallbackEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ConfirmationCallbackEvent.kt index d0c3f41c12..eee256e1de 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/ConfirmationCallbackEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ConfirmationCallbackEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callback +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_CONFIRMATION import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV2.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ConfirmationCalloutEventV2.kt similarity index 86% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV2.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ConfirmationCalloutEventV2.kt index b7139a84f0..d2561daab1 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV2.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ConfirmationCalloutEventV2.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_CONFIRMATION import java.util.UUID @@ -33,7 +30,7 @@ data class ConfirmationCalloutEventV2( projectId = projectId, selectedGuid = selectedGuid, sessionId = sessionId, - metadata = metadata + metadata = metadata, ), CALLOUT_CONFIRMATION, ) diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV3.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ConfirmationCalloutEventV3.kt similarity index 88% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV3.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ConfirmationCalloutEventV3.kt index 3364652bec..aaf55b8f63 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV3.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ConfirmationCalloutEventV3.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_CONFIRMATION_V3 import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/EnrolmentCallbackEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentCallbackEvent.kt similarity index 85% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/EnrolmentCallbackEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentCallbackEvent.kt index 8c33cf05c4..a986937987 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/EnrolmentCallbackEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentCallbackEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callback +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_ENROLMENT import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV2.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentCalloutEventV2.kt similarity index 89% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV2.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentCalloutEventV2.kt index be2f5fb8d3..798a6e7210 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV2.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentCalloutEventV2.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_ENROLMENT import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV3.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentCalloutEventV3.kt similarity index 90% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV3.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentCalloutEventV3.kt index e6959dc088..17a8b38642 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV3.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentCalloutEventV3.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_ENROLMENT_V3 import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV2.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentLastBiometricsCalloutEventV2.kt similarity index 90% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV2.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentLastBiometricsCalloutEventV2.kt index 283c7d5e6d..f1b72a3e54 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV2.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentLastBiometricsCalloutEventV2.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_LAST_BIOMETRICS import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV3.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentLastBiometricsCalloutEventV3.kt similarity index 90% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV3.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentLastBiometricsCalloutEventV3.kt index 8112787ce8..a581eb39d0 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV3.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentLastBiometricsCalloutEventV3.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_LAST_BIOMETRICS_V3 import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordCreationEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordCreationEvent.kt similarity index 98% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordCreationEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordCreationEvent.kt index c96a8dc70f..d4de708a90 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordCreationEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordCreationEvent.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.events.event.domain.models.subject +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordDeletionEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordDeletionEvent.kt similarity index 84% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordDeletionEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordDeletionEvent.kt index e4c4391d7f..765e3b45ca 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordDeletionEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordDeletionEvent.kt @@ -1,6 +1,7 @@ -package com.simprints.infra.events.event.domain.models.subject +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep +import com.simprints.core.ExcludedFromGeneratedTestCoverageReports import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import java.util.UUID @@ -8,6 +9,7 @@ import java.util.UUID @Keep @Serializable @SerialName("EnrolmentRecordDeletion") +@ExcludedFromGeneratedTestCoverageReports("Data class") data class EnrolmentRecordDeletionEvent( override val id: String, val payload: EnrolmentRecordDeletionPayload, diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordEvent.kt similarity index 93% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordEvent.kt index d6e6d9df79..c987568fdc 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordEvent.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.events.event.domain.models.subject +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.fasterxml.jackson.annotation.JsonSubTypes diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordEventType.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordEventType.kt similarity index 75% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordEventType.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordEventType.kt index 17448d96a2..132cbeddb0 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordEventType.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordEventType.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.events.event.domain.models.subject +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordMoveEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordMoveEvent.kt similarity index 90% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordMoveEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordMoveEvent.kt index 801ae43f30..72a57631da 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordMoveEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordMoveEvent.kt @@ -1,6 +1,7 @@ -package com.simprints.infra.events.event.domain.models.subject +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep +import com.simprints.core.ExcludedFromGeneratedTestCoverageReports import com.simprints.core.domain.externalcredential.ExternalCredential import com.simprints.core.domain.tokenization.TokenizableString import kotlinx.serialization.SerialName @@ -10,6 +11,7 @@ import java.util.UUID @Keep @Serializable @SerialName("EnrolmentRecordMove") +@ExcludedFromGeneratedTestCoverageReports("Data class") data class EnrolmentRecordMoveEvent( override val id: String, val payload: EnrolmentRecordMovePayload, diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordUpdateEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordUpdateEvent.kt similarity index 95% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordUpdateEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordUpdateEvent.kt index d2698d1688..225a21b260 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/EnrolmentRecordUpdateEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EnrolmentRecordUpdateEvent.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.events.event.domain.models.subject +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.ExcludedFromGeneratedTestCoverageReports diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/ErrorCallbackEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ErrorCallbackEvent.kt similarity index 93% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/ErrorCallbackEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ErrorCallbackEvent.kt index 3b6f9bcbe7..692d662da5 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/ErrorCallbackEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ErrorCallbackEvent.kt @@ -1,13 +1,10 @@ -package com.simprints.infra.events.event.domain.models.callback +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.response.AppErrorReason import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_ERROR import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/Event.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/Event.kt index 0846658873..e5f8b3b2af 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/Event.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/Event.kt @@ -60,32 +60,8 @@ import com.simprints.infra.events.event.domain.models.EventType.Companion.SCANNE import com.simprints.infra.events.event.domain.models.EventType.Companion.SCANNER_FIRMWARE_UPDATE_KEY import com.simprints.infra.events.event.domain.models.EventType.Companion.SUSPICIOUS_INTENT_KEY import com.simprints.infra.events.event.domain.models.EventType.Companion.VERO_2_INFO_SNAPSHOT_KEY -import com.simprints.infra.events.event.domain.models.callback.ConfirmationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.EnrolmentCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.RefusalCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.VerificationCallbackEvent -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceFallbackCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceOnboardingCompleteEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent -import com.simprints.infra.events.event.domain.models.samples.SampleUpSyncRequestEvent -import com.simprints.infra.events.event.domain.models.upsync.EventUpSyncRequestEvent +import com.simprints.infra.events.event.domain.models.EventUpSyncRequestEvent +import com.simprints.infra.events.event.domain.models.SampleUpSyncRequestEvent @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, @@ -150,7 +126,7 @@ import com.simprints.infra.events.event.domain.models.upsync.EventUpSyncRequestE JsonSubTypes.Type(value = ExternalCredentialSearchEvent::class, name = EXTERNAL_CREDENTIAL_SEARCH_KEY), JsonSubTypes.Type(value = ExternalCredentialConfirmationEvent::class, name = EXTERNAL_CREDENTIAL_CONFIRMATION_KEY), ) -abstract class Event { +sealed class Event { abstract val id: String abstract val type: EventType abstract val payload: EventPayload @@ -159,11 +135,11 @@ abstract class Event { abstract var projectId: String? @JsonIgnore - abstract fun getTokenizableFields(): Map + open fun getTokenizableFields(): Map = emptyMap() abstract fun setTokenizedFields(map: Map): Event - override fun equals(other: Any?): Boolean = other is Event && other.id == id + final override fun equals(other: Any?): Boolean = other is Event && other.id == id - override fun hashCode(): Int = id.hashCode() + final override fun hashCode(): Int = id.hashCode() } diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/downsync/EventDownSyncRequestEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventDownSyncRequestEvent.kt similarity index 91% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/downsync/EventDownSyncRequestEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventDownSyncRequestEvent.kt index 8548416b3b..ec4de4e452 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/downsync/EventDownSyncRequestEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventDownSyncRequestEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.downsync +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import java.util.UUID @Keep diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventPayload.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventPayload.kt index 2ce01dac51..9e5ba859a1 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventPayload.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventPayload.kt @@ -10,53 +10,43 @@ import com.simprints.infra.events.event.domain.models.AuthorizationEvent.Authori import com.simprints.infra.events.event.domain.models.BiometricReferenceCreationEvent.BiometricReferenceCreationPayload import com.simprints.infra.events.event.domain.models.CandidateReadEvent.CandidateReadPayload import com.simprints.infra.events.event.domain.models.CompletionCheckEvent.CompletionCheckPayload +import com.simprints.infra.events.event.domain.models.ConfirmationCallbackEvent.ConfirmationCallbackPayload import com.simprints.infra.events.event.domain.models.ConnectivitySnapshotEvent.ConnectivitySnapshotPayload import com.simprints.infra.events.event.domain.models.ConsentEvent.ConsentPayload +import com.simprints.infra.events.event.domain.models.EnrolmentCallbackEvent.EnrolmentCallbackPayload import com.simprints.infra.events.event.domain.models.EnrolmentUpdateEvent.EnrolmentUpdatePayload +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent.EventDownSyncRequestPayload import com.simprints.infra.events.event.domain.models.EventType.Companion +import com.simprints.infra.events.event.domain.models.EventUpSyncRequestEvent.EventUpSyncRequestPayload import com.simprints.infra.events.event.domain.models.ExternalCredentialCaptureEvent.ExternalCredentialCapturePayload import com.simprints.infra.events.event.domain.models.ExternalCredentialCaptureValueEvent.ExternalCredentialCaptureValuePayload import com.simprints.infra.events.event.domain.models.ExternalCredentialConfirmationEvent.* import com.simprints.infra.events.event.domain.models.ExternalCredentialSearchEvent.* import com.simprints.infra.events.event.domain.models.ExternalCredentialSelectionEvent.* +import com.simprints.infra.events.event.domain.models.FaceCaptureBiometricsEvent.FaceCaptureBiometricsPayload +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent.FaceCapturePayload +import com.simprints.infra.events.event.domain.models.FaceFallbackCaptureEvent.FaceFallbackCapturePayload +import com.simprints.infra.events.event.domain.models.FaceOnboardingCompleteEvent.FaceOnboardingCompletePayload +import com.simprints.infra.events.event.domain.models.FingerprintCaptureBiometricsEvent.FingerprintCaptureBiometricsPayload +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent.FingerprintCapturePayload import com.simprints.infra.events.event.domain.models.GuidSelectionEvent.GuidSelectionPayload +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent.IdentificationCallbackPayload import com.simprints.infra.events.event.domain.models.IntentParsingEvent.IntentParsingPayload import com.simprints.infra.events.event.domain.models.InvalidIntentEvent.InvalidIntentPayload import com.simprints.infra.events.event.domain.models.LicenseCheckEvent.LicenseCheckEventPayload import com.simprints.infra.events.event.domain.models.OneToManyMatchEvent.OneToManyMatchPayload import com.simprints.infra.events.event.domain.models.OneToOneMatchEvent.OneToOneMatchPayload import com.simprints.infra.events.event.domain.models.PersonCreationEvent.PersonCreationPayload +import com.simprints.infra.events.event.domain.models.RefusalCallbackEvent.RefusalCallbackPayload import com.simprints.infra.events.event.domain.models.RefusalEvent.RefusalPayload +import com.simprints.infra.events.event.domain.models.SampleUpSyncRequestEvent.SampleUpSyncRequestPayload import com.simprints.infra.events.event.domain.models.ScannerConnectionEvent.ScannerConnectionPayload import com.simprints.infra.events.event.domain.models.ScannerFirmwareUpdateEvent.ScannerFirmwareUpdatePayload import com.simprints.infra.events.event.domain.models.SuspiciousIntentEvent.SuspiciousIntentPayload +import com.simprints.infra.events.event.domain.models.VerificationCallbackEvent.VerificationCallbackPayload import com.simprints.infra.events.event.domain.models.Vero2InfoSnapshotEvent.Vero2InfoSnapshotPayload -import com.simprints.infra.events.event.domain.models.callback.ConfirmationCallbackEvent.ConfirmationCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.EnrolmentCallbackEvent.EnrolmentCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent.IdentificationCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.RefusalCallbackEvent.RefusalCallbackPayload -import com.simprints.infra.events.event.domain.models.callback.VerificationCallbackEvent.VerificationCallbackPayload -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV2 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent.EventDownSyncRequestPayload -import com.simprints.infra.events.event.domain.models.face.FaceCaptureBiometricsEvent.FaceCaptureBiometricsPayload -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent.FaceCapturePayload -import com.simprints.infra.events.event.domain.models.face.FaceFallbackCaptureEvent.FaceFallbackCapturePayload -import com.simprints.infra.events.event.domain.models.face.FaceOnboardingCompleteEvent.FaceOnboardingCompletePayload -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureBiometricsEvent.FingerprintCaptureBiometricsPayload -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent.FingerprintCapturePayload -import com.simprints.infra.events.event.domain.models.samples.SampleUpSyncRequestEvent.SampleUpSyncRequestPayload -import com.simprints.infra.events.event.domain.models.upsync.EventUpSyncRequestEvent.EventUpSyncRequestPayload @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", visible = true) @JsonSubTypes( @@ -128,7 +118,7 @@ import com.simprints.infra.events.event.domain.models.upsync.EventUpSyncRequestE JsonSubTypes.Type(value = ExternalCredentialSearchPayload::class, name = Companion.EXTERNAL_CREDENTIAL_SEARCH_KEY), JsonSubTypes.Type(value = ExternalCredentialConfirmationPayload::class, name = Companion.EXTERNAL_CREDENTIAL_CONFIRMATION_KEY), ) -abstract class EventPayload { +sealed class EventPayload { abstract val type: EventType abstract val eventVersion: Int abstract val createdAt: Timestamp diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/upsync/EventUpSyncRequestEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventUpSyncRequestEvent.kt similarity index 90% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/upsync/EventUpSyncRequestEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventUpSyncRequestEvent.kt index 55d7ce03a6..00912de6a5 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/upsync/EventUpSyncRequestEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/EventUpSyncRequestEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.upsync +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import java.util.UUID @Keep diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureBiometricsEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceCaptureBiometricsEvent.kt similarity index 88% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureBiometricsEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceCaptureBiometricsEvent.kt index 2dcbaaa7ed..b80b2727f8 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureBiometricsEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceCaptureBiometricsEvent.kt @@ -1,13 +1,10 @@ -package com.simprints.infra.events.event.domain.models.face +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.core.tools.utils.randomUUID import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType @Keep data class FaceCaptureBiometricsEvent( diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureConfirmationEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceCaptureConfirmationEvent.kt similarity index 79% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureConfirmationEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceCaptureConfirmationEvent.kt index b93c095f35..5b5b8d18a7 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureConfirmationEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceCaptureConfirmationEvent.kt @@ -1,14 +1,10 @@ -package com.simprints.infra.events.event.domain.models.face +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.FACE_CAPTURE_CONFIRMATION -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result import java.util.UUID @Keep @@ -22,7 +18,7 @@ data class FaceCaptureConfirmationEvent( constructor( startTime: Timestamp, endTime: Timestamp, - result: Result, + result: FaceCaptureConfirmationPayload.Result, ) : this( UUID.randomUUID().toString(), FaceCaptureConfirmationPayload(startTime, endTime, EVENT_VERSION, result), diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceCaptureEvent.kt similarity index 80% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceCaptureEvent.kt index 2d698cc25a..7a09e2f44a 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceCaptureEvent.kt @@ -1,15 +1,11 @@ -package com.simprints.infra.events.event.domain.models.face +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.core.tools.utils.randomUUID import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.FACE_CAPTURE -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent.FaceCapturePayload.Face @Keep data class FaceCaptureEvent( @@ -27,7 +23,7 @@ data class FaceCaptureEvent( result: FaceCapturePayload.Result, isAutoCapture: Boolean, isFallback: Boolean, - face: Face?, + face: FaceCapturePayload.Face?, id: String = randomUUID(), payloadId: String = randomUUID(), ) : this( @@ -65,8 +61,9 @@ data class FaceCaptureEvent( val face: Face?, override val type: EventType = FACE_CAPTURE, ) : EventPayload() { - override fun toSafeString(): String = "result: $result, attempt nr: $attemptNb, auto-capture: $isAutoCapture, fallback: $isFallback, " + - "quality: ${face?.quality}, format: ${face?.format}" + override fun toSafeString(): String = + "result: $result, attempt nr: $attemptNb, auto-capture: $isAutoCapture, fallback: $isFallback, " + + "quality: ${face?.quality}, format: ${face?.format}" @Keep data class Face( diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceFallbackCaptureEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceFallbackCaptureEvent.kt similarity index 84% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceFallbackCaptureEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceFallbackCaptureEvent.kt index 60e76efb4e..fb84625a31 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceFallbackCaptureEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceFallbackCaptureEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.face +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.FACE_FALLBACK_CAPTURE import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceOnboardingCompleteEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceOnboardingCompleteEvent.kt similarity index 84% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceOnboardingCompleteEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceOnboardingCompleteEvent.kt index 64214e43c1..7430041157 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/face/FaceOnboardingCompleteEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceOnboardingCompleteEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.face +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.FACE_ONBOARDING_COMPLETE import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/FaceTemplate.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceTemplate.kt similarity index 70% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/FaceTemplate.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceTemplate.kt index 55fcf0db7e..0e34604f06 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/FaceTemplate.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FaceTemplate.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.events.event.domain.models.subject +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import kotlinx.serialization.Serializable diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureBiometricsEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FingerprintCaptureBiometricsEvent.kt similarity index 88% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureBiometricsEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FingerprintCaptureBiometricsEvent.kt index 7dd003569b..58c0d2f71c 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureBiometricsEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FingerprintCaptureBiometricsEvent.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.events.event.domain.models.fingerprint +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.common.TemplateIdentifier @@ -6,9 +6,6 @@ import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.core.tools.utils.randomUUID import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType @Keep data class FingerprintCaptureBiometricsEvent( diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FingerprintCaptureEvent.kt similarity index 90% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FingerprintCaptureEvent.kt index df4a1f786f..2465e1ab97 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FingerprintCaptureEvent.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.events.event.domain.models.fingerprint +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.common.TemplateIdentifier @@ -6,9 +6,6 @@ import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.core.tools.utils.randomUUID import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.FINGERPRINT_CAPTURE @Keep diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/FingerprintTemplate.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FingerprintTemplate.kt similarity index 79% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/FingerprintTemplate.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FingerprintTemplate.kt index da1d4cea69..dc54227695 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/subject/FingerprintTemplate.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/FingerprintTemplate.kt @@ -1,4 +1,4 @@ -package com.simprints.infra.events.event.domain.models.subject +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.common.TemplateIdentifier diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/IdentificationCallbackEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/IdentificationCallbackEvent.kt similarity index 86% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/IdentificationCallbackEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/IdentificationCallbackEvent.kt index 9f272ea742..bc6f913770 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/IdentificationCallbackEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/IdentificationCallbackEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callback +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import java.util.UUID @Keep diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV2.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/IdentificationCalloutEventV2.kt similarity index 89% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV2.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/IdentificationCalloutEventV2.kt index 87113448d0..ea245a2eb8 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV2.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/IdentificationCalloutEventV2.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_IDENTIFICATION import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV3.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/IdentificationCalloutEventV3.kt similarity index 90% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV3.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/IdentificationCalloutEventV3.kt index 1855358614..65f9e57882 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV3.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/IdentificationCalloutEventV3.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_IDENTIFICATION_V3 import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/RefusalCallbackEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/RefusalCallbackEvent.kt similarity index 85% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/RefusalCallbackEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/RefusalCallbackEvent.kt index 36aec7467f..763a808c0d 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/RefusalCallbackEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/RefusalCallbackEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callback +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_REFUSAL import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/samples/SampleUpSyncRequestEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/SampleUpSyncRequestEvent.kt similarity index 87% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/samples/SampleUpSyncRequestEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/SampleUpSyncRequestEvent.kt index 9f9ecbccde..55d5582062 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/samples/SampleUpSyncRequestEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/SampleUpSyncRequestEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.samples +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import java.util.UUID @Keep diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/VerificationCallbackEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/VerificationCallbackEvent.kt similarity index 85% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/VerificationCallbackEvent.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/VerificationCallbackEvent.kt index 85cfbf0fa3..369a4855b2 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callback/VerificationCallbackEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/VerificationCallbackEvent.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callback +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_VERIFICATION import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV2.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/VerificationCalloutEventV2.kt similarity index 90% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV2.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/VerificationCalloutEventV2.kt index b4edb7abf6..10d9a53f9e 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV2.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/VerificationCalloutEventV2.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_VERIFICATION import java.util.UUID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV3.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/VerificationCalloutEventV3.kt similarity index 85% rename from infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV3.kt rename to infra/events/src/main/java/com/simprints/infra/events/event/domain/models/VerificationCalloutEventV3.kt index b4f9f4e303..ed0861546c 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV3.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/VerificationCalloutEventV3.kt @@ -1,12 +1,9 @@ -package com.simprints.infra.events.event.domain.models.callout +package com.simprints.infra.events.event.domain.models import androidx.annotation.Keep import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType -import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.EventPayload -import com.simprints.infra.events.event.domain.models.EventType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_VERIFICATION_V3 import java.util.UUID @@ -66,7 +63,8 @@ data class VerificationCalloutEventV3( override val endedAt: Timestamp? = null, override val type: EventType = CALLOUT_VERIFICATION_V3, ) : EventPayload() { - override fun toSafeString(): String = "module ID: $moduleId, guid: $verifyGuid, metadata: $metadata, biometricDataSource: $biometricDataSource" + override fun toSafeString(): String = + "module ID: $moduleId, guid: $verifyGuid, metadata: $metadata, biometricDataSource: $biometricDataSource" } companion object { diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/BiometricDataSource.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/BiometricDataSource.kt deleted file mode 100644 index 558061fed6..0000000000 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/BiometricDataSource.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.simprints.infra.events.event.domain.models.callout - -import androidx.annotation.Keep - -@Keep -enum class BiometricDataSource { - SIMPRINTS, - COMMCARE; - - companion object { - fun fromString(value: String) = - when (value.uppercase()) { - "COMMCARE" -> COMMCARE - else -> SIMPRINTS - } - } -} diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/validators/EnrolmentEventValidator.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/validators/EnrolmentEventValidator.kt index 38c8cabfbf..c4ad211144 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/validators/EnrolmentEventValidator.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/validators/EnrolmentEventValidator.kt @@ -3,8 +3,8 @@ package com.simprints.infra.events.event.domain.validators import com.simprints.infra.events.event.domain.models.BiometricReferenceCreationEvent import com.simprints.infra.events.event.domain.models.EnrolmentEventV4 import com.simprints.infra.events.event.domain.models.Event -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent import com.simprints.infra.events.exceptions.validator.EnrolmentEventValidatorException internal class EnrolmentEventValidator : EventValidator { diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordCreationEventDeserializerTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordCreationEventDeserializerTest.kt index 4309cc4fe9..89addb40c9 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordCreationEventDeserializerTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/cosync/CoSyncEnrolmentRecordCreationEventDeserializerTest.kt @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.JavaType import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.ObjectMapper import com.simprints.core.domain.tokenization.TokenizableString -import com.simprints.infra.events.event.domain.models.subject.BiometricReference +import com.simprints.infra.events.event.domain.models.BiometricReference import io.mockk.every import io.mockk.mockk import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/EventPayloadTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/EventPayloadTest.kt index 433e628596..fc0f217f7f 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/EventPayloadTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/EventPayloadTest.kt @@ -12,35 +12,15 @@ import com.simprints.infra.events.event.domain.models.CandidateReadEvent.Candida import com.simprints.infra.events.event.domain.models.CandidateReadEvent.CandidateReadPayload.RemoteResult.NOT_FOUND import com.simprints.infra.events.event.domain.models.ConsentEvent.ConsentPayload.Result.ACCEPTED import com.simprints.infra.events.event.domain.models.ConsentEvent.ConsentPayload.Type.INDIVIDUAL +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent.QueryParameters +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.CONTINUE import com.simprints.infra.events.event.domain.models.IntentParsingEvent.IntentParsingPayload.IntegrationInfo.COMMCARE import com.simprints.infra.events.event.domain.models.OneToManyMatchEvent.OneToManyMatchPayload.MatchPool import com.simprints.infra.events.event.domain.models.OneToManyMatchEvent.OneToManyMatchPayload.MatchPoolType.PROJECT import com.simprints.infra.events.event.domain.models.RefusalEvent.RefusalPayload.Answer.OTHER import com.simprints.infra.events.event.domain.models.ScannerConnectionEvent.ScannerConnectionPayload.ScannerGeneration import com.simprints.infra.events.event.domain.models.ScannerConnectionEvent.ScannerConnectionPayload.ScannerInfo -import com.simprints.infra.events.event.domain.models.callback.CallbackComparisonScore -import com.simprints.infra.events.event.domain.models.callback.ConfirmationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.EnrolmentCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.RefusalCallbackEvent -import com.simprints.infra.events.event.domain.models.callback.VerificationCallbackEvent -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV3 -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent.QueryParameters -import com.simprints.infra.events.event.domain.models.face.FaceCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.CONTINUE -import com.simprints.infra.events.event.domain.models.face.FaceCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceFallbackCaptureEvent -import com.simprints.infra.events.event.domain.models.face.FaceOnboardingCompleteEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureBiometricsEvent -import com.simprints.infra.events.event.domain.models.fingerprint.FingerprintCaptureEvent import com.simprints.infra.events.sampledata.FACE_TEMPLATE_FORMAT import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.CREDENTIAL_ID diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/ConfirmationCallbackEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/ConfirmationCallbackEventTest.kt index 0a8ad0d93b..b53f031897 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/ConfirmationCallbackEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/ConfirmationCallbackEventTest.kt @@ -1,8 +1,9 @@ package com.simprints.infra.events.event.domain.models.callback import com.google.common.truth.Truth.assertThat +import com.simprints.infra.events.event.domain.models.ConfirmationCallbackEvent +import com.simprints.infra.events.event.domain.models.ConfirmationCallbackEvent.Companion.EVENT_VERSION import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_CONFIRMATION -import com.simprints.infra.events.event.domain.models.callback.ConfirmationCallbackEvent.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/EnrolmentCallbackEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/EnrolmentCallbackEventTest.kt index 8e5e482b71..928a51a973 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/EnrolmentCallbackEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/EnrolmentCallbackEventTest.kt @@ -1,8 +1,9 @@ package com.simprints.infra.events.event.domain.models.callback import com.google.common.truth.Truth.assertThat +import com.simprints.infra.events.event.domain.models.EnrolmentCallbackEvent +import com.simprints.infra.events.event.domain.models.EnrolmentCallbackEvent.Companion.EVENT_VERSION import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_ENROLMENT -import com.simprints.infra.events.event.domain.models.callback.EnrolmentCallbackEvent.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.GUID1 import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/ErrorCallbackEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/ErrorCallbackEventTest.kt index 951a4ff5a8..cebb24640e 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/ErrorCallbackEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/ErrorCallbackEventTest.kt @@ -2,11 +2,12 @@ package com.simprints.infra.events.event.domain.models.callback import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.response.AppErrorReason +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason.Companion.fromAppResponseErrorReasonToEventReason import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_ERROR -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason.Companion.fromAppResponseErrorReasonToEventReason import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import org.junit.Test -import com.simprints.infra.events.event.domain.models.callback.ErrorCallbackEvent.ErrorCallbackPayload.Reason as ErrorReason +import com.simprints.infra.events.event.domain.models.ErrorCallbackEvent.ErrorCallbackPayload.Reason as ErrorReason class ErrorCallbackEventTest { @Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/IdentificationCallbackEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/IdentificationCallbackEventTest.kt index 2ec96edc80..7f6101f4f7 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/IdentificationCallbackEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/IdentificationCallbackEventTest.kt @@ -2,8 +2,10 @@ package com.simprints.infra.events.event.domain.models.callback import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.response.AppMatchConfidence +import com.simprints.infra.events.event.domain.models.CallbackComparisonScore import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_IDENTIFICATION -import com.simprints.infra.events.event.domain.models.callback.IdentificationCallbackEvent.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent +import com.simprints.infra.events.event.domain.models.IdentificationCallbackEvent.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.GUID1 import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/RefusalCallbackEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/RefusalCallbackEventTest.kt index 6ca4c43e40..7766785234 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/RefusalCallbackEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/RefusalCallbackEventTest.kt @@ -2,7 +2,8 @@ package com.simprints.infra.events.event.domain.models.callback import com.google.common.truth.Truth.assertThat import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_REFUSAL -import com.simprints.infra.events.event.domain.models.callback.RefusalCallbackEvent.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.RefusalCallbackEvent +import com.simprints.infra.events.event.domain.models.RefusalCallbackEvent.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/VerificationCallbackEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/VerificationCallbackEventTest.kt index 8341196dca..2fe82e7d1d 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/VerificationCallbackEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callback/VerificationCallbackEventTest.kt @@ -2,8 +2,10 @@ package com.simprints.infra.events.event.domain.models.callback import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.response.AppMatchConfidence +import com.simprints.infra.events.event.domain.models.CallbackComparisonScore import com.simprints.infra.events.event.domain.models.EventType.CALLBACK_VERIFICATION -import com.simprints.infra.events.event.domain.models.callback.VerificationCallbackEvent.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.VerificationCallbackEvent +import com.simprints.infra.events.event.domain.models.VerificationCallbackEvent.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.GUID1 import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV2Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV2Test.kt index 44d8cbf2a2..649b728006 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV2Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV2Test.kt @@ -2,8 +2,9 @@ package com.simprints.infra.events.event.domain.models.callout import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV2.Companion.EVENT_VERSION import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_CONFIRMATION -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV2.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_PROJECT_ID diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV3Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV3Test.kt index 91b722af8d..6b947b73de 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV3Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV3Test.kt @@ -2,8 +2,9 @@ package com.simprints.infra.events.event.domain.models.callout import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV3 +import com.simprints.infra.events.event.domain.models.ConfirmationCalloutEventV3.Companion.EVENT_VERSION import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_CONFIRMATION_V3 -import com.simprints.infra.events.event.domain.models.callout.ConfirmationCalloutEventV3.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_PROJECT_ID diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV2Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV2Test.kt index 33af3b1b9f..d66b72cd7c 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV2Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV2Test.kt @@ -3,8 +3,9 @@ package com.simprints.infra.events.event.domain.models.callout import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.config.store.models.TokenKeyType +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV2 +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV2.Companion.EVENT_VERSION import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_ENROLMENT -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV2.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV3Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV3Test.kt index a9f7a6e1ee..4b88421fec 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV3Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentCalloutEventV3Test.kt @@ -3,8 +3,9 @@ package com.simprints.infra.events.event.domain.models.callout import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.config.store.models.TokenKeyType +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV3 +import com.simprints.infra.events.event.domain.models.EnrolmentCalloutEventV3.Companion.EVENT_VERSION import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_ENROLMENT_V3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentCalloutEventV3.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_BIOMETRIC_DATA_SOURCE import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV2Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV2Test.kt index 882043b9d9..48a2777787 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV2Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV2Test.kt @@ -3,8 +3,9 @@ package com.simprints.infra.events.event.domain.models.callout import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.config.store.models.TokenKeyType +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV2 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV2.Companion.EVENT_VERSION import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_LAST_BIOMETRICS -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV2.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV3Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV3Test.kt index dd3d30fd87..ef4ec4bc00 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV3Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/EnrolmentLastBiometricsCalloutEventV3Test.kt @@ -3,8 +3,9 @@ package com.simprints.infra.events.event.domain.models.callout import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.config.store.models.TokenKeyType +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV3 +import com.simprints.infra.events.event.domain.models.EnrolmentLastBiometricsCalloutEventV3.Companion.EVENT_VERSION import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_LAST_BIOMETRICS_V3 -import com.simprints.infra.events.event.domain.models.callout.EnrolmentLastBiometricsCalloutEventV3.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV2Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV2Test.kt index 9e2ed788bd..8faf495de4 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV2Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV2Test.kt @@ -4,7 +4,8 @@ import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.config.store.models.TokenKeyType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_IDENTIFICATION -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV2.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV2.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV3Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV3Test.kt index a8f75828c1..69552a60a6 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV3Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/IdentificationCalloutEventV3Test.kt @@ -4,7 +4,8 @@ import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.config.store.models.TokenKeyType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_IDENTIFICATION_V3 -import com.simprints.infra.events.event.domain.models.callout.IdentificationCalloutEventV3.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV3 +import com.simprints.infra.events.event.domain.models.IdentificationCalloutEventV3.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_BIOMETRIC_DATA_SOURCE import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV2Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV2Test.kt index abf4ceb591..b2abcdde23 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV2Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV2Test.kt @@ -4,7 +4,8 @@ import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.config.store.models.TokenKeyType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_VERIFICATION -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV2.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV2 +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV2.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_MODULE_ID diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV3Test.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV3Test.kt index f164359703..35f554e98f 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV3Test.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/VerificationCalloutEventV3Test.kt @@ -4,7 +4,8 @@ import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.config.store.models.TokenKeyType import com.simprints.infra.events.event.domain.models.EventType.CALLOUT_VERIFICATION_V3 -import com.simprints.infra.events.event.domain.models.callout.VerificationCalloutEventV3.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV3 +import com.simprints.infra.events.event.domain.models.VerificationCalloutEventV3.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_BIOMETRIC_DATA_SOURCE import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_METADATA diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/downsync/EventDownSyncRequestEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/downsync/EventDownSyncRequestEventTest.kt index 619f4a4f4f..25ae714c6c 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/downsync/EventDownSyncRequestEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/downsync/EventDownSyncRequestEventTest.kt @@ -3,8 +3,9 @@ package com.simprints.infra.events.event.domain.models.downsync import com.simprints.core.domain.tokenization.TokenizableString import com.simprints.core.tools.time.Timestamp import com.simprints.infra.config.store.models.TokenKeyType +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent +import com.simprints.infra.events.event.domain.models.EventDownSyncRequestEvent.QueryParameters import com.simprints.infra.events.event.domain.models.EventType -import com.simprints.infra.events.event.domain.models.downsync.EventDownSyncRequestEvent.QueryParameters import io.mockk.mockk import org.junit.Assert.assertEquals import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureBiometricsEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureBiometricsEventTest.kt index a234867d58..1558d004dd 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureBiometricsEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureBiometricsEventTest.kt @@ -2,6 +2,7 @@ package com.simprints.infra.events.event.domain.models.face import com.google.common.truth.Truth.assertThat import com.simprints.infra.events.event.domain.models.EventType +import com.simprints.infra.events.event.domain.models.FaceCaptureBiometricsEvent import com.simprints.infra.events.sampledata.FACE_TEMPLATE_FORMAT import com.simprints.infra.events.sampledata.SampleDefaults import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureConfirmationEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureConfirmationEventTest.kt index 7df952340b..ca1ebfefee 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureConfirmationEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureConfirmationEventTest.kt @@ -3,8 +3,9 @@ package com.simprints.infra.events.event.domain.models.face import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.events.event.domain.models.EventType.FACE_CAPTURE_CONFIRMATION -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.Companion.EVENT_VERSION -import com.simprints.infra.events.event.domain.models.face.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.CONTINUE +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.FaceCaptureConfirmationEvent.FaceCaptureConfirmationPayload.Result.CONTINUE import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.ENDED_AT import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureEventTest.kt index 1a5923469e..f25848517f 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceCaptureEventTest.kt @@ -3,6 +3,7 @@ package com.simprints.infra.events.event.domain.models.face import androidx.annotation.Keep import com.google.common.truth.Truth.assertThat import com.simprints.infra.events.event.domain.models.EventType +import com.simprints.infra.events.event.domain.models.FaceCaptureEvent import com.simprints.infra.events.sampledata.FACE_TEMPLATE_FORMAT import com.simprints.infra.events.sampledata.SampleDefaults import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceFallbackCaptureEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceFallbackCaptureEventTest.kt index 5744db50e8..86e92182bb 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceFallbackCaptureEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceFallbackCaptureEventTest.kt @@ -3,7 +3,8 @@ package com.simprints.infra.events.event.domain.models.face import androidx.annotation.Keep import com.google.common.truth.Truth.* import com.simprints.infra.events.event.domain.models.EventType.FACE_FALLBACK_CAPTURE -import com.simprints.infra.events.event.domain.models.face.FaceFallbackCaptureEvent.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.FaceFallbackCaptureEvent +import com.simprints.infra.events.event.domain.models.FaceFallbackCaptureEvent.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.ENDED_AT import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceOnboardingCompleteEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceOnboardingCompleteEventTest.kt index 7c4d54be0a..6b5f1886a4 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceOnboardingCompleteEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/face/FaceOnboardingCompleteEventTest.kt @@ -3,7 +3,8 @@ package com.simprints.infra.events.event.domain.models.face import androidx.annotation.Keep import com.google.common.truth.Truth.* import com.simprints.infra.events.event.domain.models.EventType.FACE_ONBOARDING_COMPLETE -import com.simprints.infra.events.event.domain.models.face.FaceOnboardingCompleteEvent.Companion.EVENT_VERSION +import com.simprints.infra.events.event.domain.models.FaceOnboardingCompleteEvent +import com.simprints.infra.events.event.domain.models.FaceOnboardingCompleteEvent.Companion.EVENT_VERSION import com.simprints.infra.events.sampledata.SampleDefaults.CREATED_AT import com.simprints.infra.events.sampledata.SampleDefaults.ENDED_AT import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureBiometricsEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureBiometricsEventTest.kt index 425fbf6af0..9f70802904 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureBiometricsEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureBiometricsEventTest.kt @@ -3,6 +3,7 @@ package com.simprints.infra.events.event.domain.models.fingerprint import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.common.TemplateIdentifier import com.simprints.infra.events.event.domain.models.EventType +import com.simprints.infra.events.event.domain.models.FingerprintCaptureBiometricsEvent import com.simprints.infra.events.sampledata.SampleDefaults import org.junit.Test diff --git a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureEventTest.kt b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureEventTest.kt index a6d370d926..75af06f12d 100644 --- a/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureEventTest.kt +++ b/infra/events/src/test/java/com/simprints/infra/events/event/domain/models/fingerprint/FingerprintCaptureEventTest.kt @@ -3,6 +3,7 @@ package com.simprints.infra.events.event.domain.models.fingerprint import com.google.common.truth.Truth.assertThat import com.simprints.core.domain.common.TemplateIdentifier import com.simprints.infra.events.event.domain.models.EventType +import com.simprints.infra.events.event.domain.models.FingerprintCaptureEvent import com.simprints.infra.events.sampledata.SampleDefaults import org.junit.Test diff --git a/infra/images/src/main/java/com/simprints/infra/images/remote/firebase/FirebaseSampleUploader.kt b/infra/images/src/main/java/com/simprints/infra/images/remote/firebase/FirebaseSampleUploader.kt index b801454b76..878483236a 100644 --- a/infra/images/src/main/java/com/simprints/infra/images/remote/firebase/FirebaseSampleUploader.kt +++ b/infra/images/src/main/java/com/simprints/infra/images/remote/firebase/FirebaseSampleUploader.kt @@ -8,7 +8,7 @@ import com.simprints.core.tools.time.TimeHelper import com.simprints.infra.authstore.AuthStore import com.simprints.infra.config.store.ConfigRepository import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.samples.SampleUpSyncRequestEvent +import com.simprints.infra.events.event.domain.models.SampleUpSyncRequestEvent import com.simprints.infra.events.event.domain.models.scope.EventScopeEndCause import com.simprints.infra.events.event.domain.models.scope.EventScopeType import com.simprints.infra.images.local.ImageLocalDataSource diff --git a/infra/images/src/main/java/com/simprints/infra/images/remote/signedurl/usecase/UploadSampleWithTrackingUseCase.kt b/infra/images/src/main/java/com/simprints/infra/images/remote/signedurl/usecase/UploadSampleWithTrackingUseCase.kt index 36bc1d3f2d..9d68bc6733 100644 --- a/infra/images/src/main/java/com/simprints/infra/images/remote/signedurl/usecase/UploadSampleWithTrackingUseCase.kt +++ b/infra/images/src/main/java/com/simprints/infra/images/remote/signedurl/usecase/UploadSampleWithTrackingUseCase.kt @@ -3,7 +3,7 @@ package com.simprints.infra.images.remote.signedurl.usecase import com.simprints.core.tools.time.TimeHelper import com.simprints.infra.authstore.AuthStore import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.samples.SampleUpSyncRequestEvent +import com.simprints.infra.events.event.domain.models.SampleUpSyncRequestEvent import com.simprints.infra.events.event.domain.models.scope.EventScope import com.simprints.infra.images.local.ImageLocalDataSource import com.simprints.infra.images.remote.signedurl.SampleUploadData diff --git a/infra/images/src/test/java/com/simprints/infra/images/remote/signedurl/usecase/UploadSampleWithTrackingUseCaseTest.kt b/infra/images/src/test/java/com/simprints/infra/images/remote/signedurl/usecase/UploadSampleWithTrackingUseCaseTest.kt index 887b4f2a61..0d39ee4bd0 100644 --- a/infra/images/src/test/java/com/simprints/infra/images/remote/signedurl/usecase/UploadSampleWithTrackingUseCaseTest.kt +++ b/infra/images/src/test/java/com/simprints/infra/images/remote/signedurl/usecase/UploadSampleWithTrackingUseCaseTest.kt @@ -5,7 +5,7 @@ import com.simprints.core.tools.time.TimeHelper import com.simprints.core.tools.time.Timestamp import com.simprints.infra.authstore.AuthStore import com.simprints.infra.events.EventRepository -import com.simprints.infra.events.event.domain.models.samples.SampleUpSyncRequestEvent +import com.simprints.infra.events.event.domain.models.SampleUpSyncRequestEvent import com.simprints.infra.events.event.domain.models.scope.EventScope import com.simprints.infra.images.local.ImageLocalDataSource import com.simprints.infra.images.model.Path