[MERGE] #328 -> develop

[�FEAT/#328] 탐색 뷰 / 페이징 추가
teamterning · Jan 13, 2025 · 68c3f4a · 68c3f4a
2 parents 3b06ba1 + 4e3ab37
commit 68c3f4a
Show file tree

Hide file tree

Showing 14 changed files with 252 additions and 146 deletions.
diff --git a/data/search/build.gradle.kts b/data/search/build.gradle.kts
@@ -11,4 +11,7 @@ android {
 dependencies {
     // domain
     implementation(projects.domain.search)
+
+    // paging
+    implementation(libs.androidx.paging.common.android)
 }
diff --git a/data/search/src/main/java/com/terning/data/search/datasourceimpl/SearchDataSourceImpl.kt b/data/search/src/main/java/com/terning/data/search/datasourceimpl/SearchDataSourceImpl.kt
@@ -19,7 +19,6 @@ class SearchDataSourceImpl @Inject constructor(
             request.keyword,
             request.sortBy,
             request.page,
-            request.size
         )
 
     override suspend fun getSearchViews(): BaseResponse<SearchAnnouncementResponseDto> =

diff --git a/data/search/src/main/java/com/terning/data/search/dto/request/SearchRequestDto.kt b/data/search/src/main/java/com/terning/data/search/dto/request/SearchRequestDto.kt
@@ -11,6 +11,4 @@ data class SearchRequestDto(
     val sortBy: String,
     @SerialName("page")
     val page: Int,
-    @SerialName("size")
-    val size: Int,
 )
diff --git a/data/search/src/main/java/com/terning/data/search/mapper/SearchResultMapper.kt b/data/search/src/main/java/com/terning/data/search/mapper/SearchResultMapper.kt
@@ -3,18 +3,16 @@ package com.terning.data.search.mapper
 import com.terning.data.search.dto.response.SearchResultResponseDto
 import com.terning.domain.search.entity.SearchResult
 
-fun SearchResultResponseDto.toSearchResultList(): List<SearchResult> {
-    return announcements.map {
-        SearchResult(
-            internshipAnnouncementId = it.internshipAnnouncementId,
-            title = it.title,
-            dDay = it.dDay,
-            workingPeriod = it.workingPeriod,
-            companyImage = it.companyImage,
-            isScrapped = it.isScrapped,
-            deadline = it.deadline,
-            startYearMonth = it.startYearMonth,
-            color = it.color
-        )
-    }
-}
+fun SearchResultResponseDto.SearchAnnouncementDto.toSearchResultList(totalCount: Int): SearchResult =
+    SearchResult(
+        totalCount = totalCount,
+        internshipAnnouncementId = this.internshipAnnouncementId,
+        title = this.title,
+        dDay = this.dDay,
+        workingPeriod = this.workingPeriod,
+        companyImage = this.companyImage,
+        isScrapped = this.isScrapped,
+        deadline = this.deadline,
+        startYearMonth = this.startYearMonth,
+        color = this.color,
+    )
diff --git a/data/search/src/main/java/com/terning/data/search/pagingsource/SearchPagingSource.kt b/data/search/src/main/java/com/terning/data/search/pagingsource/SearchPagingSource.kt
@@ -0,0 +1,49 @@
+package com.terning.data.search.pagingsource
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import com.terning.data.search.datasource.SearchDataSource
+import com.terning.data.search.dto.request.SearchRequestDto
+import com.terning.data.search.dto.response.SearchResultResponseDto
+
+class SearchPagingSource(
+    private val query: String,
+    private val sortBy: String,
+    private val dataSource: SearchDataSource,
+) : PagingSource<Int, Pair<Int, SearchResultResponseDto.SearchAnnouncementDto>>() {
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Pair<Int, SearchResultResponseDto.SearchAnnouncementDto>> {
+        return try {
+            val nextParamKey = params.key ?: 0
+
+            val response = dataSource.getSearch(
+                request = SearchRequestDto(
+                    keyword = query,
+                    sortBy = sortBy,
+                    page = nextParamKey,
+                )
+            )
+            val totalCount = response.result.totalCount
+            val hasNextPage = response.result.hasNext
+
+            val nextKey = if (hasNextPage) nextParamKey + 1 else null
+
+            LoadResult.Page(
+                data = response.result.announcements.map {
+                    Pair(totalCount, it)
+                },
+                prevKey = null,
+                nextKey = nextKey
+            )
+        } catch (e: Exception) {
+            LoadResult.Error(e)
+        }
+    }
+
+    override fun getRefreshKey(state: PagingState<Int, Pair<Int, SearchResultResponseDto.SearchAnnouncementDto>>): Int? {
+        return state.anchorPosition?.let { anchorPosition ->
+            state.closestPageToPosition(anchorPosition)?.prevKey?.plus(1)
+                ?: state.closestPageToPosition(anchorPosition)?.nextKey?.minus(1)
+        }
+    }
+}
diff --git a/data/search/src/main/java/com/terning/data/search/repositoryimpl/SearchRepositoryImpl.kt b/data/search/src/main/java/com/terning/data/search/repositoryimpl/SearchRepositoryImpl.kt
@@ -1,34 +1,43 @@
 package com.terning.data.search.repositoryimpl
 
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.map
 import com.terning.data.search.datasource.SearchDataSource
-import com.terning.data.search.dto.request.SearchRequestDto
 import com.terning.data.search.mapper.toSearchBannerList
 import com.terning.data.search.mapper.toSearchPopularAnnouncementList
 import com.terning.data.search.mapper.toSearchResultList
+import com.terning.data.search.pagingsource.SearchPagingSource
 import com.terning.domain.search.entity.SearchBanner
 import com.terning.domain.search.entity.SearchPopularAnnouncement
 import com.terning.domain.search.entity.SearchResult
 import com.terning.domain.search.repository.SearchRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class SearchRepositoryImpl @Inject constructor(
     private val searchDataSource: SearchDataSource,
 ) : SearchRepository {
-    override suspend fun getSearchList(
+
+    override fun getSearchList(
         query: String,
         sortBy: String,
-        page: Int,
-        size: Int,
-    ): Result<List<SearchResult>> {
-        return runCatching {
-            searchDataSource.getSearch(
-                SearchRequestDto(
-                    keyword = query,
-                    sortBy = sortBy,
-                    page = page,
-                    size = size
-                )
-            ).result.toSearchResultList()
+    ): Flow<PagingData<SearchResult>> {
+        return Pager(
+            PagingConfig(
+                pageSize = 10,
+                enablePlaceholders = false
+            )
+        ) {
+            SearchPagingSource(
+                query = query,
+                sortBy = sortBy,
+                dataSource = searchDataSource
+            )
+        }.flow.map { pagedData ->
+            pagedData.map { it.second.toSearchResultList(it.first) }
         }
     }
 
@@ -43,7 +52,7 @@ class SearchRepositoryImpl @Inject constructor(
         }
 
     override suspend fun getSearchBannersList(): Result<List<SearchBanner>> =
-        kotlin.runCatching {
+        runCatching {
             searchDataSource.getSearchBanners().result.toSearchBannerList()
         }
 }
diff --git a/domain/search/build.gradle.kts b/domain/search/build.gradle.kts
@@ -1,3 +1,7 @@
 plugins {
     alias(libs.plugins.terning.kotlin)
+}
+
+dependencies {
+    implementation(libs.paging.common)
 }
diff --git a/domain/search/src/main/java/com/terning/domain/search/entity/SearchResult.kt b/domain/search/src/main/java/com/terning/domain/search/entity/SearchResult.kt
@@ -1,6 +1,7 @@
 package com.terning.domain.search.entity
 
 data class SearchResult(
+    val totalCount: Int,
     val internshipAnnouncementId: Long,
     val title: String,
     val dDay: String,

diff --git a/domain/search/src/main/java/com/terning/domain/search/repository/SearchRepository.kt b/domain/search/src/main/java/com/terning/domain/search/repository/SearchRepository.kt
@@ -1,16 +1,17 @@
 package com.terning.domain.search.repository
 
+import androidx.paging.PagingData
 import com.terning.domain.search.entity.SearchBanner
 import com.terning.domain.search.entity.SearchPopularAnnouncement
 import com.terning.domain.search.entity.SearchResult
+import kotlinx.coroutines.flow.Flow
 
 interface SearchRepository {
-    suspend fun getSearchList(
+
+    fun getSearchList(
         query: String,
         sortBy: String,
-        page: Int,
-        size: Int,
-    ): Result<List<SearchResult>>
+    ): Flow<PagingData<SearchResult>>
 
     suspend fun getSearchViewsList(): Result<List<SearchPopularAnnouncement>>
     suspend fun getSearchScrapsList(): Result<List<SearchPopularAnnouncement>>

diff --git a/feature/search/build.gradle.kts b/feature/search/build.gradle.kts
@@ -14,4 +14,8 @@ dependencies {
 
     // feature
     implementation(projects.feature.dialog)
+
+    // paging
+    implementation(libs.paging.runtime)
+    implementation(libs.paging.compose)
 }