Implement New Share Account – Details Step (#2530)

Arinyadav1 · web-flow · commit 0c99c9b15277 · 2025-11-01T03:53:54.000-04:00
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/di/RepositoryModule.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/di/RepositoryModule.kt
@@ -61,6 +61,7 @@ import com.mifos.core.data.repository.SavingsAccountSummaryRepository
 import com.mifos.core.data.repository.SavingsAccountTransactionReceiptRepository
 import com.mifos.core.data.repository.SavingsAccountTransactionRepository
 import com.mifos.core.data.repository.SearchRepository
+import com.mifos.core.data.repository.ShareAccountRepository
 import com.mifos.core.data.repository.SignatureRepository
 import com.mifos.core.data.repository.SurveyListRepository
 import com.mifos.core.data.repository.SurveySubmitRepository
@@ -123,6 +124,7 @@ import com.mifos.core.data.repositoryImp.SavingsAccountSummaryRepositoryImp
 import com.mifos.core.data.repositoryImp.SavingsAccountTransactionReceiptRepositoryImpl
 import com.mifos.core.data.repositoryImp.SavingsAccountTransactionRepositoryImp
 import com.mifos.core.data.repositoryImp.SearchRepositoryImp
+import com.mifos.core.data.repositoryImp.ShareAccountRepositoryImpl
 import com.mifos.core.data.repositoryImp.SignatureRepositoryImp
 import com.mifos.core.data.repositoryImp.SurveyListRepositoryImp
 import com.mifos.core.data.repositoryImp.SurveySubmitRepositoryImp
@@ -223,6 +225,7 @@ val RepositoryModule = module {
     singleOf(::SignatureRepositoryImp) bind SignatureRepository::class
 
     singleOf(::RecurringAccountRepositoryImp) bind RecurringAccountRepository::class
+    singleOf(::ShareAccountRepositoryImpl) bind ShareAccountRepository::class
 
     includes(platformModule)
     single<PlatformDependentDataModule> { getPlatformDataModule }
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
@@ -0,0 +1,19 @@
+/*
+ * 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.data.repository
+
+import com.mifos.core.common.utils.DataState
+import com.mifos.core.network.model.share.ShareTemplate
+import kotlinx.coroutines.flow.Flow
+
+interface ShareAccountRepository {
+
+    fun getShareTemplate(clientId: Int): Flow<DataState<ShareTemplate>>
+}
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
@@ -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/android-client/blob/master/LICENSE.md
+ */
+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.datamanager.DataManagerShare
+import com.mifos.core.network.model.share.ShareTemplate
+import kotlinx.coroutines.flow.Flow
+
+class ShareAccountRepositoryImpl(
+    private val dataManagerShare: DataManagerShare,
+) : ShareAccountRepository {
+
+    override fun getShareTemplate(clientId: Int): Flow<DataState<ShareTemplate>> {
+        return dataManagerShare.getShareTemplate(clientId).asDataStateFlow()
+    }
+}
diff --git a/core/database/src/commonMain/kotlin/com/mifos/room/basemodel/APIEndPoint.kt b/core/database/src/commonMain/kotlin/com/mifos/room/basemodel/APIEndPoint.kt
@@ -40,4 +40,5 @@ object APIEndPoint {
     const val DISBURSE = "disburse"
     const val NOTES = "notes"
     const val MAKER_CHECKER = "makercheckers"
+    const val SHARE = "share"
 }
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/BaseApiManager.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/BaseApiManager.kt
@@ -41,6 +41,7 @@ import com.mifos.core.network.services.RecurringAccountService
 import com.mifos.core.network.services.RunReportsService
 import com.mifos.core.network.services.SavingsAccountService
 import com.mifos.core.network.services.SearchService
+import com.mifos.core.network.services.ShareAccountService
 import com.mifos.core.network.services.StaffService
 import com.mifos.core.network.services.SurveyService
 import com.mifos.core.network.services.createCenterService
@@ -59,6 +60,7 @@ import com.mifos.core.network.services.createRecurringAccountService
 import com.mifos.core.network.services.createRunReportsService
 import com.mifos.core.network.services.createSavingsAccountService
 import com.mifos.core.network.services.createSearchService
+import com.mifos.core.network.services.createShareAccountService
 import com.mifos.core.network.services.createStaffService
 import com.mifos.core.network.services.createSurveyService
 import de.jensklingenberg.ktorfit.Ktorfit
@@ -87,6 +89,7 @@ class BaseApiManager(
     val collectionSheetService: CollectionSheetService = ktorfit.createCollectionSheetService()
     val noteService: NoteService = ktorfit.createNoteService()
     val runReportsService: RunReportsService = ktorfit.createRunReportsService()
+    val shareAccountService: ShareAccountService = ktorfit.createShareAccountService()
 
     // sdk apis
     val clientIdentifiersApi: ClientIdentifierApi = ktorfit.createClientIdentifierApi()
@@ -96,7 +99,6 @@ class BaseApiManager(
     val groupApi: GroupsApi = ktorfit.createGroupsApi()
     val staffApi: StaffApi = ktorfit.createStaffApi()
     val dataTableApi: DataTablesApi = ktorfit.createDataTablesApi()
-
     companion object {
         fun build(prefManager: UserPreferencesRepository): BaseApiManager {
             val ktorfitClient = KtorfitClient.builder()
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
@@ -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/android-client/blob/master/LICENSE.md
+ */
+package com.mifos.core.network.datamanager
+
+import com.mifos.core.network.BaseApiManager
+import com.mifos.core.network.model.share.ShareTemplate
+import kotlinx.coroutines.flow.Flow
+
+class DataManagerShare(
+    private val baseApiManager: BaseApiManager,
+) {
+
+    fun getShareTemplate(clientId: Int): Flow<ShareTemplate> =
+        baseApiManager.shareAccountService.shareProductTemplate(clientId)
+}
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/di/DataMangerModule.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/di/DataMangerModule.kt
@@ -27,6 +27,7 @@ import com.mifos.core.network.datamanager.DataManagerOffices
 import com.mifos.core.network.datamanager.DataManagerRunReport
 import com.mifos.core.network.datamanager.DataManagerSavings
 import com.mifos.core.network.datamanager.DataManagerSearch
+import com.mifos.core.network.datamanager.DataManagerShare
 import com.mifos.core.network.datamanager.DataManagerStaff
 import com.mifos.core.network.datamanager.DataManagerSurveys
 import org.koin.dsl.module
@@ -51,4 +52,5 @@ val DataManagerModule = module {
     single { DataManagerStaff(get(), get(), get()) }
     single { DataManagerSurveys(get(), get(), get()) }
     single { DataManagerIdentifiers(get()) }
+    single { DataManagerShare(get()) }
 }
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ProductOption.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ProductOption.kt
@@ -0,0 +1,28 @@
+/*
+ * 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.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ProductOption(
+    @SerialName("id")
+    val id: Int,
+
+    @SerialName("name")
+    val name: String,
+
+    @SerialName("shortName")
+    val shortName: String,
+
+    @SerialName("totalShares")
+    val totalShares: Int,
+)
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ShareTemplate.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ShareTemplate.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/android-client/blob/master/LICENSE.md
+ */
+package com.mifos.core.network.model.share
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ShareTemplate(
+    @SerialName("clientId")
+    val clientId: Int,
+
+    @SerialName(value = "clientName")
+    val clientName: String,
+
+    @SerialName("productOptions")
+    val productOptions: List<ProductOption> = emptyList(),
+)
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
@@ -0,0 +1,24 @@
+/*
+ * 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.services
+
+import com.mifos.core.network.model.share.ShareTemplate
+import com.mifos.room.basemodel.APIEndPoint
+import de.jensklingenberg.ktorfit.http.GET
+import de.jensklingenberg.ktorfit.http.Query
+import kotlinx.coroutines.flow.Flow
+
+interface ShareAccountService {
+
+    @GET("accounts/" + APIEndPoint.SHARE + "/template")
+    fun shareProductTemplate(
+        @Query("clientId") clientId: Int,
+    ): Flow<ShareTemplate>
+}
diff --git a/feature/client/src/commonMain/composeResources/values/strings.xml b/feature/client/src/commonMain/composeResources/values/strings.xml
@@ -532,5 +532,21 @@
     <!-- Screen Title -->
     <string name="title_new_fixed_deposit_account">New Fixed Deposit Account</string>
 
-  
+    <!-- Create Share Account -->
+    <string name="share_account_details">Details</string>
+    <string name="share_account_terms">Terms</string>
+    <string name="share_account_charges">Charges</string>
+    <string name="share_account_preview">Preview</string>
+    <string name="share_account_back">Back</string>
+    <string name="share_account_next">Next</string>
+
+    <string name="share_account_detail_product_name">Product Name*</string>
+    <string name="share_account_detail_submission_date">Submission Date*</string>
+    <string name="share_account_detail_external_id">External Id</string>
+    <string name="share_account_detail_date_select">Select</string>
+    <string name="share_account_detail_date_cancel">Cancel</string>
+
+    <!-- Handle Error-->
+    <string name="field_empty">This field cannot be empty</string>
+
 </resources>
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationRoute.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationRoute.kt
@@ -24,7 +24,7 @@ fun NavGraphBuilder.clientApplyNewApplicationRoute(
     onNavigateBack: () -> Unit,
     onNavigateApplyLoanAccount: (Int) -> Unit,
     onNavigateApplySavingsAccount: (Int) -> Unit,
-    onNavigateApplyShareAccount: () -> Unit,
+    onNavigateApplyShareAccount: (Int) -> Unit,
     onNavigateApplyRecurringAccount: () -> Unit,
     onNavigateApplyFixedAccount: () -> Unit,
     navController: NavController,
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationsScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationsScreen.kt
@@ -61,7 +61,7 @@ internal fun ClientApplyNewApplicationsScreen(
     onNavigateBack: () -> Unit,
     onNavigateApplyLoanAccount: (Int) -> Unit,
     onNavigateApplySavingsAccount: (Int) -> Unit,
-    onNavigateApplyShareAccount: () -> Unit,
+    onNavigateApplyShareAccount: (Int) -> Unit,
     onNavigateApplyRecurringAccount: () -> Unit,
     onNavigateApplyFixedAccount: () -> Unit,
     navController: NavController,
@@ -84,7 +84,7 @@ internal fun ClientApplyNewApplicationsScreen(
                         state.clientId,
                     )
 
-                    ClientApplyNewApplicationsItem.NewShareAccount -> onNavigateApplyShareAccount()
+                    ClientApplyNewApplicationsItem.NewShareAccount -> onNavigateApplyShareAccount(state.clientId)
                 }
             }
         }
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountRoute.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountRoute.kt
@@ -15,19 +15,24 @@ import androidx.navigation.compose.composable
 import kotlinx.serialization.Serializable
 
 @Serializable
-data object ShareAccountRoute
+data class CreateShareAccountRoute(
+    val clientId: Int,
+)
 
-fun NavGraphBuilder.shareAccountDestination() {
-    composable<ShareAccountRoute> {
-        ShareAccountScreen(
-            onNavigateBack = {},
+fun NavGraphBuilder.createShareAccountDestination(navController: NavController) {
+    composable<CreateShareAccountRoute> {
+        CreateShareAccountScreen(
+            onNavigateBack = navController::popBackStack,
             onFinish = {},
+            navController = navController,
         )
     }
 }
 
-fun NavController.navigateToShareAccountRoute() {
+fun NavController.navigateToCreateShareAccountRoute(
+    clientId: Int,
+) {
     this.navigate(
-        ShareAccountRoute,
+        CreateShareAccountRoute(clientId = clientId),
     )
 }
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
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/ShareAccountScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/ShareAccountScreen.kt
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/ShareAccountViewModel.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/ShareAccountViewModel.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/di/ClientModule.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/di/ClientModule.kt
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt

Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,5 @@ object APIEndPoint {`
`40`	`40`	`const val DISBURSE = "disburse"`
`41`	`41`	`const val NOTES = "notes"`
`42`	`42`	`const val MAKER_CHECKER = "makercheckers"`
	`43`	`+ const val SHARE = "share"`
`43`	`44`	`}`