fix: User 싱글톤 -> DataStore으로 변경

Begin-Vegan · Jul 10, 2024 · 649db97 · 649db97
1 parent f75e04f
commit 649db97
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 37 deletions.
diff --git a/.gradle/8.4/executionHistory/executionHistory.bin b/.gradle/8.4/executionHistory/executionHistory.bin
diff --git a/.gradle/8.4/executionHistory/executionHistory.lock b/.gradle/8.4/executionHistory/executionHistory.lock
diff --git a/.gradle/8.4/fileHashes/fileHashes.bin b/.gradle/8.4/fileHashes/fileHashes.bin
diff --git a/.gradle/8.4/fileHashes/fileHashes.lock b/.gradle/8.4/fileHashes/fileHashes.lock
diff --git a/.gradle/8.4/fileHashes/resourceHashesCache.bin b/.gradle/8.4/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/buildSrc/.gradle/8.4/executionHistory/executionHistory.bin b/buildSrc/.gradle/8.4/executionHistory/executionHistory.bin
diff --git a/buildSrc/.gradle/8.4/executionHistory/executionHistory.lock b/buildSrc/.gradle/8.4/executionHistory/executionHistory.lock
diff --git a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin b/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
diff --git a/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin b/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar
diff --git a/data/src/main/java/com/example/data/repository/remote/tips/TipsRecipeRepositoryImpl.kt b/data/src/main/java/com/example/data/repository/remote/tips/TipsRecipeRepositoryImpl.kt
@@ -14,102 +14,110 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class TipsRecipeRepositoryImpl @Inject constructor(
-    private val tipsRecipeRemoteDataSource:TipsRecipeRemoteDataSource,
-    private val tipsRecipeMapper:TipsRecipeMapper,
+    private val tipsRecipeRemoteDataSource: TipsRecipeRemoteDataSource,
+    private val tipsRecipeMapper: TipsRecipeMapper,
     private val tipsrecipeDetailMapper: TipsRecipeDetailMapper
-):TipsRecipeRepository {
-    override suspend fun getRecipeList(accessToken:String, page:Int): Flow<Result<List<TipsRecipeListItem>>> {
-        return flow{
-            try{
+) : TipsRecipeRepository {
+    override suspend fun getRecipeList(page: Int): Flow<Result<List<TipsRecipeListItem>>> {
+        return flow {
+            try {
                 val response = tipsRecipeRemoteDataSource.getRecipeList(page)
-                when(response) {
+                when (response) {
                     is ApiResponse.Success -> {
                         val recipeList = tipsRecipeMapper.mapToRecipeList(response.data.information)
                         emit(Result.success(recipeList))
                     }
+
                     is ApiResponse.Failure.Error -> {
                         Timber.e("GetAlarms error: ${response.errorBody}")
                         emit(Result.failure(Exception("GetAlarms Failed")))
                     }
+
                     is ApiResponse.Failure.Exception -> {
                         Timber.e("GetAlarms exception: ${response.message}")
                         emit(Result.failure(response.throwable))
                     }
                 }
-            }catch (e:Exception){
+            } catch (e: Exception) {
                 Timber.e(e, "SignUp exception")
                 emit(Result.failure(e))
             }
         }
     }
 
-    override suspend fun getRecipeDetail(accessToken: String, id: Int): Result<TipsRecipeDetail> {
-        return try{
+    override suspend fun getRecipeDetail(id: Int): Result<TipsRecipeDetail> {
+        return try {
             val response = tipsRecipeRemoteDataSource.getRecipeDetail(id)
-            when(response) {
+            when (response) {
                 is ApiResponse.Success -> {
-                    val recipeDetail = tipsrecipeDetailMapper.mapFromEntity(response.data.information)
+                    val recipeDetail =
+                        tipsrecipeDetailMapper.mapFromEntity(response.data.information)
                     Result.success(recipeDetail)
                 }
+
                 is ApiResponse.Failure.Error -> {
                     Timber.e("GetAlarms error: ${response.errorBody}")
                     Result.failure(Exception("GetAlarms Failed"))
                 }
+
                 is ApiResponse.Failure.Exception -> {
                     Timber.e("GetAlarms exception: ${response.message}")
                     Result.failure(response.throwable)
                 }
             }
-        }catch (e:Exception){
+        } catch (e: Exception) {
             Timber.e(e, "SignUp exception")
             Result.failure(e)
         }
     }
 
     override suspend fun getRecipeForMe(
-        accessToken: String,
         page: Int
     ): Result<List<TipsRecipeListItem>> {
-        return try{
+        return try {
             val response = tipsRecipeRemoteDataSource.getRecipeMy(page)
-            when(response) {
+            when (response) {
                 is ApiResponse.Success -> {
                     val recipeList = tipsRecipeMapper.mapToRecipeList(response.data.information)
                     Result.success(recipeList)
                 }
+
                 is ApiResponse.Failure.Error -> {
                     Timber.e("GetAlarms error: ${response.errorBody}")
                     Result.failure(Exception("GetAlarms Failed"))
                 }
+
                 is ApiResponse.Failure.Exception -> {
                     Timber.e("GetAlarms exception: ${response.message}")
                     Result.failure(response.throwable)
                 }
             }
-        }catch (e:Exception){
+        } catch (e: Exception) {
             Timber.e(e, "SignUp exception")
             Result.failure(e)
         }
     }
 
-    override suspend fun getHomeRecipe(accessToken: String): Result<List<TipsRecipeListItem>> {
-        return try{
+    override suspend fun getHomeRecipe(): Result<List<TipsRecipeListItem>> {
+        return try {
             val response = tipsRecipeRemoteDataSource.getHomeRecipe()
-            when(response) {
+            when (response) {
                 is ApiResponse.Success -> {
                     val recipeList = tipsRecipeMapper.mapToRecipeList(response.data.information)
                     Result.success(recipeList)
                 }
+
                 is ApiResponse.Failure.Error -> {
                     Timber.e("GetAlarms error: ${response.errorBody}")
                     Result.failure(Exception("GetAlarms Failed"))
                 }
+
                 is ApiResponse.Failure.Exception -> {
                     Timber.e("GetAlarms exception: ${response.message}")
                     Result.failure(response.throwable)
                 }
             }
-        }catch (e:Exception){
+        } catch (e: Exception) {
             Timber.e(e, "SignUp exception")
             Result.failure(e)
         }

diff --git a/domain/src/main/java/com/example/domain/repository/tips/TipsRecipeRepository.kt b/domain/src/main/java/com/example/domain/repository/tips/TipsRecipeRepository.kt
@@ -5,8 +5,8 @@ import com.example.domain.model.TipsRecipeListItem
 import kotlinx.coroutines.flow.Flow
 
 interface TipsRecipeRepository {
-    suspend fun getRecipeList(accessToken:String, page:Int): Flow<Result<List<TipsRecipeListItem>>>
-    suspend fun getRecipeDetail(accessToken:String, id:Int): Result<TipsRecipeDetail>
-    suspend fun getRecipeForMe(accessToken:String, page:Int): Result<List<TipsRecipeListItem>>
-    suspend fun getHomeRecipe(accessToken:String): Result<List<TipsRecipeListItem>>
+    suspend fun getRecipeList(page:Int): Flow<Result<List<TipsRecipeListItem>>>
+    suspend fun getRecipeDetail(id:Int): Result<TipsRecipeDetail>
+    suspend fun getRecipeForMe(page:Int): Result<List<TipsRecipeListItem>>
+    suspend fun getHomeRecipe(): Result<List<TipsRecipeListItem>>
 }
diff --git a/domain/src/main/java/com/example/domain/useCase/tips/TipsRecipeUseCase.kt b/domain/src/main/java/com/example/domain/useCase/tips/TipsRecipeUseCase.kt
@@ -9,16 +9,16 @@ import javax.inject.Inject
 class TipsRecipeUseCase @Inject constructor(
     private val tipsRecipeRepository: TipsRecipeRepository
 ) {
-    suspend fun getRecipeList(accessToken:String, page:Int): Flow<Result<List<TipsRecipeListItem>>> =
-        tipsRecipeRepository.getRecipeList(accessToken, page)
+    suspend fun getRecipeList(page:Int): Flow<Result<List<TipsRecipeListItem>>> =
+        tipsRecipeRepository.getRecipeList(page)
 
-    suspend fun getRecipeDetail(accessToken:String, id:Int): Result<TipsRecipeDetail> =
-        tipsRecipeRepository.getRecipeDetail(accessToken, id)
+    suspend fun getRecipeDetail(id:Int): Result<TipsRecipeDetail> =
+        tipsRecipeRepository.getRecipeDetail(id)
 
-    suspend fun getRecipeMy(accessToken:String, page:Int): Result<List<TipsRecipeListItem>> =
-        tipsRecipeRepository.getRecipeForMe(accessToken, page)
+    suspend fun getRecipeMy(page:Int): Result<List<TipsRecipeListItem>> =
+        tipsRecipeRepository.getRecipeForMe(page)
 
-    suspend fun getHomeRecipe(accessToken:String): Result<List<TipsRecipeListItem>> =
-        tipsRecipeRepository.getHomeRecipe(accessToken)
+    suspend fun getHomeRecipe(): Result<List<TipsRecipeListItem>> =
+        tipsRecipeRepository.getHomeRecipe()
 
 }
diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -38,8 +38,8 @@ android {
         manifestPlaceholders["KAKAO_API_KEY"] = kakaoApiKey
         manifestPlaceholders["KAKAO_API_KEY_TEST"] = kakaoApiKeyTest
 
-        buildConfigField("String", "KAKAO_API_KEY", "\"$kakaoApiKey\"")
-        buildConfigField("String", "KAKAO_API_KEY_TEST", "\"$kakaoApiKeyTest\"")
+        buildConfigField("String", "KAKAO_API_KEY", "$kakaoApiKey")
+        buildConfigField("String", "KAKAO_API_KEY_TEST", "$kakaoApiKeyTest")
     }
 
     buildTypes {

diff --git a/presentation/src/main/java/com/example/presentation/view/login/viewModel/LoginViewModel.kt b/presentation/src/main/java/com/example/presentation/view/login/viewModel/LoginViewModel.kt
@@ -39,9 +39,8 @@ class LoginViewModel @Inject constructor(
         viewModelScope.launch {
             signInUseCase.invoke(email, providerId).onSuccess {
                 Timber.d("$it")
-                _loginState.value = true
-
                 additionalInfoProvided = it.additionalInfo
+                _loginState.value = true
             }.onFailure {
                 _loginState.value = false
             }