fix: pagination bugs

Author: PavloNetrebchuk

core/src/main/java/org/openedx/core/data/api/CourseApi.kt

@@ -14,7 +14,6 @@ import org.openedx.core.data.model.DownloadCoursePreview
 import org.openedx.core.data.model.EnrollmentStatus
 import org.openedx.core.data.model.HandoutsModel
 import org.openedx.core.data.model.ResetCourseDates
-import org.openedx.core.data.model.ShiftDueDatesBody
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
@@ -118,8 +117,6 @@ interface CourseApi {
         @Query("page") page: Int
     ): CourseDatesResponse
 
-    @POST("/api/course_experience/v1/reset_multiple_course_deadlines/")
-    suspend fun shiftDueDate(
-        @Body shiftDueDatesBody: ShiftDueDatesBody
-    )
+    @POST("/api/course_experience/v1/reset_all_relative_course_deadlines/")
+    suspend fun shiftDueDate()
 }

core/src/main/java/org/openedx/core/data/model/ShiftDueDatesBody.kt

@@ -312,6 +312,7 @@ private fun CourseDateItem(
                 .fillMaxWidth()
                 .padding(top = 4.dp),
             text = dateBlock.courseName,
+            maxLines = 1,
             style = MaterialTheme.appTypography.labelMedium,
         )
     }

core/src/main/java/org/openedx/core/presentation/dates/DatesUI.kt

@@ -1,7 +1,6 @@
 package org.openedx.dates.data.repository
 
 import org.openedx.core.data.api.CourseApi
-import org.openedx.core.data.model.ShiftDueDatesBody
 import org.openedx.core.data.storage.CorePreferences
 import org.openedx.core.domain.model.CourseDate
 import org.openedx.core.domain.model.CourseDatesResponse
@@ -16,6 +15,9 @@ class DatesRepository(
     suspend fun getUserDates(page: Int): CourseDatesResponse {
         val username = preferencesManager.user?.username ?: ""
         val response = api.getUserDates(username, page)
+        if (page == 1) {
+            dao.clearCachedData()
+        }
         dao.insertCourseDateEntities(response.results.map { CourseDateEntity.createFrom(it) })
         return response.mapToDomain()
     }
@@ -24,6 +26,5 @@ class DatesRepository(
         return dao.getCourseDateEntities().mapNotNull { it.mapToDomain() }
     }
 
-    suspend fun shiftDueDate(courseIds: List<String>) =
-        api.shiftDueDate(ShiftDueDatesBody(courseIds))
+    suspend fun shiftDueDate() = api.shiftDueDate()
 }

dates/src/main/java/org/openedx/dates/data/repository/DatesRepository.kt

@@ -10,5 +10,5 @@ class DatesInteractor(
 
     suspend fun getUserDatesFromCache() = repository.getUserDatesFromCache()
 
-    suspend fun shiftDueDate(courseIds: List<String>) = repository.shiftDueDate(courseIds)
+    suspend fun shiftDueDate() = repository.shiftDueDate()
 }

dates/src/main/java/org/openedx/dates/domain/interactor/DatesInteractor.kt

@@ -250,7 +250,10 @@ private fun DatesScreen(
                             layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
                         val totalItemsCount = layoutInfo.totalItemsCount
                         if (totalItemsCount > 0 &&
-                            lastVisibleItemIndex >= (totalItemsCount * LOAD_MORE_THRESHOLD).toInt()
+                            lastVisibleItemIndex >= (totalItemsCount * LOAD_MORE_THRESHOLD).toInt() &&
+                            !uiState.isLoading &&
+                            !uiState.isRefreshing &&
+                            uiState.canLoadMore
                         ) {
                             onAction(DatesViewActions.LoadMore)
                         }

dates/src/main/java/org/openedx/dates/presentation/dates/DatesFragment.kt

@@ -2,6 +2,7 @@ package org.openedx.dates.presentation.dates
 
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -54,13 +55,14 @@ class DatesViewModel(
     var useRelativeDates = corePreferences.isRelativeDatesEnabled
 
     private var page = 1
+    private var fetchDataJob: Job? = null
 
     init {
         fetchDates(false)
     }
 
     private fun fetchDates(refresh: Boolean) {
-        viewModelScope.launch {
+        fetchDataJob = viewModelScope.launch {
             try {
                 updateLoadingState(refresh)
                 val response = getUserDates(refresh)
@@ -70,6 +72,7 @@ class DatesViewModel(
                     updateUIWithCachedResponse()
                 }
             } catch (e: Exception) {
+                page = -1
                 handleFetchException(e)
             } finally {
                 clearLoadingState()
@@ -86,19 +89,17 @@ class DatesViewModel(
         }
     }
 
-    private suspend fun getUserDates(refresh: Boolean) = if (refresh) {
-        page = 1
-        datesInteractor.getUserDates(page)
-    } else {
-        if (networkConnection.isOnline() || page > 1) {
+    private suspend fun getUserDates(refresh: Boolean): CourseDatesResponse? {
+        if (refresh) page = 1
+        return if (networkConnection.isOnline() || page > 1) {
             datesInteractor.getUserDates(page)
         } else {
             null
         }
     }
 
     private fun updateUIWithResponse(response: CourseDatesResponse, refresh: Boolean) {
-        if (response.next.isNotNull() && page != response.count) {
+        if (response.next.isNotNull()) {
             _uiState.update { state -> state.copy(canLoadMore = true) }
             page++
         } else {
@@ -158,12 +159,7 @@ class DatesViewModel(
                         isShiftDueDatesPressed = true,
                     )
                 }
-                val pastDueDates = _uiState.value.dates[DatesSection.PAST_DUE] ?: emptyList()
-                val courseIds = pastDueDates
-                    .filter { it.relative }
-                    .map { it.courseId }
-                    .distinct()
-                datesInteractor.shiftDueDate(courseIds)
+                datesInteractor.shiftDueDate()
                 refreshData()
             } catch (e: Exception) {
                 handleFetchException(e)
@@ -184,6 +180,7 @@ class DatesViewModel(
     }
 
     fun refreshData() {
+        fetchDataJob?.cancel()
         fetchDates(true)
     }
 

dates/src/main/java/org/openedx/dates/presentation/dates/DatesViewModel.kt

@@ -208,7 +208,7 @@ class DatesViewModelTest {
         viewModel.shiftDueDate()
         advanceUntilIdle()
 
-        coVerify { datesInteractor.shiftDueDate(listOf("course-123")) }
+        coVerify { datesInteractor.shiftDueDate() }
         // isShiftDueDatesPressed should be reset to false after processing.
         assertFalse(viewModel.uiState.value.isShiftDueDatesPressed)
     }
@@ -229,7 +229,7 @@ class DatesViewModelTest {
                 results = listOf(courseDate)
             )
             coEvery { datesInteractor.getUserDates(1) } returns courseDatesResponse
-            coEvery { datesInteractor.shiftDueDate(any()) } throws Exception()
+            coEvery { datesInteractor.shiftDueDate() } throws Exception()
 
             val viewModel = DatesViewModel(
                 datesRouter,