refactor: simplify error handling and remove unused fields

Author: prof18

shared/src/androidUnitTest/kotlin/com/prof18/moneyflow/ComponentsRoborazziTest.kt

@@ -8,7 +8,6 @@ import com.prof18.moneyflow.ui.components.TransactionCard
 import com.prof18.moneyflow.ui.style.MoneyFlowTheme
 import money_flow.shared.generated.resources.Res
 import money_flow.shared.generated.resources.error_get_categories_message
-import money_flow.shared.generated.resources.error_nerd_message
 import money_flow.shared.generated.resources.settings_screen
 import org.jetbrains.compose.resources.stringResource
 import org.junit.Test
@@ -63,10 +62,6 @@ class ComponentsRoborazziTest : RoborazziTestBase() {
                 com.prof18.moneyflow.ui.components.ErrorView(
                     uiErrorMessage = UIErrorMessage(
                         message = Res.string.error_get_categories_message,
-                        messageKey = "error_get_categories_message",
-                        nerdMessage = Res.string.error_nerd_message,
-                        nerdMessageKey = "error_nerd_message",
-                        nerdMessageArgs = listOf("101"),
                     ),
                 )
             }

shared/src/commonMain/kotlin/com/prof18/moneyflow/features/addtransaction/AddTransactionViewModel.kt

@@ -25,7 +25,6 @@ import kotlinx.datetime.atStartOfDayIn
 import kotlinx.datetime.toLocalDateTime
 import money_flow.shared.generated.resources.Res
 import money_flow.shared.generated.resources.amount_not_empty_error
-import money_flow.shared.generated.resources.error_nerd_message
 import kotlin.time.Clock
 
 internal class AddTransactionViewModel(
@@ -96,11 +95,6 @@ internal class AddTransactionViewModel(
         if (amountCents == null) {
             val errorMessage = UIErrorMessage(
                 message = Res.string.amount_not_empty_error,
-                messageKey = "amount_not_empty_error",
-                messageArgs = emptyList(),
-                nerdMessage = Res.string.error_nerd_message,
-                nerdMessageKey = "error_nerd_message",
-                nerdMessageArgs = emptyList(),
             )
             _uiState.update { state ->
                 state.copy(addTransactionAction = AddTransactionAction.ShowError(errorMessage))

shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/MoneyFlowErrorMapper.kt

@@ -19,18 +19,12 @@ import money_flow.shared.generated.resources.error_delete_transaction_message
 import money_flow.shared.generated.resources.error_get_all_transaction_message
 import money_flow.shared.generated.resources.error_get_categories_message
 import money_flow.shared.generated.resources.error_get_money_summary_message
-import money_flow.shared.generated.resources.error_nerd_message
 
 internal class MoneyFlowErrorMapper {
 
     fun getUIErrorMessage(error: MoneyFlowError): UIErrorMessage {
         return UIErrorMessage(
             message = error.getErrorMessageRes(),
-            messageKey = error.getErrorMessageKey(),
-            messageArgs = emptyList(),
-            nerdMessage = Res.string.error_nerd_message,
-            nerdMessageKey = "error_nerd_message",
-            nerdMessageArgs = listOf(error.code.toString()),
         )
     }
 
@@ -44,15 +38,4 @@ internal class MoneyFlowErrorMapper {
         is DatabaseImport -> Res.string.error_database_import
         is DatabaseNotFound -> Res.string.database_file_not_found
     }
-
-    private fun MoneyFlowError.getErrorMessageKey() = when (this) {
-        is AddTransaction -> "error_add_transaction_message"
-        is DeleteTransaction -> "error_delete_transaction_message"
-        is GetAllTransaction -> "error_get_all_transaction_message"
-        is GetCategories -> "error_get_categories_message"
-        is GetMoneySummary -> "error_get_money_summary_message"
-        is DatabaseExport -> "error_database_export"
-        is DatabaseImport -> "error_database_import"
-        is DatabaseNotFound -> "database_file_not_found"
-    }
 }

shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/addtransaction/AddTransactionScreen.kt

@@ -44,7 +44,7 @@ import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 
 @Composable
-@Suppress("LongMethod", "LongParameterList", "SpreadOperator") // TODO: reduce method length
+@Suppress("LongMethod", "LongParameterList") // TODO: reduce method length
 internal fun AddTransactionScreen(
     categoryState: State<CategoryUIData?>,
     navigateUp: () -> Unit,
@@ -75,27 +75,9 @@ internal fun AddTransactionScreen(
                 resetAction()
             }
             is AddTransactionAction.ShowError -> {
-                val messageText = stringResource(
-                    it.uiErrorMessage.message,
-                    *it.uiErrorMessage.messageArgs.toTypedArray(),
-                )
-                val nerdText = if (it.uiErrorMessage.nerdMessageArgs.isNotEmpty()) {
-                    stringResource(
-                        it.uiErrorMessage.nerdMessage,
-                        *it.uiErrorMessage.nerdMessageArgs.toTypedArray(),
-                    )
-                } else {
-                    ""
-                }
+                val messageText = stringResource(it.uiErrorMessage.message)
                 LaunchedEffect(snackbarHostState, resetAction) {
-                    val message = buildString {
-                        append(messageText)
-                        if (nerdText.isNotBlank()) {
-                            append("\n")
-                            append(nerdText)
-                        }
-                    }
-                    snackbarHostState.showSnackbar(message)
+                    snackbarHostState.showSnackbar(messageText)
                     resetAction()
                 }
             }

shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/categories/CategoriesScreen.kt

@@ -24,7 +24,6 @@ import money_flow.shared.generated.resources.Res
 import money_flow.shared.generated.resources.add
 import money_flow.shared.generated.resources.categories_screen
 import money_flow.shared.generated.resources.error_get_categories_message
-import money_flow.shared.generated.resources.error_nerd_message
 import org.jetbrains.compose.resources.stringResource
 
 @Composable
@@ -117,10 +116,6 @@ private fun CategoriesScreenErrorPreview() {
                 categoryModel = CategoryModel.Error(
                     uiErrorMessage = UIErrorMessage(
                         message = Res.string.error_get_categories_message,
-                        messageKey = "error_get_categories_message",
-                        nerdMessage = Res.string.error_nerd_message,
-                        nerdMessageKey = "error_nerd_message",
-                        nerdMessageArgs = listOf("101"),
                     ),
                 ),
             )

shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/home/HomeScreen.kt

@@ -46,7 +46,6 @@ import money_flow.shared.generated.resources.Res
 import money_flow.shared.generated.resources.delete
 import money_flow.shared.generated.resources.empty_wallet
 import money_flow.shared.generated.resources.error_get_money_summary_message
-import money_flow.shared.generated.resources.error_nerd_message
 import money_flow.shared.generated.resources.hide_sensitive_data
 import money_flow.shared.generated.resources.latest_transactions
 import money_flow.shared.generated.resources.my_wallet
@@ -256,10 +255,6 @@ private fun HomeScreenErrorPreview() {
                 homeModel = HomeModel.Error(
                     UIErrorMessage(
                         message = Res.string.error_get_money_summary_message,
-                        messageKey = "error_get_money_summary_message",
-                        nerdMessage = Res.string.error_nerd_message,
-                        nerdMessageKey = "error_nerd_message",
-                        nerdMessageArgs = listOf("101"),
                     ),
                 ),
                 hideSensitiveDataState = true,

shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/model/UIErrorMessage.kt

@@ -1,11 +1,7 @@
 package com.prof18.moneyflow.presentation.model
 
-// TODO: delete unused fields
+import org.jetbrains.compose.resources.StringResource
+
 internal data class UIErrorMessage(
-    val message: org.jetbrains.compose.resources.StringResource,
-    val messageKey: String,
-    val messageArgs: List<String> = emptyList(),
-    val nerdMessage: org.jetbrains.compose.resources.StringResource,
-    val nerdMessageKey: String,
-    val nerdMessageArgs: List<String> = emptyList(),
+    val message: StringResource,
 )

shared/src/commonMain/kotlin/com/prof18/moneyflow/presentation/model/UIErrorMessageFactory.kt

@@ -10,21 +10,12 @@ import money_flow.shared.generated.resources.error_delete_transaction_message
 import money_flow.shared.generated.resources.error_get_all_transaction_message
 import money_flow.shared.generated.resources.error_get_categories_message
 import money_flow.shared.generated.resources.error_get_money_summary_message
-import money_flow.shared.generated.resources.error_nerd_message
 import org.jetbrains.compose.resources.StringResource
 
 internal fun uiErrorMessageFromKeys(
     messageKey: String,
-    nerdMessageKey: String,
-    messageArgs: List<String> = emptyList(),
-    nerdMessageArgs: List<String> = emptyList(),
 ): UIErrorMessage = UIErrorMessage(
     message = messageKey.toStringResource(),
-    messageKey = messageKey,
-    messageArgs = messageArgs,
-    nerdMessage = nerdMessageKey.toStringResource(),
-    nerdMessageKey = nerdMessageKey,
-    nerdMessageArgs = nerdMessageArgs,
 )
 
 internal fun String.toStringResource(): StringResource = when (this) {
@@ -37,6 +28,5 @@ internal fun String.toStringResource(): StringResource = when (this) {
     "error_database_export" -> Res.string.error_database_export
     "error_database_import" -> Res.string.error_database_import
     "database_file_not_found" -> Res.string.database_file_not_found
-    "error_nerd_message" -> Res.string.error_nerd_message
     else -> Res.string.error_get_money_summary_message
 }

shared/src/commonMain/kotlin/com/prof18/moneyflow/ui/components/ErrorView.kt

@@ -17,11 +17,9 @@ import com.prof18.moneyflow.ui.style.Margins
 import com.prof18.moneyflow.ui.style.MoneyFlowTheme
 import money_flow.shared.generated.resources.Res
 import money_flow.shared.generated.resources.error_add_transaction_message
-import money_flow.shared.generated.resources.error_nerd_message
 import money_flow.shared.generated.resources.shrug
 import org.jetbrains.compose.resources.stringResource
 
-@Suppress("SpreadOperator")
 @Composable
 internal fun ErrorView(
     uiErrorMessage: UIErrorMessage,
@@ -42,24 +40,9 @@ internal fun ErrorView(
             )
 
             Text(
-                text = stringResource(
-                    uiErrorMessage.message,
-                    *uiErrorMessage.messageArgs.toTypedArray(),
-                ),
+                text = stringResource(uiErrorMessage.message),
                 style = MaterialTheme.typography.bodyLarge,
             )
-            if (uiErrorMessage.nerdMessageArgs.isNotEmpty()) {
-                val nerdMessage = stringResource(
-                    uiErrorMessage.nerdMessage,
-                    *uiErrorMessage.nerdMessageArgs.toTypedArray(),
-                )
-                if (nerdMessage.isNotBlank()) {
-                    Text(
-                        text = nerdMessage,
-                        style = MaterialTheme.typography.bodySmall,
-                    )
-                }
-            }
         }
     }
 }
@@ -69,10 +52,6 @@ internal fun ErrorView(
 private fun ErrorViewPreview() {
     val message = UIErrorMessage(
         message = Res.string.error_add_transaction_message,
-        messageKey = "error_add_transaction_message",
-        nerdMessage = Res.string.error_nerd_message,
-        nerdMessageKey = "error_nerd_message",
-        nerdMessageArgs = listOf("101"),
     )
 
     Surface {

shared/src/iosTest/kotlin/com/prof18/moneyflow/utilities/DatabaseHelperIosTest.kt

@@ -0,0 +1,17 @@
+package com.prof18.moneyflow.utilities
+
+import kotlin.test.Test
+import kotlin.test.assertNotNull
+
+internal class DatabaseHelperIosTest {
+
+    @Test
+    fun shouldInitializeAndCloseDatabaseHelper() {
+        createDriver()
+        try {
+            assertNotNull(getDatabaseHelper())
+        } finally {
+            closeDriver()
+        }
+    }
+}