[Feature] 콜밴팟 알림 구현

core/navigation/src/main/java/in/koreatech/koin/core/navigation/Navigator.kt

@@ -36,6 +36,6 @@ interface Navigator {
 
     fun navigateToGroupChat(
         context: Context,
-        postId: Int
+        extraPostId: Int
     ): Intent
 }

core/navigation/src/main/java/in/koreatech/koin/core/navigation/utils/ExtraConstants.kt

@@ -8,4 +8,5 @@ const val EXTRA_CHAT_ROOM_ID = "chat_room_id"
 const val EXTRA_BOARD_ID = "extra_board_id"
 const val EXTRA_CLUB_ID = "extra_club_id"
 const val EXTRA_EVENT_ID = "extra_event_id"
+const val EXTRA_POST_ID = "extra_post_id"
 const val EXTRA_NAV_TYPE = "extra_nav_type"

feature/callvan/src/main/java/in/koreatech/koin/feature/callvan/CallvanActivity.kt

@@ -8,12 +8,14 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.koreatech.koin.core.designsystem.theme.RebrandKoinTheme
 import `in`.koreatech.koin.core.designsystem.util.enableEdgeToEdgeWithLightStatusBar
+import `in`.koreatech.koin.core.navigation.utils.EXTRA_ID
 import `in`.koreatech.koin.feature.callvan.navigation.CallvanNavType
 import `in`.koreatech.koin.feature.callvan.navigation.koinCallvanGraph
 
@@ -36,6 +38,15 @@ class CallvanActivity : ComponentActivity() {
             RebrandKoinTheme {
                 val navController = rememberNavController()
 
+                val targetId = intent.getIntExtra(EXTRA_ID, -1)
+
+                // Scheme url from backend is not matching with deeplink url in navigation
+                // So, let's navigate to correct deeplink from here
+                LaunchedEffect(Unit) {
+                    if (targetId == -1) return@LaunchedEffect
+                    navController.navigate(CallvanNavType.CallvanDetail(targetId))
+                }
+
                 Scaffold { innerPadding ->
                     NavHost(
                         modifier = Modifier

feature/callvan/src/main/java/in/koreatech/koin/feature/callvan/navigation/Navigation.kt

@@ -4,7 +4,6 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
@@ -83,14 +82,16 @@ fun NavGraphBuilder.koinCallvanGraph(
     composable<CallvanNavType.CallvanChat> {
         val navigator = rememberNavigator()
         val context = LocalContext.current
-        val intent = remember { navigator.navigateToGroupChat(context, it.toRoute<CallvanNavType.CallvanChat>().postId) }
         val launcher = rememberLauncherForActivityResult(
             contract = ActivityResultContracts.StartActivityForResult()
         ) {
             navController.popBackStack()
         }
         LaunchedEffect(Unit) {
-            launcher.launch(intent)
+            navigator.navigateToGroupChat(
+                context,
+                it.toRoute<CallvanNavType.CallvanChat>().postId
+            ).let(launcher::launch)
         }
     }
 

feature/chat/build.gradle.kts

@@ -14,6 +14,7 @@ dependencies {
     implementation(projects.core.onboarding)
     implementation(projects.core.designsystem)
     implementation(projects.core.analytics)
+    implementation(projects.core.navigation)
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)

feature/chat/src/main/java/in/koreatech/koin/feature/chat/ui/groupchat/GroupChatActivity.kt

@@ -1,7 +1,5 @@
 package `in`.koreatech.koin.feature.chat.ui.groupchat
 
-import android.content.Context
-import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -26,10 +24,4 @@ class GroupChatActivity : ComponentActivity() {
             }
         }
     }
-
-    companion object {
-        fun createIntent(context: Context, postId: Int): Intent = Intent(context, GroupChatActivity::class.java).apply {
-            putExtra(GroupChatViewModel.POST_ID, postId)
-        }
-    }
 }

feature/chat/src/main/java/in/koreatech/koin/feature/chat/ui/groupchat/GroupChatViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import `in`.koreatech.koin.core.navigation.utils.EXTRA_POST_ID
 import `in`.koreatech.koin.domain.model.callvan.CallvanChatMessage.CallvanMessage
 import `in`.koreatech.koin.domain.model.upload.PreSignedUrlDomain
 import `in`.koreatech.koin.domain.usecase.callvan.GetCallvanChatMessagesUseCase
@@ -42,7 +43,7 @@ class GroupChatViewModel @Inject constructor(
 ) : ViewModel(), ContainerHost<GroupChatState, GroupChatSideEffect> {
 
     override val container = container<GroupChatState, GroupChatSideEffect>(GroupChatState()) {
-        val postId: Int? = savedStateHandle[POST_ID]
+        val postId: Int? = savedStateHandle[EXTRA_POST_ID]
         checkNotNull(postId)
         getCallvanPostDetail(postId)
     }
@@ -226,7 +227,6 @@ class GroupChatViewModel @Inject constructor(
     companion object {
         const val MAX_USER_COLORS = 8
         const val POLLING_INTERVAL_MS = 1000L
-        const val POST_ID = "post_id"
     }
 }
 

koin/src/main/java/in/koreatech/koin/navigation/NavigatorImpl.kt

@@ -3,6 +3,7 @@ package `in`.koreatech.koin.navigation
 import android.content.Context
 import android.content.Intent
 import `in`.koreatech.koin.core.navigation.Navigator
+import `in`.koreatech.koin.core.navigation.utils.EXTRA_POST_ID
 import `in`.koreatech.koin.core.navigation.utils.buildDeepLinkIntent
 import `in`.koreatech.koin.core.navigation.utils.buildIntent
 import `in`.koreatech.koin.core.navigation.utils.isValidDeepLink
@@ -69,8 +70,14 @@ class NavigatorImpl @Inject constructor() : Navigator {
         }
     }
 
-    override fun navigateToGroupChat(context: Context, postId: Int): Intent {
-        return GroupChatActivity.createIntent(context, postId).apply {
+    override fun navigateToGroupChat(
+        context: Context,
+        extraPostId: Int
+    ): Intent {
+        return context.buildIntent(
+            GroupChatActivity::class.java,
+            EXTRA_POST_ID to extraPostId
+        ).apply {
             flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
         }
     }

koin/src/main/java/in/koreatech/koin/navigation/SchemeType.kt

@@ -1,6 +1,8 @@
 package `in`.koreatech.koin.navigation
 
 import `in`.koreatech.koin.feature.article.ArticleActivity
+import `in`.koreatech.koin.feature.callvan.CallvanActivity
+import `in`.koreatech.koin.feature.chat.ui.groupchat.GroupChatActivity
 import `in`.koreatech.koin.feature.chat.ui.room.ChatRoomActivity
 import `in`.koreatech.koin.feature.club.ui.ClubActivity
 import `in`.koreatech.koin.feature.dining.ui.DiningActivity
@@ -17,8 +19,10 @@ enum class SchemeType(
     CHAT("chat", ChatRoomActivity::class.java),
     CLUB_RECRUIT("club-recruitment", ClubActivity::class.java),
     CLUB("club", ClubActivity::class.java),
-
-    LOST_AND_FOUND("articles/lost-item", LostAndFoundActivity::class.java);
+    LOST_AND_FOUND("articles/lost-item", LostAndFoundActivity::class.java),
+    CALLVAN("callvan", CallvanActivity::class.java),
+    CALLVAN_CHAT("callvan-chat", GroupChatActivity::class.java)
+    ;
 
     companion object {
         fun fromType(type: String?): SchemeType? {

koin/src/main/java/in/koreatech/koin/ui/scheme/SchemeActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.core.content.getSystemService
+import androidx.core.net.toUri
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.koreatech.koin.core.activity.ActivityBase
 import `in`.koreatech.koin.core.analytics.AnalyticsConstant
@@ -19,6 +20,7 @@ import `in`.koreatech.koin.core.navigation.utils.EXTRA_CLUB_ID
 import `in`.koreatech.koin.core.navigation.utils.EXTRA_EVENT_ID
 import `in`.koreatech.koin.core.navigation.utils.EXTRA_ID
 import `in`.koreatech.koin.core.navigation.utils.EXTRA_NAV_TYPE
+import `in`.koreatech.koin.core.navigation.utils.EXTRA_POST_ID
 import `in`.koreatech.koin.core.navigation.utils.EXTRA_TYPE
 import `in`.koreatech.koin.core.navigation.utils.EXTRA_URL
 import `in`.koreatech.koin.core.navigation.utils.toHost
@@ -125,36 +127,41 @@ class SchemeActivity : ActivityBase() {
             Pair(EXTRA_CHAT_ROOM_ID, getChatRoomIdFromUrl(url)),
             Pair(EXTRA_BOARD_ID, getBoardIdFromUrl(url)),
             Pair(EXTRA_CLUB_ID, getClubIdFromUrl(url)),
-            Pair(EXTRA_EVENT_ID, getEventIdFromUrl(url))
+            Pair(EXTRA_EVENT_ID, getEventIdFromUrl(url)),
+            Pair(EXTRA_POST_ID, getPostIdFromUrl(url))
         ).filter { it.second != null }
     }
 
     private fun getIdFromUrl(url: String): Int? {
-        return Uri.parse(url).getQueryParameter("id")?.toIntOrNull()
+        return url.toUri().getQueryParameter("id")?.toIntOrNull()
     }
 
     private fun getArticleIdFromUrl(url: String): Int? {
-        return Uri.parse(url).getQueryParameter("articleId")?.toIntOrNull()
+        return url.toUri().getQueryParameter("articleId")?.toIntOrNull()
     }
 
     private fun getChatRoomIdFromUrl(url: String): Int? {
-        return Uri.parse(url).getQueryParameter("chatRoomId")?.toIntOrNull()
+        return url.toUri().getQueryParameter("chatRoomId")?.toIntOrNull()
     }
 
     private fun getBoardIdFromUrl(url: String): Int? {
-        return Uri.parse(url).getQueryParameter("board-id")?.toIntOrNull()
+        return url.toUri().getQueryParameter("board-id")?.toIntOrNull()
     }
 
     private fun getKeywordFromUrl(url: String): String? {
-        return Uri.parse(url).getQueryParameter("keyword")
+        return url.toUri().getQueryParameter("keyword")
     }
 
     private fun getClubIdFromUrl(url: String): Int? {
-        return Uri.parse(url).getQueryParameter("clubId")?.toIntOrNull()
+        return url.toUri().getQueryParameter("clubId")?.toIntOrNull()
     }
 
     private fun getEventIdFromUrl(url: String): Int? {
-        return Uri.parse(url).getQueryParameter("eventId")?.toIntOrNull()
+        return url.toUri().getQueryParameter("eventId")?.toIntOrNull()
+    }
+
+    private fun getPostIdFromUrl(url: String): Int? {
+        return url.toUri().getQueryParameter("postId")?.toIntOrNull()
     }
 
     private fun navigateToActivity(intent: Intent) {

koin/src/main/java/in/koreatech/koin/ui/splash/SplashActivity.kt

@@ -30,6 +30,7 @@ import `in`.koreatech.koin.core.navigation.utils.EXTRA_CLUB_ID
 import `in`.koreatech.koin.core.navigation.utils.EXTRA_EVENT_ID
 import `in`.koreatech.koin.core.navigation.utils.EXTRA_ID
 import `in`.koreatech.koin.core.navigation.utils.EXTRA_NAV_TYPE
+import `in`.koreatech.koin.core.navigation.utils.EXTRA_POST_ID
 import `in`.koreatech.koin.core.navigation.utils.EXTRA_TYPE
 import `in`.koreatech.koin.core.onboarding.OnboardingManager
 import `in`.koreatech.koin.core.toast.ToastUtil
@@ -244,6 +245,7 @@ class SplashActivity : ActivityBase() {
         val targetChatId = intent.getIntExtra(EXTRA_CHAT_ROOM_ID, -1)
         val targetClubId = intent.getIntExtra(EXTRA_CLUB_ID, -1)
         val targetEventId = intent.getIntExtra(EXTRA_EVENT_ID, -1)
+        val targetPostId = intent.getIntExtra(EXTRA_POST_ID, -1)
         val type = intent.getStringExtra(EXTRA_TYPE) ?: ""
         val navType = intent.getStringExtra(EXTRA_NAV_TYPE) ?: ""
 
@@ -253,14 +255,13 @@ class SplashActivity : ActivityBase() {
                 navigator.navigateTo(
                     context = this@SplashActivity,
                     type = Pair(EXTRA_TYPE, type),
-                    *arrayOf(
-                        Pair(EXTRA_ID, targetId),
-                        Pair(EXTRA_BOARD_ID, targetBoardId),
-                        Pair(EXTRA_ARTICLE_ID, targetArticleId),
-                        Pair(EXTRA_CHAT_ROOM_ID, targetChatId),
-                        Pair(EXTRA_CLUB_ID, targetClubId),
-                        Pair(EXTRA_EVENT_ID, targetEventId)
-                    )
+                    Pair(EXTRA_ID, targetId),
+                    Pair(EXTRA_BOARD_ID, targetBoardId),
+                    Pair(EXTRA_ARTICLE_ID, targetArticleId),
+                    Pair(EXTRA_CHAT_ROOM_ID, targetChatId),
+                    Pair(EXTRA_CLUB_ID, targetClubId),
+                    Pair(EXTRA_EVENT_ID, targetEventId),
+                    Pair(EXTRA_POST_ID, targetPostId)
                 )
             } else {
                 Intent(this@SplashActivity, MainActivity::class.java)