NetworkRepository -> GithubRepository 네이밍 변경

Author: KwonDae

app/src/main/java/camp/nextstep/edu/github/GithubViewModel.kt

@@ -7,11 +7,10 @@ package camp.nextstep.edu.github
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import camp.nextstep.edu.github.domain.model.GithubRepository
-import camp.nextstep.edu.github.domain.repository.NetworkRepository
+import camp.nextstep.edu.github.domain.model.RepositoryItem
+import camp.nextstep.edu.github.domain.repository.GithubRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -21,7 +20,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class GithubViewModel @Inject constructor(
-    private val networkRepository: NetworkRepository
+    private val githubRepository: GithubRepository
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow<UiState>(UiState.Loading)
@@ -36,7 +35,7 @@ class GithubViewModel @Inject constructor(
 
     private fun getGithubRepositories() {
         viewModelScope.launch {
-            networkRepository.getRepositories()
+            githubRepository.getRepositories()
                 .onSuccess { result ->
                     _uiState.value = UiState.Success(result)
                 }.onFailure {
@@ -49,7 +48,7 @@ class GithubViewModel @Inject constructor(
 
 sealed interface UiState {
     object Loading : UiState
-    data class Success(val repositories: List<GithubRepository>) : UiState
+    data class Success(val repositories: List<RepositoryItem>) : UiState
     data class Error(val message: String) : UiState
 }
 

app/src/main/java/camp/nextstep/edu/github/ui/HomeScreen.kt

@@ -19,12 +19,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import camp.nextstep.edu.github.domain.model.GithubRepository
+import camp.nextstep.edu.github.domain.model.RepositoryItem
 
 @Composable
 fun HomeScreen(
     modifier: Modifier = Modifier,
-    repositories: List<GithubRepository>,
+    repositories: List<RepositoryItem>,
 ) {
     LazyColumn(
         modifier = modifier,
@@ -35,7 +35,7 @@ fun HomeScreen(
 }
 
 fun LazyListScope.repositoryList(
-    repositories: List<GithubRepository>
+    repositories: List<RepositoryItem>
 ) {
     itemsIndexed(repositories) { index, repository ->
         RepositoryItem(repository = repository,)
@@ -47,7 +47,7 @@ fun LazyListScope.repositoryList(
 
 @Composable
 fun RepositoryItem(
-    repository: GithubRepository
+    repository: RepositoryItem
 ) {
    Column(
      modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),

app/src/test/java/camp/nextstep/edu/github/GithubViewModelTest.kt

@@ -6,8 +6,8 @@
 package camp.nextstep.edu.github
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import camp.nextstep.edu.github.domain.model.GithubRepository
-import camp.nextstep.edu.github.domain.repository.NetworkRepository
+import camp.nextstep.edu.github.domain.model.RepositoryItem
+import camp.nextstep.edu.github.domain.repository.GithubRepository
 import com.google.common.truth.Truth.assertThat
 import io.mockk.coEvery
 import io.mockk.coVerify
@@ -26,29 +26,29 @@ class GithubViewModelTest {
     val instantExecutorRule = InstantTaskExecutorRule()
 
     private lateinit var viewModel: GithubViewModel
-    private val networkRepository: NetworkRepository = mockk(relaxed = true)
+    private val githubRepository: GithubRepository = mockk(relaxed = true)
 
     @Test
     fun `GithubViewModel이 생성되면, 정상적으로 통신할 경우 GithubRepository를 가져온다`() {
         // given
-        coEvery { networkRepository.getRepositories() } returns Result.success(
+        coEvery { githubRepository.getRepositories() } returns Result.success(
             listOf(
-                GithubRepository(
+                RepositoryItem(
                     fullName = "KwonDae",
                     description = "KwonDae's repository",
                 )
             )
         )
 
         // when
-        viewModel = GithubViewModel(networkRepository)
+        viewModel = GithubViewModel(githubRepository)
 
         // then
-        coVerify { networkRepository.getRepositories() }
+        coVerify { githubRepository.getRepositories() }
         assertThat(viewModel.uiState.value).isEqualTo(
             UiState.Success(
                 listOf(
-                    GithubRepository(
+                    RepositoryItem(
                         fullName = "KwonDae",
                         description = "KwonDae's repository",
                     )
@@ -60,13 +60,13 @@ class GithubViewModelTest {
     @Test
     fun `GithubViewModel이 생성되고, 정상적으로 통신했으나 빈값인 경우, 빈화면이 노출되어야 한다`() {
         // given
-        coEvery { networkRepository.getRepositories() } returns Result.success(emptyList())
+        coEvery { githubRepository.getRepositories() } returns Result.success(emptyList())
 
         // when
-        viewModel = GithubViewModel(networkRepository)
+        viewModel = GithubViewModel(githubRepository)
 
         // then
-        coVerify { networkRepository.getRepositories() }
+        coVerify { githubRepository.getRepositories() }
         assertThat(viewModel.uiState.value).isEqualTo(
             UiState.Success(emptyList())
         )
@@ -76,15 +76,15 @@ class GithubViewModelTest {
     fun `GithubViewModel이 생성되고, 통신이 실패하면, 에러메시지를 가져온다`() {
         // given
         val errorMessage = "통신에 실패하였습니다."
-        coEvery { networkRepository.getRepositories() } returns Result.failure(
+        coEvery { githubRepository.getRepositories() } returns Result.failure(
             Throwable(errorMessage)
         )
 
         // when
-        viewModel = GithubViewModel(networkRepository)
+        viewModel = GithubViewModel(githubRepository)
 
         // then
-        coVerify { networkRepository.getRepositories() }
+        coVerify { githubRepository.getRepositories() }
         assertThat(viewModel.uiState.value).isEqualTo(
             UiState.Error(errorMessage)
         )

data/src/main/java/camp/nextstep/edu/github/data/Mapper.kt

@@ -5,15 +5,15 @@
 
 package camp.nextstep.edu.github.data
 
-import camp.nextstep.edu.github.data.response.GithubRepositoryResponse
-import camp.nextstep.edu.github.domain.model.GithubRepository
+import camp.nextstep.edu.github.data.response.RepositoryItemResponse
+import camp.nextstep.edu.github.domain.model.RepositoryItem
 
-internal fun List<GithubRepositoryResponse>.toDomainModels(): List<GithubRepository> {
+internal fun List<RepositoryItemResponse>.toDomainModels(): List<RepositoryItem> {
     return this.map { it.toDomainModel() }
 }
 
-internal fun GithubRepositoryResponse.toDomainModel(): GithubRepository {
-    return GithubRepository(
+internal fun RepositoryItemResponse.toDomainModel(): RepositoryItem {
+    return RepositoryItem(
         fullName = fullName,
         description = description
     )

data/src/main/java/camp/nextstep/edu/github/data/di/DataModule.kt

@@ -5,8 +5,8 @@
 
 package camp.nextstep.edu.github.data.di
 
-import camp.nextstep.edu.github.data.network.DefaultNetworkRepository
-import camp.nextstep.edu.github.domain.repository.NetworkRepository
+import camp.nextstep.edu.github.data.network.DefaultGithubRepository
+import camp.nextstep.edu.github.domain.repository.GithubRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -20,6 +20,6 @@ internal interface DataModule {
     @Singleton
     @Binds
     fun bindNetworkRepository(
-        networkRepositoryImpl: DefaultNetworkRepository
-    ): NetworkRepository
+        networkRepositoryImpl: DefaultGithubRepository
+    ): GithubRepository
 }

data/src/main/java/camp/nextstep/edu/github/data/network/DefaultNetworkRepository.kt renamed to data/src/main/java/camp/nextstep/edu/github/data/network/DefaultGithubRepository.kt

@@ -7,14 +7,14 @@ package camp.nextstep.edu.github.data.network
 
 import camp.nextstep.edu.github.data.retrofit.GithubService
 import camp.nextstep.edu.github.data.toDomainModels
-import camp.nextstep.edu.github.domain.model.GithubRepository
-import camp.nextstep.edu.github.domain.repository.NetworkRepository
+import camp.nextstep.edu.github.domain.model.RepositoryItem
+import camp.nextstep.edu.github.domain.repository.GithubRepository
 import javax.inject.Inject
 
-internal class DefaultNetworkRepository @Inject constructor(
+internal class DefaultGithubRepository @Inject constructor(
     private val githubService: GithubService
-) : NetworkRepository {
-    override suspend fun getRepositories(): Result<List<GithubRepository>> =
+) : GithubRepository {
+    override suspend fun getRepositories(): Result<List<RepositoryItem>> =
         runCatching { githubService.getRepositories().toDomainModels() }
 
 }

data/src/main/java/camp/nextstep/edu/github/data/response/GithubRepositoryResponse.kt renamed to data/src/main/java/camp/nextstep/edu/github/data/response/RepositoryItemResponse.kt

@@ -2,7 +2,7 @@ package camp.nextstep.edu.github.data.response
 
 import com.squareup.moshi.Json
 
-internal data class GithubRepositoryResponse(
+internal data class RepositoryItemResponse(
     @Json(name = "full_name")
     val fullName: String,
     @Json(name = "description")

data/src/main/java/camp/nextstep/edu/github/data/retrofit/GithubService.kt

@@ -5,11 +5,11 @@
 
 package camp.nextstep.edu.github.data.retrofit
 
-import camp.nextstep.edu.github.data.response.GithubRepositoryResponse
+import camp.nextstep.edu.github.data.response.RepositoryItemResponse
 import retrofit2.http.GET
 
 
 internal interface GithubService {
     @GET("repositories")
-    suspend fun getRepositories(): List<GithubRepositoryResponse>
+    suspend fun getRepositories(): List<RepositoryItemResponse>
 }

data/src/test/kotlin/camp/nextstep/edu/github/data/GithubServiceTest.kt

@@ -5,8 +5,7 @@
 
 package camp.nextstep.edu.github.data
 
-import camp.nextstep.edu.github.data.di.NetworkProvider
-import camp.nextstep.edu.github.data.response.GithubRepositoryResponse
+import camp.nextstep.edu.github.data.response.RepositoryItemResponse
 import camp.nextstep.edu.github.data.retrofit.GithubNetwork
 import camp.nextstep.edu.github.data.retrofit.GithubService
 import com.google.common.truth.Truth.assertThat
@@ -15,7 +14,6 @@ import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.Before
 import org.junit.Test
-import retrofit2.create
 import java.io.File
 
 
@@ -42,7 +40,7 @@ class GithubServiceTest {
         val actual = githubService.getRepositories()
 
         // then
-        val expected = GithubRepositoryResponse(
+        val expected = RepositoryItemResponse(
             fullName = "mojombo/grit",
             description = "**Grit is no longer maintained. Check out libgit2/rugged.** Grit gives you object oriented read/write access to Git repositories via Ruby."
         )

domain/src/main/java/camp/nextstep/edu/github/domain/model/GithubRepository.kt renamed to domain/src/main/java/camp/nextstep/edu/github/domain/model/RepositoryItem.kt

@@ -1,6 +1,6 @@
 package camp.nextstep.edu.github.domain.model
 
-data class GithubRepository(
+data class RepositoryItem(
     val fullName: String,
     val description: String?
 )