From 547a01336d5993a1dd36f61f9284e705dc6ed8f7 Mon Sep 17 00:00:00 2001 From: Sergejs Luhmirins Date: Mon, 29 Jul 2024 16:03:36 +0300 Subject: [PATCH 1/2] MS-593 Match age group selection json type name with class name --- .../main/java/com/simprints/feature/orchestrator/steps/Step.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt index 04c69a16b8..9bce8e2566 100644 --- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt +++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt @@ -57,7 +57,7 @@ import java.io.Serializable JsonSubTypes.Type(value = AlertResult::class, name = "AlertResult"), JsonSubTypes.Type(value = ExitFormResult::class, name = "ExitFormResult"), JsonSubTypes.Type(value = ValidateSubjectPoolResult::class, name = "ValidateSubjectPoolResult"), - JsonSubTypes.Type(value = SelectSubjectAgeGroupResult::class, name = "SelectSubjectAgeResult"), + JsonSubTypes.Type(value = SelectSubjectAgeGroupResult::class, name = "SelectSubjectAgeGroupResult"), ) abstract class SerializableMixin : Serializable From 143473e83dd22f080b4e8af9da262a5ac39b4742 Mon Sep 17 00:00:00 2001 From: Sergejs Luhmirins Date: Mon, 29 Jul 2024 16:16:04 +0300 Subject: [PATCH 2/2] MS-593 Cache steps after any change --- .../com/simprints/feature/orchestrator/OrchestratorViewModel.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt index e1e0f1b2c2..52026c8be1 100644 --- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt +++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt @@ -152,11 +152,13 @@ internal class OrchestratorViewModel @Inject constructor( val nextStep = steps.firstOrNull { it.status == StepStatus.NOT_STARTED } if (nextStep != null) { nextStep.status = StepStatus.IN_PROGRESS + cache.steps = steps _currentStep.send(nextStep) } else { // Acquiring location info could take long time, so we should stop location tracker // before returning to the caller app to avoid creating empty sessions. locationStore.cancelLocationCollection() + cache.steps = steps buildAppResponse() } }