[FEAT/#380] action -> redirect, id -> internId 복구

Author: leeeyubin

core/designsystem/src/main/java/com/terning/core/designsystem/util/DeeplinkDefaults.kt

@@ -4,20 +4,20 @@ import android.net.Uri
 
 object DeeplinkDefaults {
     private const val SCHEME: String = "terning"
-    const val ACTION: String = "action"
-    const val ID: String = "id"
+    const val REDIRECT: String = "redirect"
+    const val INTERN_ID: String = "internId"
 
     fun build(
         host: String,
-        action: String? = null,
-        id: String? = null
+        redirect: String? = null,
+        internId: String? = null
     ): String {
         val uriBuilder = Uri.Builder()
             .scheme(SCHEME)
             .authority(host)
 
-        action?.let { uriBuilder.appendQueryParameter(ACTION, it) }
-        id?.let { uriBuilder.appendQueryParameter(ID, it) }
+        redirect?.let { uriBuilder.appendQueryParameter(REDIRECT, it) }
+        internId?.let { uriBuilder.appendQueryParameter(INTERN_ID, it) }
 
         return uriBuilder.build().toString()
     }

core/firebase/src/main/java/com/terning/core/firebase/messageservice/TerningMessagingService.kt

@@ -164,7 +164,7 @@ class TerningMessagingService : FirebaseMessagingService() {
         val base = DeeplinkType.from(type) ?: return ""
 
         return if (isForeground) DeeplinkDefaults.build(host = base.path)
-        else DeeplinkDefaults.build(host = BACKGROUND_HOST, action = base.path)
+        else DeeplinkDefaults.build(host = BACKGROUND_HOST, redirect = base.path)
     }
 
     companion object {

feature/intern/src/main/java/com/terning/feature/intern/InternViewModel.kt

@@ -78,9 +78,11 @@ class InternViewModel @Inject constructor(
             "START_DATE" to internInfo.startYearMonth,
             "PERIOD" to internInfo.workingPeriod,
             "A_E" to "kakaolink",
-            "A_E_D" to "jobDetail",
+            "A_E_D" to "intern",
             "I_E" to "kakaolink",
             "I_E_D" to "jobDetail",
+            "redirect" to "intern",
+            "internId" to announcementId,
             "action" to "jobDetail",
             "JOB_ID" to announcementId
             )

feature/main/src/main/java/com/terning/feature/main/MainActivity.kt

@@ -13,8 +13,11 @@ import com.terning.core.analytics.AmplitudeTracker
 import com.terning.core.analytics.EventType
 import com.terning.core.analytics.LocalTracker
 import com.terning.core.designsystem.theme.TerningPointTheme
+import com.terning.core.designsystem.util.DeeplinkDefaults.INTERN_ID
+import com.terning.core.designsystem.util.DeeplinkDefaults.REDIRECT
 import com.terning.core.firebase.messageservice.TerningMessagingService.Companion.FROM_NOTIFICATION
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -30,14 +33,14 @@ class MainActivity : ComponentActivity() {
 
         setContent {
             val navigator: MainNavigator = rememberMainNavigator()
-            val (host, action, id) = handleDeeplink(intent)
+            val (host, redirect, internId) = handleDeeplink(intent)
 
             TerningPointTheme {
                 CompositionLocalProvider(LocalTracker provides tracker) {
                     MainScreen(
                         host = host,
-                        action = action,
-                        id = id,
+                        redirect = redirect,
+                        internId = internId,
                         navigator = navigator
                     )
                 }
@@ -51,10 +54,10 @@ class MainActivity : ComponentActivity() {
 
         if (uriString.isNullOrEmpty()) return Triple(null, null, null)
 
+        Timber.tag("LYB").d("uri = $uri")
         val host = uri.host
-        val action =  uri.getQueryParameter("action")
-        val id = uri.getQueryParameter("id")
-
+        val redirect = uri.getQueryParameter(REDIRECT)
+        val internId = uri.getQueryParameter(INTERN_ID)
 
         if (!intent.getBooleanExtra(ALREADY_TRACKED, false)
             && intent.getBooleanExtra(FROM_NOTIFICATION, false)
@@ -67,7 +70,7 @@ class MainActivity : ComponentActivity() {
 
         intent.putExtra(ALREADY_TRACKED, true)
 
-        return Triple(host, action, id)
+        return Triple(host, redirect, internId)
     }
 
     companion object {

feature/main/src/main/java/com/terning/feature/main/MainNavigator.kt

@@ -28,15 +28,15 @@ class MainNavigator(
 
     fun getStartDestination(
         host: String?,
-        action: String?,
-        id: String?
+        redirect: String?,
+        internId: String?
     ) = when (DeeplinkType.from(host)) {
         DeeplinkType.SEARCH -> Search
         DeeplinkType.HOME -> Home(internId = null)
         DeeplinkType.CALENDAR -> Calendar
-        DeeplinkType.KAKAOLINK -> Splash(action = action, id = id)
+        DeeplinkType.KAKAOLINK -> Splash(redirect = redirect, internId = internId)
 
-        else -> Splash(action = action)
+        else -> Splash(redirect = redirect)
     }
 
     val currentTab: MainTab?

feature/main/src/main/java/com/terning/feature/main/MainScreen.kt

@@ -64,8 +64,8 @@ import kotlinx.coroutines.launch
 @Composable
 fun MainScreen(
     host: String?,
-    action: String?,
-    id: String?,
+    redirect: String?,
+    internId: String?,
     navigator: MainNavigator = rememberMainNavigator(),
 ) {
     val context = LocalContext.current
@@ -91,7 +91,7 @@ fun MainScreen(
 
     val amplitudeTracker = LocalTracker.current
     val splashNavOptions = NavOptions.Builder().setPopUpTo(
-        route = Splash(action = action, id = id),
+        route = Splash(redirect = redirect, internId = internId),
         inclusive = true
     ).build()
 
@@ -148,8 +148,8 @@ fun MainScreen(
                 navController = navigator.navController,
                 startDestination = navigator.getStartDestination(
                     host = host,
-                    action = action,
-                    id = id
+                    redirect = redirect,
+                    internId = internId
                 )
             ) {
                 splashNavGraph(

feature/splash/src/main/java/com/terning/feature/splash/SplashRoute.kt

@@ -36,8 +36,8 @@ import kotlinx.coroutines.launch
 
 @Composable
 internal fun SplashRoute(
-    action: String?,
-    id: String?,
+    redirect: String?,
+    internId: String?,
     navigateToHome: (internId: String?) -> Unit,
     navigateToSignIn: () -> Unit,
     navigateToCalendar: () -> Unit,
@@ -87,11 +87,11 @@ internal fun SplashRoute(
                 when (sideEffect) {
                     is SplashSideEffect.HasAccessToken -> {
                         if (sideEffect.hasAccessToken) {
-                            when (DeeplinkType.from(action)) {
+                            when (DeeplinkType.from(redirect)) {
                                 DeeplinkType.CALENDAR -> navigateToCalendar()
                                 DeeplinkType.HOME -> navigateToHome(null)
                                 DeeplinkType.SEARCH -> navigateToSearch()
-                                DeeplinkType.INTERN -> navigateToHome(id.orEmpty())
+                                DeeplinkType.INTERN -> navigateToHome(internId.orEmpty())
 
                                 else -> navigateToHome(null)
                             }

feature/splash/src/main/java/com/terning/feature/splash/navigation/SplashNavigation.kt

@@ -25,8 +25,8 @@ fun NavGraphBuilder.splashNavGraph(
     ) {
         val args = it.toRoute<Splash>()
         SplashRoute(
-            action = args.action,
-            id = args.id,
+            redirect = args.redirect,
+            internId = args.internId,
             navigateToHome = navigateHome,
             navigateToSignIn = navigateSignIn,
             navigateToSearch = navigateSearch,
@@ -37,8 +37,8 @@ fun NavGraphBuilder.splashNavGraph(
 
 @Serializable
 data class Splash(
-    @SerialName("action")
-    val action: String? = null,
-    @SerialName("id")
-    val id: String? = null
+    @SerialName("redirect")
+    val redirect: String? = null,
+    @SerialName("internId")
+    val internId: String? = null
 ) : Route