[IDLE-506] CI CD에 AppsFlyer Api Key 추가 및 릴리즈 버전 업

Author: tgyuuAn

.github/workflows/android_cd.yml

@@ -39,6 +39,7 @@ jobs:
           echo "NAVER_CLIENT_SECRET=${{ secrets.NAVER_CLIENT_SECRET }}" >> local.properties
           echo "AMPLITUDE_API_KEY=${{ secrets.AMPLITUDE_API_KEY }}" >> local.properties
           echo "KAKAO_APP_KEY=${{ secrets.KAKAO_APP_KEY }}" >> local.properties
+          echo "APPSFLYER_API_KEY=${{ secrets.APPSFLYER_API_KEY }}" >> local.properties
 
       - name: Set up keystore.properties
         run: |

.github/workflows/android_ci.yml

@@ -42,6 +42,7 @@ jobs:
         echo "NAVER_CLIENT_SECRET=${{ secrets.NAVER_CLIENT_SECRET }}" >> local.properties
         echo "AMPLITUDE_API_KEY=${{ secrets.AMPLITUDE_API_KEY }}" >> local.properties
         echo "KAKAO_APP_KEY=${{ secrets.KAKAO_APP_KEY }}" >> local.properties
+        echo "APPSFLYER_API_KEY=${{ secrets.APPSFLYER_API_KEY }}" >> local.properties
 
     - name: Set up keystore.properties
       run: |

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
     namespace = "com.idle.care"
 
     defaultConfig {
-        versionCode = 13
-        versionName = "1.1.6"
+        versionCode = 15
+        versionName = "1.2.0"
         targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/idle/care/notification/NotificationService.kt

@@ -1,10 +1,8 @@
 package com.idle.care.notification
 
-import android.util.Log
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.idle.analytics.error.ErrorLoggingHelper
-import com.idle.domain.model.auth.UserType
 import com.idle.domain.usecase.auth.GetUserTypeUseCase
 import com.idle.domain.usecase.notification.PostDeviceTokenUseCase
 import dagger.hilt.android.AndroidEntryPoint
@@ -42,12 +40,10 @@ class NotificationService : FirebaseMessagingService() {
         scope.launch {
             val userType = getUserTypeUseCase()
 
-            when (userType) {
-                UserType.CENTER.apiValue, UserType.WORKER.apiValue -> postDeviceTokenUseCase(
-                    deviceToken = token,
-                    userType = userType,
-                )
-            }
+            postDeviceTokenUseCase(
+                deviceToken = token,
+                userType = userType,
+            )
         }
     }
 

core/navigation/src/main/java/com/idle/navigation/NavigationHelper.kt

@@ -27,16 +27,18 @@ class NavigationHelper @Inject constructor() {
     fun handleFCMNavigate(
         isColdStart: Boolean,
         extras: Bundle?,
-        onInit: () -> Unit
+        onInit: () -> Unit,
+        readNotification: (String) -> Unit,
     ) {
+        val notificationId = extras?.getString(NotificationKeys.NOTIFICATION_ID) ?: run {
+            if (isColdStart) onInit()
+            return
+        }
+
+        readNotification(notificationId)
+
         val notificationType = NotificationType.create(
-            extras?.getString(NotificationKeys.NOTIFICATION_TYPE) ?: run {
-                if (isColdStart) {
-                    onInit()
-                    return
-                }
-                return
-            }
+            extras.getString(NotificationKeys.NOTIFICATION_TYPE) ?: return
         )
 
         when (notificationType) {
@@ -92,36 +94,27 @@ class NavigationHelper @Inject constructor() {
     fun handleNotificationNavigate(notification: Notification) {
         val destinations = when (notification.notificationType) {
             APPLICANT -> {
-                val notificationContent =
-                    notification.notificationDetails as? NotificationContent.ApplicantNotification
-
-                notificationContent?.let { content ->
-                    listOf(
-                        NavigationEvent.NavigateTo(CenterJobDetail(content.jobPostingId)),
-                    )
+                (notification.notificationDetails as? NotificationContent.ApplicantNotification)?.let { content ->
+                    listOf(NavigationEvent.NavigateTo(CenterJobDetail(content.jobPostingId)))
                 } ?: listOf()
             }
 
             NEW_JOB_POSTING -> {
-                val notificationContent =
-                    notification.notificationDetails as? NotificationContent.NewJobPostingNotification
-
-                notificationContent?.let { content ->
+                (notification.notificationDetails as? NotificationContent.NewJobPostingNotification)?.let { content ->
                     listOf(
                         NavigationEvent.NavigateTo(
                             WorkerJobDetail(
-                                jobPostingId = content.jobPostingId,
-                                jobPostingType = JobPostingType.CAREMEET.name,
+                                content.jobPostingId,
+                                JobPostingType.CAREMEET.name
                             )
-                        ),
+                        )
                     )
                 } ?: listOf()
             }
 
             else -> listOf()
         }
-
-        destinations.onEach { destination -> _navigationFlow.trySend(destination) }
+        destinations.forEach { _navigationFlow.trySend(it) }
     }
 }
 
@@ -148,6 +141,7 @@ enum class NotificationType {
 }
 
 private object NotificationKeys {
+    const val NOTIFICATION_ID = "notificationId"
     const val NOTIFICATION_TYPE = "notificationType"
     const val JOB_POSTING_ID = "jobPostingId"
 }

presentation/src/main/java/com/idle/presentation/MainActivity.kt

@@ -117,6 +117,7 @@ class MainActivity : AppCompatActivity() {
                     return
                 },
                 onInit = ::initializeUserSession,
+                readNotification = ::readNotification,
             )
         }
     }
@@ -136,6 +137,7 @@ class MainActivity : AppCompatActivity() {
             isColdStart = false,
             extras = intent?.extras ?: return,
             onInit = viewModel::initializeUserSession,
+            readNotification = viewModel::readNotification,
         )
     }
 

presentation/src/main/java/com/idle/presentation/MainViewModel.kt

@@ -116,6 +116,10 @@ class MainViewModel @Inject constructor(
         jobPostingRepository.sharedJobPostingInfo = sharedJobPostingInfo
     }
 
+    internal fun readNotification(notificationId: String) = viewModelScope.launch {
+        readNotificationUseCase(notificationId).onFailure { errorHandlerHelper.sendError(it) }
+    }
+
     private suspend fun getAccessTokenAndUserRole(): Pair<String, String> = coroutineScope {
         val accessTokenDeferred = async { getAccessTokenUseCase() }
         val userRoleDeferred = async { getMyUserRoleUseCase() }