Merge branch 'develop' into feature/#23-home-ui

wjdrjs00 · web-flow · commit 6b13a0638b8d · 2025-07-26T13:47:18.000+09:00
diff --git a/app/src/main/java/com/threegap/bitnagil/di/data/DataSourceModule.kt b/app/src/main/java/com/threegap/bitnagil/di/data/DataSourceModule.kt
@@ -4,6 +4,8 @@ import com.threegap.bitnagil.data.auth.datasource.AuthLocalDataSource
 import com.threegap.bitnagil.data.auth.datasource.AuthRemoteDataSource
 import com.threegap.bitnagil.data.auth.datasourceimpl.AuthLocalDataSourceImpl
 import com.threegap.bitnagil.data.auth.datasourceimpl.AuthRemoteDataSourceImpl
+import com.threegap.bitnagil.data.emotion.datasource.EmotionDataSource
+import com.threegap.bitnagil.data.emotion.datasourceImpl.EmotionDataSourceImpl
 import com.threegap.bitnagil.data.onboarding.datasource.OnBoardingDataSource
 import com.threegap.bitnagil.data.onboarding.datasourceImpl.OnBoardingDataSourceImpl
 import com.threegap.bitnagil.data.routine.datasource.RoutineRemoteDataSource
@@ -36,6 +38,10 @@ abstract class DataSourceModule {
     @Singleton
     abstract fun bindRoutineDataSource(routineDataSourceImpl: RoutineRemoteDataSourceImpl): RoutineRemoteDataSource
 
+    @Binds
+    @Singleton
+    abstract fun bindEmotionDataSource(emotionDataSourceImpl: EmotionDataSourceImpl): EmotionDataSource
+
     @Binds
     @Singleton
     abstract fun bindWriteRoutineDataSource(writeRoutineDataSourceImpl: WriteRoutineDataSourceImpl): WriteRoutineDataSource
diff --git a/app/src/main/java/com/threegap/bitnagil/di/data/RepositoryModule.kt b/app/src/main/java/com/threegap/bitnagil/di/data/RepositoryModule.kt
@@ -1,10 +1,12 @@
 package com.threegap.bitnagil.di.data
 
 import com.threegap.bitnagil.data.auth.repositoryimpl.AuthRepositoryImpl
+import com.threegap.bitnagil.data.emotion.repositoryImpl.EmotionRepositoryImpl
 import com.threegap.bitnagil.data.onboarding.repositoryImpl.OnBoardingRepositoryImpl
 import com.threegap.bitnagil.data.routine.repositoryImpl.RoutineRepositoryImpl
 import com.threegap.bitnagil.data.writeroutine.repositoryImpl.WriteRoutineRepositoryImpl
 import com.threegap.bitnagil.domain.auth.repository.AuthRepository
+import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
 import com.threegap.bitnagil.domain.onboarding.repository.OnBoardingRepository
 import com.threegap.bitnagil.domain.routine.repository.RoutineRepository
 import com.threegap.bitnagil.domain.writeroutine.repository.WriteRoutineRepository
@@ -30,6 +32,10 @@ abstract class RepositoryModule {
     @Singleton
     abstract fun bindRoutineRepository(routineRepositoryImpl: RoutineRepositoryImpl): RoutineRepository
 
+    @Binds
+    @Singleton
+    abstract fun bindEmotionRepository(emotionRepositoryImpl: EmotionRepositoryImpl): EmotionRepository
+
     @Binds
     @Singleton
     abstract fun bindWriteRoutineRepository(writeRoutineRepositoryImpl: WriteRoutineRepositoryImpl): WriteRoutineRepository
diff --git a/app/src/main/java/com/threegap/bitnagil/di/data/ServiceModule.kt b/app/src/main/java/com/threegap/bitnagil/di/data/ServiceModule.kt
@@ -1,6 +1,7 @@
 package com.threegap.bitnagil.di.data
 
 import com.threegap.bitnagil.data.auth.service.AuthService
+import com.threegap.bitnagil.data.emotion.service.EmotionService
 import com.threegap.bitnagil.data.onboarding.service.OnBoardingService
 import com.threegap.bitnagil.data.routine.service.RoutineService
 import com.threegap.bitnagil.data.writeroutine.service.WriteRoutineService
@@ -33,6 +34,11 @@ object ServiceModule {
     fun provideRoutineService(@Auth retrofit: Retrofit): RoutineService =
         retrofit.create(RoutineService::class.java)
 
+    @Provides
+    @Singleton
+    fun providerEmotionService(@Auth retrofit: Retrofit): EmotionService =
+        retrofit.create(EmotionService::class.java)
+
     @Provides
     @Singleton
     fun providerWriteRoutineService(@Auth retrofit: Retrofit): WriteRoutineService =
diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/datasource/EmotionDataSource.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/datasource/EmotionDataSource.kt
@@ -0,0 +1,9 @@
+package com.threegap.bitnagil.data.emotion.datasource
+
+import com.threegap.bitnagil.data.emotion.model.response.GetEmotionsResponse
+import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
+
+interface EmotionDataSource {
+    suspend fun getEmotions(): Result<GetEmotionsResponse>
+    suspend fun registerEmotion(emotion: String): Result<RegisterEmotionResponse>
+}
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
@@ -0,0 +1,26 @@
+package com.threegap.bitnagil.data.emotion.datasourceImpl
+
+import com.threegap.bitnagil.data.common.safeApiCall
+import com.threegap.bitnagil.data.emotion.datasource.EmotionDataSource
+import com.threegap.bitnagil.data.emotion.model.request.RegisterEmotionRequest
+import com.threegap.bitnagil.data.emotion.model.response.GetEmotionsResponse
+import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
+import com.threegap.bitnagil.data.emotion.service.EmotionService
+import javax.inject.Inject
+
+class EmotionDataSourceImpl @Inject constructor(
+    private val emotionService: EmotionService,
+) : EmotionDataSource {
+    override suspend fun getEmotions(): Result<GetEmotionsResponse> {
+        return safeApiCall {
+            emotionService.getEmotions()
+        }
+    }
+
+    override suspend fun registerEmotion(emotion: String): Result<RegisterEmotionResponse> {
+        val registerEmotionRequest = RegisterEmotionRequest(emotionMarbleType = emotion)
+        return safeApiCall {
+            emotionService.postEmotions(registerEmotionRequest)
+        }
+    }
+}
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
@@ -0,0 +1,16 @@
+package com.threegap.bitnagil.data.emotion.model.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EmotionRecommendedRoutineDto(
+    @SerialName("recommendedRoutineId")
+    val recommendedRoutineId: Int,
+    @SerialName("recommendedRoutineName")
+    val recommendedRoutineName: String,
+    @SerialName("routineDescription")
+    val routineDescription: String,
+    @SerialName("recommendedSubRoutines")
+    val recommendedSubRoutines: List<EmotionRecommendedSubRoutineDto>,
+)
diff --git a/data/src/main/java/com/threegap/bitnagil/data/emotion/model/dto/EmotionRecommendedSubRoutineDto.kt b/data/src/main/java/com/threegap/bitnagil/data/emotion/model/dto/EmotionRecommendedSubRoutineDto.kt
@@ -0,0 +1,12 @@
+package com.threegap.bitnagil.data.emotion.model.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EmotionRecommendedSubRoutineDto(
+    @SerialName("recommendedSubRoutineId")
+    val recommendedSubRoutineId: Int,
+    @SerialName("recommendedSubRoutineName")
+    val recommendedSubRoutineName: String,
+)
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
@@ -0,0 +1,10 @@
+package com.threegap.bitnagil.data.emotion.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RegisterEmotionRequest(
+    @SerialName("emotionMarbleType")
+    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
@@ -0,0 +1,10 @@
+package com.threegap.bitnagil.data.emotion.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GetEmotionsResponse(
+    @SerialName("emotionMarbleTypes")
+    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
@@ -0,0 +1,11 @@
+package com.threegap.bitnagil.data.emotion.model.response
+
+import com.threegap.bitnagil.data.emotion.model.dto.EmotionRecommendedRoutineDto
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RegisterEmotionResponse(
+    @SerialName("recommendedRoutines")
+    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
@@ -0,0 +1,39 @@
+package com.threegap.bitnagil.data.emotion.repositoryImpl
+
+import com.threegap.bitnagil.data.emotion.datasource.EmotionDataSource
+import com.threegap.bitnagil.domain.emotion.model.Emotion
+import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
+import javax.inject.Inject
+
+class EmotionRepositoryImpl @Inject constructor(
+    private val emotionDataSource: EmotionDataSource,
+) : EmotionRepository {
+    override suspend fun getEmotions(): Result<List<Emotion>> {
+        return emotionDataSource.getEmotions().map { response ->
+            response.emotionMarbleTypes.mapNotNull {
+                when (it) {
+                    "CALM" -> Emotion.CALM
+                    "VITALITY" -> Emotion.VITALITY
+                    "LETHARGY" -> Emotion.LETHARGY
+                    "ANXIETY" -> Emotion.ANXIETY
+                    "SATISFACTION" -> Emotion.SATISFACTION
+                    "FATIGUE" -> Emotion.FATIGUE
+                    else -> null
+                }
+            }
+        }
+    }
+
+    override suspend fun registerEmotion(emotion: Emotion): Result<Unit> {
+        val selectedEmotion = when (emotion) {
+            Emotion.CALM -> "CALM"
+            Emotion.VITALITY -> "VITALITY"
+            Emotion.LETHARGY -> "LETHARGY"
+            Emotion.ANXIETY -> "ANXIETY"
+            Emotion.SATISFACTION -> "SATISFACTION"
+            Emotion.FATIGUE -> "FATIGUE"
+        }
+
+        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
@@ -0,0 +1,19 @@
+package com.threegap.bitnagil.data.emotion.service
+
+import com.threegap.bitnagil.data.emotion.model.request.RegisterEmotionRequest
+import com.threegap.bitnagil.data.emotion.model.response.GetEmotionsResponse
+import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
+import com.threegap.bitnagil.network.model.BaseResponse
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+
+interface EmotionService {
+    @GET("/api/v1/emotion-marbles")
+    suspend fun getEmotions(): BaseResponse<GetEmotionsResponse>
+
+    @POST("/api/v1/emotion-marbles")
+    suspend fun postEmotions(
+        @Body request: RegisterEmotionRequest,
+    ): BaseResponse<RegisterEmotionResponse>
+}
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/emotion/model/Emotion.kt b/domain/src/main/java/com/threegap/bitnagil/domain/emotion/model/Emotion.kt
@@ -0,0 +1,10 @@
+package com.threegap.bitnagil.domain.emotion.model
+
+enum class Emotion {
+    CALM,
+    VITALITY,
+    LETHARGY,
+    ANXIETY,
+    SATISFACTION,
+    FATIGUE,
+}
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/emotion/repository/EmotionRepository.kt b/domain/src/main/java/com/threegap/bitnagil/domain/emotion/repository/EmotionRepository.kt
@@ -0,0 +1,8 @@
+package com.threegap.bitnagil.domain.emotion.repository
+
+import com.threegap.bitnagil.domain.emotion.model.Emotion
+
+interface EmotionRepository {
+    suspend fun getEmotions(): Result<List<Emotion>>
+    suspend fun registerEmotion(emotion: Emotion): Result<Unit>
+}
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
@@ -0,0 +1,13 @@
+package com.threegap.bitnagil.domain.emotion.usecase
+
+import com.threegap.bitnagil.domain.emotion.model.Emotion
+import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
+import javax.inject.Inject
+
+class GetEmotionsUseCase @Inject constructor(
+    private val emotionRepository: EmotionRepository,
+) {
+    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
@@ -0,0 +1,13 @@
+package com.threegap.bitnagil.domain.emotion.usecase
+
+import com.threegap.bitnagil.domain.emotion.model.Emotion
+import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
+import javax.inject.Inject
+
+class RegisterEmotionUseCase @Inject constructor(
+    private val emotionRepository: EmotionRepository,
+) {
+    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
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
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/Emotion.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/Emotion.kt
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
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/mvi/EmotionSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/mvi/EmotionSideEffect.kt
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/mvi/EmotionState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/mvi/EmotionState.kt
