Merge pull request #5415 from grzesiek2010/COLLECT-5413

Fixed sorting by date
getodk · Jan 25, 2023 · 97a5566 · 97a5566
1 parent 4fafd51
commit 97a5566
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/...p/src/main/java/org/odk/collect/android/formlists/blankformlist/BlankFormListViewModel.kt b/...p/src/main/java/org/odk/collect/android/formlists/blankformlist/BlankFormListViewModel.kt
@@ -200,8 +200,8 @@ class BlankFormListViewModel(
         _formsToDisplay.value = when (sortingOrder) {
             0 -> _allForms.value.sortedBy { it.formName.lowercase() }
             1 -> _allForms.value.sortedByDescending { it.formName.lowercase() }
-            2 -> _allForms.value.sortedByDescending { it.dateOfCreation }
-            3 -> _allForms.value.sortedBy { it.dateOfCreation }
+            2 -> _allForms.value.sortedByDescending { it.dateOfLastDetectedAttachmentsUpdate ?: it.dateOfCreation }
+            3 -> _allForms.value.sortedBy { it.dateOfLastDetectedAttachmentsUpdate ?: it.dateOfCreation }
             4 -> _allForms.value.sortedByDescending { it.dateOfLastUsage }
             else -> { _allForms.value }
         }.filter {

diff --git a/...c/test/java/org/odk/collect/android/formlists/blankformlist/BlankFormListViewModelTest.kt b/...c/test/java/org/odk/collect/android/formlists/blankformlist/BlankFormListViewModelTest.kt
@@ -283,30 +283,30 @@ class BlankFormListViewModelTest {
     fun `when list of forms sorted 'by date newest first', saved should forms be ordered properly`() {
         saveForms(
             form(dbId = 1, formId = "1", formName = "1Form"),
-            form(dbId = 2, formId = "2", formName = "BForm"),
+            form(dbId = 2, formId = "2", formName = "BForm", lastDetectedAttachmentsUpdateDate = 6),
             form(dbId = 3, formId = "3", formName = "aForm"),
-            form(dbId = 4, formId = "4", formName = "AForm"),
+            form(dbId = 4, formId = "4", formName = "AForm", lastDetectedAttachmentsUpdateDate = 7),
             form(dbId = 5, formId = "5", formName = "2Form")
         )
 
         createViewModel()
 
         viewModel.sortingOrder = 2
 
-        assertFormItem(viewModel.formsToDisplay.value!![0], form(dbId = 5, formId = "5", formName = "2Form"))
-        assertFormItem(viewModel.formsToDisplay.value!![1], form(dbId = 4, formId = "4", formName = "AForm"))
-        assertFormItem(viewModel.formsToDisplay.value!![2], form(dbId = 3, formId = "3", formName = "aForm"))
-        assertFormItem(viewModel.formsToDisplay.value!![3], form(dbId = 2, formId = "2", formName = "BForm"))
+        assertFormItem(viewModel.formsToDisplay.value!![0], form(dbId = 4, formId = "4", formName = "AForm", lastDetectedAttachmentsUpdateDate = 7))
+        assertFormItem(viewModel.formsToDisplay.value!![1], form(dbId = 2, formId = "2", formName = "BForm", lastDetectedAttachmentsUpdateDate = 6))
+        assertFormItem(viewModel.formsToDisplay.value!![2], form(dbId = 5, formId = "5", formName = "2Form"))
+        assertFormItem(viewModel.formsToDisplay.value!![3], form(dbId = 3, formId = "3", formName = "aForm"))
         assertFormItem(viewModel.formsToDisplay.value!![4], form(dbId = 1, formId = "1", formName = "1Form"))
     }
 
     @Test
     fun `when list of forms sorted 'by date oldest first', saved should forms be ordered properly`() {
         saveForms(
             form(dbId = 1, formId = "1", formName = "1Form"),
-            form(dbId = 2, formId = "2", formName = "BForm"),
+            form(dbId = 2, formId = "2", formName = "BForm", lastDetectedAttachmentsUpdateDate = 6),
             form(dbId = 3, formId = "3", formName = "aForm"),
-            form(dbId = 4, formId = "4", formName = "AForm"),
+            form(dbId = 4, formId = "4", formName = "AForm", lastDetectedAttachmentsUpdateDate = 7),
             form(dbId = 5, formId = "5", formName = "2Form")
         )
 
@@ -315,10 +315,10 @@ class BlankFormListViewModelTest {
         viewModel.sortingOrder = 3
 
         assertFormItem(viewModel.formsToDisplay.value!![0], form(dbId = 1, formId = "1", formName = "1Form"))
-        assertFormItem(viewModel.formsToDisplay.value!![1], form(dbId = 2, formId = "2", formName = "BForm"))
-        assertFormItem(viewModel.formsToDisplay.value!![2], form(dbId = 3, formId = "3", formName = "aForm"))
-        assertFormItem(viewModel.formsToDisplay.value!![3], form(dbId = 4, formId = "4", formName = "AForm"))
-        assertFormItem(viewModel.formsToDisplay.value!![4], form(dbId = 5, formId = "5", formName = "2Form"))
+        assertFormItem(viewModel.formsToDisplay.value!![1], form(dbId = 3, formId = "3", formName = "aForm"))
+        assertFormItem(viewModel.formsToDisplay.value!![2], form(dbId = 5, formId = "5", formName = "2Form"))
+        assertFormItem(viewModel.formsToDisplay.value!![3], form(dbId = 2, formId = "2", formName = "BForm", lastDetectedAttachmentsUpdateDate = 6))
+        assertFormItem(viewModel.formsToDisplay.value!![4], form(dbId = 4, formId = "4", formName = "AForm", lastDetectedAttachmentsUpdateDate = 7))
     }
 
     @Test
@@ -540,7 +540,8 @@ class BlankFormListViewModelTest {
         formId: String = "1",
         version: String? = null,
         formName: String = "Form $formId",
-        deleted: Boolean = false
+        deleted: Boolean = false,
+        lastDetectedAttachmentsUpdateDate: Long? = null
     ) = Form.Builder()
         .dbId(dbId)
         .formId(formId)
@@ -549,6 +550,7 @@ class BlankFormListViewModelTest {
         .date(dbId)
         .deleted(deleted)
         .formFilePath(FormUtils.createXFormFile(formId, version).absolutePath)
+        .lastDetectedAttachmentsUpdateDate(lastDetectedAttachmentsUpdateDate)
         .build()
 
     private fun instance(