Skip to content

Fix trending ConverterExtKt crash #3511

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

Open
andreia-ferreira wants to merge 2 commits into
base: master
Choose a base branch
from
+24 −3
Open

Fix trending ConverterExtKt crash #3511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef2ab2c
remove throwing exception if draft job is deleted
andreia-ferreira Feb 2, 2026
5a97634
fix code style
andreia-ferreira Feb 2, 2026
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
8 changes: 5 additions & 3 deletions app/src/main/java/org/groundplatform/android/data/local/room/converter/ConverterExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,11 +515,13 @@ fun ExpressionEntity.toModelObject(): Expression =
optionIds = optionIds?.split(',')?.toSet() ?: setOf(),
)

@Throws(LocalDataConsistencyException::class)
fun DraftSubmissionEntity.toModelObject(survey: Survey): DraftSubmission {
fun DraftSubmissionEntity.toModelObject(survey: Survey): DraftSubmission? {
val job =
survey.getJob(jobId)
?: throw LocalDataConsistencyException("Unknown jobId in submission mutation $id")
?: run {
Timber.w("Draft submission $id references jobId $jobId that no longer exists, discarding")
return null
}

return DraftSubmission(
id = id,
Expand Down
20 changes: 20 additions & 0 deletions app/src/test/java/org/groundplatform/android/ui/datacollection/DataCollectionFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,26 @@ class DataCollectionFragmentTest : BaseHiltTest() {
.assertInputTextDisplayed(TASK_CONDITIONAL_RESPONSE)
}

@Test
fun `Does not load draft if it references missing job`() =
runWithTestDispatcher {
setupFragment()

runner().inputText(TASK_1_RESPONSE).clickNextButton()

// Verify draft was saved
val draftId = submissionRepository.getDraftSubmissionsId()
assertThat(draftId).isNotEmpty()
assertThat(submissionRepository.countDraftSubmissions()).isEqualTo(1)

// Simulate deleting the job from the submission
val surveyWithMissingJob = SURVEY.copy(jobMap = emptyMap())

// Attempt to get draft with the survey that's missing the job
val result = submissionRepository.getDraftSubmission(draftId, surveyWithMissingJob)
assertThat(result).isNull()
}

@Test
fun `Clicking done on final task saves the submission`() = runWithTestDispatcher {
setupFragment()
Expand Down
Loading