refactor(savingsAccount): enhance error handling in createSavingsAccount, improve string resource usage and null safety

Author: sam-arth07

core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerSavings.kt

@@ -23,7 +23,6 @@ import com.mifos.room.entities.client.Savings
 import com.mifos.room.entities.templates.savings.SavingProductsTemplate
 import com.mifos.room.entities.templates.savings.SavingsAccountTransactionTemplateEntity
 import com.mifos.room.helper.SavingsDaoHelper
-import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.isSuccess
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -290,29 +289,22 @@ class DataManagerSavings(
         get() = mBaseApiManager.savingsService.allSavingsAccounts()
 
     fun createSavingsAccount(savingsPayload: SavingsPayload?): Flow<Savings> {
-        suspend fun extractErrorMessage(response: HttpResponse): String {
+        return mBaseApiManager.savingsService.createSavingsAccount(savingsPayload).map { response ->
             val responseText = response.bodyAsText()
-            var result = ""
-            try {
-                if (!response.status.isSuccess()) {
-                    val json = Json { ignoreUnknownKeys = true }
+            val json = Json { ignoreUnknownKeys = true }
+
+            if (!response.status.isSuccess()) {
+                val errorMessage = try {
                     val errorResponse = json.decodeFromString<MifosError>(responseText)
-                    result = errorResponse.errors.firstOrNull()?.defaultUserMessage
+                    errorResponse.errors.firstOrNull()?.defaultUserMessage
                         ?: errorResponse.defaultUserMessage
-                        ?: "Message Not Found"
+                        ?: "HTTP ${response.status.value} ${response.status.description}"
+                } catch (e: Exception) {
+                    "HTTP ${response.status.value} ${response.status.description}"
                 }
-            } catch (e: Exception) {
-                result = "Failed to parse error response"
+                throw IllegalStateException(errorMessage)
             }
-            return result
-        }
-        return mBaseApiManager.savingsService.createSavingsAccount(savingsPayload).map { response ->
-            val errorMessage = extractErrorMessage(response)
-            if (errorMessage.isNotEmpty()) {
-                throw Exception(errorMessage)
-            }
-            val responseText = response.bodyAsText()
-            val json = Json { ignoreUnknownKeys = true }
+
             json.decodeFromString<Savings>(responseText)
         }
     }

feature/savings/src/commonMain/composeResources/values/feature_savings_strings.xml

@@ -148,7 +148,7 @@
     <string name="feature_savings_new_savings_account_submitted_success">New Savings Account Application Submitted Successfully</string>
     <string name="feature_savings_new_savings_account_submitted_failed">Failed to apply for new savings account with the provided details</string>
 
-
+    <string name="feature_savings_charges_active_count">%1$d active charges</string>
 
 </resources>
 

feature/savings/src/commonMain/kotlin/com/mifos/feature/savings/savingsAccountv2/SavingsAccountViewModel.kt

@@ -131,17 +131,17 @@ internal class SavingsAccountViewModel(
             dateFormat = "dd-MM-yyyy"
             productId = state.savingProductOptions.getOrNull(state.savingsProductSelected)?.id
             clientId = state.clientId
-            fieldOfficerId = state.fieldOfficerOptions[state.fieldOfficerIndex].id
+            fieldOfficerId = state.fieldOfficerOptions.getOrNull(state.fieldOfficerIndex)?.id
             submittedOnDate = state.submissionDate
             externalId = state.externalId
             allowOverdraft = state.isCheckedOverdraftAllowed
             enforceMinRequiredBalance = state.isCheckedMinimumBalance
             minRequiredOpeningBalance = state.minimumOpeningBalance
             minRequiredBalance = state.monthlyMinimumBalance
             lockinPeriodFrequency = state.frequency.toIntOrNull()
-            lockinPeriodFrequencyType = state.freqTypeIndex.let {
-                if (it != -1 && state.frequency.toIntOrNull() != null) it else null
-            }
+            lockinPeriodFrequencyType = state.savingsProductTemplate?.lockinPeriodFrequencyTypeOptions
+                ?.getOrNull(state.freqTypeIndex)?.id
+                .takeIf { state.frequency.toIntOrNull() != null }
             charges = state.addedCharges.map { charges ->
                 ChargesPayload(
                     chargeId = charges.id,

feature/savings/src/commonMain/kotlin/com/mifos/feature/savings/savingsAccountv2/pages/PreviewPage.kt

@@ -11,6 +11,7 @@ package com.mifos.feature.savings.savingsAccountv2.pages
 
 import androidclient.feature.savings.generated.resources.Res
 import androidclient.feature.savings.generated.resources.feature_savings_back
+import androidclient.feature.savings.generated.resources.feature_savings_charges_active_count
 import androidclient.feature.savings.generated.resources.feature_savings_currency
 import androidclient.feature.savings.generated.resources.feature_savings_days_in_year
 import androidclient.feature.savings.generated.resources.feature_savings_external_id
@@ -24,7 +25,6 @@ import androidclient.feature.savings.generated.resources.feature_savings_submiss
 import androidclient.feature.savings.generated.resources.feature_savings_submit
 import androidclient.feature.savings.generated.resources.feature_savings_yes
 import androidclient.feature.savings.generated.resources.step_charges
-import androidclient.feature.savings.generated.resources.step_charges_active
 import androidclient.feature.savings.generated.resources.step_charges_view
 import androidclient.feature.savings.generated.resources.step_details
 import androidclient.feature.savings.generated.resources.step_terms
@@ -60,8 +60,10 @@ fun PreviewPage(
     modifier: Modifier = Modifier,
 ) {
     val previewDetailsMap = mapOf(
-        stringResource(Res.string.feature_savings_product_name) to state.savingProductOptions[state.savingsProductSelected].name,
-        stringResource(Res.string.feature_savings_field_officer) to state.fieldOfficerOptions[state.fieldOfficerIndex].displayName,
+        stringResource(Res.string.feature_savings_product_name) to
+            state.savingProductOptions.getOrNull(state.savingsProductSelected)?.name.orEmpty(),
+        stringResource(Res.string.feature_savings_field_officer) to
+            state.fieldOfficerOptions.getOrNull(state.fieldOfficerIndex)?.displayName.orEmpty(),
         stringResource(Res.string.feature_savings_submission_date) to state.submissionDate,
         stringResource(Res.string.feature_savings_external_id) to state.externalId,
     )
@@ -173,8 +175,9 @@ fun PreviewPage(
                         onAction(SavingsAccountAction.ShowCharges)
                     },
                     btnText = stringResource(Res.string.step_charges_view),
-                    text = state.addedCharges.size.toString() + " " + stringResource(Res.string.step_charges_active) + " " + stringResource(
-                        Res.string.step_charges,
+                    text = stringResource(
+                        Res.string.feature_savings_charges_active_count,
+                        state.addedCharges.size,
                     ),
                     btnEnabled = state.addedCharges.isNotEmpty(),
                 )