more bug fixes

Author: Josh

app/build.gradle.kts

@@ -162,6 +162,7 @@ dependencies {
     testImplementation(libs.sqldelight.test)
     testImplementation(libs.jdbc.sqlite)
     testImplementation(libs.androidx.test.core)
+    testImplementation(libs.kotlinx.coroutines.test)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))

app/src/main/java/net/frozendevelopment/openletters/feature/letter/list/LetterListViewModel.kt

@@ -29,13 +29,7 @@ data class LetterListState(
     val searchTerms: String = "",
     val urgentReminders: List<ReminderId> = emptyList(),
     val upcomingReminders: List<ReminderId> = emptyList(),
-) {
-    val listHash: String
-        get() =
-            letters.hashCode().toString() +
-                urgentReminders.hashCode().toString() +
-                upcomingReminders.hashCode().toString()
-}
+)
 
 class LetterListViewModel(
     private val reminderQueries: ReminderQueries,
@@ -67,24 +61,22 @@ class LetterListViewModel(
     ) {
         val categories = categoryQueries.allCategories().executeAsList()
 
-        val letters =
-            searchUseCase(
-                query = searchTerms,
-                category = categoryFilter,
-            )
+        val letters = searchUseCase(
+            query = searchTerms,
+            category = categoryFilter,
+        )
 
         val urgentReminders = if (searchTerms.isBlank() && categoryFilter == null) {
             reminderQueries.urgentReminders().executeAsList()
         } else {
             emptyList()
         }
 
-        val upcomingReminders =
-            if (searchTerms.isBlank() && categoryFilter == null) {
-                reminderQueries.upcomingReminders().executeAsList()
-            } else {
-                emptyList()
-            }
+        val upcomingReminders = if (searchTerms.isBlank() && categoryFilter == null) {
+            reminderQueries.upcomingReminders().executeAsList()
+        } else {
+            emptyList()
+        }
 
         update {
             copy(
@@ -103,12 +95,11 @@ class LetterListViewModel(
     }
 
     fun toggleCategory(category: CategoryId?) = viewModelScope.launch {
-        val toggleCategory =
-            if (category == state.selectedCategoryId) {
-                null
-            } else {
-                category
-            }
+        val toggleCategory = if (category == state.selectedCategoryId) {
+            null
+        } else {
+            category
+        }
 
         update { copy(selectedCategoryId = toggleCategory) }
         load(categoryFilter = toggleCategory, searchTerms = state.searchTerms)

app/src/test/java/net/frozendevelopment/openletters/LetterCellUseCaseTests.kt

@@ -3,6 +3,7 @@ package net.frozendevelopment.openletters
 import androidx.compose.ui.graphics.Color
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNull
+import kotlinx.coroutines.test.runTest
 import net.frozendevelopment.openletters.data.sqldelight.models.CategoryId
 import net.frozendevelopment.openletters.data.sqldelight.models.LetterId
 import net.frozendevelopment.openletters.usecase.LetterCellModel
@@ -14,15 +15,15 @@ import java.time.ZoneOffset
 
 class LetterCellUseCaseTests {
     @Test
-    fun `should return null if the letter does not exist`() {
+    fun `should return null if the letter does not exist`() = runTest {
         val database = testDatabase()
         val useCase = LetterCellUseCase(database.letterQueries)
         val result = useCase.invoke(LetterId.random())
         assertNull(result)
     }
 
     @Test
-    fun `should return a LetterCellModel if the letter exists`() {
+    fun `should return a LetterCellModel if the letter exists`() = runTest {
         val categoryId = CategoryId.random()
         val categoryColor = Color.Cyan
 

gradle/libs.versions.toml

@@ -28,6 +28,7 @@ ktlint = "13.1.0"
 robolectric = "4.16"
 mockk = "1.14.7"
 nav3Core = "1.0.0"
+coroutines = "1.10.2"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -86,6 +87,8 @@ androidx-core-animation = { group = "androidx.core", name = "core-animation", ve
 androidx-ui-text-google-fonts = { group = "androidx.compose.ui", name = "ui-text-google-fonts", version.ref = "uiTextGoogleFonts" }
 androidx-datastore-core-android = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastoreCoreAndroid" }
 
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }