[REFACTOR/#216] 유빈 QA

app/instructor/src/main/java/com/ssing/instructor/InstructorMainNavHost.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
+import androidx.navigation.navOptions
 import com.ssing.core.ui.extension.clearBackStackNavOptions
 import com.ssing.core.ui.navigation.Route
 import com.ssing.core.ui.navigation.SsingNavHost
@@ -55,17 +56,20 @@ internal fun InstructorMainNavHost(
             paddingValues = paddingValues,
             navigateToMatching = {
                 navController.navigate(
-                    route = InstructorMatching(),
+                    route = InstructorMatching(startFresh = true),
+                    navOptions = navController.backToHomeNavOptions(),
                 )
             },
             navigateToLessonDetail = { lessonId ->
                 navController.navigate(
                     route = InstructorLesson(lessonId = lessonId ?: 0),
+                    navOptions = navController.backToHomeNavOptions(),
                 )
             },
-            navigateToMatchingWaiting = {
+            navigateToMatchingWaiting = { offerId ->
                 navController.navigate(
-                    route = InstructorMatching
+                    route = InstructorMatching(offerId = offerId),
+                    navOptions = navController.backToHomeNavOptions(),
                 )
             },
             navigateToNotification = {
@@ -82,14 +86,18 @@ internal fun InstructorMainNavHost(
             navigateToLessonDetail = { lessonId ->
                 navController.navigate(
                     route = InstructorLesson(lessonId = lessonId),
+                    navOptions = navController.backToHomeNavOptions(),
                 )
             },
         )
         instructorLessonNavGraph(
             paddingValues = paddingValues,
             navController = navController,
             navigateToMatching = {
-                navController.navigate(route = InstructorMatching())
+                navController.navigate(
+                    route = InstructorMatching(),
+                    navOptions = navController.backToHomeNavOptions(),
+                )
             },
             navigateToHome = {
                 navController.navigate(
@@ -109,3 +117,7 @@ internal fun InstructorMainNavHost(
         )
     }
 }
+private fun NavHostController.backToHomeNavOptions() = navOptions {
+    popUpTo(InstructorHome) { inclusive = false }
+    launchSingleTop = true
+}

data/src/main/java/com/ssing/data/lesson/consumer/remote/dto/response/ConsumerLessonDetailResponse.kt

@@ -69,7 +69,7 @@ data class InstructorProfileResponse(
     @SerialName("gender") val gender: String,
     @SerialName("birthYear") val birthYear: Int,
     @SerialName("level") val level: Int,
-    @SerialName("profileImageUrl") val profileImageUrl: String? = null,
+    @SerialName("profileImageUrl") val profileImageUrl: String,
 )
 
 @Serializable
@@ -156,4 +156,4 @@ data class ConsumerMatchingRequestResponse(
     @SerialName("representativeMemberName") val representativeMemberName: String,
     @SerialName("headcount") val headcount: Int,
     @SerialName("participants") val participants: List<ParticipantResponse>,
-)
+)

data/src/main/java/com/ssing/data/lesson/consumer/repository/impl/ConsumerLessonRepositoryImpl.kt

@@ -144,7 +144,7 @@ internal class ConsumerLessonRepositoryImpl @Inject constructor(
         gender = gender,
         birthYear = birthYear,
         level = level,
-        profileImageUrl = profileImageUrl.orEmpty(),
+        profileImageUrl = profileImageUrl,
     )
 
     private fun ParticipantResponse.toModel() = LessonParticipant(participantId, gender, age)
@@ -176,4 +176,4 @@ internal class ConsumerLessonRepositoryImpl @Inject constructor(
         )
     }
 
-}
+}

data/src/main/java/com/ssing/data/matching/instructormatching/model/InstructorMatchingOffer.kt

@@ -16,7 +16,5 @@ data class InstructorMatchingLessonSummary(
 )
 
 data class InstructorMatchingPriceSummary(
-    val lessonPriceAmount: Int,
-    val resortPassFeeAmount: Int,
-    val totalPaymentAmount: Int,
+    val instructorSettlementAmount: Int,
 )

data/src/main/java/com/ssing/data/matching/instructormatching/remote/dto/response/InstructorMatchingOffersResponse.kt

@@ -39,7 +39,5 @@ internal data class InstructorMatchingLessonSummaryResponse(
 
 @Serializable
 internal data class InstructorMatchingPriceSummaryResponse(
-    @SerialName("lessonPriceAmount") val lessonPriceAmount: Int,
-    @SerialName("resortPassFeeAmount") val resortPassFeeAmount: Int,
-    @SerialName("totalPaymentAmount") val totalPaymentAmount: Int,
+    @SerialName("instructorSettlementAmount") val instructorSettlementAmount: Int? = null,
 )

data/src/main/java/com/ssing/data/matching/instructormatching/repository/impl/InstructorMatchingRepositoryImpl.kt

@@ -237,9 +237,7 @@ internal class InstructorMatchingRepositoryImpl @Inject constructor(
                 },
                 priceSummary = requireNotNull(priceSummary) { "AVAILABLE 응답에 priceSummary 누락" }.let {
                     InstructorMatchingPriceSummary(
-                        lessonPriceAmount = it.lessonPriceAmount,
-                        resortPassFeeAmount = it.resortPassFeeAmount,
-                        totalPaymentAmount = it.totalPaymentAmount,
+                        instructorSettlementAmount = it.instructorSettlementAmount ?: 0,
                     )
                 },
                 participants = participants.map {

presentation/instructor-home/src/main/java/com/ssing/presentation/instructorhome/InstructorHomeContract.kt

@@ -19,6 +19,7 @@ internal interface InstructorHomeContract {
         val averageRating: Float = 0f,
         val grade: Grade = Grade.GRADE1,
         val achievementRate: Int = 0,
+        val hasActiveLesson: Boolean = false,
     )
 
     sealed interface Effect {
@@ -29,7 +30,7 @@ internal interface InstructorHomeContract {
             val offerId: Long? = null,
         ) : Effect
 
-        data object NavigateToMatchingWaiting : Effect
+        data class NavigateToMatchingWaiting(val offerId: Long? = null) : Effect
     }
 }
 

presentation/instructor-home/src/main/java/com/ssing/presentation/instructorhome/InstructorHomeScreen.kt

@@ -24,6 +24,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.ssing.core.ui.R
 import com.ssing.core.ui.common.component.Empty
@@ -48,16 +50,23 @@ internal fun InstructorHomeRoute(
     navigateToLessonDetail: (Long?) -> Unit,
     navigateToMatching: () -> Unit,
     navigateToNotification: () -> Unit,
+    navigateToMatchingWaiting: (Long?) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: InstructorHomeViewModel = hiltViewModel(),
-    navigateToMatchingWaiting: () -> Unit,
 ) {
     val state by viewModel.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
 
+    LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
+        viewModel.loadHome()
+    }
+
     HandleUiEffects(viewModel.uiEffect) { effect ->
         when (effect) {
-            is InstructorHomeContract.Effect.NavigateToMatchingWaiting -> navigateToMatchingWaiting
+            is InstructorHomeContract.Effect.NavigateToMatchingWaiting -> navigateToMatchingWaiting(
+                effect.offerId
+            )
+
             is InstructorHomeContract.Effect.NavigateToLessonDetail -> navigateToLessonDetail(effect.lessonId)
             is InstructorHomeContract.Effect.NavigateToMatching -> navigateToMatching()
             is InstructorHomeContract.Effect.ShowToast -> context.toast(effect.message)

presentation/instructor-home/src/main/java/com/ssing/presentation/instructorhome/InstructorHomeViewModel.kt

@@ -29,10 +29,6 @@ internal class InstructorHomeViewModel @Inject constructor(
         InstructorHomeContract.State()
     ) {
 
-    init {
-        loadHome()
-    }
-
     fun loadHome() {
         viewModelScope.launch {
             updateState {
@@ -47,6 +43,9 @@ internal class InstructorHomeViewModel @Inject constructor(
                         copy(
                             isLoading = false,
                             lessonCards = result.lessonCards.toUiState(),
+                            hasActiveLesson = result.lessonCards.any {
+                                it.displayStatus == CONFIRMED || it.displayStatus == IN_PROGRESS
+                            },
                             hasUnreadNotification = result.hasUnreadNotification,
                             instructorName = result.instructorName,
                             matchingPeopleCount = result.matchingPeopleCount,
@@ -111,10 +110,9 @@ internal class InstructorHomeViewModel @Inject constructor(
 
             WAITING_FOR_INSTRUCTOR,
             WAITING_FOR_CONFIRMATION,
-            PAYMENT_PENDING,
-            IN_PROGRESS -> Status.Matched
-
-            CONFIRMED -> Status.Default
+            PAYMENT_PENDING -> Status.Matched
+            CONFIRMED,
+            IN_PROGRESS -> Status.Default
 
             else -> Status.Default
         }
@@ -126,58 +124,33 @@ internal class InstructorHomeViewModel @Inject constructor(
         const val PAYMENT_PENDING = "PAYMENT_PENDING"
         const val CONFIRMED = "CONFIRMED"
         const val IN_PROGRESS = "IN_PROGRESS"
+
+        const val MSG_ACTIVE_LESSON_BLOCK =
+            "진행 예정이거나 진행 중인 강습이 있어 즉시매칭을 시작할 수 없어요."
     }
 
     fun onMatchingClick() {
+        // 확정/진행 중인 강습이 있으면 즉시매칭 시작을 막는다.
+        if (uiState.value.hasActiveLesson) {
+            sendEffect(InstructorHomeContract.Effect.ShowToast(MSG_ACTIVE_LESSON_BLOCK))
+            return
+        }
         sendEffect(InstructorHomeContract.Effect.NavigateToMatching)
     }
 
-    fun onLessonClick(
-        lesson: Reservation,
-    ) {
-        Timber.i("lessonId: ${lesson.lessonId} / offerId: $lesson.offerId")
-
-        when (lesson.status) {
-            Status.Matching -> {
-                sendEffect(
-                    InstructorHomeContract.Effect.NavigateToMatching
-                )
-            }
-
-            Status.Matched -> {
-                val lessonId = lesson.lessonId
-
-                if (lessonId == null) {
-                    sendEffect(InstructorHomeContract.Effect.NavigateToMatching)
-                    return
-                }
-
-                sendEffect(
-                    InstructorHomeContract.Effect.NavigateToLessonDetail(
-                        lessonId = lessonId,
-                    )
-                )
-            }
-
-            Status.Default -> {
-                val lessonId = lesson.lessonId
-                val offerId = lesson.offerId
-
-                if (lessonId == null || offerId == null) {
-                    Timber.e(
-                        "강습 상세 이동에 필요한 lessonId나 offerId가 없습니다. " +
-                                "status=${lesson.status}, offerId=${lesson.offerId}"
-                    )
-                    return
-                }
-
-                sendEffect(
-                    InstructorHomeContract.Effect.NavigateToLessonDetail(
-                        lessonId = lessonId,
-                        offerId = offerId,
-                    )
-                )
-            }
+    fun onLessonClick(lesson: Reservation) {
+        Timber.i("lessonId: ${lesson.lessonId} / offerId: ${lesson.offerId}")
+
+        when {
+            lesson.lessonId != null -> sendEffect(
+                InstructorHomeContract.Effect.NavigateToLessonDetail(lessonId = lesson.lessonId)
+            )
+            lesson.offerId != null -> sendEffect(
+                InstructorHomeContract.Effect.NavigateToMatchingWaiting(offerId = lesson.offerId)
+            )
+            else -> sendEffect(
+                InstructorHomeContract.Effect.NavigateToMatchingWaiting(offerId = null)
+            )
         }
     }
 

presentation/instructor-home/src/main/java/com/ssing/presentation/instructorhome/navigation/InstructorHomeNavigation.kt

@@ -15,7 +15,7 @@ fun NavGraphBuilder.instructorHomeNavGraph(
     navigateToMatching: () -> Unit,
     navigateToNotification: () -> Unit,
     navigateToLessonDetail: (Long?) -> Unit,
-    navigateToMatchingWaiting: () -> Unit,
+    navigateToMatchingWaiting: (Long?) -> Unit,
 ) {
     composable<InstructorHome> {
         InstructorHomeRoute(