feat: additional details for share account application (#2943)

Nagarjuna0033 · web-flow · commit e26c8a6998b3 · 2025-08-19T23:13:08.000-04:00
diff --git a/cmp-navigation/src/commonMain/kotlin/cmp/navigation/authenticated/AuthenticatedNavigation.kt b/cmp-navigation/src/commonMain/kotlin/cmp/navigation/authenticated/AuthenticatedNavigation.kt
@@ -197,6 +197,8 @@ internal fun NavGraphBuilder.authenticatedGraph(
 
         shareApplicationNavGraph(
             navController = navController,
+            navigateToStatusScreen = navController::navigateToStatusAfterUpdate,
+            navigateToAuthenticateScreen = navController::navigateToVerifyPasscodeScreen,
         )
 
         passcodeDestination(
diff --git a/core/data/src/commonMain/kotlin/org/mifos/mobile/core/data/repository/ShareAccountRepository.kt b/core/data/src/commonMain/kotlin/org/mifos/mobile/core/data/repository/ShareAccountRepository.kt
@@ -12,12 +12,17 @@ package org.mifos.mobile.core.data.repository
 import kotlinx.coroutines.flow.Flow
 import org.mifos.mobile.core.common.DataState
 import org.mifos.mobile.core.model.entity.Page
-import org.mifos.mobile.core.model.entity.templates.shareProduct.ShareDetails
+import org.mifos.mobile.core.model.entity.payload.ShareApplicationPayload
+import org.mifos.mobile.core.model.entity.templates.shareProductDetails.ShareProductDetails
 import org.mifos.mobile.core.model.entity.templates.shares.ShareProduct
 
 interface ShareAccountRepository {
 
     fun getShareProducts(clientId: Long?): Flow<DataState<Page<ShareProduct>>>
 
-    fun getShareProductById(productId: Long, clientId: String?): Flow<DataState<ShareDetails>>
+    fun getShareProductById(productId: Long, clientId: Long?): Flow<DataState<ShareProductDetails>>
+
+    suspend fun submitShareApplication(
+        payload: ShareApplicationPayload?,
+    ): DataState<String>
 }
diff --git a/core/data/src/commonMain/kotlin/org/mifos/mobile/core/data/repositoryImpl/ShareAccountRepositoryImp.kt b/core/data/src/commonMain/kotlin/org/mifos/mobile/core/data/repositoryImpl/ShareAccountRepositoryImp.kt
@@ -9,14 +9,19 @@
  */
 package org.mifos.mobile.core.data.repositoryImpl
 
+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.flowOn
+import kotlinx.coroutines.withContext
 import org.mifos.mobile.core.common.DataState
 import org.mifos.mobile.core.common.asDataStateFlow
 import org.mifos.mobile.core.data.repository.ShareAccountRepository
+import org.mifos.mobile.core.data.util.extractErrorMessage
 import org.mifos.mobile.core.model.entity.Page
-import org.mifos.mobile.core.model.entity.templates.shareProduct.ShareDetails
+import org.mifos.mobile.core.model.entity.payload.ShareApplicationPayload
+import org.mifos.mobile.core.model.entity.templates.shareProductDetails.ShareProductDetails
 import org.mifos.mobile.core.model.entity.templates.shares.ShareProduct
 import org.mifos.mobile.core.network.DataManager
 
@@ -32,9 +37,22 @@ class ShareAccountRepositoryImp(
 
     override fun getShareProductById(
         productId: Long,
-        clientId: String?,
-    ): Flow<DataState<ShareDetails>> {
+        clientId: Long?,
+    ): Flow<DataState<ShareProductDetails>> {
         return dataManager.shareAccountApi.getShareProductById(productId, clientId)
             .asDataStateFlow().flowOn(ioDispatcher)
     }
+
+    override suspend fun submitShareApplication(payload: ShareApplicationPayload?): DataState<String> {
+        return withContext(ioDispatcher) {
+            try {
+                val response =
+                    dataManager.shareAccountApi.submitShareApplication(payload)
+                DataState.Success(response.bodyAsText())
+            } catch (e: ClientRequestException) {
+                val errorMessage = extractErrorMessage(e.response)
+                DataState.Error(Exception(errorMessage), null)
+            }
+        }
+    }
 }
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/payload/ShareApplicationPayload.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/payload/ShareApplicationPayload.kt
@@ -0,0 +1,25 @@
+/*
+ * 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/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.core.model.entity.payload
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ShareApplicationPayload(
+    val productId: Int,
+    val unitPrice: Double,
+    val requestedShares: Int,
+    val submittedDate: String,
+    val savingsAccountId: Int,
+    val applicationDate: String,
+    val locale: String = "en",
+    val dateFormat: String = "dd MMMM yyyy",
+    val clientId: Long,
+)
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/AccountingItem.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/AccountingItem.kt
@@ -0,0 +1,22 @@
+/*
+ * 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/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.core.model.entity.templates.shareProductDetails
+
+import kotlinx.serialization.Serializable
+import org.mifos.mobile.core.model.Parcelable
+import org.mifos.mobile.core.model.Parcelize
+
+@Parcelize
+@Serializable
+data class AccountingItem(
+    val id: Int? = null,
+    val name: String? = null,
+    val glCode: String? = null,
+) : Parcelable
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/AccountingMappings.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/AccountingMappings.kt
@@ -0,0 +1,23 @@
+/*
+ * 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/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.core.model.entity.templates.shareProductDetails
+
+import kotlinx.serialization.Serializable
+import org.mifos.mobile.core.model.Parcelable
+import org.mifos.mobile.core.model.Parcelize
+
+@Parcelize
+@Serializable
+data class AccountingMappings(
+    val shareReferenceId: AccountingItem? = null,
+    val incomeFromFeeAccountId: AccountingItem? = null,
+    val shareEquityId: AccountingItem? = null,
+    val shareSuspenseId: AccountingItem? = null,
+) : Parcelable
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/Charge.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/Charge.kt
@@ -0,0 +1,29 @@
+/*
+ * 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/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.core.model.entity.templates.shareProductDetails
+
+import kotlinx.serialization.Serializable
+import org.mifos.mobile.core.model.Parcelable
+import org.mifos.mobile.core.model.Parcelize
+
+@Parcelize
+@Serializable
+data class Charge(
+    val id: Int? = null,
+    val name: String? = null,
+    val active: Boolean? = null,
+    val penalty: Boolean? = null,
+    val currency: Currency? = null,
+    val amount: Double? = null,
+    val chargeTimeType: EnumOption? = null,
+    val chargeAppliesTo: EnumOption? = null,
+    val chargeCalculationType: EnumOption? = null,
+    val chargePaymentMode: EnumOption? = null,
+) : Parcelable
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/Currency.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/Currency.kt
@@ -0,0 +1,26 @@
+/*
+ * 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/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.core.model.entity.templates.shareProductDetails
+
+import kotlinx.serialization.Serializable
+import org.mifos.mobile.core.model.Parcelable
+import org.mifos.mobile.core.model.Parcelize
+
+@Parcelize
+@Serializable
+data class Currency(
+    val code: String? = null,
+    val name: String? = null,
+    val decimalPlaces: Int? = null,
+    val inMultiplesOf: Int? = null,
+    val displaySymbol: String? = null,
+    val nameCode: String? = null,
+    val displayLabel: String? = null,
+) : Parcelable
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/EnumOption.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/EnumOption.kt
@@ -0,0 +1,22 @@
+/*
+ * 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/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.core.model.entity.templates.shareProductDetails
+
+import kotlinx.serialization.Serializable
+import org.mifos.mobile.core.model.Parcelable
+import org.mifos.mobile.core.model.Parcelize
+
+@Parcelize
+@Serializable
+data class EnumOption(
+    val id: Int? = null,
+    val code: String? = null,
+    val value: String? = null,
+) : Parcelable
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/MarketPrice.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/MarketPrice.kt
@@ -0,0 +1,22 @@
+/*
+ * 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/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.core.model.entity.templates.shareProductDetails
+
+import kotlinx.serialization.Serializable
+import org.mifos.mobile.core.model.Parcelable
+import org.mifos.mobile.core.model.Parcelize
+
+@Parcelize
+@Serializable
+data class MarketPrice(
+    val id: Int? = null,
+    val fromDate: String? = null,
+    val shareValue: Double? = null,
+) : Parcelable
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/ShareProductDetails.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/templates/shareProductDetails/ShareProductDetails.kt
@@ -0,0 +1,38 @@
+/*
+ * 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/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.core.model.entity.templates.shareProductDetails
+
+import kotlinx.serialization.Serializable
+import org.mifos.mobile.core.model.Parcelable
+import org.mifos.mobile.core.model.Parcelize
+
+@Serializable
+@Parcelize
+data class ShareProductDetails(
+    val id: Int? = null,
+    val name: String? = null,
+    val shortName: String? = null,
+    val description: String? = null,
+    val currency: Currency? = null,
+    val totalShares: Int? = null,
+    val totalSharesIssued: Int? = null,
+    val unitPrice: Double? = null,
+    val shareCapital: Double? = null,
+    val nominalShares: Int? = null,
+    val marketPrice: List<MarketPrice>? = emptyList(),
+    val charges: List<Charge>? = emptyList(),
+    val allowDividendCalculationForInactiveClients: Boolean? = null,
+    val lockinPeriod: Int? = null,
+    val lockPeriodTypeEnum: EnumOption? = null,
+    val minimumActivePeriod: Int? = null,
+    val minimumActivePeriodForDividendsTypeEnum: EnumOption? = null,
+    val accountingRule: EnumOption? = null,
+    val accountingMappings: AccountingMappings? = null,
+) : Parcelable
diff --git a/core/network/src/commonMain/kotlin/org/mifos/mobile/core/network/services/ShareAccountService.kt b/core/network/src/commonMain/kotlin/org/mifos/mobile/core/network/services/ShareAccountService.kt
@@ -9,12 +9,16 @@
  */
 package org.mifos.mobile.core.network.services
 
+import de.jensklingenberg.ktorfit.http.Body
 import de.jensklingenberg.ktorfit.http.GET
+import de.jensklingenberg.ktorfit.http.POST
 import de.jensklingenberg.ktorfit.http.Path
 import de.jensklingenberg.ktorfit.http.Query
+import io.ktor.client.statement.HttpResponse
 import kotlinx.coroutines.flow.Flow
 import org.mifos.mobile.core.model.entity.Page
-import org.mifos.mobile.core.model.entity.templates.shareProduct.ShareDetails
+import org.mifos.mobile.core.model.entity.payload.ShareApplicationPayload
+import org.mifos.mobile.core.model.entity.templates.shareProductDetails.ShareProductDetails
 import org.mifos.mobile.core.model.entity.templates.shares.ShareProduct
 import org.mifos.mobile.core.network.utils.ApiEndPoints
 
@@ -28,12 +32,11 @@ interface ShareAccountService {
     @GET("${ApiEndPoints.PRODUCTS}/" + ApiEndPoints.SHARE + "/{productId}")
     fun getShareProductById(
         @Path("productId") productId: Long,
-        @Query("clientId") clientId: String?,
-    ): Flow<ShareDetails>
+        @Query("clientId") clientId: Long?,
+    ): Flow<ShareProductDetails>
 
-//    @POST(ApiEndPoints.SHARE_ACCOUNTS)
-//    suspend fun submitShareApplication(
-//        @Path("savingsId") savingsId: Long,
-//        @Body payload: SavingsAccountWithdrawPayload?,
-//    ): HttpResponse
+    @POST(ApiEndPoints.SHARE_ACCOUNTS)
+    suspend fun submitShareApplication(
+        @Body payload: ShareApplicationPayload?,
+    ): HttpResponse
 }
diff --git a/feature/share-application/src/commonMain/composeResources/values/strings.xml b/feature/share-application/src/commonMain/composeResources/values/strings.xml
@@ -28,4 +28,38 @@
 
     <string name="feature_apply_share_unsaved_changes_message">You have unsaved changes. Are you sure you want to go back?</string>
     <string name="feature_share_no_products_available">No Share Products Available for applying share account</string>
+
+
+    <string name="feature_apply_share_label_terms">Terms</string>
+    <string name="feature_apply_share_label_currency">Currency</string>
+    <string name="feature_apply_share_label_current_price">Current Price</string>
+    <string name="feature_apply_share_label_total_number_of_shares">Total Number of Shares</string>
+    <string name="feature_apply_share_label_default_savings_account">Default Savings Account</string>
+
+    <string name="feature_apply_share_label_minimum_active_period">Minimum Active Period</string>
+    <string name="feature_apply_share_section_minimum_active_period">Minimum Active Period</string>
+    <string name="feature_apply_share_label_minimum_frequency">Frequency</string>
+    <string name="feature_apply_share_label_minimum_frequency_type">Frequency Type</string>
+
+    <string name="feature_apply_share_label_lockin_period">Lock-in Period</string>
+    <string name="feature_apply_share_section_lockin_period">Lock-in Period</string>
+    <string name="feature_apply_share_label_lockin_frequency">Frequency</string>
+    <string name="feature_apply_share_label_lockin_frequency_type">Frequency Type</string>
+
+    <string name="feature_apply_share_error_frequency_required">Frequency is required</string>
+    <string name="feature_apply_share_frequency_invalid">Please enter a valid frequency</string>
+
+    <string name="feature_apply_share_error_shares_required">Shares are required</string>
+    <string name="feature_apply_share_shares_invalid">Please enter valid shares</string>
+
+    <string name="feature_apply_share_error_price_required">Frequency is required</string>
+    <string name="feature_apply_share_price_invalid">Please enter a valid frequency</string>
+
+    <string name="feature_apply_share_status_failure">Application Failed To Submit</string>
+    <string name="feature_apply_share_status_failure_tip">Failed to apply a share account under %1$s</string>
+    <string name="feature_apply_share_status_failure_action">Try Again</string>
+
+    <string name="feature_apply_share_status_success">Applied Successful!</string>
+    <string name="feature_apply_share_status_success_tip">You have successfully applied for a share account under %1$s</string>
+    <string name="feature_apply_share_status_success_action">Back To Home</string>
 </resources>
diff --git a/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/di/ShareApplicationModule.kt b/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/di/ShareApplicationModule.kt
@@ -11,8 +11,10 @@ package org.mifos.mobile.feature.share.application.di
 
 import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
+import org.mifos.mobile.feature.share.application.fillApplication.ShareFillApplicationViewModel
 import org.mifos.mobile.feature.share.application.shareApplication.ShareApplyViewModel
 
 val shareApplicationModule = module {
     viewModelOf(::ShareApplyViewModel)
+    viewModelOf(::ShareFillApplicationViewModel)
 }
diff --git a/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/fillApplication/FillApplicationRoute.kt b/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/fillApplication/FillApplicationRoute.kt
diff --git a/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/fillApplication/FillApplicationScreen.kt b/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/fillApplication/FillApplicationScreen.kt
diff --git a/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/fillApplication/FillApplicationViewModel.kt b/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/fillApplication/FillApplicationViewModel.kt
diff --git a/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/navigation/ShareApplicationNavGraph.kt b/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/navigation/ShareApplicationNavGraph.kt
diff --git a/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/shareApplication/ShareApplyRoute.kt b/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/shareApplication/ShareApplyRoute.kt
diff --git a/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/shareApplication/ShareApplyScreen.kt b/feature/share-application/src/commonMain/kotlin/org/mifos/mobile/feature/share/application/shareApplication/ShareApplyScreen.kt

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,8 @@ internal fun NavGraphBuilder.authenticatedGraph(`
`197`	`197`
`198`	`198`	`shareApplicationNavGraph(`
`199`	`199`	`navController = navController,`
	`200`	`+ navigateToStatusScreen = navController::navigateToStatusAfterUpdate,`
	`201`	`+ navigateToAuthenticateScreen = navController::navigateToVerifyPasscodeScreen,`
`200`	`202`	`)`
`201`	`203`
`202`	`204`	`passcodeDestination(`