Merge pull request #59 from Nexters/refactor/domain-layer

Refactor/layer

app/build.gradle.kts

@@ -74,5 +74,11 @@ dependencies {
     implementation(project(":feature:main"))
     implementation(project(":feature:login"))
     implementation(project(":core:designsystem"))
-    implementation(project(":core:data"))
+
+    implementation(project(":core:data:auth"))
+    implementation(project(":core:data:common"))
+    implementation(project(":core:data:mission"))
+    implementation(project(":core:data:onboarding"))
+    implementation(project(":core:data:setting"))
+    implementation(project(":core:data:user"))
 }

core/data/build.gradle.kts → core/data/auth/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 android {
-    namespace = "com.goalpanzi.mission_mate.core.data"
+    namespace = "com.goalpanzi.mission_mate.core.data.auth"
     compileSdk = 34
 
     defaultConfig {
@@ -45,7 +45,9 @@ dependencies {
     ksp(libs.hilt.compiler)
     implementation(libs.hilt.android)
 
-    implementation(project(":core:domain"))
-    implementation(project(":core:model"))
+    implementation(project(":core:data:common"))
+    implementation(project(":core:domain:common"))
+    implementation(project(":core:domain:auth"))
     implementation(project(":core:network"))
-}
+    implementation(project(":core:datastore"))
+}

core/domain/proguard-rules.pro → core/data/auth/proguard-rules.pro

@@ -18,12 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
--keep class * { *; }
--keep interface * { *; }
-
-# Keep Dependency Injection Framework related classes and methods
--keep class dagger.hilt.** { *; }
--keep class javax.inject.** { *; }
--keep class javax.annotation.** { *; }
+#-renamesourcefileattribute SourceFile

core/domain/src/main/AndroidManifest.xml → core/data/auth/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-</manifest>
+</manifest>

core/data/auth/src/main/java/com/goalpanzi/mission_mate/core/data/auth/di/AuthDataModule.kt

@@ -0,0 +1,17 @@
+package com.goalpanzi.mission_mate.core.data.auth.di
+
+import com.goalpanzi.mission_mate.core.data.auth.repository.AuthRepositoryImpl
+import com.goalpanzi.mission_mate.core.domain.auth.repository.AuthRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal abstract class AuthDataModule {
+
+    @Binds
+    abstract fun bindLoginRepository(impl: AuthRepositoryImpl): AuthRepository
+
+}

core/data/auth/src/main/java/com/goalpanzi/mission_mate/core/data/auth/mapper/AuthMapper.kt

@@ -0,0 +1,17 @@
+package com.goalpanzi.mission_mate.core.data.auth.mapper
+
+import com.goalpanzi.mission_mate.core.data.common.mapper.toModel
+import com.goalpanzi.mission_mate.core.domain.auth.model.GoogleLogin
+import com.goalpanzi.mission_mate.core.domain.common.model.user.CharacterType
+import com.goalpanzi.mission_mate.core.network.model.response.GoogleLoginResponse
+
+fun GoogleLoginResponse.toModel() : GoogleLogin {
+    return GoogleLogin(
+        accessToken = accessToken,
+        refreshToken = refreshToken,
+        nickname = nickname,
+        characterType = characterType?.toModel() ?: CharacterType.RABBIT,
+        isProfileSet = isProfileSet,
+        memberId = memberId
+    )
+}

core/data/auth/src/main/java/com/goalpanzi/mission_mate/core/data/auth/repository/AuthRepositoryImpl.kt

@@ -0,0 +1,41 @@
+package com.goalpanzi.mission_mate.core.data.auth.repository
+
+import com.goalpanzi.mission_mate.core.data.auth.mapper.toModel
+import com.goalpanzi.mission_mate.core.data.common.handleResult
+import com.goalpanzi.mission_mate.core.datastore.datasource.AuthDataSource
+import com.goalpanzi.mission_mate.core.domain.auth.repository.AuthRepository
+import com.goalpanzi.mission_mate.core.domain.common.DomainResult
+import com.goalpanzi.mission_mate.core.domain.common.convert
+import com.goalpanzi.mission_mate.core.network.model.request.GoogleLoginRequest
+import com.goalpanzi.mission_mate.core.network.service.LoginService
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class AuthRepositoryImpl @Inject constructor(
+    private val loginService: LoginService,
+    private val authDataSource: AuthDataSource
+): AuthRepository {
+
+    override suspend fun requestGoogleLogin(email: String) = handleResult {
+        val request = GoogleLoginRequest(email = email)
+        loginService.requestGoogleLogin(request)
+    }.convert {
+        it.toModel()
+    }
+
+    override suspend fun requestLogout(): DomainResult<Unit> = handleResult {
+        loginService.requestLogout()
+    }
+
+    override suspend fun requestAccountDelete(): DomainResult<Unit> = handleResult {
+        loginService.requestDeleteAccount()
+    }
+
+    override fun getAccessToken(): Flow<String?> = authDataSource.getAccessToken()
+
+    override fun getRefreshToken(): Flow<String?> = authDataSource.getRefreshToken()
+
+    override fun setAccessToken(accessToken: String): Flow<Unit> = authDataSource.setAccessToken(accessToken)
+
+    override fun setRefreshToken(refreshToken: String): Flow<Unit> = authDataSource.setRefreshToken(refreshToken)
+}

core/domain/src/test/java/com/goalpanzi/mission_mate/core/domain/ExampleUnitTest.kt → core/data/auth/src/test/java/com/goalpanzi/mission_mate/core/data/auth/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.goalpanzi.mission_mate.core.domain
+package com.goalpanzi.mission_mate.core.data.auth
 
 import org.junit.Test
 
@@ -14,4 +14,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}

core/domain/build.gradle.kts → core/data/common/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 android {
-    namespace = "com.goalpanzi.mission_mate.core.domain"
+    namespace = "com.goalpanzi.mission_mate.core.data.common"
     compileSdk = 34
 
     defaultConfig {
@@ -40,11 +40,12 @@ dependencies {
 
     implementation(libs.bundles.test)
     implementation(libs.bundles.coroutines)
+    implementation(libs.retrofit)
 
     ksp(libs.hilt.compiler)
     implementation(libs.hilt.android)
+    implementation(project(":core:domain:common"))
 
-    implementation(project(":core:model"))
-    implementation(project(":core:datastore"))
     implementation(project(":core:network"))
-}
+    implementation(project(":core:datastore"))
+}

core/data/proguard-rules.pro → core/data/common/proguard-rules.pro

@@ -18,12 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
--keep class * { *; }
--keep interface * { *; }
-
-# Keep Dependency Injection Framework related classes and methods
--keep class dagger.hilt.** { *; }
--keep class javax.inject.** { *; }
--keep class javax.annotation.** { *; }
+#-renamesourcefileattribute SourceFile

core/model/src/main/AndroidManifest.xml → core/data/common/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-</manifest>
+</manifest>

core/data/common/src/main/java/com/goalpanzi/mission_mate/core/data/common/ResultHandler.kt

@@ -0,0 +1,25 @@
+package com.goalpanzi.mission_mate.core.data.common
+
+import com.goalpanzi.mission_mate.core.domain.common.DomainResult
+import retrofit2.HttpException
+import retrofit2.Response
+
+suspend fun <T : Any> handleResult(execute: suspend () -> Response<T>): DomainResult<T> {
+    return try {
+        val response = execute()
+        if (response.isSuccessful) {
+            val body = response.body()
+            if (body != null) {
+                DomainResult.Success(body)
+            } else {
+                DomainResult.Error(response.code(), "Response body is null")
+            }
+        } else {
+            DomainResult.Error(response.code(), response.errorBody()?.string())
+        }
+    } catch (e: HttpException) {
+        DomainResult.Error(e.code(), e.message())
+    } catch (e: Throwable) {
+        DomainResult.Exception(e)
+    }
+}

core/data/src/main/java/com/goalpanzi/mission_mate/core/data/di/DispatchersModule.kt → core/data/common/src/main/java/com/goalpanzi/mission_mate/core/data/common/di/DispatchersModule.kt

@@ -1,4 +1,4 @@
-package com.goalpanzi.mission_mate.core.data.di
+package com.goalpanzi.mission_mate.core.data.common.di
 
 import dagger.Module
 import dagger.Provides
@@ -24,4 +24,4 @@ interface DispatchersModule {
     @Dispatcher(MissionMateDispatcher.IO)
     fun providesIODispatcher(): CoroutineDispatcher = Dispatchers.IO
 
-}
+}

core/data/common/src/main/java/com/goalpanzi/mission_mate/core/data/common/mapper/CommonMapper.kt

@@ -0,0 +1,30 @@
+package com.goalpanzi.mission_mate.core.data.common.mapper
+
+import com.goalpanzi.mission_mate.core.domain.common.model.user.CharacterType
+import com.goalpanzi.mission_mate.core.domain.common.model.user.UserProfile
+import com.goalpanzi.mission_mate.core.network.model.response.CharacterTypeResponse
+import com.goalpanzi.mission_mate.core.network.model.response.ProfileResponse
+
+fun ProfileResponse.toModel() : UserProfile {
+    return UserProfile(
+        nickname = nickname,
+        characterType = characterType.toModel()
+    )
+}
+
+fun CharacterTypeResponse.toModel() : CharacterType {
+    return try {
+        CharacterType.valueOf(this.name)
+    }catch (e: Exception){
+        CharacterType.RABBIT
+    }
+}
+
+fun CharacterType.toResponse() : CharacterTypeResponse {
+    return try {
+        CharacterTypeResponse.valueOf(this.name)
+    }catch (e: Exception){
+        CharacterTypeResponse.RABBIT
+    }
+}
+

core/data/common/src/test/java/com/goalpanzi/mission_mate/core/data/common/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.goalpanzi.mission_mate.core.data.common
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

core/data/mission/build.gradle.kts

@@ -0,0 +1,53 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.hilt.android)
+    alias(libs.plugins.kotlin.ksp)
+}
+
+android {
+    namespace = "com.goalpanzi.mission_mate.core.data.mission"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+}
+
+dependencies {
+
+    implementation(libs.bundles.test)
+    implementation(libs.bundles.coroutines)
+    implementation(libs.retrofit)
+
+    ksp(libs.hilt.compiler)
+    implementation(libs.hilt.android)
+
+    implementation(project(":core:data:common"))
+    implementation(project(":core:domain:common"))
+    implementation(project(":core:domain:mission"))
+    implementation(project(":core:network"))
+    implementation(project(":core:datastore"))
+}

core/model/proguard-rules.pro → core/data/mission/proguard-rules.pro

@@ -18,12 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
--keep class * { *; }
--keep interface * { *; }
-
-# Keep Dependency Injection Framework related classes and methods
--keep class dagger.hilt.** { *; }
--keep class javax.inject.** { *; }
--keep class javax.annotation.** { *; }
+#-renamesourcefileattribute SourceFile

core/data/src/main/AndroidManifest.xml → core/data/mission/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-</manifest>
+</manifest>

core/data/mission/src/main/java/com/goalpanzi/mission_mate/core/board/di/MissionDataModule.kt

@@ -0,0 +1,17 @@
+package com.goalpanzi.mission_mate.core.board.di
+
+import com.goalpanzi.mission_mate.core.board.repository.MissionRepositoryImpl
+import com.goalpanzi.mission_mate.core.domain.mission.repository.MissionRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal abstract class MissionDataModule {
+
+    @Binds
+    abstract fun bindMissionRepository(impl: MissionRepositoryImpl): MissionRepository
+
+}