Feature/jaino/#35

app/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("com.wap.wapp.firebase")
     id("com.wap.wapp.compose")
     id("com.wap.wapp.hilt")
+    id("com.wap.wapp.navigation")
 }
 
 android {

app/src/main/java/com/wap/wapp/MainActivity.kt

@@ -1,8 +1,6 @@
 package com.wap.wapp
 
 import android.os.Bundle
-import android.util.Log
-import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.navigation.NavController
@@ -39,7 +37,7 @@ class MainActivity : AppCompatActivity() {
         val typedArray = resources.obtainTypedArray(R.array.hide_bottomNavigation_fragments)
 
         for (index in 0..typedArray.length()) {
-            hideBottomNavigationFragments.add(typedArray.getResourceId(index, 0,))
+            hideBottomNavigationFragments.add(typedArray.getResourceId(index, 0))
         }
 
         typedArray.recycle()

app/src/main/res/navigation/nav_main.xml

@@ -4,6 +4,7 @@
     android:id="@+id/main_nav"
     app:startDestination="@id/nav_splash">
 
+    <include app:graph="@navigation/nav_auth" />
     <include app:graph="@navigation/nav_manage" />
     <include app:graph="@navigation/nav_notice" />
     <include app:graph="@navigation/nav_profile" />

app/src/main/res/values/arrays.xml

@@ -2,5 +2,7 @@
 <resources>
     <array name="hide_bottomNavigation_fragments">
         <item>@id/splashFragment</item>
+        <item>@id/signInFragment</item>
+        <item>@id/signUpFragment</item>
     </array>
 </resources>

build-logic/convention/build.gradle.kts

@@ -2,10 +2,6 @@ plugins{
     `kotlin-dsl`
 }
 
-kotlin {
-    jvmToolchain(17)
-}
-
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
@@ -42,5 +38,9 @@ gradlePlugin {
             id = "com.wap.wapp.hilt"
             implementationClass = "com.wap.wapp.plugin.AndroidHiltPlugin"
         }
+        create("androidNavigation") {
+            id = "com.wap.wapp.navigation"
+            implementationClass = "com.wap.wapp.plugin.AndroidNavigationPlugin"
+        }
     }
 }

build-logic/convention/src/main/java/com/wap/wapp/plugin/AndroidFeatureConventionPlugin.kt

@@ -11,8 +11,9 @@ class AndroidFeatureConventionPlugin: Plugin<Project>{
                 apply("com.wap.wapp.library")
                 apply("com.wap.wapp.compose")
                 apply("com.wap.wapp.hilt")
+                apply("com.wap.wapp.navigation")
             }
             configureBinding()
         }
     }
-}
+}

build-logic/convention/src/main/java/com/wap/wapp/plugin/AndroidNavigationPlugin.kt

@@ -0,0 +1,25 @@
+package com.wap.wapp.plugin
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
+
+class AndroidNavigationPlugin: Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("androidx.navigation.safeargs")
+            }
+
+            val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+            dependencies{
+                "implementation"(libs.findLibrary("androidx-navigation-fragment-ktx").get())
+                "implementation"(libs.findLibrary("androidx-navigation-ui-ktx").get())
+                "implementation"(libs.findLibrary("androidx-navigation-compose").get())
+            }
+        }
+    }
+}

build.gradle.kts

@@ -6,6 +6,7 @@ buildscript {
     dependencies {
         classpath(libs.android.build)
         classpath(libs.kotlin.gradle)
+        classpath(libs.androidx.navigation.safeargs)
         classpath(libs.hilt.gradle)
         classpath(libs.google.services.gradle)
         classpath(libs.firebase.crashlytics.gradle)
@@ -16,6 +17,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.androidx.navigation.safeargs) apply false
     alias(libs.plugins.dagger.hilt) apply false
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.firebase.crashlytics) apply false

core/base/build.gradle.kts → core/common/build.gradle.kts

@@ -23,6 +23,9 @@ android {
 
 dependencies {
     implementation(libs.bundles.androidx)
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.auth)
+    implementation(libs.firebase.firestore)
     implementation(libs.material)
 
     testImplementation(libs.junit)

core/base/src/main/java/com/wap/wapp/core/base/BaseFragment.kt → core/common/src/main/java/com/wap/wapp/core/commmon/base/BaseFragment.kt

@@ -1,4 +1,4 @@
-package com.android.mediproject.core.ui.base
+package com.wap.wapp.core.commmon.base
 
 import android.os.Bundle
 import android.util.Log

core/base/src/main/java/com/wap/wapp/core/base/util/RepeatOnLifecycle.kt → core/common/src/main/java/com/wap/wapp/core/commmon/extensions/CoroutinesExtension.kt

@@ -1,4 +1,4 @@
-package com.wap.wapp.core.base.util
+package com.wap.wapp.core.commmon.extensions
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner

core/common/src/main/java/com/wap/wapp/core/commmon/extensions/ThrowableExtensions.kt

@@ -0,0 +1,47 @@
+package com.wap.wapp.core.commmon.extensions
+
+import com.google.firebase.auth.FirebaseAuthException
+import com.google.firebase.firestore.FirebaseFirestoreException
+import java.net.UnknownHostException
+
+fun Throwable.toSupportingText(): String {
+    return when (this) {
+        is UnknownHostException -> {
+            "네트워크 연결이 원활하지 않습니다."
+        }
+        is FirebaseAuthException -> {
+            this.toSupportingText()
+        }
+        is FirebaseFirestoreException -> {
+            this.toSupportingText()
+        }
+        else -> {
+            "알 수 없는 오류가 발생하였습니다."
+        }
+    }
+}
+
+fun FirebaseAuthException.toSupportingText(): String {
+    return when (this.errorCode) {
+        "ERROR_WEB_CONTEXT_CANCELED", "ERROR_USER_CANCELLED" -> {
+            "다시 시도해 주세요."
+        }
+        else -> {
+            "알 수 없는 오류가 발생하였습니다."
+        }
+    }
+}
+
+fun FirebaseFirestoreException.toSupportingText(): String {
+    return when (this.code.value()) {
+        7 -> {
+            "접근 권한이 없습니다."
+        }
+        16 -> {
+            "회원이 만료되었습니다. 다시 로그인 해주세요."
+        }
+        else -> {
+            "알 수 없는 오류가 발생하였습니다."
+        }
+    }
+}

core/data/src/main/java/com/wap/wapp/core/data/di/AuthRepositoryModule.kt

@@ -13,7 +13,7 @@ import dagger.hilt.android.scopes.ActivityScoped
 abstract class AuthRepositoryModule {
     @Binds
     @ActivityScoped
-    abstract fun providesAuthRepository(
+    abstract fun bindsAuthRepository(
         authRepositoryImpl: AuthRepositoryImpl,
     ): AuthRepository
 }

core/data/src/main/java/com/wap/wapp/core/data/di/DataModule.kt

@@ -13,7 +13,7 @@ import javax.inject.Singleton
 abstract class DataModule {
     @Binds
     @Singleton
-    abstract fun providesUserRepository(
+    abstract fun bindsUserRepository(
         userRepositoryImpl: UserRepositoryImpl,
     ): UserRepository
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/user/UserRepository.kt

@@ -5,6 +5,8 @@ import com.wap.wapp.core.model.user.UserProfile
 interface UserRepository {
     suspend fun getUserProfile(userId: String): Result<UserProfile>
 
+    suspend fun getUserId(): Result<String>
+
     suspend fun postUserProfile(
         userId: String,
         userName: String,

core/data/src/main/java/com/wap/wapp/core/data/repository/user/UserRepositoryImpl.kt

@@ -14,6 +14,10 @@ class UserRepositoryImpl @Inject constructor(
         }
     }
 
+    override suspend fun getUserId(): Result<String> {
+        return userDataSource.getUserId()
+    }
+
     override suspend fun postUserProfile(
         userId: String,
         userName: String,

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/auth/SignInUseCase.kt

@@ -6,6 +6,7 @@ import com.wap.wapp.core.domain.model.AuthState
 import com.wap.wapp.core.domain.model.AuthState.SIGN_IN
 import com.wap.wapp.core.domain.model.AuthState.SIGN_UP
 import dagger.hilt.android.scopes.ActivityScoped
+import java.lang.IllegalStateException
 import javax.inject.Inject
 
 @ActivityScoped
@@ -21,13 +22,15 @@ class SignInUseCase @Inject constructor(
             userRepository.getUserProfile(userId)
                 .fold(
                     onFailure = { exception ->
-                        // 사용자를 조회할 수 없는 예외인 경우
-                        val userNotFoundException = IllegalStateException()
-                        if (exception == userNotFoundException) {
-                            SIGN_UP
+                        when (exception) {
+                            // 사용자를 조회할 수 없는 예외인 경우
+                            is IllegalStateException -> {
+                                SIGN_UP
+                            }
+                            else -> {
+                                throw (exception)
+                            }
                         }
-                        // 이외의 예외라면,
-                        throw (exception)
                     },
                     onSuccess = {
                         SIGN_IN

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/user/PostUserProfileUseCase.kt

@@ -9,16 +9,19 @@ class PostUserProfileUseCase @Inject constructor(
     private val userRepository: UserRepository,
 ) {
     suspend operator fun invoke(
-        userId: String,
         userName: String,
         studentId: String,
         registeredAt: String,
     ): Result<Unit> {
-        return userRepository.postUserProfile(
-            userId = userId,
-            userName = userName,
-            studentId = studentId,
-            registeredAt = registeredAt,
-        )
+        return runCatching {
+            val userId = userRepository.getUserId().getOrThrow()
+
+            userRepository.postUserProfile(
+                userId = userId,
+                userName = userName,
+                studentId = studentId,
+                registeredAt = registeredAt,
+            )
+        }
     }
 }

core/network/src/main/java/com/wap/wapp/core/network/di/AuthDataSourceModule.kt

@@ -13,7 +13,7 @@ import dagger.hilt.android.scopes.ActivityScoped
 abstract class AuthDataSourceModule {
     @Binds
     @ActivityScoped
-    abstract fun providesAuthDataSource(
+    abstract fun bindsAuthDataSource(
         authDataSourceImpl: AuthDataSourceImpl,
     ): AuthDataSource
 }

core/network/src/main/java/com/wap/wapp/core/network/di/FirebaseModule.kt

@@ -0,0 +1,24 @@
+package com.wap.wapp.core.network.di
+
+import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.auth.ktx.auth
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.ktx.firestore
+import com.google.firebase.ktx.Firebase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object FirebaseModule {
+    @Provides
+    @Singleton
+    fun providesFirebaseAuth(): FirebaseAuth = Firebase.auth
+
+    @Provides
+    @Singleton
+    fun providesFirestore(): FirebaseFirestore = Firebase.firestore
+}

core/network/src/main/java/com/wap/wapp/core/network/di/NetworkModule.kt

@@ -1,24 +1,20 @@
 package com.wap.wapp.core.network.di
 
-import com.google.firebase.auth.FirebaseAuth
-import com.google.firebase.auth.ktx.auth
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.ktx.firestore
-import com.google.firebase.ktx.Firebase
+import com.wap.wapp.core.network.source.user.UserDataSource
+import com.wap.wapp.core.network.source.user.UserDataSourceImpl
+import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-object NetworkModule {
-    @Provides
-    @Singleton
-    fun providesFirebaseAuth(): FirebaseAuth = Firebase.auth
+abstract class NetworkModule {
 
-    @Provides
+    @Binds
     @Singleton
-    fun providesFirestore(): FirebaseFirestore = Firebase.firestore
+    abstract fun bindsUserDataSource(
+        userDataSourceImpl: UserDataSourceImpl,
+    ): UserDataSource
 }

core/network/src/main/java/com/wap/wapp/core/network/source/user/UserDataSource.kt

@@ -7,4 +7,6 @@ interface UserDataSource {
     suspend fun postUserProfile(userProfileRequest: UserProfileRequest): Result<Unit>
 
     suspend fun getUserProfile(userId: String): Result<UserProfileResponse>
+
+    suspend fun getUserId(): Result<String>
 }

core/network/src/main/java/com/wap/wapp/core/network/source/user/UserDataSourceImpl.kt

@@ -1,5 +1,6 @@
 package com.wap.wapp.core.network.source.user
 
+import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.SetOptions
 import com.wap.wapp.core.network.constant.USER_COLLECTION
@@ -10,6 +11,7 @@ import javax.inject.Inject
 
 class UserDataSourceImpl @Inject constructor(
     private val firebaseFirestore: FirebaseFirestore,
+    private val firebaseAuth: FirebaseAuth,
 ) : UserDataSource {
     override suspend fun postUserProfile(
         userProfileRequest: UserProfileRequest,
@@ -28,6 +30,12 @@ class UserDataSourceImpl @Inject constructor(
         }
     }
 
+    override suspend fun getUserId(): Result<String> {
+        return runCatching {
+            checkNotNull(firebaseAuth.uid)
+        }
+    }
+
     override suspend fun getUserProfile(
         userId: String,
     ): Result<UserProfileResponse> {