Skip to content

Revert "[MS-464] Update session modalities after bio SDK selection" #820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meladRaouf merged 1 commit into from
Jul 22, 2024
Merged

Revert "[MS-464] Update session modalities after bio SDK selection" #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions ...c/main/java/com/simprints/feature/orchestrator/usecases/UpdateSessionModalitiesUseCase.kt
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ...ator/src/main/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import com.simprints.feature.orchestrator.steps.MatchStepStubPayload
import com.simprints.feature.orchestrator.steps.Step
import com.simprints.feature.orchestrator.steps.StepId
import com.simprints.feature.orchestrator.usecases.MapStepsForLastBiometricEnrolUseCase
import com.simprints.feature.orchestrator.usecases.UpdateSessionModalitiesUseCase
import com.simprints.feature.selectagegroup.SelectSubjectAgeGroupContract
import com.simprints.feature.selectsubject.SelectSubjectContract
import com.simprints.feature.setup.SetupContract
Expand All @@ -38,7 +37,6 @@ internal class BuildStepsUseCase @Inject constructor(
private val buildMatcherSubjectQuery: BuildMatcherSubjectQueryUseCase,
private val cache: OrchestratorCache,
private val mapStepsForLastBiometrics: MapStepsForLastBiometricEnrolUseCase,
private val updateSessionModalitiesUseCase: UpdateSessionModalitiesUseCase,
) {

fun build(action: ActionRequest, projectConfiguration: ProjectConfiguration) = when (action) {
Expand Down Expand Up @@ -319,17 +317,6 @@ internal class BuildStepsUseCase @Inject constructor(
}
}
}
}.also { steps ->
// Update session with modalities that will actually be used (if user doesn't exit)
steps.mapNotNull { step ->
when (step.id) {
StepId.FINGERPRINT_CAPTURE -> Modality.FINGERPRINT
StepId.FACE_CAPTURE -> Modality.FACE
else -> null
}
}.distinct().takeIf { it.isNotEmpty() }?.let { modalities ->
updateSessionModalitiesUseCase(modalities)
}
}

private fun buildModalityMatcherSteps(
Expand Down
8 changes: 1 addition & 7 deletions .../src/test/java/com/simprints/feature/orchestrator/usecases/steps/BuildStepsUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import com.simprints.feature.orchestrator.exceptions.SubjectAgeNotSupportedExcep
import com.simprints.feature.orchestrator.steps.Step
import com.simprints.feature.orchestrator.steps.StepId
import com.simprints.feature.orchestrator.usecases.MapStepsForLastBiometricEnrolUseCase
import com.simprints.feature.orchestrator.usecases.UpdateSessionModalitiesUseCase
import com.simprints.infra.config.store.models.AgeGroup
import com.simprints.infra.config.store.models.FaceConfiguration
import com.simprints.infra.config.store.models.Finger
Expand All @@ -19,7 +18,6 @@ import io.mockk.MockKAnnotations
import io.mockk.every
import io.mockk.impl.annotations.RelaxedMockK
import io.mockk.mockk
import io.mockk.verify
import org.junit.Assert.assertEquals
import org.junit.Assert.assertThrows
import org.junit.Before
Expand All @@ -42,15 +40,12 @@ class BuildStepsUseCaseTest {
@RelaxedMockK
private lateinit var nec: FingerprintConfiguration.FingerprintSdkConfiguration

@RelaxedMockK
private lateinit var updateSessionModalitiesUseCase: UpdateSessionModalitiesUseCase

private lateinit var useCase: BuildStepsUseCase

@Before
fun setup() {
MockKAnnotations.init(this)
useCase = BuildStepsUseCase(buildMatcherSubjectQuery, cache, mapStepsForLastBiometrics, updateSessionModalitiesUseCase)
useCase = BuildStepsUseCase(buildMatcherSubjectQuery, cache, mapStepsForLastBiometrics)
}

private fun mockCommonProjectConfiguration(): ProjectConfiguration {
Expand Down Expand Up @@ -109,7 +104,6 @@ class BuildStepsUseCaseTest {
StepId.FINGERPRINT_CAPTURE,
StepId.FACE_CAPTURE,
)
verify { updateSessionModalitiesUseCase(listOf(Modality.FINGERPRINT, Modality.FACE)) }
}

@Test
Expand Down