분석 녹음 파일 업로드 화면 구현

Prezel/app/build.gradle.kts

@@ -51,6 +51,7 @@ dependencies {
 
     implementation(projects.featureTermsImpl)
     implementation(projects.featurePracticeImpl)
+    implementation(projects.featureAnalysisImpl)
     implementation(projects.featureSettingImpl)
     implementation(projects.featureProfileImpl)
 

Prezel/core/common/src/main/kotlin/com/team/prezel/core/common/error/AppError.kt

@@ -7,6 +7,7 @@ enum class AppError {
     NOT_FOUND,
     DUPLICATE,
     VOICE_RECOGNITION_FAILED,
+    SCRIPT_FILE_RECOGNITION_FAILED,
     NETWORK,
     UNKNOWN,
 }

Prezel/core/data/src/main/java/com/team/prezel/core/data/error/AppErrorExt.kt

@@ -40,17 +40,17 @@ private fun ServerErrorCode.toDomainError(): AppError =
     when (this) {
         ServerErrorCode.INVALID_REQUEST,
         ServerErrorCode.REQUIRED_TERMS_DISAGREED,
-        ServerErrorCode.FILE_IS_EMPTY,
+        ServerErrorCode.FILE_UPLOAD_FAILED,
         -> AppError.INVALID_REQUEST
 
+        ServerErrorCode.FILE_IS_EMPTY -> AppError.SCRIPT_FILE_RECOGNITION_FAILED
+
         ServerErrorCode.SERVER_ERROR,
-        ServerErrorCode.FILE_UPLOAD_FAILED,
+        ServerErrorCode.SENTENCE_NOT_FOUND,
         ServerErrorCode.VOICE_ANALYSIS_FAILED,
         -> AppError.SERVER_ERROR
 
-        ServerErrorCode.TERMS_NOT_FOUND,
-        ServerErrorCode.SENTENCE_NOT_FOUND,
-        -> AppError.NOT_FOUND
+        ServerErrorCode.TERMS_NOT_FOUND -> AppError.NOT_FOUND
 
         ServerErrorCode.DUPLICATE_NICKNAME -> AppError.DUPLICATE
 

Prezel/core/data/src/main/java/com/team/prezel/core/data/mapper/PracticeMapper.kt

@@ -0,0 +1,92 @@
+package com.team.prezel.core.data.mapper
+
+import com.team.prezel.core.model.practice.PracticeRecordingAnalysisResult
+import com.team.prezel.core.model.practice.PracticeRecordingOverallEvaluation
+import com.team.prezel.core.model.practice.PracticeRecordingSpeed
+import com.team.prezel.core.model.practice.PracticeScript
+import com.team.prezel.core.model.presentation.Audience
+import com.team.prezel.core.model.presentation.Category
+import com.team.prezel.core.model.presentation.PresentationExpectedQuestion
+import com.team.prezel.core.model.presentation.PresentationGrowthGraph
+import com.team.prezel.core.model.presentation.PresentationRecordingAnalysisResult
+import com.team.prezel.core.model.presentation.Purpose
+import com.team.prezel.core.model.presentation.Style
+import com.team.prezel.core.network.model.practice.AnalyzePracticeRecordingResponse
+import com.team.prezel.core.network.model.practice.PracticeSentenceResponse
+import com.team.prezel.core.network.model.practice.PresentationRecordingAnalysisResponse
+import kotlin.math.roundToInt
+
+internal fun PracticeSentenceResponse.toDomain(): PracticeScript =
+    PracticeScript(
+        id = PRACTICE_SCRIPT_ID,
+        content = sentence,
+    )
+
+internal fun AnalyzePracticeRecordingResponse.toDomain(): PracticeRecordingAnalysisResult =
+    PracticeRecordingAnalysisResult(
+        pronunciationScore = accuracyScore.roundToInt(),
+        speed = speedEvaluation.toPracticeRecordingSpeed(),
+        overallEvaluation = overallEvaluation.toPracticeRecordingOverallEvaluation(),
+    )
+
+internal fun PresentationRecordingAnalysisResponse.toDomain(): PresentationRecordingAnalysisResult =
+    PresentationRecordingAnalysisResult(
+        presentationId = presentationId,
+        analysisResultId = analysisResultId,
+        name = name,
+        type = type,
+        purpose = purpose,
+        style = style,
+        audience = audience,
+        analysisDate = analysisDate,
+        durationSeconds = durationSeconds,
+        formattedDuration = formattedDuration,
+        spm = spm,
+        speedEval = speedEval,
+        summaryFeedback = summaryFeedback,
+        accuracyScore = accuracyScore,
+        scriptMatchRate = scriptMatchRate,
+        spellErrorCount = spellErrorCount,
+        grammarErrorCount = grammarErrorCount,
+        totalErrorCount = totalErrorCount,
+        growthGraph = growthGraph.map { it.toDomain() },
+        expectedQuestions = expectedQuestions.map { it.toDomain() },
+    )
+
+internal fun Category.toRequestType(): String = name
+
+internal fun Purpose.toRequestPurpose(): String = name
+
+internal fun Style.toRequestStyle(): String = name
+
+internal fun Audience.toRequestAudience(): String = name
+
+internal fun PresentationRecordingAnalysisResponse.GrowthGraph.toDomain(): PresentationGrowthGraph =
+    PresentationGrowthGraph(
+        attempt = attempt,
+        accuracyScore = accuracyScore,
+        scriptMatchRate = scriptMatchRate,
+    )
+
+internal fun PresentationRecordingAnalysisResponse.ExpectedQuestion.toDomain(): PresentationExpectedQuestion =
+    PresentationExpectedQuestion(
+        question = question,
+        answer = answer,
+    )
+
+internal fun String.toPracticeRecordingSpeed(): PracticeRecordingSpeed =
+    when {
+        contains("느려요") -> PracticeRecordingSpeed.SLOW
+        contains("빨라요") -> PracticeRecordingSpeed.FAST
+        else -> PracticeRecordingSpeed.ADEQUATE
+    }
+
+internal fun String.toPracticeRecordingOverallEvaluation(): PracticeRecordingOverallEvaluation =
+    when (this) {
+        "Perfect" -> PracticeRecordingOverallEvaluation.PERFECT
+        "Good" -> PracticeRecordingOverallEvaluation.GOOD
+        "Try" -> PracticeRecordingOverallEvaluation.TRY
+        else -> PracticeRecordingOverallEvaluation.TRY
+    }
+
+private const val PRACTICE_SCRIPT_ID = 0L

Prezel/core/data/src/main/java/com/team/prezel/core/data/repository/PracticeRepositoryImpl.kt

@@ -1,16 +1,21 @@
 package com.team.prezel.core.data.repository
 
 import com.team.prezel.core.data.error.mapDomainFailure
+import com.team.prezel.core.data.mapper.toDomain
+import com.team.prezel.core.data.mapper.toRequestAudience
+import com.team.prezel.core.data.mapper.toRequestPurpose
+import com.team.prezel.core.data.mapper.toRequestStyle
+import com.team.prezel.core.data.mapper.toRequestType
 import com.team.prezel.core.domain.repository.practice.PracticeRepository
 import com.team.prezel.core.model.practice.PracticeRecordingAnalysisResult
-import com.team.prezel.core.model.practice.PracticeRecordingOverallEvaluation
-import com.team.prezel.core.model.practice.PracticeRecordingSpeed
 import com.team.prezel.core.model.practice.PracticeScript
+import com.team.prezel.core.model.presentation.Audience
+import com.team.prezel.core.model.presentation.Category
+import com.team.prezel.core.model.presentation.PresentationRecordingAnalysisResult
+import com.team.prezel.core.model.presentation.Purpose
+import com.team.prezel.core.model.presentation.Style
 import com.team.prezel.core.network.datasource.PracticeRemoteDataSource
-import com.team.prezel.core.network.model.practice.AnalyzePracticeRecordingResponse
-import com.team.prezel.core.network.model.practice.PracticeSentenceResponse
 import javax.inject.Inject
-import kotlin.math.roundToInt
 
 internal class PracticeRepositoryImpl @Inject constructor(
     private val practiceRemoteDataSource: PracticeRemoteDataSource,
@@ -22,6 +27,33 @@ internal class PracticeRepositoryImpl @Inject constructor(
             response.toDomain()
         }.mapDomainFailure()
 
+    override suspend fun analyzePresentationRecording(
+        name: String,
+        date: String,
+        category: Category,
+        purpose: Purpose,
+        style: Style,
+        audience: Audience,
+        script: String?,
+        scriptFilePath: String?,
+        audioFilePath: String,
+    ): Result<PresentationRecordingAnalysisResult> =
+        runCatching {
+            practiceRemoteDataSource.analyzePresentationRecording(
+                name = name,
+                date = date,
+                type = category.toRequestType(),
+                purpose = purpose.toRequestPurpose(),
+                style = style.toRequestStyle(),
+                audience = audience.toRequestAudience(),
+                script = script,
+                scriptFilePath = scriptFilePath,
+                audioFilePath = audioFilePath,
+            )
+        }.mapCatching { response ->
+            response.toDomain()
+        }.mapDomainFailure()
+
     override suspend fun analyzePracticeRecording(
         recordingFilePath: String,
         referenceText: String,
@@ -34,36 +66,4 @@ internal class PracticeRepositoryImpl @Inject constructor(
         }.mapCatching { response ->
             response.toDomain()
         }.mapDomainFailure()
-
-    private fun PracticeSentenceResponse.toDomain(): PracticeScript =
-        PracticeScript(
-            id = PRACTICE_SCRIPT_ID,
-            content = sentence,
-        )
-
-    private fun AnalyzePracticeRecordingResponse.toDomain(): PracticeRecordingAnalysisResult =
-        PracticeRecordingAnalysisResult(
-            pronunciationScore = accuracyScore.roundToInt(),
-            speed = speedEvaluation.toPracticeRecordingSpeed(),
-            overallEvaluation = overallEvaluation.toPracticeRecordingOverallEvaluation(),
-        )
-
-    private fun String.toPracticeRecordingSpeed(): PracticeRecordingSpeed =
-        when {
-            contains("느려요") -> PracticeRecordingSpeed.SLOW
-            contains("빨라요") -> PracticeRecordingSpeed.FAST
-            else -> PracticeRecordingSpeed.ADEQUATE
-        }
-
-    private fun String.toPracticeRecordingOverallEvaluation(): PracticeRecordingOverallEvaluation =
-        when (this) {
-            "Perfect" -> PracticeRecordingOverallEvaluation.PERFECT
-            "Good" -> PracticeRecordingOverallEvaluation.GOOD
-            "Try" -> PracticeRecordingOverallEvaluation.TRY
-            else -> PracticeRecordingOverallEvaluation.TRY
-        }
-
-    private companion object {
-        const val PRACTICE_SCRIPT_ID = 0L
-    }
 }

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/PrezelAccordion.kt

@@ -83,7 +83,7 @@ fun PrezelAccordion(
             )
         }
 
-        if (showDivider) {
+        if (showDivider && !expanded) {
             PrezelHorizontalDivider(
                 type = PrezelDividerType.THICK,
             )

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/datepicker/config/DayCell.kt

@@ -31,6 +31,7 @@ internal fun DayCell(
             .padding(PrezelTheme.spacing.V4)
             .clip(PrezelTheme.shapes.V1000)
             .background(color = config.dayContainerColor(dayCell = dayCell)),
+        isUseRipple = false,
         onClick = onClick,
     ) {
         if (dayCell == null) return@PrezelTouchArea

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/navigations/PrezelTabs.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.team.prezel.core.designsystem.foundation.typography.PrezelTextStyles
 import com.team.prezel.core.designsystem.theme.PrezelTheme
+import com.team.prezel.core.designsystem.util.NoRippleInteractionSource
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
@@ -76,5 +77,6 @@ private fun PrezelTab(
         },
         selectedContentColor = PrezelTheme.colors.solidBlack,
         unselectedContentColor = PrezelTheme.colors.textDisabled,
+        interactionSource = NoRippleInteractionSource,
     )
 }

Prezel/core/domain/src/main/kotlin/com/team/prezel/core/domain/repository/practice/PracticeRepository.kt

@@ -2,6 +2,11 @@ package com.team.prezel.core.domain.repository.practice
 
 import com.team.prezel.core.model.practice.PracticeRecordingAnalysisResult
 import com.team.prezel.core.model.practice.PracticeScript
+import com.team.prezel.core.model.presentation.Audience
+import com.team.prezel.core.model.presentation.Category
+import com.team.prezel.core.model.presentation.PresentationRecordingAnalysisResult
+import com.team.prezel.core.model.presentation.Purpose
+import com.team.prezel.core.model.presentation.Style
 
 interface PracticeRepository {
     suspend fun fetchPracticeScript(): Result<PracticeScript>
@@ -10,4 +15,16 @@ interface PracticeRepository {
         recordingFilePath: String,
         referenceText: String,
     ): Result<PracticeRecordingAnalysisResult>
+
+    suspend fun analyzePresentationRecording(
+        name: String,
+        date: String,
+        category: Category,
+        purpose: Purpose,
+        style: Style,
+        audience: Audience,
+        script: String?,
+        scriptFilePath: String?,
+        audioFilePath: String,
+    ): Result<PresentationRecordingAnalysisResult>
 }