Merge pull request #57 from YAPP-Github/feature/#49-write_routine_with_api

[Feature/#49] 단일 루틴/단일 추천 루틴 API 연결 및 기존 API 호출부 점검

Author: l5x5l

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -2,6 +2,7 @@ package com.threegap.bitnagil
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
@@ -15,6 +16,8 @@ import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
 import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer
 import com.threegap.bitnagil.presentation.webview.BitnagilWebViewScreen
 import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineScreenContainer
+import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineViewModel
+import com.threegap.bitnagil.presentation.writeroutine.model.navarg.WriteRoutineScreenArg
 
 @Composable
 fun MainNavHost(
@@ -162,8 +165,20 @@ fun MainNavHost(
             )
         }
 
-        composable<Route.WriteRoutine> {
+        composable<Route.WriteRoutine> { navBackStackEntry ->
+            val arg = navBackStackEntry.toRoute<Route.WriteRoutine>()
+            val writeScreenNavArg = if (arg.isRegister) {
+                WriteRoutineScreenArg.Add(baseRoutineId = arg.routineId)
+            } else {
+                WriteRoutineScreenArg.Edit(routineId = arg.routineId!!)
+            }
+
+            val viewModel = hiltViewModel<WriteRoutineViewModel, WriteRoutineViewModel.Factory> { factory ->
+                factory.create(writeScreenNavArg)
+            }
+
             WriteRoutineScreenContainer(
+                viewModel = viewModel,
                 navigateToBack = {
                     navigator.navController.popBackStack()
                 },

data/src/main/java/com/threegap/bitnagil/data/auth/datasourceimpl/AuthRemoteDataSourceImpl.kt

@@ -18,7 +18,7 @@ class AuthRemoteDataSourceImpl @Inject constructor(
         }
 
     override suspend fun submitAgreement(termsAgreementRequestDto: TermsAgreementRequestDto): Result<Unit> =
-        safeApiCall {
+        safeUnitApiCall {
             authService.submitAgreement(termsAgreementRequestDto)
         }
 

data/src/main/java/com/threegap/bitnagil/data/emotion/datasource/EmotionDataSource.kt

@@ -1,11 +1,11 @@
 package com.threegap.bitnagil.data.emotion.datasource
 
-import com.threegap.bitnagil.data.emotion.model.response.GetEmotionsResponse
+import com.threegap.bitnagil.data.emotion.model.dto.EmotionDto
 import com.threegap.bitnagil.data.emotion.model.response.MyEmotionResponseDto
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
 
 interface EmotionDataSource {
-    suspend fun getEmotions(): Result<GetEmotionsResponse>
+    suspend fun getEmotions(): Result<List<EmotionDto>>
     suspend fun registerEmotion(emotion: String): Result<RegisterEmotionResponse>
     suspend fun getMyEmotionMarble(currentDate: String): Result<MyEmotionResponseDto>
 }

data/src/main/java/com/threegap/bitnagil/data/emotion/datasourceImpl/EmotionDataSourceImpl.kt

@@ -2,8 +2,8 @@ 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.dto.EmotionDto
 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.MyEmotionResponseDto
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
 import com.threegap.bitnagil.data.emotion.service.EmotionService
@@ -12,7 +12,7 @@ import javax.inject.Inject
 class EmotionDataSourceImpl @Inject constructor(
     private val emotionService: EmotionService,
 ) : EmotionDataSource {
-    override suspend fun getEmotions(): Result<GetEmotionsResponse> {
+    override suspend fun getEmotions(): Result<List<EmotionDto>> {
         return safeApiCall {
             emotionService.getEmotions()
         }

data/src/main/java/com/threegap/bitnagil/data/emotion/model/dto/EmotionDto.kt

@@ -0,0 +1,14 @@
+package com.threegap.bitnagil.data.emotion.model.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EmotionDto(
+    @SerialName("emotionMarbleType")
+    val emotionMarbleType: String,
+    @SerialName("emotionMarbleName")
+    val emotionMarbleName: String,
+    @SerialName("imageUrl")
+    val imageUrl: String,
+)

data/src/main/java/com/threegap/bitnagil/data/emotion/model/dto/EmotionRecommendedRoutineDto.kt

@@ -9,8 +9,8 @@ data class EmotionRecommendedRoutineDto(
     val recommendedRoutineId: Int,
     @SerialName("recommendedRoutineName")
     val recommendedRoutineName: String,
-    @SerialName("routineDescription")
-    val routineDescription: String,
-    @SerialName("recommendedSubRoutines")
-    val recommendedSubRoutines: List<EmotionRecommendedSubRoutineDto>,
+    @SerialName("recommendedRoutineDescription")
+    val recommendedRoutineDescription: String,
+    @SerialName("recommendedSubRoutineSearchResult")
+    val recommendedSubRoutineSearchResult: List<EmotionRecommendedSubRoutineDto>,
 )

data/src/main/java/com/threegap/bitnagil/data/emotion/model/response/GetEmotionsResponse.kt

@@ -12,8 +12,8 @@ class EmotionRepositoryImpl @Inject constructor(
 ) : EmotionRepository {
     override suspend fun getEmotions(): Result<List<Emotion>> {
         return emotionDataSource.getEmotions().map { response ->
-            response.emotionMarbleTypes.mapNotNull {
-                when (it) {
+            response.mapNotNull {
+                when (it.emotionMarbleType) {
                     "CALM" -> Emotion.CALM
                     "VITALITY" -> Emotion.VITALITY
                     "LETHARGY" -> Emotion.LETHARGY

data/src/main/java/com/threegap/bitnagil/data/emotion/repositoryImpl/EmotionRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package com.threegap.bitnagil.data.emotion.service
 
+import com.threegap.bitnagil.data.emotion.model.dto.EmotionDto
 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.MyEmotionResponseDto
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
 import com.threegap.bitnagil.network.model.BaseResponse
@@ -12,7 +12,7 @@ import retrofit2.http.Query
 
 interface EmotionService {
     @GET("/api/v1/emotion-marbles")
-    suspend fun getEmotions(): BaseResponse<GetEmotionsResponse>
+    suspend fun getEmotions(): BaseResponse<List<EmotionDto>>
 
     @POST("/api/v1/emotion-marbles")
     suspend fun postEmotions(

data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt

@@ -1,6 +1,7 @@
 package com.threegap.bitnagil.data.onboarding.datasourceImpl
 
 import com.threegap.bitnagil.data.common.safeApiCall
+import com.threegap.bitnagil.data.common.safeUnitApiCall
 import com.threegap.bitnagil.data.onboarding.datasource.OnBoardingDataSource
 import com.threegap.bitnagil.data.onboarding.model.dto.OnBoardingAbstractDto
 import com.threegap.bitnagil.data.onboarding.model.dto.OnBoardingAbstractTextDto
@@ -51,7 +52,7 @@ class OnBoardingDataSourceImpl @Inject constructor(
 
     override suspend fun registerRecommendRoutineList(selectedRecommendRoutineIds: List<Int>): Result<Unit> {
         val registerRecommendRoutineListRequest = RegisterOnBoardingRecommendRoutinesRequest(recommendedRoutineIds = selectedRecommendRoutineIds)
-        return safeApiCall {
+        return safeUnitApiCall {
             onBoardingService.postOnBoardingRoutines(registerRecommendRoutineListRequest)
         }
     }