Merge pull request #86 from Nexters/dev

Release 1.1.0

Author: eshc123

app/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("missionmate.android.application")
+    alias(libs.plugins.google.service)
 }
 
 android {
@@ -11,8 +12,8 @@ android {
     defaultConfig {
         applicationId = "com.goalpanzi.mission_mate"
         targetSdk = 34
-        versionCode = 6
-        versionName = "1.0.3"
+        versionCode = 7
+        versionName = "1.1.0"
 
         vectorDrawables {
             useSupportLibrary = true
@@ -47,6 +48,8 @@ dependencies {
     ksp(libs.hilt.compiler)
     implementation(libs.hilt.android)
     implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.messaging)
+    implementation(libs.firebase.analytics)
 
     implementation(project(":feature:main"))
     implementation(project(":feature:login"))
@@ -58,4 +61,6 @@ dependencies {
     implementation(project(":core:data:onboarding"))
     implementation(project(":core:data:setting"))
     implementation(project(":core:data:user"))
+    implementation(project(":core:push"))
+    implementation(project(":core:notification"))
 }

app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
-
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
@@ -30,4 +30,4 @@
         </service>
 
     </application>
-</manifest>
+</manifest>

app/src/main/java/com/goalpanzi/mission_mate/MainApplication.kt

@@ -1,7 +1,13 @@
 package com.goalpanzi.mission_mate
 
 import android.app.Application
+import com.google.firebase.FirebaseApp
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class MainApplication : Application()
+class MainApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        FirebaseApp.initializeApp(this)
+    }
+}

build-logic/src/main/kotlin/missionmate.android.feature.gradle.kts

@@ -28,6 +28,7 @@ dependencies {
     implementation(project(":core:domain:mission"))
     implementation(project(":core:domain:common"))
     implementation(project(":core:domain:auth"))
+    implementation(project(":core:domain:onboarding"))
     implementation(project(":core:ui"))
 
-}
+}

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

@@ -1,6 +1,7 @@
 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.DeviceInfoProvider
 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
@@ -13,11 +14,15 @@ import javax.inject.Inject
 
 class AuthRepositoryImpl @Inject constructor(
     private val loginService: LoginService,
-    private val authDataSource: AuthDataSource
-): AuthRepository {
+    private val authDataSource: AuthDataSource,
+    private val deviceInfoProvider: DeviceInfoProvider
+) : AuthRepository {
 
     override suspend fun requestGoogleLogin(email: String) = handleResult {
-        val request = GoogleLoginRequest(email = email)
+        val request = GoogleLoginRequest(
+            email = email,
+            deviceIdentifier = deviceInfoProvider.getDeviceSSAID()
+        )
         loginService.requestGoogleLogin(request)
     }.convert {
         it.toModel()
@@ -35,7 +40,9 @@ class AuthRepositoryImpl @Inject constructor(
 
     override fun getRefreshToken(): Flow<String?> = authDataSource.getRefreshToken()
 
-    override fun setAccessToken(accessToken: String): Flow<Unit> = authDataSource.setAccessToken(accessToken)
+    override fun setAccessToken(accessToken: String): Flow<Unit> =
+        authDataSource.setAccessToken(accessToken)
 
-    override fun setRefreshToken(refreshToken: String): Flow<Unit> = authDataSource.setRefreshToken(refreshToken)
+    override fun setRefreshToken(refreshToken: String): Flow<Unit> =
+        authDataSource.setRefreshToken(refreshToken)
 }

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

@@ -0,0 +1,15 @@
+package com.goalpanzi.mission_mate.core.data.common
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.provider.Settings
+import javax.inject.Inject
+
+class DeviceInfoProvider @Inject constructor(
+    private val context: Context
+) {
+    @SuppressLint("HardwareIds")
+    fun getDeviceSSAID(): String {
+        return Settings.Secure.getString(context.contentResolver,Settings.Secure.ANDROID_ID)
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.goalpanzi.mission_mate.core.data.common.di
+
+import android.content.Context
+import com.goalpanzi.mission_mate.core.data.common.DeviceInfoProvider
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+object DeviceInfoProviderModule {
+    @Singleton
+    @Provides
+    fun provideADeviceInfoProvider(
+        @ApplicationContext context: Context
+    ): DeviceInfoProvider {
+        return DeviceInfoProvider(context)
+    }
+}

core/data/user/src/main/java/com/goalpanzi/mission_mate/core/data/user/FcmTokenManager.kt

@@ -0,0 +1,7 @@
+package com.goalpanzi.mission_mate.core.data.user
+
+import kotlinx.coroutines.flow.Flow
+
+interface FcmTokenManager {
+    fun getFcmToken() : Flow<String>
+}

core/data/user/src/main/java/com/goalpanzi/mission_mate/core/data/user/repository/UserRepositoryImpl.kt

@@ -1,7 +1,9 @@
 package com.goalpanzi.mission_mate.core.data.user.repository
 
+import com.goalpanzi.mission_mate.core.data.common.DeviceInfoProvider
 import com.goalpanzi.mission_mate.core.data.common.handleResult
 import com.goalpanzi.mission_mate.core.data.common.mapper.toResponse
+import com.goalpanzi.mission_mate.core.data.user.FcmTokenManager
 import com.goalpanzi.mission_mate.core.data.user.mapper.toDto
 import com.goalpanzi.mission_mate.core.data.user.mapper.toModel
 import com.goalpanzi.mission_mate.core.datastore.datasource.DefaultDataSource
@@ -10,14 +12,17 @@ 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.domain.user.repository.UserRepository
 import com.goalpanzi.mission_mate.core.network.model.request.SaveProfileRequest
+import com.goalpanzi.mission_mate.core.network.model.request.UpdateDeviceTokenRequest
 import com.goalpanzi.mission_mate.core.network.service.ProfileService
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class UserRepositoryImpl @Inject constructor(
     private val profileService: ProfileService,
-    private val defaultDataSource: DefaultDataSource
+    private val defaultDataSource: DefaultDataSource,
+    private val fcmTokenManager: FcmTokenManager,
+    private val deviceInfoProvider: DeviceInfoProvider
 ) : UserRepository {
     override suspend fun saveProfile(
         nickname: String,
@@ -31,6 +36,17 @@ class UserRepositoryImpl @Inject constructor(
         profileService.saveProfile(request)
     }
 
+    override suspend fun updateFcmToken(fcmToken: String): DomainResult<Unit> = handleResult {
+        val request = UpdateDeviceTokenRequest(
+            deviceToken = fcmToken,
+            deviceIdentifier = deviceInfoProvider.getDeviceSSAID(),
+            osType = "AOS"
+        )
+        profileService.updateDeviceToken(request)
+    }
+
+    override fun getFcmToken(): Flow<String> = fcmTokenManager.getFcmToken()
+
     override fun clearUserData(): Flow<Unit> = defaultDataSource.clearUserData()
 
     override fun setUserProfile(data: UserProfile): Flow<Unit> = defaultDataSource.setUserProfile(data.toDto())
@@ -41,4 +57,8 @@ class UserRepositoryImpl @Inject constructor(
 
     override fun getMemberId(): Flow<Long?> = defaultDataSource.getMemberId()
 
+    override fun setCachedFcmToken(data: String): Flow<Unit> = defaultDataSource.setFcmToken(data)
+
+    override fun getCachedFcmToken(): Flow<String?> = defaultDataSource.getFcmToken()
+
 }

core/datastore/src/main/java/com/goalpanzi/mission_mate/core/datastore/datasource/DefaultDataSource.kt

@@ -11,4 +11,6 @@ interface DefaultDataSource {
     fun setViewedTooltip() : Flow<Unit>
     fun setMemberId(data: Long) : Flow<Unit>
     fun getMemberId() : Flow<Long?>
-}
+    fun setFcmToken(data: String) : Flow<Unit>
+    fun getFcmToken() : Flow<String?>
+}