[Публичный тренажер] ANDR-72: Четвертый этап InterviewQuizScreen. Навигация + Интеграция

app/src/main/java/ru/yeahub/Application.kt

@@ -8,6 +8,7 @@ import ru.yeahub.example_details.impl.detailsFeatureModule
 import ru.yeahub.example_home.impl.data.di.questionsMainFeatureModule
 import ru.yeahub.example_profile.impl.profileFeatureModule
 import ru.yeahub.interview_trainer.impl.createQuiz.di.createQuizModule
+import ru.yeahub.interview_trainer.impl.interviewQuiz.di.interviewQuizModule
 import ru.yeahub.interview_trainer.impl.interviewQuizResult.di.interviewQuizResultModule
 import ru.yeahub.navigation_impl.navigationPathModule
 import ru.yeahub.network_impl.networkModule
@@ -57,6 +58,7 @@ class Application : Application() {
                 collectionsAndQuestionsFeatureModule,
                 specializationFeatureModule,
                 createQuizModule,
+                interviewQuizModule,
                 interviewQuizResultModule
             )
         }

core/network-api/src/main/java/ru/yeahub/network_api/models/GetNewMockQuizResponse.kt

@@ -5,6 +5,6 @@ data class GetNewMockQuizResponse(
     val startDate: String,
     val fullCount: Int,
     val skills: List<String>,
-    val response: List<QuestionAnswerDto>,
+    val response: QuizAnswersWrapperDto,
     val questions: List<GetQuestionResponse>
 )

core/network-api/src/main/java/ru/yeahub/network_api/models/QuestionAnswerDto.kt

@@ -1,7 +1,7 @@
 package ru.yeahub.network_api.models
 
 data class QuestionAnswerDto(
-    val questionId: Int,
+    val questionId: Long,
     val questionTitle: String,
     val answer: String
 )

core/network-api/src/main/java/ru/yeahub/network_api/models/QuizAnswersWrapperDto.kt

@@ -0,0 +1,5 @@
+package ru.yeahub.network_api.models
+
+data class QuizAnswersWrapperDto(
+    val answers: List<QuestionAnswerDto>
+)

core/network-impl/src/main/java/ru/yeahub/network_impl/RetrofitApiService.kt

@@ -63,7 +63,7 @@ interface RetrofitApiService : ApiService {
         @Query("isFree") isFree: Boolean
     ): GetCollectionsResponse
 
-    @GET("/interview-preparation/quizzes/mock/new")
+    @GET("interview-preparation/quizzes/mock/new")
     override suspend fun getQuizMockQuestions(
         @Query("skills") skills: List<String>?,
         @Query("complexity") complexity: List<Int>?,

feature/interview-trainer/impl/src/main/java/ru/yeahub/interview_trainer/impl/interviewQuiz/di/InterviewQuizModule.kt

@@ -0,0 +1,36 @@
+package ru.yeahub.interview_trainer.impl.interviewQuiz.di
+
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+import ru.yeahub.interview_trainer.impl.interviewQuiz.data.InterviewQuizDataToDomainMapper
+import ru.yeahub.interview_trainer.impl.interviewQuiz.data.InterviewQuizRepositoryImpl
+import ru.yeahub.interview_trainer.impl.interviewQuiz.domain.GetQuestionsListUseCase
+import ru.yeahub.interview_trainer.impl.interviewQuiz.domain.GetQuestionsListUseCaseImpl
+import ru.yeahub.interview_trainer.impl.interviewQuiz.domain.InterviewQuizRepositoryApi
+import ru.yeahub.interview_trainer.impl.interviewQuiz.presentation.InterviewQuizScreenMapper
+import ru.yeahub.interview_trainer.impl.interviewQuiz.presentation.InterviewQuizViewModel
+
+val interviewQuizModule = module { 
+    // Мапперы
+    single { InterviewQuizDataToDomainMapper() }
+    single { InterviewQuizScreenMapper() }
+
+    // Репозиторий
+    single<InterviewQuizRepositoryApi> {
+        InterviewQuizRepositoryImpl(networkProvider = get(), mapper = get())
+    }
+
+    // Юзкейс
+    single<GetQuestionsListUseCase> {
+        GetQuestionsListUseCaseImpl(repository = get())
+    }
+
+    // Вьюмодель экрана
+    viewModel { params ->
+        InterviewQuizViewModel(
+            savedStateHandle = params.get(),
+            screenMapper = get(),
+            getQuestionsListUseCase = get()
+        )
+    }
+}

feature/interview-trainer/impl/src/main/java/ru/yeahub/interview_trainer/impl/interviewQuiz/presentation/InterviewQuizViewModel.kt

@@ -56,7 +56,7 @@ open class InterviewQuizViewModel(
             selectedAnswer = userInput.selectedAnswer
         )
     }.catch { e ->
-        screenMapper.getScreenState(e)
+        emit(screenMapper.getScreenState(e))
     }.stateIn(
         scope = viewModelScopeSafe,
         started = SharingStarted.WhileSubscribed(TIME_TO_CLEAN_UP_RESOURCES),

feature/interview-trainer/impl/src/main/java/ru/yeahub/interview_trainer/impl/interviewQuiz/ui/InterviewQuizScreen.kt

@@ -366,7 +366,7 @@ private fun QuestionCard(
                 }
             } else {
                 SecondaryButton(
-                    onClick = {},
+                    onClick = onResultClick,
                     modifier = Modifier
                         .width(170.dp)
                         .height(48.dp)

feature/interview-trainer/impl/src/test/java/test/InterviewQuizDataToDomainMapperTest.kt

@@ -9,6 +9,7 @@ import ru.yeahub.interview_trainer.impl.interviewQuiz.domain.DomainQuestionsList
 import ru.yeahub.network_api.models.GetNewMockQuizResponse
 import ru.yeahub.network_api.models.GetQuestionResponse
 import ru.yeahub.network_api.models.NestedUserReferenceDto
+import ru.yeahub.network_api.models.QuizAnswersWrapperDto
 import ru.yeahub.test.TestArgumentsProvider
 
 class InterviewQuizDataToDomainMapperTest {
@@ -87,7 +88,7 @@ class InterviewQuizDataToDomainMapperTest {
             startDate = "01.01.2026",
             fullCount = 2,
             skills = emptyList(),
-            response = emptyList(),
+            response = QuizAnswersWrapperDto(emptyList()),
             questions = listOf(defaultQuestionResponse, defaultQuestionResponseWithLongAnswer),
         )