Merge pull request #274 from easyhooon/main

fix: flow 반환 타입 함수 suspend 키워드 제거
droidknights · Apr 22, 2024 · 145abcb · 145abcb
2 parents 77fef86 + e98576b
commit 145abcb
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.../data/src/main/java/com/droidknights/app/core/data/repository/DefaultSessionRepository.kt b/.../data/src/main/java/com/droidknights/app/core/data/repository/DefaultSessionRepository.kt
@@ -33,7 +33,7 @@ internal class DefaultSessionRepository @Inject constructor(
             ?: error("Session not found with id: $sessionId")
     }
 
-    override suspend fun getBookmarkedSessionIds(): Flow<Set<String>> {
+    override fun getBookmarkedSessionIds(): Flow<Set<String>> {
         return bookmarkIds.filterNotNull()
     }
 

diff --git a/core/data/src/main/java/com/droidknights/app/core/data/repository/SessionRepository.kt b/core/data/src/main/java/com/droidknights/app/core/data/repository/SessionRepository.kt
@@ -9,7 +9,7 @@ interface SessionRepository {
 
     suspend fun getSession(sessionId: String): Session
 
-    suspend fun getBookmarkedSessionIds(): Flow<Set<String>>
+    fun getBookmarkedSessionIds(): Flow<Set<String>>
 
     suspend fun bookmarkSession(sessionId: String, bookmark: Boolean)
 }
diff --git a/.../src/main/java/com/droidknights/app/core/domain/usecase/GetBookmarkedSessionIdsUseCase.kt b/.../src/main/java/com/droidknights/app/core/domain/usecase/GetBookmarkedSessionIdsUseCase.kt
@@ -8,7 +8,7 @@ class GetBookmarkedSessionIdsUseCase @Inject constructor(
     private val sessionRepository: SessionRepository,
 ) {
 
-    suspend operator fun invoke(): Flow<Set<String>> {
+    operator fun invoke(): Flow<Set<String>> {
         return sessionRepository.getBookmarkedSessionIds()
     }
 }
diff --git a/...in/src/main/java/com/droidknights/app/core/domain/usecase/GetBookmarkedSessionsUseCase.kt b/...in/src/main/java/com/droidknights/app/core/domain/usecase/GetBookmarkedSessionsUseCase.kt
@@ -10,7 +10,7 @@ class GetBookmarkedSessionsUseCase @Inject constructor(
     private val getBookmarkedSessionIdsUseCase: GetBookmarkedSessionIdsUseCase,
 ) {
 
-    suspend operator fun invoke(): Flow<List<Session>> =
+    operator fun invoke(): Flow<List<Session>> =
         combine(
             getSessionsUseCase(),
             getBookmarkedSessionIdsUseCase()

diff --git a/core/domain/src/main/java/com/droidknights/app/core/domain/usecase/GetSessionsUseCase.kt b/core/domain/src/main/java/com/droidknights/app/core/domain/usecase/GetSessionsUseCase.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.flow
 class GetSessionsUseCase @Inject constructor(
     private val sessionRepository: SessionRepository,
 ) {
-    suspend operator fun invoke(): Flow<List<Session>> {
+    operator fun invoke(): Flow<List<Session>> {
         return flow {
             emit(sessionRepository.getSessions())
         }

diff --git a/core/domain/src/test/java/com/droidknights/app/core/domain/usecase/FakeSessionRepository.kt b/core/domain/src/test/java/com/droidknights/app/core/domain/usecase/FakeSessionRepository.kt
@@ -18,7 +18,7 @@ internal class FakeSessionRepository(
         return sessions.first { it.id == sessionId }
     }
 
-    override suspend fun getBookmarkedSessionIds(): Flow<Set<String>> {
+    override fun getBookmarkedSessionIds(): Flow<Set<String>> {
         return flow { emit(bookmarkedSessionIds) }
     }
 

diff --git a/feature/session/src/test/java/com/droidknights/app/feature/session/SessionViewModelTest.kt b/feature/session/src/test/java/com/droidknights/app/feature/session/SessionViewModelTest.kt
@@ -41,7 +41,7 @@ internal class SessionViewModelTest {
     @Test
     fun `세션 데이터를 확인할 수 있다`() = runTest {
         // given
-        coEvery { getSessionsUseCase() } returns listOf(fakeSession)
+        coEvery { getSessionsUseCase() } returns flowOf(listOf(fakeSession))
         coEvery { getBookmarkedSessionIdsUseCase() } returns flowOf(emptySet())
         viewModel = SessionViewModel(getSessionsUseCase, getBookmarkedSessionIdsUseCase)