[MS-1190] Refactoring matching module module into infra:matching + feature:match

.github/workflows/pr-checks.yml

@@ -51,6 +51,7 @@ jobs:
                 infra:images
                 infra:auth-store
                 infra:auth-logic
+                infra:matching
             reportsId: infra2
 
     feature-unit-tests1:

feature/matcher/build.gradle.kts

@@ -12,12 +12,9 @@ dependencies {
 
     implementation(project(":infra:orchestrator-data"))
     implementation(project(":infra:enrolment-records:repository"))
-    implementation(project(":infra:events"))
+    implementation(project(":infra:matching"))
     implementation(project(":infra:config-store"))
     implementation(project(":infra:config-sync"))
 
-    implementation(project(":face:infra:bio-sdk-resolver"))
-
-    implementation(project(":fingerprint:infra:bio-sdk"))
     implementation(project(":infra:auth-store"))
 }

feature/matcher/src/main/java/com/simprints/matcher/MatchContract.kt

@@ -5,6 +5,7 @@ import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.config.store.models.FingerprintConfiguration
 import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource
 import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery
+import com.simprints.infra.matching.MatchParams
 
 object MatchContract {
     val DESTINATION = R.id.matcherFragment

feature/matcher/src/main/java/com/simprints/matcher/screen/MatchFragment.kt

@@ -16,11 +16,11 @@ import com.simprints.core.tools.extentions.hasPermission
 import com.simprints.core.tools.extentions.permissionFromResult
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.ORCHESTRATION
 import com.simprints.infra.logging.Simber
+import com.simprints.infra.matching.MatchParams
 import com.simprints.infra.uibase.navigation.finishWithResult
 import com.simprints.infra.uibase.navigation.navigationParams
 import com.simprints.infra.uibase.view.applySystemBarInsets
 import com.simprints.infra.uibase.viewbinding.viewBinding
-import com.simprints.matcher.MatchParams
 import com.simprints.matcher.R
 import com.simprints.matcher.databinding.FragmentMatcherBinding
 import com.simprints.matcher.screen.MatchViewModel.MatchState

feature/matcher/src/main/java/com/simprints/matcher/screen/MatchViewModel.kt

@@ -10,14 +10,14 @@ import com.simprints.core.tools.time.TimeHelper
 import com.simprints.infra.authstore.AuthStore
 import com.simprints.infra.config.store.models.DecisionPolicy
 import com.simprints.infra.config.sync.ConfigManager
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
-import com.simprints.matcher.MatchParams
-import com.simprints.matcher.MatchResultItem
-import com.simprints.matcher.usecases.FaceMatcherUseCase
-import com.simprints.matcher.usecases.FingerprintMatcherUseCase
-import com.simprints.matcher.usecases.MatcherUseCase
-import com.simprints.matcher.usecases.SaveMatchEventUseCase
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
+import com.simprints.infra.matching.MatchParams
+import com.simprints.infra.matching.MatchResultItem
+import com.simprints.infra.matching.usecase.FaceMatcherUseCase
+import com.simprints.infra.matching.usecase.FingerprintMatcherUseCase
+import com.simprints.infra.matching.usecase.MatcherUseCase
+import com.simprints.infra.matching.usecase.SaveMatchEventUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -104,9 +104,11 @@ internal class MatchViewModel @Inject constructor(
 
     private suspend fun getDecisionPolicy(params: MatchParams): DecisionPolicy {
         val config = configManager.getProjectConfiguration()
+        val faceSDK = params.faceSDK
+        val fingerprintSDK = params.fingerprintSDK
         val policy = when {
-            params.faceSDK != null -> config.face?.getSdkConfiguration(params.faceSDK)?.decisionPolicy
-            params.fingerprintSDK != null -> config.fingerprint?.getSdkConfiguration(params.fingerprintSDK)?.decisionPolicy
+            faceSDK != null -> config.face?.getSdkConfiguration(faceSDK)?.decisionPolicy
+            fingerprintSDK != null -> config.fingerprint?.getSdkConfiguration(fingerprintSDK)?.decisionPolicy
             else -> null
         }
         return policy ?: fallbackDecisionPolicy()

feature/matcher/src/test/java/com/simprints/matcher/screen/MatchViewModelTest.kt

@@ -13,14 +13,14 @@ import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.config.store.models.FingerprintConfiguration.BioSdk.SECUGEN_SIM_MATCHER
 import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
-import com.simprints.matcher.MatchBatchInfo
-import com.simprints.matcher.MatchParams
-import com.simprints.matcher.usecases.FaceMatcherUseCase
-import com.simprints.matcher.usecases.FingerprintMatcherUseCase
-import com.simprints.matcher.usecases.MatcherUseCase
-import com.simprints.matcher.usecases.SaveMatchEventUseCase
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
+import com.simprints.infra.matching.MatchBatchInfo
+import com.simprints.infra.matching.MatchParams
+import com.simprints.infra.matching.usecase.FaceMatcherUseCase
+import com.simprints.infra.matching.usecase.FingerprintMatcherUseCase
+import com.simprints.infra.matching.usecase.MatcherUseCase
+import com.simprints.infra.matching.usecase.SaveMatchEventUseCase
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
 import com.simprints.testtools.common.livedata.getOrAwaitValue
 import io.mockk.*

feature/orchestrator/build.gradle.kts

@@ -37,6 +37,7 @@ dependencies {
     implementation(project(":infra:events"))
     implementation(project(":infra:event-sync"))
     implementation(project(":infra:images"))
+    implementation(project(":infra:matching"))
 
     implementation(libs.jackson.core)
     implementation(libs.androidX.ui.preference)

feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt

@@ -39,10 +39,10 @@ import com.simprints.infra.config.store.models.GeneralConfiguration
 import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.ORCHESTRATION
 import com.simprints.infra.logging.Simber
+import com.simprints.infra.matching.MatchParams
 import com.simprints.infra.orchestration.data.ActionRequest
 import com.simprints.infra.orchestration.data.responses.AppErrorResponse
 import com.simprints.infra.orchestration.data.responses.AppResponse
-import com.simprints.matcher.MatchParams
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import java.io.Serializable

feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/MatchStepStubPayload.kt

@@ -6,8 +6,8 @@ import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.config.store.models.FingerprintConfiguration
 import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource
 import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery
+import com.simprints.infra.matching.MatchParams
 import com.simprints.matcher.MatchContract
-import com.simprints.matcher.MatchParams
 
 /**
  * Actual matching step payload is based on capture step results, so until the it is done we are storing

feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt

@@ -35,9 +35,9 @@ import com.simprints.fingerprint.connect.FingerprintConnectParams
 import com.simprints.fingerprint.connect.FingerprintConnectResult
 import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource
 import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
-import com.simprints.matcher.MatchParams
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
+import com.simprints.infra.matching.MatchParams
 import java.io.Serializable
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "resultType")

feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/MapStepsForLastBiometricEnrolUseCase.kt

@@ -8,8 +8,8 @@ import com.simprints.feature.enrollast.FingerTemplateCaptureResult
 import com.simprints.feature.enrollast.MatchResult
 import com.simprints.fingerprint.capture.FingerprintCaptureResult
 import com.simprints.infra.config.store.models.fromModuleApiToDomain
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
 import java.io.Serializable
 import javax.inject.Inject
 

feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCase.kt

@@ -5,8 +5,8 @@ import com.simprints.infra.events.session.SessionEventRepository
 import com.simprints.infra.orchestration.data.responses.AppIdentifyResponse
 import com.simprints.infra.orchestration.data.responses.AppMatchResult
 import com.simprints.infra.orchestration.data.responses.AppResponse
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
 import java.io.Serializable
 import javax.inject.Inject
 

feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateVerifyResponseUseCase.kt

@@ -8,8 +8,8 @@ import com.simprints.infra.orchestration.data.responses.AppErrorResponse
 import com.simprints.infra.orchestration.data.responses.AppMatchResult
 import com.simprints.infra.orchestration.data.responses.AppResponse
 import com.simprints.infra.orchestration.data.responses.AppVerifyResponse
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
 import java.io.Serializable
 import javax.inject.Inject
 

feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/IsNewEnrolmentUseCase.kt

@@ -1,8 +1,8 @@
 package com.simprints.feature.orchestrator.usecases.response
 
 import com.simprints.infra.config.store.models.ProjectConfiguration
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
 import java.io.Serializable
 import javax.inject.Inject
 import kotlin.text.compareTo

feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/OrchestratorViewModelTest.kt

@@ -37,8 +37,8 @@ import com.simprints.infra.config.store.models.GeneralConfiguration
 import com.simprints.infra.config.sync.ConfigManager
 import com.simprints.infra.enrolment.records.repository.domain.models.BiometricDataSource
 import com.simprints.infra.enrolment.records.repository.domain.models.SubjectQuery
+import com.simprints.infra.matching.MatchParams
 import com.simprints.infra.orchestration.data.responses.AppErrorResponse
-import com.simprints.matcher.MatchParams
 import com.simprints.testtools.common.coroutines.TestCoroutineRule
 import io.mockk.MockKAnnotations
 import io.mockk.clearMocks

feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/MapStepsForLastBiometricEnrolUseCaseTest.kt

@@ -12,8 +12,8 @@ import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.config.store.models.Finger
 import com.simprints.infra.config.store.models.FingerprintConfiguration
 import com.simprints.infra.events.sampledata.SampleDefaults.GUID1
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
 import org.junit.Before
 import org.junit.Test
 

feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCaseTest.kt

@@ -6,8 +6,8 @@ import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.config.store.models.FingerprintConfiguration
 import com.simprints.infra.events.session.SessionEventRepository
 import com.simprints.infra.orchestration.data.responses.AppIdentifyResponse
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.every

feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateVerifyResponseUseCaseTest.kt

@@ -4,8 +4,8 @@ import com.google.common.truth.Truth.*
 import com.simprints.infra.config.store.models.DecisionPolicy
 import com.simprints.infra.orchestration.data.responses.AppErrorResponse
 import com.simprints.infra.orchestration.data.responses.AppVerifyResponse
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
 import io.mockk.*
 import org.junit.Before
 import org.junit.Test

feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/IsNewEnrolmentUseCaseTest.kt

@@ -1,15 +1,13 @@
 package com.simprints.feature.orchestrator.usecases.response
 
-import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.*
 import com.simprints.infra.config.store.models.DecisionPolicy
 import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.config.store.models.ProjectConfiguration
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.FingerprintMatchResult
-import io.mockk.MockKAnnotations
-import io.mockk.every
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.FingerprintMatchResult
+import io.mockk.*
 import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
 import org.junit.Before
 import org.junit.Test
 

infra/matching/.gitignore

@@ -0,0 +1 @@
+/build

infra/matching/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    id("simprints.feature")
+}
+
+android {
+    namespace = "com.simprints.infra.mathching"
+}
+
+dependencies {
+
+    implementation(project(":infra:orchestrator-data"))
+    implementation(project(":infra:enrolment-records:repository"))
+    implementation(project(":infra:events"))
+    implementation(project(":infra:config-store"))
+    implementation(project(":infra:config-sync"))
+
+    implementation(project(":face:infra:bio-sdk-resolver"))
+
+    implementation(project(":fingerprint:infra:bio-sdk"))
+    implementation(project(":infra:auth-store"))
+}

infra/matching/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>

feature/matcher/src/main/java/com/simprints/matcher/MatchBatchInfo.kt → infra/matching/src/main/java/com/simprints/infra/matching/MatchBatchInfo.kt

@@ -1,4 +1,4 @@
-package com.simprints.matcher
+package com.simprints.infra.matching
 
 import com.simprints.core.tools.time.Timestamp
 

feature/matcher/src/main/java/com/simprints/matcher/MatchParams.kt → infra/matching/src/main/java/com/simprints/infra/matching/MatchParams.kt

@@ -1,4 +1,4 @@
-package com.simprints.matcher
+package com.simprints.infra.matching
 
 import androidx.annotation.Keep
 import com.simprints.core.domain.common.FlowType

feature/matcher/src/main/java/com/simprints/matcher/MatchResult.kt → infra/matching/src/main/java/com/simprints/infra/matching/MatchResult.kt

@@ -1,4 +1,4 @@
-package com.simprints.matcher
+package com.simprints.infra.matching
 
 import androidx.annotation.Keep
 import com.simprints.core.domain.step.StepResult

feature/matcher/src/main/java/com/simprints/matcher/usecases/CreateRangesUseCase.kt → infra/matching/src/main/java/com/simprints/infra/matching/usecase/CreateRangesUseCase.kt

@@ -1,10 +1,10 @@
-package com.simprints.matcher.usecases
+package com.simprints.infra.matching.usecase
 
 import com.simprints.core.AvailableProcessors
 import javax.inject.Inject
 import kotlin.math.ceil
 
-internal class CreateRangesUseCase @Inject constructor(
+class CreateRangesUseCase @Inject constructor(
     @AvailableProcessors private val availableProcessors: Int,
 ) {
     /**

feature/matcher/src/main/java/com/simprints/matcher/usecases/FaceMatcherUseCase.kt → infra/matching/src/main/java/com/simprints/infra/matching/usecase/FaceMatcherUseCase.kt

@@ -1,4 +1,4 @@
-package com.simprints.matcher.usecases
+package com.simprints.infra.matching.usecase
 
 import com.simprints.core.DispatcherBG
 import com.simprints.core.tools.time.TimeHelper
@@ -12,10 +12,10 @@ import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepositor
 import com.simprints.infra.enrolment.records.repository.domain.models.IdentityBatch
 import com.simprints.infra.logging.LoggingConstants
 import com.simprints.infra.logging.Simber
-import com.simprints.matcher.FaceMatchResult
-import com.simprints.matcher.MatchBatchInfo
-import com.simprints.matcher.MatchParams
-import com.simprints.matcher.usecases.MatcherUseCase.MatcherState
+import com.simprints.infra.matching.FaceMatchResult
+import com.simprints.infra.matching.MatchBatchInfo
+import com.simprints.infra.matching.MatchParams
+import com.simprints.infra.matching.usecase.MatcherUseCase.MatcherState
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.flow.Flow
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 import com.simprints.infra.enrolment.records.repository.domain.models.FaceIdentity as DomainFaceIdentity
 
-internal class FaceMatcherUseCase @Inject constructor(
+class FaceMatcherUseCase @Inject constructor(
     private val timeHelper: TimeHelper,
     private val enrolmentRecordRepository: EnrolmentRecordRepository,
     private val resolveFaceBioSdk: ResolveFaceBioSdkUseCase,

feature/matcher/src/main/java/com/simprints/matcher/usecases/FingerprintMatcherUseCase.kt → infra/matching/src/main/java/com/simprints/infra/matching/usecase/FingerprintMatcherUseCase.kt

@@ -1,4 +1,4 @@
-package com.simprints.matcher.usecases
+package com.simprints.infra.matching.usecase
 
 import com.simprints.core.DispatcherBG
 import com.simprints.core.domain.common.FlowType
@@ -17,10 +17,10 @@ import com.simprints.infra.enrolment.records.repository.EnrolmentRecordRepositor
 import com.simprints.infra.enrolment.records.repository.domain.models.IdentityBatch
 import com.simprints.infra.logging.LoggingConstants
 import com.simprints.infra.logging.Simber
-import com.simprints.matcher.FingerprintMatchResult
-import com.simprints.matcher.MatchBatchInfo
-import com.simprints.matcher.MatchParams
-import com.simprints.matcher.usecases.MatcherUseCase.MatcherState
+import com.simprints.infra.matching.FingerprintMatchResult
+import com.simprints.infra.matching.MatchBatchInfo
+import com.simprints.infra.matching.MatchParams
+import com.simprints.infra.matching.usecase.MatcherUseCase.MatcherState
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.flow.Flow
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 import com.simprints.infra.enrolment.records.repository.domain.models.FingerprintIdentity as DomainFingerprintIdentity
 
-internal class FingerprintMatcherUseCase @Inject constructor(
+class FingerprintMatcherUseCase @Inject constructor(
     private val timeHelper: TimeHelper,
     private val enrolmentRecordRepository: EnrolmentRecordRepository,
     private val resolveBioSdkWrapper: ResolveBioSdkWrapperUseCase,

feature/matcher/src/main/java/com/simprints/matcher/usecases/MatchResultSet.kt → infra/matching/src/main/java/com/simprints/infra/matching/usecase/MatchResultSet.kt

@@ -1,12 +1,12 @@
-package com.simprints.matcher.usecases
+package com.simprints.infra.matching.usecase
 
-import com.simprints.matcher.MatchResultItem
+import com.simprints.infra.matching.MatchResultItem
 import java.util.concurrent.ConcurrentSkipListSet
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
 
-internal class MatchResultSet<T : MatchResultItem>(
+class MatchResultSet<T : MatchResultItem>(
     private val maxSize: Int = MAX_RESULTS,
 ) {
     private val lowestConfidence = AtomicReference(0f)