Skip to content

[MS-719] Missing callback event after license error #908

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
alexandr-simprints merged 2 commits into from
Sep 23, 2024
Merged

[MS-719] Missing callback event after license error #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
136dabb
[MS-791] Adding CreateErrorCallbackEventIfNeeded use case to ClientAp…
alexandr-simprints Sep 18, 2024
017351b
[MS-791] All AppError results are now handled by the OrchestratorView…
alexandr-simprints Sep 19, 2024
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
1 change: 0 additions & 1 deletion feature/client-api/src/main/java/com/simprints/feature/clientapi/ClientApiViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ class ClientApiViewModel @Inject internal constructor(
val flowCompleted = isFlowCompletedWithError(errorResponse)
simpleEventReporter.addCompletionCheckEvent(flowCompleted = flowCompleted)
simpleEventReporter.closeCurrentSessionNormally()

deleteSessionEventsIfNeeded(currentSessionId)

_returnResponse.send(
Expand Down
6 changes: 2 additions & 4 deletions ...ure/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {
observeOrchestratorVm()

handleResult<AlertResult>(AlertContract.DESTINATION) { alertResult ->
clientApiVm.handleErrorResponse(
args.requestAction,
orchestratorVm.handleErrorResponse(
AppErrorResponse(alertResult.appErrorReason ?: AppErrorReason.UNEXPECTED_ERROR)
)
}
Expand Down Expand Up @@ -151,8 +150,7 @@ internal class OrchestratorFragment : Fragment(R.layout.fragment_orchestrator) {
})

loginCheckVm.returnLoginNotComplete.observe(viewLifecycleOwner, LiveDataEventObserver {
clientApiVm.handleErrorResponse(
args.requestAction,
orchestratorVm.handleErrorResponse(
AppErrorResponse(AppErrorReason.LOGIN_NOT_COMPLETE)
)
})
Expand Down
6 changes: 3 additions & 3 deletions ...re/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ internal class OrchestratorViewModel @Inject constructor(
try {
steps = stepsBuilder.build(action, projectConfiguration)
} catch (e: SubjectAgeNotSupportedException) {
sendErrorResponse(AppErrorResponse(AppErrorReason.AGE_GROUP_NOT_SUPPORTED))
handleErrorResponse(AppErrorResponse(AppErrorReason.AGE_GROUP_NOT_SUPPORTED))
return@launch
}

Expand All @@ -94,7 +94,7 @@ internal class OrchestratorViewModel @Inject constructor(
val errorResponse = mapRefusalOrErrorResult(result, projectConfiguration)
if (errorResponse != null) {
// Shortcut the flow execution if any refusal or error result is found
sendErrorResponse(errorResponse)
handleErrorResponse(errorResponse)
return@launch
}

Expand All @@ -121,7 +121,7 @@ internal class OrchestratorViewModel @Inject constructor(
doNextStep()
}

private fun sendErrorResponse(errorResponse: AppResponse) {
fun handleErrorResponse(errorResponse: AppResponse) {
addCallbackEvent(errorResponse)
_appResponse.send(OrchestratorResult(actionRequest, errorResponse))
}
Expand Down