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

fix: Review page showing incorrect data after complete the quiz exam #484

Merged
merged 1 commit into from
Sep 11, 2023
Merged

fix: Review page showing incorrect data after complete the quiz exam #484

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
4 changes: 2 additions & 2 deletions course/src/main/java/in/testpress/course/network/CourseService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ interface CourseService {
@PUT("{end_exam_url}")
fun endContentAttempt(
@Path(value = "end_exam_url", encoded = true) endExamUrlFrag: String?
): RetrofitCall<NetworkAttempt>
): RetrofitCall<NetworkContentAttempt>

@GET("{contents_url}")
fun getContents(
Expand Down Expand Up @@ -87,7 +87,7 @@ class CourseNetwork(context: Context) : TestpressApiClient(context, TestpressSdk
return getCourseService().getContentAttempts(url)
}

fun endContentAttempt(url: String): RetrofitCall<NetworkAttempt> {
fun endContentAttempt(url: String): RetrofitCall<NetworkContentAttempt> {
return getCourseService().endContentAttempt(url)
}

Expand Down
2 changes: 2 additions & 0 deletions course/src/main/java/in/testpress/course/network/NetworkContentAttempt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package `in`.testpress.course.network

import `in`.testpress.course.domain.DomainContentAttempt
import `in`.testpress.exam.network.NetworkAttempt
import `in`.testpress.exam.network.asGreenDaoModel
import `in`.testpress.models.greendao.CourseAttempt

data class NetworkContentAttempt(
Expand Down Expand Up @@ -30,6 +31,7 @@ fun createContentAttempt(contentAttempt: NetworkContentAttempt): CourseAttempt {
contentAttempt.userVideoId
)
courseAttempt.chapterContent = contentAttempt.chapterContent?.asGreenDaoModel()
courseAttempt.assessment = contentAttempt.assessment?.asGreenDaoModel()
return courseAttempt
}

Expand Down
23 changes: 13 additions & 10 deletions course/src/main/java/in/testpress/course/repository/QuizExamRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ open class QuizExamRepository(val context: Context) {
val resourceContentAttempt: LiveData<Resource<DomainContentAttempt>>
get() = _resourceContentAttempt

var _resourceAttempt: MutableLiveData<Resource<DomainAttempt>> = MutableLiveData()
val resourceAttempt: LiveData<Resource<DomainAttempt>>
get() = _resourceAttempt
private var _endContentAttemptState: MutableLiveData<Resource<DomainContentAttempt>> = MutableLiveData()
val endContentAttemptState: LiveData<Resource<DomainContentAttempt>>
get() = _endContentAttemptState

fun createContentAttempt(contentId: Long): LiveData<Resource<DomainContentAttempt>> {
courseNetwork.createContentAttempt(contentId)
Expand Down Expand Up @@ -101,20 +101,23 @@ open class QuizExamRepository(val context: Context) {

fun endExam(url: String, attemptId: Long) {
courseNetwork.endContentAttempt(url)
.enqueue(object : TestpressCallback<NetworkAttempt>() {
override fun onSuccess(result: NetworkAttempt?) {
attemptDao.insertOrReplaceInTx(result?.asGreenDaoModel())
val attempts = attemptDao.queryBuilder()
.where(AttemptDao.Properties.Id.eq(result!!.id)).list()
_resourceAttempt.postValue(Resource.success(attempts[0].asDomainModel()))
.enqueue(object : TestpressCallback<NetworkContentAttempt>() {
override fun onSuccess(result: NetworkContentAttempt?) {
courseAttemptDao.insertOrReplaceInTx(result?.asGreenDaoModel())
attemptDao.insertOrReplaceInTx(result?.assessment?.asGreenDaoModel())
val contentAttempts = courseAttemptDao.queryBuilder()
.where(CourseAttemptDao.Properties.Id.eq(result?.id)).list()
_endContentAttemptState.postValue(Resource.success(contentAttempts[0].asDomainContentAttempt()))
}

override fun onException(exception: TestpressException?) {
val attempt = attemptDao.queryBuilder()
.where(AttemptDao.Properties.Id.eq(attemptId)).list()[0]
attempt.state = "COMPLETED"
attemptDao.insertOrReplaceInTx(attempt)
_resourceAttempt.postValue(Resource.success(attempt.asDomainModel()))
val contentAttempts = courseAttemptDao.queryBuilder()
.where(CourseAttemptDao.Properties.AssessmentId.eq(attempt.id)).list()
_endContentAttemptState.postValue(Resource.success(contentAttempts[0].asDomainContentAttempt()))
}
})
}
Expand Down
2 changes: 1 addition & 1 deletion course/src/main/java/in/testpress/course/ui/QuizActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class QuizActivity : BaseToolBarActivity(), ShowQuizHandler, ExamEndHanlder, Que
showEndExamAlert()
}

viewModel.endExamState.observe(this, Observer {
viewModel.endContentAttemptState.observe(this, Observer {
dialog.hide()
when(it.status) {
Status.SUCCESS -> {
Expand Down
3 changes: 2 additions & 1 deletion course/src/main/java/in/testpress/course/viewmodels/QuizExamViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.ViewModel

class QuizExamViewModel(val repository: QuizExamRepository): ViewModel() {
val endExamState = repository.resourceAttempt

val endContentAttemptState = repository.endContentAttemptState

fun loadContentAttempt(id: Long): LiveData<Resource<DomainContentAttempt>> {
return repository.loadContentAttempt(id)
Expand Down