FIX: 감정 등록 중간에 다시 감정을 선택해도 api를 호출하지 않도록 수정, ktlint 적용

l5x5l · l5x5l · commit 0c2466a00728 · 2025-07-25T23:05:45.000+09:00
diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/datasourceImpl/EmotionDataSourceImpl.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/datasourceImpl/EmotionDataSourceImpl.kt
@@ -9,7 +9,7 @@ import com.threegap.bitnagil.data.emotion.service.EmotionService
 import javax.inject.Inject
 
 class EmotionDataSourceImpl @Inject constructor(
-    private val emotionService: EmotionService
+    private val emotionService: EmotionService,
 ) : EmotionDataSource {
     override suspend fun getEmotions(): Result<GetEmotionsResponse> {
         return safeApiCall {
diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/model/dto/EmotionRecommendedRoutineDto.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/model/dto/EmotionRecommendedRoutineDto.kt
@@ -12,5 +12,5 @@ data class EmotionRecommendedRoutineDto(
     @SerialName("routineDescription")
     val routineDescription: String,
     @SerialName("recommendedSubRoutines")
-    val recommendedSubRoutines: List<EmotionRecommendedSubRoutineDto>
+    val recommendedSubRoutines: List<EmotionRecommendedSubRoutineDto>,
 )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/model/request/RegisterEmotionRequest.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/model/request/RegisterEmotionRequest.kt
@@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class RegisterEmotionRequest(
     @SerialName("emotionMarbleType")
-    val emotionMarbleType: String
+    val emotionMarbleType: String,
 )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/model/response/GetEmotionsResponse.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/model/response/GetEmotionsResponse.kt
@@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class GetEmotionsResponse(
     @SerialName("emotionMarbleTypes")
-    val emotionMarbleTypes: List<String>
+    val emotionMarbleTypes: List<String>,
 )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/model/response/RegisterEmotionResponse.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/model/response/RegisterEmotionResponse.kt
@@ -7,5 +7,5 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class RegisterEmotionResponse(
     @SerialName("recommendedRoutines")
-    val recommendedRoutines: List<EmotionRecommendedRoutineDto>
+    val recommendedRoutines: List<EmotionRecommendedRoutineDto>,
 )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/repositoryImpl/EmotionRepositoryImpl.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/repositoryImpl/EmotionRepositoryImpl.kt
@@ -6,12 +6,12 @@ import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
 import javax.inject.Inject
 
 class EmotionRepositoryImpl @Inject constructor(
-    private val emotionDataSource: EmotionDataSource
+    private val emotionDataSource: EmotionDataSource,
 ) : EmotionRepository {
     override suspend fun getEmotions(): Result<List<Emotion>> {
         return emotionDataSource.getEmotions().map { response ->
             response.emotionMarbleTypes.mapNotNull {
-                when(it) {
+                when (it) {
                     "CALM" -> Emotion.CALM
                     "VITALITY" -> Emotion.VITALITY
                     "LETHARGY" -> Emotion.LETHARGY
@@ -25,7 +25,7 @@ class EmotionRepositoryImpl @Inject constructor(
     }
 
     override suspend fun registerEmotion(emotion: Emotion): Result<Unit> {
-        val selectedEmotion = when(emotion) {
+        val selectedEmotion = when (emotion) {
             Emotion.CALM -> "CALM"
             Emotion.VITALITY -> "VITALITY"
             Emotion.LETHARGY -> "LETHARGY"
@@ -36,5 +36,4 @@ class EmotionRepositoryImpl @Inject constructor(
 
         return emotionDataSource.registerEmotion(selectedEmotion).map { _ -> }
     }
-
 }
diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt
@@ -14,6 +14,6 @@ interface EmotionService {
 
     @POST("/api/v1/emotion-marbles")
     suspend fun postEmotions(
-        @Body request: RegisterEmotionRequest
+        @Body request: RegisterEmotionRequest,
     ): BaseResponse<RegisterEmotionResponse>
 }
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/emotion/usecase/GetEmotionsUseCase.kt b/domain/src/main/java/com/threegap/bitnagil/domain/emotion/usecase/GetEmotionsUseCase.kt
@@ -5,9 +5,9 @@ import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
 import javax.inject.Inject
 
 class GetEmotionsUseCase @Inject constructor(
-    private val emotionRepository: EmotionRepository
+    private val emotionRepository: EmotionRepository,
 ) {
-    suspend operator fun invoke() : Result<List<Emotion>> {
+    suspend operator fun invoke(): Result<List<Emotion>> {
         return emotionRepository.getEmotions()
     }
 }
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/emotion/usecase/RegisterEmotionUseCase.kt b/domain/src/main/java/com/threegap/bitnagil/domain/emotion/usecase/RegisterEmotionUseCase.kt
@@ -5,9 +5,9 @@ import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
 import javax.inject.Inject
 
 class RegisterEmotionUseCase @Inject constructor(
-    private val emotionRepository: EmotionRepository
+    private val emotionRepository: EmotionRepository,
 ) {
-    suspend operator fun invoke(emotion: Emotion) : Result<Unit> {
+    suspend operator fun invoke(emotion: Emotion): Result<Unit> {
         return emotionRepository.registerEmotion(emotion)
     }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt
@@ -63,7 +63,7 @@ private fun EmotionScreen(
         modifier = Modifier
             .fillMaxSize()
             .background(color = BitnagilTheme.colors.white),
-        horizontalAlignment = Alignment.CenterHorizontally
+        horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Box(
             modifier = Modifier
@@ -86,26 +86,30 @@ private fun EmotionScreen(
 
         Spacer(modifier = Modifier.height(6.dp))
 
-        Text("감정구슬을 등록하면 루틴을 추천받아요!", style = BitnagilTheme.typography.subtitle1Regular.copy(color = BitnagilTheme.colors.navy300), textAlign = TextAlign.Center)
+        Text(
+            "감정구슬을 등록하면 루틴을 추천받아요!",
+            style = BitnagilTheme.typography.subtitle1Regular.copy(color = BitnagilTheme.colors.navy300),
+            textAlign = TextAlign.Center,
+        )
 
         Spacer(modifier = Modifier.height(64.dp))
 
         LazyVerticalGrid(
             columns = GridCells.Fixed(3),
             modifier = Modifier.padding(horizontal = 40.dp).widthIn(300.dp),
             horizontalArrangement = Arrangement.spacedBy(32.dp),
-            verticalArrangement = Arrangement.spacedBy(32.dp)
+            verticalArrangement = Arrangement.spacedBy(32.dp),
         ) {
             items(state.emotions) { emotion ->
                 Column(
-                    horizontalAlignment = Alignment.CenterHorizontally
+                    horizontalAlignment = Alignment.CenterHorizontally,
                 ) {
                     Image(
                         painter = painterResource(id = emotion.imageResourceId),
                         contentDescription = null,
                         modifier = Modifier.size(72.dp).clickable {
                             onClickEmotion(emotion)
-                        }
+                        },
                     )
                     Spacer(modifier = Modifier.height(12.dp))
                     Text(emotion.emotionName, style = BitnagilTheme.typography.body1Regular.copy(color = BitnagilTheme.colors.coolGray20))
@@ -125,7 +129,7 @@ fun MyPageScreenPreview() {
                 isLoading = false,
             ),
             onClickEmotion = { _ -> },
-            onClickPreviousButton = {}
+            onClickPreviousButton = {},
         )
     }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionViewModel.kt
@@ -22,7 +22,7 @@ class EmotionViewModel @Inject constructor(
     private val registerEmotionUseCase: RegisterEmotionUseCase,
 ) : MviViewModel<EmotionState, EmotionSideEffect, EmotionIntent>(
     savedStateHandle = savedStateHandle,
-    initState = EmotionState.Init
+    initState = EmotionState.Init,
 ) {
     init {
         loadEmotions()
@@ -33,7 +33,7 @@ class EmotionViewModel @Inject constructor(
             getEmotionsUseCase().fold(
                 onSuccess = { emotions ->
                     sendIntent(
-                        EmotionIntent.EmotionListLoadSuccess(emotions = emotions.map { Emotion.fromDomain(it) })
+                        EmotionIntent.EmotionListLoadSuccess(emotions = emotions.map { Emotion.fromDomain(it) }),
                     )
                 },
                 onFailure = {
@@ -44,7 +44,7 @@ class EmotionViewModel @Inject constructor(
     }
 
     override suspend fun SimpleSyntax<EmotionState, EmotionSideEffect>.reduceState(intent: EmotionIntent, state: EmotionState): EmotionState? {
-        when(intent) {
+        when (intent) {
             is EmotionIntent.EmotionListLoadSuccess -> {
                 return state.copy(
                     emotions = intent.emotions,
@@ -55,18 +55,27 @@ class EmotionViewModel @Inject constructor(
                 postSideEffect(EmotionSideEffect.NavigateToBack)
                 return null
             }
+            EmotionIntent.RegisterEmotionLoading -> {
+                return state.copy(
+                    isLoading = true,
+                )
+            }
         }
     }
 
     fun selectEmotion(emotion: Emotion) {
+        val isLoading = stateFlow.value.isLoading
+        if (isLoading) return
+
         viewModelScope.launch {
+            sendIntent(EmotionIntent.RegisterEmotionLoading)
             registerEmotionUseCase(emotion = emotion.toDomain()).fold(
                 onSuccess = {
                     sendIntent(EmotionIntent.RegisterEmotionSuccess)
                 },
                 onFailure = {
                     // todo 실패 케이스 정의되면 처리
-                }
+                },
             )
         }
     }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/mvi/EmotionIntent.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/mvi/EmotionIntent.kt
@@ -3,7 +3,8 @@ package com.threegap.bitnagil.presentation.emotion.model.mvi
 import com.threegap.bitnagil.presentation.common.mviviewmodel.MviIntent
 import com.threegap.bitnagil.presentation.emotion.model.Emotion
 
-sealed class EmotionIntent: MviIntent {
+sealed class EmotionIntent : MviIntent {
     data class EmotionListLoadSuccess(val emotions: List<Emotion>) : EmotionIntent()
     data object RegisterEmotionSuccess : EmotionIntent()
+    data object RegisterEmotionLoading : EmotionIntent()
 }

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@ data class EmotionRecommendedRoutineDto(`
`12`	`12`	`@SerialName("routineDescription")`
`13`	`13`	`val routineDescription: String,`
`14`	`14`	`@SerialName("recommendedSubRoutines")`
`15`		`- val recommendedSubRoutines: List<EmotionRecommendedSubRoutineDto>`
	`15`	`+ val recommendedSubRoutines: List<EmotionRecommendedSubRoutineDto>,`
`16`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable`
`6`	`6`	`@Serializable`
`7`	`7`	`data class RegisterEmotionRequest(`
`8`	`8`	`@SerialName("emotionMarbleType")`
`9`		`- val emotionMarbleType: String`
	`9`	`+ val emotionMarbleType: String,`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable`
`6`	`6`	`@Serializable`
`7`	`7`	`data class GetEmotionsResponse(`
`8`	`8`	`@SerialName("emotionMarbleTypes")`
`9`		`- val emotionMarbleTypes: List<String>`
	`9`	`+ val emotionMarbleTypes: List<String>,`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ import kotlinx.serialization.Serializable`
`7`	`7`	`@Serializable`
`8`	`8`	`data class RegisterEmotionResponse(`
`9`	`9`	`@SerialName("recommendedRoutines")`
`10`		`- val recommendedRoutines: List<EmotionRecommendedRoutineDto>`
	`10`	`+ val recommendedRoutines: List<EmotionRecommendedRoutineDto>,`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ interface EmotionService {`
`14`	`14`
`15`	`15`	`@POST("/api/v1/emotion-marbles")`
`16`	`16`	`suspend fun postEmotions(`
`17`		`- @Body request: RegisterEmotionRequest`
	`17`	`+ @Body request: RegisterEmotionRequest,`
`18`	`18`	`): BaseResponse<RegisterEmotionResponse>`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository`
`5`	`5`	`import javax.inject.Inject`
`6`	`6`
`7`	`7`	`class GetEmotionsUseCase @Inject constructor(`
`8`		`- private val emotionRepository: EmotionRepository`
	`8`	`+ private val emotionRepository: EmotionRepository,`
`9`	`9`	`) {`
`10`		`- suspend operator fun invoke() : Result<List<Emotion>> {`
	`10`	`+ suspend operator fun invoke(): Result<List<Emotion>> {`
`11`	`11`	`return emotionRepository.getEmotions()`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository`
`5`	`5`	`import javax.inject.Inject`
`6`	`6`
`7`	`7`	`class RegisterEmotionUseCase @Inject constructor(`
`8`		`- private val emotionRepository: EmotionRepository`
	`8`	`+ private val emotionRepository: EmotionRepository,`
`9`	`9`	`) {`
`10`		`- suspend operator fun invoke(emotion: Emotion) : Result<Unit> {`
	`10`	`+ suspend operator fun invoke(emotion: Emotion): Result<Unit> {`
`11`	`11`	`return emotionRepository.registerEmotion(emotion)`
`12`	`12`	`}`
`13`	`13`	`}`