[SHARED] Refactor shared domain and remove Mapper interface

Author: moallemi

shared/src/androidMain/kotlin/me/moallemi/kmpshowcase/shared/di/KoinAndroid.kt

@@ -1,8 +1,16 @@
 package me.moallemi.kmpshowcase.shared.di
 
+import io.ktor.client.engine.okhttp.OkHttp
 import org.koin.core.module.Module
+import org.koin.dsl.KoinAppDeclaration
 import org.koin.dsl.module
 
-actual val platformModule: Module = module {
+fun initKoinAndroid(appDeclaration: KoinAppDeclaration) = initKoin {
+    appDeclaration()
+}
 
+actual val platformModule: Module = module {
+    single {
+        OkHttp.create()
+    }
 }

shared/src/commonMain/kotlin/me/moallemi/kmpshowcase/shared/Greeting.kt

@@ -2,32 +2,17 @@ package me.moallemi.kmpshowcase.shared.di
 
 import me.moallemi.kmpshowcase.shared.domain.mapper.AppDtoToApp
 import me.moallemi.kmpshowcase.shared.domain.mapper.LinksDtoToLinks
-import me.moallemi.kmpshowcase.shared.domain.mapper.Mapper
-import me.moallemi.kmpshowcase.shared.domain.model.App
-import me.moallemi.kmpshowcase.shared.domain.model.Links
-import me.moallemi.kmpshowcase.shared.network.response.AppDto
-import me.moallemi.kmpshowcase.shared.network.response.LinksDto
 import me.moallemi.kmpshowcase.shared.repository.AppRepository
-import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 internal val domainModule = module {
-    single<Mapper<LinksDto?, Links?>>(
-        named(QUALIFIER_NAME_MAPPER_LINKSDTO_TOLINKS)
-    ) {
+    single {
         LinksDtoToLinks()
     }
-    single<Mapper<AppDto, App>>(
-        named(QUALIFIER_NAME_MAPPER_APPDTO_TO_APP)
-    ) {
-        AppDtoToApp(
-            get(named(QUALIFIER_NAME_MAPPER_LINKSDTO_TOLINKS))
-        )
+    single {
+        AppDtoToApp(get())
     }
     single {
-        AppRepository(
-            get(),
-            get(named(QUALIFIER_NAME_MAPPER_APPDTO_TO_APP))
-        )
+        AppRepository(get(), get())
     }
 }

shared/src/commonMain/kotlin/me/moallemi/kmpshowcase/shared/di/globalDomain.kt

@@ -1,12 +1,10 @@
 package me.moallemi.kmpshowcase.shared.di
 
-import me.moallemi.kmpshowcase.shared.presentation.AppListViewModel
 import org.koin.core.context.startKoin
 import org.koin.core.module.Module
 import org.koin.dsl.KoinAppDeclaration
-import org.koin.dsl.module
 
-fun initKoin(appDeclaration: KoinAppDeclaration = {}) = startKoin {
+internal fun initKoin(appDeclaration: KoinAppDeclaration = {}) = startKoin {
     appDeclaration()
     modules(
         networkModule,
@@ -15,12 +13,4 @@ fun initKoin(appDeclaration: KoinAppDeclaration = {}) = startKoin {
     )
 }
 
-fun initKoin() = initKoin {
-    modules(
-        module {
-            factory { AppListViewModel(get()) }
-        }
-    )
-}
-
 expect val platformModule: Module

shared/src/commonMain/kotlin/me/moallemi/kmpshowcase/shared/di/koin.kt

@@ -13,7 +13,7 @@ import me.moallemi.kmpshowcase.shared.utils.log as kmpLog
 
 internal val networkModule = module {
     single {
-        HttpClient {
+        HttpClient(this@single.get()) {
             install(JsonFeature) {
                 serializer = KotlinxSerializer(this@single.get())
             }

shared/src/commonMain/kotlin/me/moallemi/kmpshowcase/shared/di/network.kt

@@ -1,15 +1,13 @@
 package me.moallemi.kmpshowcase.shared.domain.mapper
 
 import me.moallemi.kmpshowcase.shared.domain.model.App
-import me.moallemi.kmpshowcase.shared.domain.model.Links
 import me.moallemi.kmpshowcase.shared.network.response.AppDto
-import me.moallemi.kmpshowcase.shared.network.response.LinksDto
 
-internal class AppDtoToApp(
-    private val linksDtoToLinks: Mapper<LinksDto?, Links?>,
-) : Mapper<AppDto, App> {
+class AppDtoToApp(
+    private val linksDtoToLinks: LinksDtoToLinks,
+) {
 
-    override fun map(from: AppDto) = with(from) {
+    fun map(from: AppDto) = with(from) {
         App(
             id = name,
             name = name,

…lemi/kmpshowcase/shared/di/viewModels.kt …lemi/kmpshowcase/shared/di/viewModels.ktshared/src/iosMain/kotlin/me/moallemi/kmpshowcase/shared/di/viewModels.kt renamed to shared/src/commonMain/kotlin/me/moallemi/kmpshowcase/shared/di/viewModels.kt shared/src/iosMain/kotlin/me/moallemi/kmpshowcase/shared/di/viewModels.kt renamed to shared/src/commonMain/kotlin/me/moallemi/kmpshowcase/shared/di/viewModels.kt

@@ -3,9 +3,9 @@ package me.moallemi.kmpshowcase.shared.domain.mapper
 import me.moallemi.kmpshowcase.shared.domain.model.Links
 import me.moallemi.kmpshowcase.shared.network.response.LinksDto
 
-internal class LinksDtoToLinks : Mapper<LinksDto?, Links?> {
+class LinksDtoToLinks {
 
-    override fun map(from: LinksDto?) = from?.let { linksDto ->
+    fun map(from: LinksDto?) = from?.let { linksDto ->
         Links(
             appStore = linksDto.appStore,
             googlePlay = linksDto.googlePlay,

shared/src/commonMain/kotlin/me/moallemi/kmpshowcase/shared/domain/mapper/AppDtoToApp.kt

@@ -1,5 +1,7 @@
 package me.moallemi.kmpshowcase.shared.domain.mapper
 
+// FIXME due to inconsistency we can not use generic interfaces with Koin
+// https://github.com/InsertKoinIO/koin/issues/75#issuecomment-474405908
 interface Mapper<in F, out T> {
     fun map(from: F): T
 }

shared/src/commonMain/kotlin/me/moallemi/kmpshowcase/shared/domain/mapper/LinksDtoToLinks.kt

@@ -2,14 +2,15 @@ package me.moallemi.kmpshowcase.shared.repository
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import me.moallemi.kmpshowcase.shared.domain.mapper.AppDtoToApp
 import me.moallemi.kmpshowcase.shared.domain.mapper.Mapper
 import me.moallemi.kmpshowcase.shared.domain.model.App
 import me.moallemi.kmpshowcase.shared.network.api.KmpShowcaseApi
 import me.moallemi.kmpshowcase.shared.network.response.AppDto
 
 class AppRepository(
     private val kmpShowcaseApi: KmpShowcaseApi,
-    private val appDtoToApp: Mapper<AppDto, App>,
+    private val appDtoToApp: AppDtoToApp,
 ) {
     fun getAllAppsAsFlow(): Flow<List<App>> = flow {
         kmpShowcaseApi.getApps()