feat: 첫번째 요청 결과 last 인데 현재 진행, 예정만 있다면 과거 요청을 한번 더 보낸다

woowacourse-teams · May 19, 2024 · 935428a · 935428a
1 parent 80804ba
commit 935428a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...n/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailViewModel.kt b/...n/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailViewModel.kt
@@ -67,8 +67,13 @@ class ArtistDetailViewModel @Inject constructor(
                     onBookmarkClick = ::toggleArtistBookmark,
                 )
 
-                if (festivalPage.festivals.isEmpty()) {
+                if(!festivalPage.isLastPage) {
+                    return@launch
+                }
+                val lastFestival = festivalPage.festivals.lastOrNull()
+                if (lastFestival == null || lastFestival.endDate >= LocalDate.now()) {
                     loadMoreArtistFestivals(id)
+                    return@launch
                 }
             }.onFailure {
                 handleFailure(key = KEY_LOAD_ARTIST_DETAIL, throwable = it)

diff --git a/...n/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailViewModel.kt b/...n/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailViewModel.kt
@@ -65,8 +65,13 @@ class SchoolDetailViewModel @Inject constructor(
                     isLast = festivalPage.isLastPage,
                     onBookmarkClick = { schoolId -> toggleSchoolBookmark(schoolId) },
                 )
-                if (festivalPage.festivals.isEmpty()) {
+                if (!festivalPage.isLastPage) {
+                    return@launch
+                }
+                val lastFestival = festivalPage.festivals.lastOrNull()
+                if (lastFestival == null || lastFestival.endDate >= LocalDate.now()) {
                     loadMoreSchoolFestivals(schoolId)
+                    return@launch
                 }
             }.onFailure {
                 handleFailure(key = KEY_LOAD_SCHOOL_DETAIL, throwable = it)