Merge pull request #1502 from BCSDLab/feature/1496-home-connect-api

kongwoojin · web-flow · commit fdfcd742c62f · 2026-05-30T15:57:28.000+09:00
[Feature] 홈화면 API 연결
diff --git a/core/navigation/src/main/java/in/koreatech/koin/core/navigation/Navigator.kt b/core/navigation/src/main/java/in/koreatech/koin/core/navigation/Navigator.kt
@@ -3,6 +3,7 @@ package `in`.koreatech.koin.core.navigation
 import android.content.Context
 import android.content.Intent
 
+@Suppress("TooManyFunctions")
 interface Navigator {
     fun navigateToSplash(
         context: Context,
@@ -30,6 +31,26 @@ interface Navigator {
         context: Context
     ): Intent
 
+    fun navigateToDining(
+        context: Context
+    ): Intent
+
+    fun navigateToBusTimeTable(
+        context: Context
+    ): Intent
+
+    fun navigateToBusSearch(
+        context: Context
+    ): Intent
+
+    fun navigateToUnibus(
+        context: Context
+    ): Intent
+
+    fun navigateToCallvan(
+        context: Context
+    ): Intent
+
     fun navigateToChatRoom(
         context: Context
     ): Intent
diff --git a/feature/home/src/main/java/in/koreatech/koin/feature/home/HomeScreen.kt b/feature/home/src/main/java/in/koreatech/koin/feature/home/HomeScreen.kt
@@ -25,14 +25,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import `in`.koreatech.koin.core.designsystem.noRippleClickable
 import `in`.koreatech.koin.core.designsystem.theme.RebrandKoinTheme
+import `in`.koreatech.koin.core.navigation.utils.rememberNavigator
 import `in`.koreatech.koin.feature.home.component.DiningPager
 import `in`.koreatech.koin.feature.home.component.DiningPagerData
 import `in`.koreatech.koin.feature.home.component.HomeChip
@@ -149,6 +152,9 @@ private fun DiningSection(
     diningData: ImmutableList<DiningPagerData>,
     modifier: Modifier = Modifier
 ) {
+    val navigator = rememberNavigator()
+    val context = LocalContext.current
+
     HomeSection(
         modifier = modifier.fillMaxWidth(),
         text = {
@@ -159,6 +165,9 @@ private fun DiningSection(
         },
         more = {
             Row(
+                modifier = Modifier.noRippleClickable {
+                    navigator.navigateToDining(context).let(context::startActivity)
+                },
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text(
@@ -173,7 +182,9 @@ private fun DiningSection(
             }
         }
     ) {
-        DiningPager(data = diningData)
+        DiningPager(data = diningData) {
+            navigator.navigateToDining(context).let(context::startActivity)
+        }
     }
 }
 
@@ -182,6 +193,9 @@ private fun BusSection(
     callVanRecruitCount: Int,
     modifier: Modifier = Modifier
 ) {
+    val navigator = rememberNavigator()
+    val context = LocalContext.current
+
     HomeSection(
         modifier = modifier.fillMaxWidth(),
         text = {
@@ -191,7 +205,9 @@ private fun BusSection(
             )
         },
         more = {
-            ShuttleTicketCard()
+            ShuttleTicketCard {
+                navigator.navigateToUnibus(context).let(context::startActivity)
+            }
         }
     ) {
         Column(
@@ -243,6 +259,9 @@ private fun BusSection(
                             style = RebrandKoinTheme.typography.medium13
                         )
                     }
+                },
+                onClick = {
+                    navigator.navigateToCallvan(context).let(context::startActivity)
                 }
             )
         }
@@ -279,6 +298,9 @@ private fun BusSection(
                         color = Color(0xFFB611F5),
                         style = RebrandKoinTheme.typography.regular10
                     )
+                },
+                onClick = {
+                    navigator.navigateToBusTimeTable(context).let(context::startActivity)
                 }
             )
 
@@ -311,6 +333,9 @@ private fun BusSection(
                         color = Color(0xFFB611F5),
                         style = RebrandKoinTheme.typography.regular10
                     )
+                },
+                onClick = {
+                    navigator.navigateToBusSearch(context).let(context::startActivity)
                 }
             )
         }
@@ -324,6 +349,8 @@ private fun ShopSection(
     shopCount: Int,
     modifier: Modifier = Modifier
 ) {
+    val navigator = rememberNavigator()
+    val context = LocalContext.current
     val shopOpen = stringResource(R.string.shop_open)
     val shopTotal = stringResource(R.string.shop_total, shopCount)
 
@@ -337,6 +364,9 @@ private fun ShopSection(
         },
         more = {
             Row(
+                modifier = Modifier.noRippleClickable {
+                    navigator.navigateToStore(context).let(context::startActivity)
+                },
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text(
@@ -384,6 +414,9 @@ private fun ShopSection(
                     style = RebrandKoinTheme.typography.regular13,
                     color = Color(0xFFA8A8A8)
                 )
+            },
+            onClick = {
+                navigator.navigateToStore(context).let(context::startActivity)
             }
         )
     }
diff --git a/feature/home/src/main/java/in/koreatech/koin/feature/home/HomeViewModel.kt b/feature/home/src/main/java/in/koreatech/koin/feature/home/HomeViewModel.kt
@@ -2,11 +2,72 @@ package `in`.koreatech.koin.feature.home
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
+import `in`.koreatech.koin.domain.usecase.callvan.GetRecruitingCallvanCountUseCase
+import `in`.koreatech.koin.domain.usecase.dining.GetDiningWithOperationTimeUseCase
+import `in`.koreatech.koin.domain.usecase.store.GetStoreCountUseCase
+import `in`.koreatech.koin.domain.usecase.store.GetStoreEventCountUseCase
+import `in`.koreatech.koin.domain.util.DiningUtil
+import `in`.koreatech.koin.domain.util.TimeUtil
+import `in`.koreatech.koin.feature.home.mapper.toDiningPagerDataList
 import javax.inject.Inject
+import kotlinx.collections.immutable.toImmutableList
 import org.orbitmvi.orbit.ContainerHost
+import org.orbitmvi.orbit.syntax.simple.intent
+import org.orbitmvi.orbit.syntax.simple.reduce
 import org.orbitmvi.orbit.viewmodel.container
+import timber.log.Timber
 
 @HiltViewModel
-class HomeViewModel @Inject constructor() : ViewModel(), ContainerHost<HomeState, HomeSideEffect> {
-    override val container = container<HomeState, HomeSideEffect>(HomeState())
+class HomeViewModel @Inject constructor(
+    private val getDiningWithOperationTimeUseCase: GetDiningWithOperationTimeUseCase,
+    private val getStoreCountUseCase: GetStoreCountUseCase,
+    private val getStoreEventCountUseCase: GetStoreEventCountUseCase,
+    private val getRecruitingCallvanCountUseCase: GetRecruitingCallvanCountUseCase
+) : ViewModel(), ContainerHost<HomeState, HomeSideEffect> {
+    override val container = container<HomeState, HomeSideEffect>(HomeState()) {
+        getDining()
+        getStoreCount()
+        getStoreEventCount()
+        getRecruitingCallvanCount()
+    }
+
+    private fun getDining() = intent {
+        getDiningWithOperationTimeUseCase(TimeUtil.dateFormatToYYMMDD(DiningUtil.getCurrentDate())).onSuccess { data ->
+            reduce {
+                state.copy(diningData = data.filter { it.type == DiningUtil.getCurrentType().typeEnglish }.map { it.toDiningPagerDataList() }.toImmutableList())
+            }
+        }.onFailure {
+            Timber.e(it)
+        }
+    }
+
+    private fun getStoreCount() = intent {
+        getStoreCountUseCase().onSuccess {
+            reduce {
+                state.copy(openShopCount = it.openCount, shopCount = it.totalCount)
+            }
+        }.onFailure {
+            Timber.e(it)
+        }
+    }
+
+    private fun getStoreEventCount() = intent {
+        getStoreEventCountUseCase().onSuccess {
+            reduce {
+                state.copy(shopEventForKoin = it)
+            }
+        }.onFailure {
+            Timber.e(it)
+        }
+    }
+
+    private fun getRecruitingCallvanCount() = intent {
+        getRecruitingCallvanCountUseCase().onSuccess {
+            reduce {
+                state.copy(callVanRecruitCount = it)
+            }
+        }.onFailure {
+            Timber.e(it)
+        }
+    }
 }
diff --git a/feature/home/src/main/java/in/koreatech/koin/feature/home/component/DiningPager.kt b/feature/home/src/main/java/in/koreatech/koin/feature/home/component/DiningPager.kt
@@ -17,6 +17,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -38,7 +39,8 @@ import kotlinx.coroutines.launch
 @Composable
 fun DiningPager(
     data: ImmutableList<DiningPagerData>,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    onCardClick: (data: DiningPagerData) -> Unit = { }
 ) {
     val pagerState = rememberPagerState(pageCount = { data.size })
     val coroutineScope = rememberCoroutineScope()
@@ -54,7 +56,8 @@ fun DiningPager(
             modifier = Modifier.fillMaxWidth()
         ) { page ->
             DiningPagerContent(
-                data = data[page]
+                data = data[page],
+                onClick = onCardClick
             )
         }
 
@@ -84,13 +87,17 @@ fun DiningPager(
 @Composable
 private fun DiningPagerContent(
     data: DiningPagerData,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    onClick: (data: DiningPagerData) -> Unit = { }
 ) {
+    val click = remember(data) { { onClick(data) } }
+
     Column(
         modifier = modifier
             .border(0.5.dp, Color(0xFFE6E6E6), RoundedCornerShape(24.dp))
             .clip(RoundedCornerShape(24.dp))
             .background(color = Color(0xFFFFFFFF))
+            .clickable(onClick = click)
             .padding(vertical = 20.dp, horizontal = 24.dp),
         verticalArrangement = Arrangement.spacedBy(12.dp)
     ) {
diff --git a/feature/home/src/main/java/in/koreatech/koin/feature/home/mapper/DiningMapper.kt b/feature/home/src/main/java/in/koreatech/koin/feature/home/mapper/DiningMapper.kt
@@ -0,0 +1,14 @@
+package `in`.koreatech.koin.feature.home.mapper
+
+import `in`.koreatech.koin.domain.model.dining.DiningWithOperationTime
+import `in`.koreatech.koin.feature.home.component.DiningPagerData
+import kotlinx.collections.immutable.toImmutableList
+
+fun DiningWithOperationTime.toDiningPagerDataList(): DiningPagerData = DiningPagerData(
+    place = place,
+    startTime = startTime,
+    endTime = endTime,
+    price = priceCard.toIntOrNull() ?: priceCash.toIntOrNull() ?: 0,
+    kcal = kcal.toIntOrNull() ?: 0,
+    menu = menu.toImmutableList()
+)
diff --git a/koin/src/main/java/in/koreatech/koin/navigation/NavigatorImpl.kt b/koin/src/main/java/in/koreatech/koin/navigation/NavigatorImpl.kt
@@ -2,20 +2,26 @@ package `in`.koreatech.koin.navigation
 
 import android.content.Context
 import android.content.Intent
+import `in`.koreatech.bus.BusSearchActivity
+import `in`.koreatech.bus.BusTimetableActivity
 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
+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.dining.ui.DiningActivity
 import `in`.koreatech.koin.feature.store.StoreActivity
 import `in`.koreatech.koin.feature.user.ui.signin.SignInActivity
 import `in`.koreatech.koin.ui.main.activity.MainActivity
 import `in`.koreatech.koin.ui.notification.NotificationActivity
 import `in`.koreatech.koin.ui.splash.SplashActivity
+import `in`.koreatech.koin.ui.unibus.UnibusActivity
 import javax.inject.Inject
 
+@Suppress("TooManyFunctions")
 class NavigatorImpl @Inject constructor() : Navigator {
     override fun navigateToSplash(
         context: Context,
@@ -64,6 +70,37 @@ class NavigatorImpl @Inject constructor() : Navigator {
         }
     }
 
+    override fun navigateToDining(context: Context): Intent {
+        return context.buildIntent(DiningActivity::class.java).apply {
+            putExtra("url", "https://koreatech.unibus.kr/")
+            flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+    }
+
+    override fun navigateToBusTimeTable(context: Context): Intent {
+        return context.buildIntent(BusTimetableActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+    }
+
+    override fun navigateToBusSearch(context: Context): Intent {
+        return context.buildIntent(BusSearchActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+    }
+
+    override fun navigateToUnibus(context: Context): Intent {
+        return context.buildIntent(UnibusActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+    }
+
+    override fun navigateToCallvan(context: Context): Intent {
+        return context.buildIntent(CallvanActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+    }
+
     override fun navigateToChatRoom(context: Context): Intent {
         return context.buildIntent(ChatRoomActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
