Implement Share Account Preview Screen (#2549)

Arinyadav1 · web-flow · commit a8e99541d16d · 2025-12-06T06:19:57.000-05:00
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/repository/ShareAccountRepository.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/repository/ShareAccountRepository.kt
@@ -10,10 +10,13 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.common.utils.DataState
+import com.mifos.core.network.GenericResponse
+import com.mifos.core.network.model.share.ShareAccountPayload
 import com.mifos.core.network.model.share.ShareTemplate
 import kotlinx.coroutines.flow.Flow
 
 interface ShareAccountRepository {
 
     fun getShareTemplate(clientId: Int, productId: Int?): Flow<DataState<ShareTemplate>>
+    suspend fun createShareAccount(shareAccountPayload: ShareAccountPayload): Flow<DataState<GenericResponse>>
 }
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/ShareAccountRepositoryImpl.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/ShareAccountRepositoryImpl.kt
@@ -12,9 +12,12 @@ package com.mifos.core.data.repositoryImp
 import com.mifos.core.common.utils.DataState
 import com.mifos.core.common.utils.asDataStateFlow
 import com.mifos.core.data.repository.ShareAccountRepository
+import com.mifos.core.network.GenericResponse
 import com.mifos.core.network.datamanager.DataManagerShare
+import com.mifos.core.network.model.share.ShareAccountPayload
 import com.mifos.core.network.model.share.ShareTemplate
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 
 class ShareAccountRepositoryImpl(
     private val dataManagerShare: DataManagerShare,
@@ -23,4 +26,12 @@ class ShareAccountRepositoryImpl(
     override fun getShareTemplate(clientId: Int, productId: Int?): Flow<DataState<ShareTemplate>> {
         return dataManagerShare.getShareTemplate(clientId, productId).asDataStateFlow()
     }
+
+    override suspend fun createShareAccount(
+        shareAccountPayload: ShareAccountPayload,
+    ): Flow<DataState<GenericResponse>> {
+        return flow {
+            emit(dataManagerShare.createShareAccount(shareAccountPayload))
+        }.asDataStateFlow()
+    }
 }
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerShare.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerShare.kt
@@ -9,14 +9,35 @@
  */
 package com.mifos.core.network.datamanager
 
+import com.mifos.core.common.utils.extractErrorMessage
 import com.mifos.core.network.BaseApiManager
+import com.mifos.core.network.GenericResponse
+import com.mifos.core.network.model.share.ShareAccountPayload
 import com.mifos.core.network.model.share.ShareTemplate
+import io.ktor.client.statement.bodyAsText
+import io.ktor.http.isSuccess
+import io.ktor.serialization.kotlinx.json.json
 import kotlinx.coroutines.flow.Flow
+import kotlinx.serialization.json.Json
 
 class DataManagerShare(
     private val baseApiManager: BaseApiManager,
 ) {
 
     fun getShareTemplate(clientId: Int, productId: Int?): Flow<ShareTemplate> =
         baseApiManager.shareAccountService.shareProductTemplate(clientId, productId)
+
+    suspend fun createShareAccount(shareAccountPayload: ShareAccountPayload): GenericResponse {
+        val response = baseApiManager.shareAccountService.createShareAccount(shareAccountPayload)
+
+        return if (!response.status.isSuccess()) {
+            val errorMsg = extractErrorMessage(response)
+
+            throw IllegalStateException(errorMsg)
+        } else {
+            val json = Json { ignoreUnknownKeys = true }
+
+            json.decodeFromString<GenericResponse>(response.bodyAsText())
+        }
+    }
 }
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ShareAccountPayload.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ShareAccountPayload.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
+package com.mifos.core.network.model.share
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ShareAccountPayload(
+    val clientId: Int,
+
+    val productId: Int? = null,
+
+    val requestedShares: Int,
+
+    val externalId: String? = null,
+
+    val submittedDate: String,
+
+    val minimumActivePeriod: Int? = null,
+
+    val minimumActivePeriodFrequencyType: Int? = null,
+
+    val lockinPeriodFrequency: Int? = null,
+
+    val lockinPeriodFrequencyType: Int? = null,
+
+    val applicationDate: String,
+
+    val allowDividendCalculationForInactiveClients: Boolean,
+
+    val locale: String? = null,
+
+    val dateFormat: String? = null,
+
+    val charges: List<ChargeItem> = emptyList(),
+
+    val savingsAccountId: Int,
+)
+
+@Serializable
+data class ChargeItem(
+    val chargeId: Int? = null,
+
+    val amount: Double? = null,
+)
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/services/ShareAccountService.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/services/ShareAccountService.kt
@@ -9,17 +9,25 @@
  */
 package com.mifos.core.network.services
 
+import com.mifos.core.network.model.share.ShareAccountPayload
 import com.mifos.core.network.model.share.ShareTemplate
 import com.mifos.room.basemodel.APIEndPoint
+import de.jensklingenberg.ktorfit.http.Body
 import de.jensklingenberg.ktorfit.http.GET
+import de.jensklingenberg.ktorfit.http.POST
 import de.jensklingenberg.ktorfit.http.Query
+import io.ktor.client.statement.HttpResponse
 import kotlinx.coroutines.flow.Flow
 
 interface ShareAccountService {
-
     @GET("accounts/" + APIEndPoint.SHARE + "/template")
     fun shareProductTemplate(
         @Query("clientId") clientId: Int,
         @Query("productId") productId: Int?,
     ): Flow<ShareTemplate>
+
+    @POST("accounts/" + APIEndPoint.SHARE)
+    suspend fun createShareAccount(
+        @Body shareAccountPayload: ShareAccountPayload,
+    ): HttpResponse
 }
diff --git a/feature/client/src/commonMain/composeResources/values/strings.xml b/feature/client/src/commonMain/composeResources/values/strings.xml
@@ -551,9 +551,11 @@
     <string name="feature_share_account_preview">Preview</string>
     <string name="feature_share_account_back">Back</string>
     <string name="feature_share_account_next">Next</string>
+    <string name="feature_share_account_submit">Submit</string>
+    <string name="feature_share_account_created_successfully">Share account created successfully</string>
 
-    <string name="feature_share_account_detail_product_name">Product Name*</string>
-    <string name="feature_share_account_detail_submission_date">Submission Date*</string>
+    <string name="feature_share_account_detail_product_name">Product Name</string>
+    <string name="feature_share_account_detail_submission_date">Submission Date</string>
     <string name="feature_share_account_detail_external_id">External Id</string>
     <string name="feature_share_account_detail_date_select">Select</string>
     <string name="feature_share_account_detail_date_cancel">Cancel</string>
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountScreen.kt
@@ -25,16 +25,20 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
+import co.touchlab.kermit.Logger
 import com.mifos.core.designsystem.component.MifosBottomSheet
 import com.mifos.core.designsystem.component.MifosScaffold
 import com.mifos.core.designsystem.component.MifosSweetError
@@ -54,6 +58,7 @@ import com.mifos.feature.client.createShareAccount.pages.ChargesPage
 import com.mifos.feature.client.createShareAccount.pages.DetailsPage
 import com.mifos.feature.client.createShareAccount.pages.PreviewPage
 import com.mifos.feature.client.createShareAccount.pages.TermsPage
+import kotlinx.coroutines.delay
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 
@@ -67,30 +72,35 @@ internal fun CreateShareAccountScreen(
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
 
+    val snackbarHostState = remember { SnackbarHostState() }
+
     EventsEffect(viewModel.eventFlow) { event ->
         when (event) {
             CreateShareAccountEvent.NavigateBack -> onNavigateBack()
             CreateShareAccountEvent.Finish -> onFinish()
         }
     }
 
-    CreateShareAccountContent(
-        modifier = modifier,
+    CreateShareAccountDialog(
         state = state,
         onAction = { viewModel.trySendAction(it) },
-        navController = navController,
+        snackbarHostState = snackbarHostState,
     )
 
-    CreateShareAccountDialog(
+    CreateShareAccountContent(
+        modifier = modifier,
         state = state,
         onAction = { viewModel.trySendAction(it) },
+        navController = navController,
+        snackbarHostState = snackbarHostState,
     )
 }
 
 @Composable
 fun CreateShareAccountDialog(
     state: CreateShareAccountState,
     onAction: (CreateShareAccountAction) -> Unit,
+    snackbarHostState: SnackbarHostState,
 ) {
     when (state.dialogState) {
         is CreateShareAccountState.DialogState.AddNewCharge -> {
@@ -108,7 +118,20 @@ fun CreateShareAccountDialog(
                 onAction = onAction,
             )
         }
+        is CreateShareAccountState.DialogState.SuccessResponseStatus -> {
+            LaunchedEffect(state.launchEffectKey) {
+                snackbarHostState.showSnackbar(
+                    message = state.dialogState.msg,
+                )
 
+                Logger.d("SuccessResponseStatus")
+
+                if (state.dialogState.successStatus) {
+                    delay(1000)
+                    onAction(CreateShareAccountAction.NavigateBack)
+                }
+            }
+        }
         null -> Unit
     }
 }
@@ -119,6 +142,7 @@ private fun CreateShareAccountContent(
     modifier: Modifier = Modifier,
     onAction: (CreateShareAccountAction) -> Unit,
     navController: NavController,
+    snackbarHostState: SnackbarHostState,
 ) {
     val steps = listOf(
         Step(name = stringResource(Res.string.feature_share_account_details)) {
@@ -141,13 +165,15 @@ private fun CreateShareAccountContent(
         },
         Step(name = stringResource(Res.string.feature_share_account_preview)) {
             PreviewPage(
-                onNext = { onAction(CreateShareAccountAction.Finish) },
+                state = state,
+                onAction = onAction,
             )
         },
     )
 
     MifosScaffold(
         modifier = modifier,
+        snackbarHostState = snackbarHostState,
     ) { paddingValues ->
         when (state.screenState) {
             is CreateShareAccountState.ScreenState.Loading -> MifosProgressIndicator()
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountViewModel.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountViewModel.kt
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/pages/DetailsPage.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/pages/DetailsPage.kt
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/pages/PreviewPage.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/pages/PreviewPage.kt
