[MERGE] #378 -> develop

leeeyubin · web-flow · commit b723d29a942a · 2025-04-21T07:34:40.000+09:00
[FEAT/#378] 회원가입 / FCM 서버통신 구현
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -77,9 +77,6 @@ android {
 }
 
 dependencies {
-    // feature
-    implementation(projects.feature.main)
-
     // data
     implementation(projects.data.auth)
     implementation(projects.data.calendar)
@@ -93,6 +90,9 @@ dependencies {
     implementation(projects.data.search)
     implementation(projects.data.update)
 
+    // feature
+    implementation(projects.feature.main)
+
     // baseline profile
     baselineProfile(projects.baselineprofile)
     implementation(libs.androidx.profileinstaller)
diff --git a/core/firebase/build.gradle.kts b/core/firebase/build.gradle.kts
@@ -11,7 +11,9 @@ android {
 dependencies {
     //core
     implementation(projects.core.navigator)
-    implementation(projects.core.local)
+
+    // domain
+    implementation(projects.domain.token)
 
     // timber
     implementation(libs.timber)
diff --git a/core/firebase/src/main/java/com/terning/core/firebase/di/FcmTokenModule.kt b/core/firebase/src/main/java/com/terning/core/firebase/di/FcmTokenModule.kt
@@ -0,0 +1,17 @@
+package com.terning.core.firebase.di
+
+import com.terning.core.firebase.fcmtoken.FcmTokenProvider
+import com.terning.core.firebase.fcmtoken.FcmTokenProviderImpl
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object FcmTokenModule {
+    @Provides
+    @Singleton
+    fun provideFcmTokenProviderImpl(): FcmTokenProvider = FcmTokenProviderImpl()
+}
diff --git a/core/firebase/src/main/java/com/terning/core/firebase/di/RemoteConfigModule.kt b/core/firebase/src/main/java/com/terning/core/firebase/di/RemoteConfigModule.kt
@@ -0,0 +1,17 @@
+package com.terning.core.firebase.di
+
+import com.terning.core.firebase.remoteconfig.TerningRemoteConfig
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RemoteConfigModule {
+
+    @Singleton
+    @Provides
+    fun provideFirebaseRemoteConfig(): TerningRemoteConfig = TerningRemoteConfig()
+}
diff --git a/core/firebase/src/main/java/com/terning/core/firebase/fcmtoken/FcmTokenProvider.kt b/core/firebase/src/main/java/com/terning/core/firebase/fcmtoken/FcmTokenProvider.kt
@@ -0,0 +1,5 @@
+package com.terning.core.firebase.fcmtoken
+
+interface FcmTokenProvider {
+    suspend fun fetchFcmToken(): String
+}
diff --git a/core/firebase/src/main/java/com/terning/core/firebase/fcmtoken/FcmTokenProviderImpl.kt b/core/firebase/src/main/java/com/terning/core/firebase/fcmtoken/FcmTokenProviderImpl.kt
@@ -0,0 +1,20 @@
+package com.terning.core.firebase.fcmtoken
+
+import com.google.firebase.messaging.FirebaseMessaging
+import timber.log.Timber
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlin.coroutines.suspendCoroutine
+
+class FcmTokenProviderImpl : FcmTokenProvider {
+    override suspend fun fetchFcmToken(): String = suspendCoroutine { continuation ->
+        FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
+            if (task.isSuccessful) {
+                Timber.tag("okhttp").d("FCM TOKEN : ${task.result}")
+                continuation.resume(task.result)
+            } else {
+                continuation.resumeWithException(task.exception ?: Exception())
+            }
+        }
+    }
+}
diff --git a/core/firebase/src/main/java/com/terning/core/firebase/messageservice/TerningMessagingService.kt b/core/firebase/src/main/java/com/terning/core/firebase/messageservice/TerningMessagingService.kt
@@ -1,4 +1,4 @@
-package com.terning.core.firebase.remoteconfig.messageservice
+package com.terning.core.firebase.messageservice
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -11,7 +11,7 @@ import androidx.core.net.toUri
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.terning.core.firebase.R
-import com.terning.core.local.TerningDataStore
+import com.terning.domain.token.repository.TokenRepository
 import com.terning.navigator.NavigatorProvider
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
@@ -22,7 +22,7 @@ import javax.inject.Inject
 class TerningMessagingService : FirebaseMessagingService() {
 
     @Inject
-    lateinit var terningDataStore: TerningDataStore
+    lateinit var tokenRepository: TokenRepository
 
     @Inject
     lateinit var navigatorProvider: NavigatorProvider
@@ -49,7 +49,8 @@ class TerningMessagingService : FirebaseMessagingService() {
         super.onMessageReceived(message)
 
         if (message.data.isEmpty())
-        // TODO: 조건 추가 by 이유빈 ->  || !terningDataStore.alarmAvailable
+            // TODO: 조건 추가 by 이유빈 ->  || !terningDataStore.alarmAvailable
+            // TODO: #352번 브렌치에서 관련 코드 수정하기
             return
 
         val title = message.data[TITLE].orEmpty()
diff --git a/core/firebase/src/main/java/com/terning/core/firebase/remoteconfig/RemoteConfigModule.kt b/core/firebase/src/main/java/com/terning/core/firebase/remoteconfig/RemoteConfigModule.kt
diff --git a/core/local/src/main/java/com/terning/core/local/TerningDataStore.kt b/core/local/src/main/java/com/terning/core/local/TerningDataStore.kt
@@ -3,6 +3,7 @@ package com.terning.core.local
 interface TerningDataStore {
     var accessToken: String
     var refreshToken: String
+    var fcmToken: String
     var userId: Long
     fun clearInfo()
 }
diff --git a/core/local/src/main/java/com/terning/core/local/TerningDataStoreImpl.kt b/core/local/src/main/java/com/terning/core/local/TerningDataStoreImpl.kt
@@ -8,13 +8,17 @@ class TerningDataStoreImpl @Inject constructor(
     private val dataStore: SharedPreferences,
 ) : TerningDataStore {
     override var accessToken: String
-        get() = dataStore.getString(ACCESS_TOKEN, "") ?: ""
+        get() = dataStore.getString(ACCESS_TOKEN, "").orEmpty()
         set(value) = dataStore.edit { putString(ACCESS_TOKEN, value) }
 
     override var refreshToken: String
-        get() = dataStore.getString(REFRESH_TOKEN, "") ?: ""
+        get() = dataStore.getString(REFRESH_TOKEN, "").orEmpty()
         set(value) = dataStore.edit { putString(REFRESH_TOKEN, value) }
 
+    override var fcmToken: String
+        get() = dataStore.getString(FCM_TOKEN, "").orEmpty()
+        set(value) = dataStore.edit { putString(FCM_TOKEN, value) }
+
     override var userId: Long
         get() = dataStore.getLong(USER_ID, 0L)
         set(value) = dataStore.edit { putLong(USER_ID, value) }
@@ -26,6 +30,7 @@ class TerningDataStoreImpl @Inject constructor(
     companion object {
         private const val ACCESS_TOKEN = "ACCESS_TOKEN"
         private const val REFRESH_TOKEN = "REFRESH_TOKEN"
+        private const val FCM_TOKEN = "FCM_TOKEN"
         private const val USER_ID = "USER_ID"
     }
 }
diff --git a/data/auth/src/main/java/com/terning/data/auth/dto/request/SignUpRequestDto.kt b/data/auth/src/main/java/com/terning/data/auth/dto/request/SignUpRequestDto.kt
@@ -10,5 +10,7 @@ data class SignUpRequestDto(
     @SerialName("profileImage")
     val profileImage: String,
     @SerialName("authType")
-    val authType: String
+    val authType: String,
+    @SerialName("fcmToken")
+    val fcmToken: String
 )
diff --git a/data/auth/src/main/java/com/terning/data/auth/dto/response/SignInResponseDto.kt b/data/auth/src/main/java/com/terning/data/auth/dto/response/SignInResponseDto.kt
@@ -14,5 +14,5 @@ data class SignInResponseDto(
     @SerialName("authId")
     val authId: String,
     @SerialName("authType")
-    val authType: String,
+    val authType: String
 )
diff --git a/data/auth/src/main/java/com/terning/data/auth/mapper/SignInResponseMapper.kt b/data/auth/src/main/java/com/terning/data/auth/mapper/SignInResponseMapper.kt
@@ -9,5 +9,5 @@ fun SignInResponseDto.toSignInResponse(): SignInResponse =
         refreshToken = refreshToken,
         userId = userId,
         authId = authId,
-        authType = authType
+        authType = authType,
     )
diff --git a/data/auth/src/main/java/com/terning/data/auth/mapper/SignUpRequestMapper.kt b/data/auth/src/main/java/com/terning/data/auth/mapper/SignUpRequestMapper.kt
@@ -7,5 +7,6 @@ fun SignUpRequest.toSignUpRequestDto(): SignUpRequestDto =
     SignUpRequestDto(
         name = name,
         profileImage = profileImage,
-        authType = authType
+        authType = authType,
+        fcmToken = fcmToken
     )
diff --git a/data/auth/src/main/java/com/terning/data/auth/repositoryimpl/AuthRepositoryImpl.kt b/data/auth/src/main/java/com/terning/data/auth/repositoryimpl/AuthRepositoryImpl.kt
@@ -16,7 +16,7 @@ class AuthRepositoryImpl @Inject constructor(
     private val authDataSource: AuthDataSource
 ) : AuthRepository {
 
-    override suspend fun postSignIn(
+    override suspend fun signIn(
         authorization: String,
         request: SignInRequest
     ): Result<SignInResponse> = runCatching {
@@ -26,7 +26,7 @@ class AuthRepositoryImpl @Inject constructor(
         ).result.toSignInResponse()
     }
 
-    override suspend fun postSignUp(
+    override suspend fun signUp(
         authId: String,
         request: SignUpRequest
     ): Result<SignUpResponse> = runCatching {
diff --git a/data/token/build.gradle.kts b/data/token/build.gradle.kts
@@ -11,6 +11,7 @@ android {
 dependencies {
     // core
     implementation(projects.core.local)
+    implementation(projects.core.firebase)
 
     //domain
     implementation(projects.domain.token)
diff --git a/data/token/src/main/java/com/terning/data/token/repositoryimpl/TokenRepositoryImpl.kt b/data/token/src/main/java/com/terning/data/token/repositoryimpl/TokenRepositoryImpl.kt
@@ -1,27 +1,38 @@
 package com.terning.data.token.repositoryimpl
 
+import com.terning.core.firebase.fcmtoken.FcmTokenProvider
 import com.terning.core.local.TerningDataStore
 import com.terning.domain.token.repository.TokenRepository
 import javax.inject.Inject
 
 class TokenRepositoryImpl @Inject constructor(
-    private val terningDataStore: TerningDataStore
+    private val terningDataStore: TerningDataStore,
+    private val fcmTokenProvider: FcmTokenProvider
 ) : TokenRepository {
     override fun getAccessToken(): String = terningDataStore.accessToken
 
+    override fun setAccessToken(accessToken: String) {
+        terningDataStore.accessToken = accessToken
+    }
+
     override fun getRefreshToken(): String = terningDataStore.refreshToken
 
-    override fun setTokens(accessToken: String, refreshToken: String) {
-        terningDataStore.accessToken = accessToken
+    override fun setRefreshToken(refreshToken: String) {
         terningDataStore.refreshToken = refreshToken
     }
 
-    override fun setUserId(userId: Long) {
-        terningDataStore.userId = userId
+    override fun getFcmToken(): String = terningDataStore.fcmToken
+
+    override suspend fun fetchAndSetFcmToken(): Result<Unit> = runCatching {
+        terningDataStore.fcmToken = fcmTokenProvider.fetchFcmToken()
     }
 
     override fun getUserId(): Long = terningDataStore.userId
 
+    override fun setUserId(userId: Long) {
+        terningDataStore.userId = userId
+    }
+
     override fun clearInfo() {
         terningDataStore.clearInfo()
     }
diff --git a/domain/auth/src/main/java/com/terning/domain/auth/entity/SignInResponse.kt b/domain/auth/src/main/java/com/terning/domain/auth/entity/SignInResponse.kt
@@ -5,5 +5,5 @@ data class SignInResponse(
     val refreshToken: String?,
     val userId: Long?,
     val authId: String,
-    val authType: String
+    val authType: String,
 )
diff --git a/domain/auth/src/main/java/com/terning/domain/auth/entity/SignUpRequest.kt b/domain/auth/src/main/java/com/terning/domain/auth/entity/SignUpRequest.kt
@@ -3,5 +3,6 @@ package com.terning.domain.auth.entity
 data class SignUpRequest (
     val name : String,
     val profileImage : String,
-    val authType : String
+    val authType : String,
+    val fcmToken: String
 )
diff --git a/domain/auth/src/main/java/com/terning/domain/auth/repository/AuthRepository.kt b/domain/auth/src/main/java/com/terning/domain/auth/repository/AuthRepository.kt
@@ -7,12 +7,12 @@ import com.terning.domain.auth.entity.SignUpResponse
 
 interface AuthRepository {
 
-    suspend fun postSignIn(
+    suspend fun signIn(
         authorization: String,
         request: SignInRequest
     ): Result<SignInResponse>
 
-    suspend fun postSignUp(
+    suspend fun signUp(
         authId: String,
         request: SignUpRequest
     ): Result<SignUpResponse>
diff --git a/domain/token/src/main/java/com/terning/domain/token/repository/TokenRepository.kt b/domain/token/src/main/java/com/terning/domain/token/repository/TokenRepository.kt
@@ -3,13 +3,19 @@ package com.terning.domain.token.repository
 interface TokenRepository {
     fun getAccessToken(): String
 
+    fun setAccessToken(accessToken: String)
+
     fun getRefreshToken(): String
 
-    fun setTokens(accessToken: String, refreshToken: String)
+    fun setRefreshToken(refreshToken: String)
 
-    fun setUserId(userId: Long)
+    fun getFcmToken(): String
+
+    suspend fun fetchAndSetFcmToken(): Result<Unit>
 
-    fun getUserId() : Long
+    fun getUserId(): Long
+
+    fun setUserId(userId: Long)
 
     fun clearInfo()
 }
diff --git a/feature/main/src/main/AndroidManifest.xml b/feature/main/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
             </intent-filter>
         </activity>
         <service
-            android:name="com.terning.core.firebase.remoteconfig.messageservice.TerningMessagingService"
+            android:name="com.terning.core.firebase.messageservice.TerningMessagingService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
diff --git a/feature/onboarding/build.gradle.kts b/feature/onboarding/build.gradle.kts
@@ -13,5 +13,6 @@ dependencies {
     implementation(projects.domain.auth)
     implementation(projects.domain.token)
 
+    // kakao
     implementation(libs.kakao.user)
 }
diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt
diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt
diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpViewModel.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpViewModel.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/project.dot.png b/project.dot.png

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package com.terning.core.local`
`3`	`3`	`interface TerningDataStore {`
`4`	`4`	`var accessToken: String`
`5`	`5`	`var refreshToken: String`
	`6`	`+ var fcmToken: String`
`6`	`7`	`var userId: Long`
`7`	`8`	`fun clearInfo()`
`8`	`9`	`}`