refactor: applying share account (#2946)

Author: Nagarjuna0033

core/data/src/commonMain/kotlin/org/mifos/mobile/core/data/repositoryImpl/ShareAccountRepositoryImp.kt

@@ -13,7 +13,9 @@ import io.ktor.client.plugins.ClientRequestException
 import io.ktor.client.statement.bodyAsText
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import org.mifos.mobile.core.common.DataState
 import org.mifos.mobile.core.common.asDataStateFlow
@@ -32,7 +34,9 @@ class ShareAccountRepositoryImp(
 
     override fun getShareProducts(clientId: Long?): Flow<DataState<Page<ShareProduct>>> {
         return dataManager.shareAccountApi.getShareProducts(clientId)
-            .asDataStateFlow().flowOn(ioDispatcher)
+            .map { response -> DataState.Success(response) }
+            .catch { exception -> DataState.Error(exception, exception.message) }
+            .flowOn(ioDispatcher)
     }
 
     override fun getShareProductById(

core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/payload/ShareApplicationPayload.kt

@@ -19,7 +19,7 @@ data class ShareApplicationPayload(
     val submittedDate: String,
     val savingsAccountId: Int,
     val applicationDate: String,
-    val locale: String = "en",
-    val dateFormat: String = "dd MMMM yyyy",
+    val locale: String,
+    val dateFormat: String,
     val clientId: Long,
 )

core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/ShareProductDetails.kt

@@ -35,4 +35,12 @@ data class ShareProductDetails(
     val minimumActivePeriodForDividendsTypeEnum: EnumOption? = null,
     val accountingRule: EnumOption? = null,
     val accountingMappings: AccountingMappings? = null,
+    val clientSavingsAccounts: List<SavingsAccountSummary>? = emptyList(),
+) : Parcelable
+
+@Serializable
+@Parcelize
+data class SavingsAccountSummary(
+    val id: Int? = null,
+    val savingsProductName: String? = null,
 ) : Parcelable

core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shares/SharePageItem.kt

@@ -16,6 +16,22 @@ import org.mifos.mobile.core.model.Parcelize
 @Serializable
 @Parcelize
 data class ShareProduct(
-    val pageItems: List<SharePageItem>? = null,
-    val totalFilteredRecords: Int? = null,
+    val accountingRule: AccountingRule? = null,
+    val allowDividendCalculationForInactiveClients: Boolean? = null,
+    val currency: Currency? = null,
+    val description: String? = null,
+    val id: Int? = null,
+    val lockPeriodTypeEnum: LockPeriodTypeEnum? = null,
+    val lockinPeriod: Int? = null,
+    val maximumShares: Int? = null,
+    val minimumActivePeriod: Int? = null,
+    val minimumActivePeriodForDividendsTypeEnum: MinimumActivePeriodForDividendsTypeEnum? = null,
+    val minimumShares: Int? = null,
+    val name: String? = null,
+    val nominalShares: Int? = null,
+    val shareCapital: Double? = null,
+    val shortName: String? = null,
+    val totalShares: Int? = null,
+    val totalSharesIssued: Int? = null,
+    val unitPrice: Double? = null,
 ) : Parcelable

core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shares/ShareProduct.kt

@@ -32,9 +32,11 @@ import mifos_mobile.feature.share_application.generated.resources.Res
 import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_error_server
 import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_label_currency
 import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_label_current_price
+import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_label_default_savings_account
 import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_label_lockin_frequency
 import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_label_lockin_frequency_type
 import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_label_minimum_frequency
+import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_label_minimum_frequency_type
 import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_label_terms
 import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_label_total_number_of_shares
 import mifos_mobile.feature.share_application.generated.resources.feature_apply_share_section_lockin_period
@@ -226,7 +228,7 @@ internal fun ShareFillApplicationForm(
 
         MifosOutlinedTextField(
             value = state.totalNumberOfShares,
-            onValueChange = { onAction(ShareApplicationAction.CurrentPriceChange(it)) },
+            onValueChange = { onAction(ShareApplicationAction.TotalNumberOfSharesChange(it)) },
             label = stringResource(Res.string.feature_apply_share_label_total_number_of_shares),
             shape = DesignToken.shapes.medium,
             textStyle = MifosTypography.bodyLarge,
@@ -243,14 +245,14 @@ internal fun ShareFillApplicationForm(
         MifosOutlineDropdown(
             selectedText = state.defaultSavingsAccountName,
             items = state.accountIdNameMap,
-            enabled = false,
+            enabled = state.defaultAccounts.isNotEmpty(),
             onItemSelected = { id, value ->
                 onAction(
                     ShareApplicationAction.DefaultSavingsAccountChange
                         (id, value),
                 )
             },
-            label = stringResource(Res.string.feature_apply_share_label_currency),
+            label = stringResource(Res.string.feature_apply_share_label_default_savings_account),
         )
 
         Text(
@@ -278,11 +280,10 @@ internal fun ShareFillApplicationForm(
         MifosOutlineDropdown(
             selectedText = state.selectedMapFrequencyTypeName,
             items = state.mapFrequencyMap,
-            enabled = false,
             onItemSelected = { id, value ->
                 onAction(ShareApplicationAction.MapFrequencyTypeChange(id, value))
             },
-            label = stringResource(Res.string.feature_apply_share_label_currency),
+            label = stringResource(Res.string.feature_apply_share_label_minimum_frequency_type),
         )
 
         Text(
@@ -293,7 +294,7 @@ internal fun ShareFillApplicationForm(
 
         MifosOutlinedTextField(
             value = state.lipFrequency,
-            onValueChange = { onAction(ShareApplicationAction.MapFrequencyChange(it)) },
+            onValueChange = { onAction(ShareApplicationAction.LipFrequencyChange(it)) },
             label = stringResource(Res.string.feature_apply_share_label_lockin_frequency),
             shape = DesignToken.shapes.medium,
             textStyle = MifosTypography.bodyLarge,