Skip to content
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

Jump to bottom

ALTAPPS-462: Shared submission polling improvements #282

Merged
merged 2 commits into from
Dec 22, 2022
Merged

ALTAPPS-462: Shared submission polling improvements #282

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3520c50
add polling submission
vladkash Dec 21, 2022
9a9ea61
review fixes
vladkash Dec 22, 2022
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
39 changes: 24 additions & 15 deletions ...rc/commonMain/kotlin/org/hyperskill/app/step_quiz/domain/interactor/StepQuizInteractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.hyperskill.app.step_quiz.domain.interactor

import kotlinx.coroutines.delay
import org.hyperskill.app.step.domain.model.StepContext
import org.hyperskill.app.step_quiz.domain.model.attempts.Attempt
import org.hyperskill.app.step_quiz.domain.model.attempts.AttemptStatus
Expand All @@ -8,11 +9,16 @@ import org.hyperskill.app.step_quiz.domain.model.submissions.Submission
import org.hyperskill.app.step_quiz.domain.model.submissions.SubmissionStatus
import org.hyperskill.app.step_quiz.domain.repository.AttemptRepository
import org.hyperskill.app.step_quiz.domain.repository.SubmissionRepository
import kotlin.time.Duration.Companion.seconds

class StepQuizInteractor(
private val attemptRepository: AttemptRepository,
private val submissionRepository: SubmissionRepository
) {
companion object {
private val POLL_SUBMISSION_INTERVAL = 1.seconds
}

suspend fun getAttempt(stepId: Long, userId: Long): Result<Attempt> =
kotlin.runCatching {
val activeAttempt = attemptRepository
Expand Down Expand Up @@ -46,28 +52,31 @@ class StepQuizInteractor(
.createSubmission(attemptId, reply, solvingContext)
.getOrThrow()

val pollSub = pollSubmission(submission.id)
if (pollSub.getOrNull()?.status == SubmissionStatus.CORRECT) {
val evaluatedSubmission = if (submission.status == SubmissionStatus.EVALUATION) {
pollSubmission(submission.id)
} else {
submission
}

if (evaluatedSubmission.status == SubmissionStatus.CORRECT) {
submissionRepository.notifyStepSolved(stepId)
}

return pollSub
return Result.success(evaluatedSubmission)
}

private suspend fun pollSubmission(submissionId: Long): Result<Submission> {
while (true) {
// delay(1000) TODO ALTAPPS-88 freezes indefinitely
private suspend fun pollSubmission(submissionId: Long, retryCount: Int = 1): Submission {
delay(POLL_SUBMISSION_INTERVAL * retryCount)

val submission = submissionRepository
.getSubmissions(listOf(submissionId))
.getOrThrow()
.first()
val submission = submissionRepository
.getSubmissions(listOf(submissionId))
.getOrThrow()
.first()

if (submission.status == SubmissionStatus.EVALUATION) {
continue
} else {
return Result.success(submission)
}
return if (submission.status == SubmissionStatus.EVALUATION) {
pollSubmission(submissionId = submissionId, retryCount = retryCount + 1)
} else {
submission
}
}
}