core 모듈 분리 및 data 리팩터링

build-logic/convention/src/main/kotlin/com/peto/droidmorning/DroidMorningFeaturePlugin.kt

@@ -1,7 +1,5 @@
 package com.peto.droidmorning
 
-import com.peto.droidmorning.extentions.composeMultiplatformDependencies
-import com.peto.droidmorning.extentions.koinDependencies
 import com.peto.droidmorning.extentions.library
 import com.peto.droidmorning.extentions.libs
 import com.peto.droidmorning.extentions.plugin

build-logic/convention/src/main/kotlin/com/peto/droidmorning/KotlinMultiplatformConventionPlugin.kt

@@ -1,15 +1,18 @@
 package com.peto.droidmorning
 
+import com.peto.droidmorning.extentions.libs
+import com.peto.droidmorning.extentions.plugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 
 class KotlinMultiplatformConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) = with(target) {
         with(pluginManager) {
-            apply("org.jetbrains.kotlin.multiplatform")
+            apply(libs.plugin("kotlin-multiplatform").pluginId)
         }
-
+
+        apply<AndroidLibraryConventionPlugin>()
         apply<KotlinMultiPlatformPlugin>()
         apply<KotlinMultiPlatformAndroidPlugin>()
         apply<KotlinMultiPlatformiOSPlugin>()

build-logic/convention/src/main/kotlin/com/peto/droidmorning/extentions/ProjectExtensions.kt

@@ -39,7 +39,9 @@ internal fun Project.koinDependencies() {
         sourceSets.apply {
             commonMain {
                 dependencies {
-                    implementation(libs.bundle("koin"))
+                    implementation(libs.library("koin-core"))
+                    implementation(libs.library("koin-compose"))
+                    implementation(libs.library("koin-compose-viewmodel"))
                 }
             }
             commonTest {

composeApp/build.gradle.kts

@@ -54,6 +54,8 @@ kotlin {
             implementation(project(":domain"))
             implementation(project(":data"))
             implementation(project(":designsystem"))
+            implementation(project(":core:network"))
+            implementation(project(":core:datastore"))
 
             implementation(libs.bundles.compose.multiplatform)
             implementation(libs.androidx.navigation.compose)

composeApp/src/commonMain/kotlin/com/peto/droidmorning/KoinInitializer.kt

@@ -1,5 +1,7 @@
 package com.peto.droidmorning
 
+import com.peto.droidmorning.core.datastore.di.dataStoreModule
+import com.peto.droidmorning.core.network.di.networkModule
 import com.peto.droidmorning.data.di.dataModule
 import com.peto.droidmorning.di.navigationModule
 import com.peto.droidmorning.di.platformModule
@@ -19,6 +21,8 @@ fun initKoin(
             extraModules +
                 listOf(
                     platformModule,
+                    networkModule,
+                    dataStoreModule,
                     dataModule,
                     viewModelModule,
                     navigationModule,

core/build.gradle.kts

@@ -0,0 +1,2 @@
+plugins {
+}

core/datastore/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    alias(libs.plugins.droidmorning.kotlin.multiplatform)
+    alias(libs.plugins.droidmorning.android.library)
+    alias(libs.plugins.droidmorning.koin)
+}
+
+kotlin {
+    sourceSets {
+        commonMain.dependencies {
+            implementation(libs.bundles.datastore)
+        }
+        iosMain.dependencies {
+            implementation(libs.okio)
+        }
+    }
+}
+
+android {
+    namespace = "com.peto.droidmorning.core.datastore"
+}

data/src/androidMain/kotlin/com/peto/droidmorning/data/local/DataStoreFactory.android.kt → core/datastore/src/androidMain/kotlin/com/peto/droidmorning/core/datastore/DataStoreFactory.android.kt

@@ -1,4 +1,4 @@
-package com.peto.droidmorning.data.local
+package com.peto.droidmorning.core.datastore
 
 import android.content.Context
 import androidx.datastore.core.DataStore

core/datastore/src/commonMain/kotlin/com/peto/droidmorning/core/datastore/DefaultTokenDataStore.kt

@@ -0,0 +1,33 @@
+package com.peto.droidmorning.core.datastore
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import kotlinx.coroutines.flow.first
+
+class DefaultTokenDataStore(
+    private val dataStore: DataStore<Preferences>,
+) : TokenDataStore {
+    override suspend fun userId(): String? = preferences()[KEY_USER_ID]
+
+    override suspend fun hasUserId(): Boolean = preferences()[KEY_USER_ID] != null
+
+    override suspend fun save(userId: String) {
+        dataStore.edit { preferences ->
+            preferences[KEY_USER_ID] = userId
+        }
+    }
+
+    override suspend fun clear() {
+        dataStore.edit { preferences ->
+            preferences.remove(KEY_USER_ID)
+        }
+    }
+
+    private suspend fun preferences(): Preferences = dataStore.data.first()
+
+    private companion object {
+        private val KEY_USER_ID = stringPreferencesKey("user_id")
+    }
+}

core/datastore/src/commonMain/kotlin/com/peto/droidmorning/core/datastore/TokenDataStore.kt

@@ -0,0 +1,11 @@
+package com.peto.droidmorning.core.datastore
+
+interface TokenDataStore {
+    suspend fun userId(): String?
+
+    suspend fun hasUserId(): Boolean
+
+    suspend fun save(userId: String)
+
+    suspend fun clear()
+}

data/src/commonMain/kotlin/com/peto/droidmorning/data/local/TokenDataStoreFactory.kt → core/datastore/src/commonMain/kotlin/com/peto/droidmorning/core/datastore/TokenDataStoreFactory.kt

@@ -1,4 +1,4 @@
-package com.peto.droidmorning.data.local
+package com.peto.droidmorning.core.datastore
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences

core/datastore/src/commonMain/kotlin/com/peto/droidmorning/core/datastore/di/DataStoreModule.kt

@@ -0,0 +1,12 @@
+package com.peto.droidmorning.core.datastore.di
+
+import com.peto.droidmorning.core.datastore.DefaultTokenDataStore
+import com.peto.droidmorning.core.datastore.TokenDataStore
+import com.peto.droidmorning.core.datastore.createTokenDataStore
+import org.koin.dsl.module
+
+val dataStoreModule =
+    module {
+        single { createTokenDataStore() }
+        single<TokenDataStore> { DefaultTokenDataStore(get()) }
+    }

data/src/iosMain/kotlin/com/peto/droidmorning/data/local/DataStoreFactory.ios.kt → core/datastore/src/iosMain/kotlin/com/peto/droidmorning/core/datastore/DataStoreFactory.ios.kt

@@ -1,4 +1,4 @@
-package com.peto.droidmorning.data.local
+package com.peto.droidmorning.core.datastore
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory

core/network/build.gradle.kts

@@ -0,0 +1,59 @@
+import com.codingfeline.buildkonfig.compiler.FieldSpec.Type
+import java.util.Properties
+
+plugins {
+    alias(libs.plugins.droidmorning.kotlin.multiplatform)
+    alias(libs.plugins.droidmorning.android.library)
+    alias(libs.plugins.droidmorning.koin)
+    alias(libs.plugins.buildkonfig)
+}
+
+kotlin {
+    sourceSets {
+        androidMain.dependencies {
+            implementation(libs.ktor.client.okhttp)
+        }
+        commonMain.dependencies {
+            implementation(libs.bundles.ktor.common)
+
+            implementation(project.dependencies.platform(libs.supabase.bom))
+            implementation(libs.bundles.supabase)
+        }
+        iosMain.dependencies {
+            implementation(libs.ktor.client.darwin)
+        }
+    }
+}
+
+buildkonfig {
+    packageName = "com.peto.droidmorning"
+    exposeObjectWithName = "BuildKonfig"
+
+    val props =
+        Properties().apply {
+            val file = rootProject.file("local.properties")
+            if (file.exists()) file.inputStream().use { load(it) }
+        }
+
+    defaultConfigs {
+        buildConfigField(
+            Type.STRING,
+            "GOOGLE_CLIENT_ID",
+            props.getProperty("GOOGLE_CLIENT_ID"),
+        )
+        buildConfigField(
+            Type.STRING,
+            "SUPABASE_URL",
+            props.getProperty("SUPABASE_URL"),
+        )
+        buildConfigField(
+            Type.STRING,
+            "SUPABASE_KEY",
+            props.getProperty("SUPABASE_KEY"),
+        )
+    }
+}
+
+android {
+    namespace = "com.peto.droidmorning.core.network"
+}

core/network/src/commonMain/kotlin/com/peto/droidmorning/core/network/AuthClient.kt

@@ -0,0 +1,9 @@
+package com.peto.droidmorning.core.network
+
+interface AuthClient {
+    suspend fun signInWithGoogleIdToken(idToken: String): String?
+
+    suspend fun signOut()
+
+    fun currentUserId(): String?
+}

core/network/src/commonMain/kotlin/com/peto/droidmorning/core/network/HttpClient.kt

@@ -0,0 +1,18 @@
+package com.peto.droidmorning.core.network
+
+import com.peto.droidmorning.BuildKonfig
+import io.github.jan.supabase.auth.Auth
+import io.github.jan.supabase.createSupabaseClient
+import io.github.jan.supabase.postgrest.Postgrest
+
+object HttpClient {
+    val client by lazy {
+        createSupabaseClient(
+            supabaseUrl = BuildKonfig.SUPABASE_URL,
+            supabaseKey = BuildKonfig.SUPABASE_KEY,
+        ) {
+            install(Auth)
+            install(Postgrest)
+        }
+    }
+}

core/network/src/commonMain/kotlin/com/peto/droidmorning/core/network/PostgrestClient.kt

@@ -0,0 +1,33 @@
+package com.peto.droidmorning.core.network
+
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+
+interface PostgrestClient {
+    suspend fun select(
+        table: String,
+        filters: List<PostgrestFilter> = emptyList(),
+        order: PostgrestOrder? = null,
+    ): String
+
+    suspend fun rpc(
+        function: String,
+        parameters: JsonObject? = null,
+    ): String
+
+    suspend fun insert(
+        table: String,
+        body: JsonObject,
+    )
+
+    suspend fun update(
+        table: String,
+        body: JsonElement,
+        filters: List<PostgrestFilter> = emptyList(),
+    )
+
+    suspend fun delete(
+        table: String,
+        filters: List<PostgrestFilter> = emptyList(),
+    )
+}

core/network/src/commonMain/kotlin/com/peto/droidmorning/core/network/PostgrestFilter.kt

@@ -0,0 +1,6 @@
+package com.peto.droidmorning.core.network
+
+data class PostgrestFilter(
+    val column: String,
+    val value: Any,
+)

core/network/src/commonMain/kotlin/com/peto/droidmorning/core/network/PostgrestOrder.kt

@@ -0,0 +1,6 @@
+package com.peto.droidmorning.core.network
+
+data class PostgrestOrder(
+    val column: String,
+    val descending: Boolean = false,
+)

core/network/src/commonMain/kotlin/com/peto/droidmorning/core/network/SupabaseAuthClient.kt

@@ -0,0 +1,23 @@
+package com.peto.droidmorning.core.network
+
+import io.github.jan.supabase.auth.Auth
+import io.github.jan.supabase.auth.providers.Google
+import io.github.jan.supabase.auth.providers.builtin.IDToken
+
+class SupabaseAuthClient(
+    private val auth: Auth,
+) : AuthClient {
+    override suspend fun signInWithGoogleIdToken(idToken: String): String? {
+        auth.signInWith(IDToken) {
+            this.idToken = idToken
+            provider = Google
+        }
+        return currentUserId()
+    }
+
+    override suspend fun signOut() {
+        auth.signOut()
+    }
+
+    override fun currentUserId(): String? = auth.currentSessionOrNull()?.user?.id
+}