[CHORE] #32 코드리뷰 반영

YAPP-Github · Aug 11, 2024 · eb2e904 · eb2e904
1 parent 29befea
commit eb2e904
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitViewModel.kt b/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitViewModel.kt
@@ -31,7 +31,6 @@ import pokitmons.pokit.domain.usecase.pokit.GetPokitUseCase
 import pokitmons.pokit.domain.usecase.pokit.GetPokitsUseCase
 import pokitmons.pokit.domain.usecase.pokit.ModifyPokitUseCase
 import javax.inject.Inject
-import pokitmons.pokit.domain.model.pokit.Pokit as DomainPokit
 
 @HiltViewModel
 class AddPokitViewModel @Inject constructor(
@@ -48,7 +47,7 @@ class AddPokitViewModel @Inject constructor(
     private val pokitId = savedStateHandle.get<String>("pokit_id")?.toIntOrNull()
 
     private val pokitPaging = PokitPaging(
-        getPokits = ::getPokits,
+        getPokits = getPokitsUseCase,
         perPage = 10,
         coroutineScope = viewModelScope,
         initPage = 0
@@ -105,10 +104,6 @@ class AddPokitViewModel @Inject constructor(
         }
     }
 
-    private suspend fun getPokits(size: Int, page: Int): PokitResult<List<DomainPokit>> {
-        return getPokitsUseCase.getPokits(size = size, page = page)
-    }
-
     fun inputPokitName(pokitName: String) {
         _pokitName.update { pokitName }
 

diff --git a/feature/addpokit/src/main/java/com/strayalpaca/addpokit/paging/PokitPaging.kt b/feature/addpokit/src/main/java/com/strayalpaca/addpokit/paging/PokitPaging.kt
@@ -11,11 +11,10 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import pokitmons.pokit.domain.commom.PokitResult
-import kotlin.reflect.KSuspendFunction2
-import pokitmons.pokit.domain.model.pokit.Pokit as DomainPokit
+import pokitmons.pokit.domain.usecase.pokit.GetPokitsUseCase
 
 class PokitPaging(
-    private val getPokits: KSuspendFunction2<Int, Int, PokitResult<List<DomainPokit>>>,
+    private val getPokits: GetPokitsUseCase,
     private val perPage: Int = 10,
     private val coroutineScope: CoroutineScope = CoroutineScope(Dispatchers.IO),
     private val initPage: Int = 0,
@@ -37,7 +36,7 @@ class PokitPaging(
         requestJob = coroutineScope.launch {
             try {
                 currentPageIndex = initPage
-                val response = getPokits(perPage * firstRequestPage, currentPageIndex)
+                val response = getPokits.getPokits(size = perPage * firstRequestPage, page = currentPageIndex)
                 when (response) {
                     is PokitResult.Success -> {
                         val pokitList = response.result.map { domainPokit ->
@@ -66,7 +65,7 @@ class PokitPaging(
 
         requestJob = coroutineScope.launch {
             try {
-                val response = getPokits(perPage, currentPageIndex)
+                val response = getPokits.getPokits(size = perPage, page = currentPageIndex)
                 when (response) {
                     is PokitResult.Success -> {
                         val pokitList = response.result.map { domainPokit ->

diff --git a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailViewModel.kt b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailViewModel.kt
@@ -25,7 +25,6 @@ import pokitmons.pokit.domain.usecase.pokit.GetPokitUseCase
 import pokitmons.pokit.domain.usecase.pokit.GetPokitsUseCase
 import javax.inject.Inject
 import pokitmons.pokit.domain.model.link.Link as DomainLink
-import pokitmons.pokit.domain.model.pokit.Pokit as DomainPokit
 
 @HiltViewModel
 class PokitDetailViewModel @Inject constructor(
@@ -36,7 +35,7 @@ class PokitDetailViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
     private val pokitPaging = PokitPaging(
-        getPokits = ::getPokits,
+        getPokits = getPokitsUseCase,
         perPage = 10,
         coroutineScope = viewModelScope,
         initPage = 0
@@ -69,10 +68,6 @@ class PokitDetailViewModel @Inject constructor(
         }
     }
 
-    private suspend fun getPokits(size: Int, page: Int): PokitResult<List<DomainPokit>> {
-        return getPokitsUseCase.getPokits(size = size, page = page)
-    }
-
     private suspend fun getLinks(categoryId: Int, size: Int, page: Int, sort: LinksSort): PokitResult<List<DomainLink>> {
         val currentFilter = state.value.currentFilter
         return getLinksUseCase.getLinks(

diff --git a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/paging/PokitPaging.kt b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/paging/PokitPaging.kt
@@ -11,11 +11,10 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import pokitmons.pokit.domain.commom.PokitResult
-import kotlin.reflect.KSuspendFunction2
-import pokitmons.pokit.domain.model.pokit.Pokit as DomainPokit
+import pokitmons.pokit.domain.usecase.pokit.GetPokitsUseCase
 
 class PokitPaging(
-    private val getPokits: KSuspendFunction2<Int, Int, PokitResult<List<DomainPokit>>>,
+    private val getPokits: GetPokitsUseCase,
     private val perPage: Int = 10,
     private val coroutineScope: CoroutineScope = CoroutineScope(Dispatchers.IO),
     private val initPage: Int = 0,
@@ -37,7 +36,7 @@ class PokitPaging(
         requestJob = coroutineScope.launch {
             try {
                 currentPageIndex = initPage
-                val response = getPokits(perPage * firstRequestPage, currentPageIndex)
+                val response = getPokits.getPokits(size = perPage * firstRequestPage, page = currentPageIndex)
                 when (response) {
                     is PokitResult.Success -> {
                         val pokitList = response.result.map { domainPokit ->
@@ -66,7 +65,7 @@ class PokitPaging(
 
         requestJob = coroutineScope.launch {
             try {
-                val response = getPokits(perPage, currentPageIndex)
+                val response = getPokits.getPokits(size = perPage, page = currentPageIndex)
                 when (response) {
                     is PokitResult.Success -> {
                         val pokitList = response.result.map { domainPokit ->