[#333] 코드리뷰 반영

droidknights · Jun 10, 2024 · d2676a1 · d2676a1
1 parent 24766b0
commit d2676a1
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 72 deletions.
diff --git a/...-api/src/main/java/com/droidknights/app/core/data/repository/api/ContributorRepository.kt b/...-api/src/main/java/com/droidknights/app/core/data/repository/api/ContributorRepository.kt
@@ -1,12 +1,12 @@
 package com.droidknights.app.core.data.repository.api
 
-import com.droidknights.app.core.model.Contributor
+import com.droidknights.app.core.model.ContributorGroup
 import kotlinx.coroutines.flow.Flow
 
 interface ContributorRepository {
 
     fun flowContributors(
         owner: String,
         name: String,
-    ): Flow<Map<Int, List<Contributor>>>
+    ): Flow<List<ContributorGroup>>
 }
diff --git a/...a/src/main/java/com/droidknights/app/core/data/repository/DefaultContributorRepository.kt b/...a/src/main/java/com/droidknights/app/core/data/repository/DefaultContributorRepository.kt
@@ -4,7 +4,7 @@ import com.droidknights.app.core.data.api.GithubApi
 import com.droidknights.app.core.data.api.GithubRawApi
 import com.droidknights.app.core.data.mapper.toData
 import com.droidknights.app.core.data.repository.api.ContributorRepository
-import com.droidknights.app.core.model.Contributor
+import com.droidknights.app.core.model.ContributorGroup
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flow
@@ -16,7 +16,7 @@ internal class DefaultContributorRepository @Inject constructor(
     private val githubRawApi: GithubRawApi
 ) : ContributorRepository {
 
-    override fun flowContributors(owner: String, name: String): Flow<Map<Int, List<Contributor>>> =
+    override fun flowContributors(owner: String, name: String): Flow<List<ContributorGroup>> =
         combine(
             flow {
                 emit(githubApi.getContributors(owner, name))
@@ -48,5 +48,11 @@ internal class DefaultContributorRepository @Inject constructor(
             yearMap.mapValues { year ->
                 year.value.mapNotNull { id -> resultMap[id] }
             }
+            yearMap.map { year ->
+                ContributorGroup(
+                    year = year.key,
+                    contributors = year.value.mapNotNull { id -> resultMap[id] },
+                )
+            }
         }
 }
diff --git a/...c/test/java/com/droidknights/app/core/data/repository/DefaultContributorRepositoryTest.kt b/...c/test/java/com/droidknights/app/core/data/repository/DefaultContributorRepositoryTest.kt
@@ -4,6 +4,7 @@ import com.droidknights.app.core.data.api.fake.FakeGithubApi
 import com.droidknights.app.core.data.api.fake.FakeGithubRawApi
 import com.droidknights.app.core.data.api.model.ContributorResponse
 import com.droidknights.app.core.model.Contributor
+import com.droidknights.app.core.model.ContributorGroup
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.flow.first
@@ -24,27 +25,33 @@ internal class DefaultContributorRepositoryTest : BehaviorSpec() {
                 ).first()
                 Then("컨트리뷰터를 반환한다") {
                     contributorList.size shouldBe 2
-                    contributorList shouldBe mapOf(
-                        2024 to listOf(
-                            Contributor(
-                                name = "2024 - name",
-                                imageUrl = "test image url",
-                                githubUrl = "test github url",
-                                id = 32327475
+                    contributorList shouldBe listOf(
+                        ContributorGroup(
+                            year = 2024,
+                            contributors = listOf(
+                                Contributor(
+                                    name = "2024 - name",
+                                    imageUrl = "test image url",
+                                    githubUrl = "test github url",
+                                    id = 32327475
+                                ),
                             ),
                         ),
-                        2023 to listOf(
-                            Contributor(
-                                name = "test name",
-                                imageUrl = "test image url",
-                                githubUrl = "test github url",
-                                id = 28249981
-                            ),
-                            Contributor(
-                                name = "2024 - name",
-                                imageUrl = "test image url",
-                                githubUrl = "test github url",
-                                id = 32327475
+                        ContributorGroup(
+                            year = 2023,
+                            contributors = listOf(
+                                Contributor(
+                                    name = "test name",
+                                    imageUrl = "test image url",
+                                    githubUrl = "test github url",
+                                    id = 28249981
+                                ),
+                                Contributor(
+                                    name = "2024 - name",
+                                    imageUrl = "test image url",
+                                    githubUrl = "test github url",
+                                    id = 32327475
+                                ),
                             ),
                         ),
                     )

diff --git a/core/domain/src/main/java/com/droidknights/app/core/domain/usecase/GetContributorsUseCase.kt b/core/domain/src/main/java/com/droidknights/app/core/domain/usecase/GetContributorsUseCase.kt
@@ -1,15 +1,15 @@
 package com.droidknights.app.core.domain.usecase
 
 import com.droidknights.app.core.data.repository.api.ContributorRepository
-import com.droidknights.app.core.model.Contributor
+import com.droidknights.app.core.model.ContributorGroup
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetContributorsUseCase @Inject constructor(
     private val repository: ContributorRepository,
 ) {
 
-    operator fun invoke(): Flow<Map<Int, List<Contributor>>> =
+    operator fun invoke(): Flow<List<ContributorGroup>> =
         repository.flowContributors(
             owner = OWNER,
             name = NAME,

diff --git a/...omain/src/test/java/com/droidknights/app/core/domain/usecase/FakeContributorRepository.kt b/...omain/src/test/java/com/droidknights/app/core/domain/usecase/FakeContributorRepository.kt
@@ -1,14 +1,14 @@
 package com.droidknights.app.core.domain.usecase
 
 import com.droidknights.app.core.data.repository.api.ContributorRepository
-import com.droidknights.app.core.model.Contributor
+import com.droidknights.app.core.model.ContributorGroup
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
 internal class FakeContributorRepository(
-    private val contributors: Map<Int, List<Contributor>>,
+    private val contributors: List<ContributorGroup>,
 ) : ContributorRepository {
 
-    override fun flowContributors(owner: String, name: String): Flow<Map<Int, List<Contributor>>> =
+    override fun flowContributors(owner: String, name: String): Flow<List<ContributorGroup>> =
         flowOf(contributors)
 }
diff --git a/...main/src/test/java/com/droidknights/app/core/domain/usecase/GetContributorsUseCaseTest.kt b/...main/src/test/java/com/droidknights/app/core/domain/usecase/GetContributorsUseCaseTest.kt
@@ -1,14 +1,15 @@
 package com.droidknights.app.core.domain.usecase
 
 import com.droidknights.app.core.model.Contributor
+import com.droidknights.app.core.model.ContributorGroup
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.flow.first
 
 internal class GetContributorsUseCaseTest : BehaviorSpec() {
 
     private val useCase: GetContributorsUseCase = GetContributorsUseCase(
-        repository = FakeContributorRepository(contributors)
+        repository = FakeContributorRepository(mockContributors)
     )
 
     init {
@@ -17,35 +18,42 @@ internal class GetContributorsUseCaseTest : BehaviorSpec() {
             When("드로이드나이츠 컨트리뷰터를 조회한다") {
                 val contributors = useCase.invoke().first()
 
-                Then("올해 드로이드나이츠 컨트리뷰터를 반환한다") {
-                    contributors shouldBe contributors
+                Then("연도별 드로이드나이츠 컨트리뷰터를 반환한다") {
+                    contributors shouldBe mockContributors
                 }
             }
         }
     }
 
     companion object {
-        private val contributors = mapOf(
-            2023 to listOf(
-                Contributor(
-                    name = "test name",
-                    imageUrl = "test image url",
-                    githubUrl = "test github url",
-                    id = 28249981
-                ),
-                Contributor(
-                    name = "2024 - name",
-                    imageUrl = "test image url",
-                    githubUrl = "test github url",
-                    id = 32327475
+
+        private val mockContributors = listOf(
+            ContributorGroup(
+                year = 2024,
+                contributors = listOf(
+                    Contributor(
+                        name = "2024 - name",
+                        imageUrl = "test image url",
+                        githubUrl = "test github url",
+                        id = 32327475
+                    ),
                 ),
             ),
-            2024 to listOf(
-                Contributor(
-                    name = "2024 - name",
-                    imageUrl = "test image url",
-                    githubUrl = "test github url",
-                    id = 32327475
+            ContributorGroup(
+                year = 2023,
+                contributors = listOf(
+                    Contributor(
+                        name = "test name",
+                        imageUrl = "test image url",
+                        githubUrl = "test github url",
+                        id = 28249981
+                    ),
+                    Contributor(
+                        name = "2024 - name",
+                        imageUrl = "test image url",
+                        githubUrl = "test github url",
+                        id = 32327475
+                    ),
                 ),
             ),
         )

diff --git a/core/model/src/main/java/com/droidknights/app/core/model/ContributorGroup.kt b/core/model/src/main/java/com/droidknights/app/core/model/ContributorGroup.kt
@@ -0,0 +1,6 @@
+package com.droidknights.app.core.model
+
+data class ContributorGroup(
+    val year: Int,
+    val contributors: List<Contributor>,
+)
diff --git a/...c/main/java/com/droidknights/app/feature/contributor/model/convert/ContributorsConvert.kt b/...c/main/java/com/droidknights/app/feature/contributor/model/convert/ContributorsConvert.kt
@@ -1,32 +1,21 @@
 package com.droidknights.app.feature.contributor.model.convert
 
-import com.droidknights.app.core.model.Contributor
+import com.droidknights.app.core.model.ContributorGroup
 import com.droidknights.app.feature.contributor.model.ContributorsUiState
 import kotlinx.collections.immutable.toPersistentList
 
-internal fun Map<Int, List<Contributor>>.toContributorsUiState(): ContributorsUiState {
-    val newList = mutableListOf<ContributorsUiState.Contributors.Item>()
-
-    // key, value 추가
-    forEach { (key, values) ->
-        newList.add(
-            ContributorsUiState.Contributors.Item.Section(
-                title = key.toString(),
-            )
-        )
-        values.forEach { item ->
-            newList.add(
+internal fun List<ContributorGroup>.toContributorsUiState(): ContributorsUiState =
+    ContributorsUiState.Contributors(
+        contributors = flatMap { (year, contributors) ->
+            sequenceOf(
+                ContributorsUiState.Contributors.Item.Section(title = year.toString())
+            ) + contributors.map { item ->
                 ContributorsUiState.Contributors.Item.User(
                     id = item.id,
                     imageUrl = item.imageUrl,
                     githubUrl = item.githubUrl,
-                    name = item.name,
+                    name = item.name
                 )
-            )
-        }
-    }
-
-    return ContributorsUiState.Contributors(
-        contributors = newList.toPersistentList(),
-    )
-}
+            }
+        }.toPersistentList(),
+    )