feat(search-record): Phase C Wave 4 — Search Record end-to-end Store5 migration (#2689)

therajanmaurya · Rajan Maurya · web-flow · commit c89bed62a1a0 · 2026-05-21T21:16:38.000+05:30
Co-authored-by: Rajan Maurya &lt;therajanmaurya@Rajans-MacBook-Pro.local&gt;
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
@@ -10,10 +10,12 @@
 package com.mifos.core.data.di
 
 import com.mifos.core.common.network.MifosDispatchers
-import com.mifos.core.data.datasource.SearchRecordLocalDataSource
-import com.mifos.core.data.datasource.SearchRecordLocalDataSourceImpl
 import com.mifos.core.data.activate.ActivateRepository
 import com.mifos.core.data.activate.impl.ActivateRepositoryImpl
+import com.mifos.core.data.searchrecord.SearchRecordRepository
+import com.mifos.core.data.searchrecord.impl.SearchRecordRepositoryImpl
+import com.mifos.core.data.searchrecord.local.SearchRecordLocalDataSource
+import com.mifos.core.data.searchrecord.local.SearchRecordLocalDataSourceImpl
 import com.mifos.core.data.repository.AmountTransferRepository
 import com.mifos.core.data.repository.AppLockRepository
 import com.mifos.core.data.repository.CenterDetailsRepository
@@ -67,7 +69,6 @@ import com.mifos.core.data.repository.SavingsAccountRepository
 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.SearchRecordRepository
 import com.mifos.core.data.search.SearchRepository
 import com.mifos.core.data.search.impl.SearchRepositoryImpl
 import com.mifos.core.data.repository.ShareAccountRepository
@@ -136,7 +137,6 @@ import com.mifos.core.data.repositoryImp.SavingsAccountRepositoryImp
 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.SearchRecordRepositoryImpl
 import com.mifos.core.data.repositoryImp.ShareAccountRepositoryImpl
 import com.mifos.core.data.repositoryImp.SignatureRepositoryImp
 import com.mifos.core.data.repositoryImp.SurveyListRepositoryImp
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/searchrecord/SearchRecordRepository.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/searchrecord/SearchRecordRepository.kt
@@ -7,7 +7,7 @@
  *
  * See https://github.com/openMF/mifos-x-field-officer-app/blob/master/LICENSE.md
  */
-package com.mifos.core.data.repository
+package com.mifos.core.data.searchrecord
 
 import com.mifos.core.model.objects.searchrecord.GenericSearchRecord
 import com.mifos.core.model.objects.searchrecord.RecordType
@@ -17,5 +17,5 @@ interface SearchRecordRepository {
     fun searchRecords(
         recordType: RecordType,
         query: String,
-    ): Flow<Result<List<GenericSearchRecord>>>
+    ): Flow<List<GenericSearchRecord>>
 }
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/searchrecord/impl/SearchRecordRepositoryImpl.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/searchrecord/impl/SearchRecordRepositoryImpl.kt
@@ -7,16 +7,13 @@
  *
  * See https://github.com/openMF/mifos-x-field-officer-app/blob/master/LICENSE.md
  */
-package com.mifos.core.data.repositoryImp
+package com.mifos.core.data.searchrecord.impl
 
-import com.mifos.core.data.datasource.SearchRecordLocalDataSource
-import com.mifos.core.data.repository.SearchRecordRepository
+import com.mifos.core.data.searchrecord.SearchRecordRepository
+import com.mifos.core.data.searchrecord.local.SearchRecordLocalDataSource
 import com.mifos.core.model.objects.searchrecord.GenericSearchRecord
 import com.mifos.core.model.objects.searchrecord.RecordType
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
 
 class SearchRecordRepositoryImpl(
     private val localDataSource: SearchRecordLocalDataSource,
@@ -25,11 +22,5 @@ class SearchRecordRepositoryImpl(
     override fun searchRecords(
         recordType: RecordType,
         query: String,
-    ): Flow<Result<List<GenericSearchRecord>>> =
-        localDataSource.searchRecords(recordType, query)
-            .map { Result.success(it) }
-            .catch { e ->
-                if (e is CancellationException) throw e
-                emit(Result.failure(e))
-            }
+    ): Flow<List<GenericSearchRecord>> = localDataSource.searchRecords(recordType, query)
 }
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/searchrecord/local/SearchRecordLocalDataSource.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/searchrecord/local/SearchRecordLocalDataSource.kt
@@ -7,7 +7,7 @@
  *
  * See https://github.com/openMF/mifos-x-field-officer-app/blob/master/LICENSE.md
  */
-package com.mifos.core.data.datasource
+package com.mifos.core.data.searchrecord.local
 
 import com.mifos.core.model.objects.searchrecord.GenericSearchRecord
 import com.mifos.core.model.objects.searchrecord.RecordType
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/searchrecord/local/SearchRecordLocalDataSourceImpl.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/searchrecord/local/SearchRecordLocalDataSourceImpl.kt
@@ -7,7 +7,7 @@
  *
  * See https://github.com/openMF/mifos-x-field-officer-app/blob/master/LICENSE.md
  */
-package com.mifos.core.data.datasource
+package com.mifos.core.data.searchrecord.local
 
 import com.mifos.core.common.utils.Constants
 import com.mifos.core.model.objects.searchrecord.GenericSearchRecord
diff --git a/feature/search-record/build.gradle.kts b/feature/search-record/build.gradle.kts
@@ -23,9 +23,8 @@ kotlin {
             implementation(compose.components.resources)
             implementation(compose.components.uiToolingPreview)
             implementation(compose.ui)
-            implementation(projects.core.common)
-            implementation(projects.core.domain)
-            implementation(projects.core.model)
+            implementation(projects.core.data)
+            implementation(projects.core.ui)
             implementation(libs.kotlinx.serialization.json)
         }
     }
diff --git a/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/SearchRecordViewModel.kt b/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/SearchRecordViewModel.kt
diff --git a/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/di/SearchRecordModule.kt b/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/di/SearchRecordModule.kt
@@ -9,7 +9,7 @@
  */
 package com.mifos.feature.searchrecord.di
 
-import com.mifos.feature.searchrecord.SearchRecordViewModel
+import com.mifos.feature.searchrecord.ui.SearchRecordViewModel
 import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
diff --git a/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/navigation/SearchRecordNavigation.kt b/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/navigation/SearchRecordNavigation.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Mifos Initiative
+ * Copyright 2026 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
@@ -13,13 +13,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import com.mifos.core.model.objects.searchrecord.GenericSearchRecord
-import com.mifos.feature.searchrecord.SearchRecordScreen
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class SearchRecordRoute(
-    val type: String,
-)
+import com.mifos.feature.searchrecord.ui.SearchRecordScreen
 
 fun NavGraphBuilder.searchRecordNavigation(
     onBackClick: () -> Unit,
diff --git a/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/navigation/SearchRecordRoute.kt b/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/navigation/SearchRecordRoute.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2026 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/mifos-x-field-officer-app/blob/master/LICENSE.md
+ */
+package com.mifos.feature.searchrecord.navigation
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SearchRecordRoute(
+    val type: String,
+)
diff --git a/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/ui/SearchRecordScreen.kt b/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/ui/SearchRecordScreen.kt
diff --git a/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/ui/SearchRecordState.kt b/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/ui/SearchRecordState.kt
diff --git a/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/ui/SearchRecordViewModel.kt b/feature/search-record/src/commonMain/kotlin/com/mifos/feature/searchrecord/ui/SearchRecordViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* See https://github.com/openMF/mifos-x-field-officer-app/blob/master/LICENSE.md`
`9`	`9`	`*/`
`10`		`-package com.mifos.core.data.repository`
	`10`	`+package com.mifos.core.data.searchrecord`
`11`	`11`
`12`	`12`	`import com.mifos.core.model.objects.searchrecord.GenericSearchRecord`
`13`	`13`	`import com.mifos.core.model.objects.searchrecord.RecordType`
`@@ -17,5 +17,5 @@ interface SearchRecordRepository {`
`17`	`17`	`fun searchRecords(`
`18`	`18`	`recordType: RecordType,`
`19`	`19`	`query: String,`
`20`		`- ): Flow<Result<List<GenericSearchRecord>>>`
	`20`	`+ ): Flow<List<GenericSearchRecord>>`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,8 @@ kotlin {`
`23`	`23`	`implementation(compose.components.resources)`
`24`	`24`	`implementation(compose.components.uiToolingPreview)`
`25`	`25`	`implementation(compose.ui)`
`26`		`- implementation(projects.core.common)`
`27`		`- implementation(projects.core.domain)`
`28`		`- implementation(projects.core.model)`
	`26`	`+ implementation(projects.core.data)`
	`27`	`+ implementation(projects.core.ui)`
`29`	`28`	`implementation(libs.kotlinx.serialization.json)`
`30`	`29`	`}`
`31`	`30`	`}`