Quicksync custom date bug fix

michaldrabik · Jun 26, 2024 · 0704063 · 0704063
1 parent eda13c3
commit 0704063
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 14 deletions.
diff --git a/...chaldrabik/ui_base/common/sheets/context_menu/movie/cases/MovieContextMenuMyMoviesCase.kt b/...chaldrabik/ui_base/common/sheets/context_menu/movie/cases/MovieContextMenuMyMoviesCase.kt
@@ -42,7 +42,7 @@ class MovieContextMenuMyMoviesCase @Inject constructor(
     with(quickSyncManager) {
       clearWatchlistMovies(listOf(traktId.id))
       clearHiddenMovies(listOf(traktId.id))
-      scheduleMovies(listOf(traktId.id))
+      scheduleMovies(listOf(traktId.id), customDate)
     }
 
     RemoveTraktUiEvent(removeWatchlist = isWatchlist, removeHidden = isHidden)

diff --git a/ui-base/src/main/java/com/michaldrabik/ui_base/trakt/quicksync/QuickSyncManager.kt b/ui-base/src/main/java/com/michaldrabik/ui_base/trakt/quicksync/QuickSyncManager.kt
@@ -3,6 +3,8 @@ package com.michaldrabik.ui_base.trakt.quicksync
 import androidx.work.WorkManager
 import com.michaldrabik.common.Mode
 import com.michaldrabik.common.extensions.nowUtcMillis
+import com.michaldrabik.common.extensions.toMillis
+import com.michaldrabik.common.extensions.toUtcZone
 import com.michaldrabik.data_local.LocalDataSource
 import com.michaldrabik.data_local.database.model.TraktSyncQueue
 import com.michaldrabik.data_local.database.model.TraktSyncQueue.Operation
@@ -11,6 +13,7 @@ import com.michaldrabik.data_local.utilities.TransactionsProvider
 import com.michaldrabik.repository.UserTraktManager
 import com.michaldrabik.repository.settings.SettingsRepository
 import timber.log.Timber
+import java.time.ZonedDateTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -26,25 +29,26 @@ class QuickSyncManager @Inject constructor(
   suspend fun scheduleEpisodes(
     episodesIds: List<Long>,
     showId: Long,
+    customDate: ZonedDateTime?,
     clearProgress: Boolean = false
   ) {
     if (!ensureQuickSync() && !(clearProgress && ensureQuickRemove())) {
       return
     }
 
-    val time = nowUtcMillis()
-    val items = episodesIds.map { TraktSyncQueue.createEpisode(it, showId, time, time, clearProgress) }
+    val timestamp = customDate?.toUtcZone()?.toMillis() ?: nowUtcMillis()
+    val items = episodesIds.map { TraktSyncQueue.createEpisode(it, showId, timestamp, timestamp, clearProgress) }
     localSource.traktSyncQueue.insert(items)
     Timber.d("Episodes added into sync queue. Count: ${items.size}")
 
     QuickSyncWorker.schedule(workManager)
   }
 
-  suspend fun scheduleMovies(moviesIds: List<Long>) {
+  suspend fun scheduleMovies(moviesIds: List<Long>, customDate: ZonedDateTime?) {
     if (!ensureQuickSync()) return
 
-    val time = nowUtcMillis()
-    val items = moviesIds.map { TraktSyncQueue.createMovie(it, time, time) }
+    val timestamp = customDate?.toUtcZone()?.toMillis() ?: nowUtcMillis()
+    val items = moviesIds.map { TraktSyncQueue.createMovie(it, timestamp, timestamp) }
     localSource.traktSyncQueue.insert(items)
     Timber.d("Movies added into sync queue. Count: ${items.size}")
 

diff --git a/ui-movie/src/main/java/com/michaldrabik/ui_movie/cases/MovieDetailsMyMoviesCase.kt b/ui-movie/src/main/java/com/michaldrabik/ui_movie/cases/MovieDetailsMyMoviesCase.kt
@@ -37,7 +37,7 @@ class MovieDetailsMyMoviesCase @Inject constructor(
   suspend fun addToMyMovies(movie: Movie, customDate: ZonedDateTime?) {
     withContext(dispatchers.IO) {
       moviesRepository.myMovies.insert(movie.ids.trakt, customDate)
-      quickSyncManager.scheduleMovies(listOf(movie.traktId))
+      quickSyncManager.scheduleMovies(listOf(movie.traktId), customDate)
       pinnedItemsRepository.removePinnedItem(movie)
       announcementManager.refreshMoviesAnnouncements()
     }

diff --git a/...es/src/main/java/com/michaldrabik/ui_progress_movies/main/cases/ProgressMoviesMainCase.kt b/...es/src/main/java/com/michaldrabik/ui_progress_movies/main/cases/ProgressMoviesMainCase.kt
@@ -20,7 +20,7 @@ class ProgressMoviesMainCase @Inject constructor(
   suspend fun addToMyMovies(movie: Movie, customDate: ZonedDateTime?) {
     moviesRepository.myMovies.insert(movie.ids.trakt, customDate)
     pinnedItemsRepository.removePinnedItem(movie)
-    quickSyncManager.scheduleMovies(listOf(movie.ids.trakt.id))
+    quickSyncManager.scheduleMovies(listOf(movie.traktId), customDate)
   }
 
   suspend fun addToMyMovies(movieId: IdTrakt) {

diff --git a/...rc/test/java/com/michaldrabik/ui_progress_movies/main/cases/ProgressMoviesMainCaseTest.kt b/...rc/test/java/com/michaldrabik/ui_progress_movies/main/cases/ProgressMoviesMainCaseTest.kt
@@ -47,7 +47,7 @@ class ProgressMoviesMainCaseTest : BaseMockTest() {
 
     coVerify { moviesRepository.myMovies.insert(IdTrakt(123), null) }
     coVerify { pinnedItemsRepository.removePinnedItem(movie) }
-    coVerify { quickSyncManager.scheduleMovies(listOf(123)) }
+    coVerify { quickSyncManager.scheduleMovies(listOf(123), null) }
   }
 
   @Test
@@ -56,6 +56,6 @@ class ProgressMoviesMainCaseTest : BaseMockTest() {
 
     coVerify { moviesRepository.myMovies.insert(IdTrakt(123), null) }
     coVerify { pinnedItemsRepository.removePinnedItem(any<Movie>()) }
-    coVerify { quickSyncManager.scheduleMovies(listOf(123)) }
+    coVerify { quickSyncManager.scheduleMovies(listOf(123), null) }
   }
 }
diff --git a/...rogress/src/main/java/com/michaldrabik/ui_progress/main/cases/ProgressMainEpisodesCase.kt b/...rogress/src/main/java/com/michaldrabik/ui_progress/main/cases/ProgressMainEpisodesCase.kt
@@ -26,7 +26,8 @@ class ProgressMainEpisodesCase @Inject constructor(
     episodesManager.setEpisodeWatched(bundle, customDate)
     quickSyncManager.scheduleEpisodes(
       showId = bundle.show.traktId,
-      episodesIds = listOf(bundle.episode.ids.trakt.id)
+      episodesIds = listOf(bundle.episode.ids.trakt.id),
+      customDate = customDate
     )
   }
 

diff --git a/...ow/src/main/java/com/michaldrabik/ui_show/episodes/cases/EpisodesSetEpisodeWatchedCase.kt b/...ow/src/main/java/com/michaldrabik/ui_show/episodes/cases/EpisodesSetEpisodeWatchedCase.kt
@@ -40,6 +40,7 @@ class EpisodesSetEpisodeWatchedCase @Inject constructor(
           quickSyncManager.scheduleEpisodes(
             episodesIds = listOf(episode.ids.trakt.id),
             showId = show.traktId,
+            customDate = customDate,
             clearProgress = false
           )
         }

diff --git a/...how/src/main/java/com/michaldrabik/ui_show/episodes/cases/EpisodesSetSeasonWatchedCase.kt b/...how/src/main/java/com/michaldrabik/ui_show/episodes/cases/EpisodesSetSeasonWatchedCase.kt
@@ -42,7 +42,8 @@ class EpisodesSetSeasonWatchedCase @Inject constructor(
         if (isMyShows) {
           quickSyncManager.scheduleEpisodes(
             showId = show.traktId,
-            episodesIds = episodesAdded.map { it.ids.trakt.id }
+            episodesIds = episodesAdded.map { it.ids.trakt.id },
+            customDate = customDate
           )
         }
         return Result.SUCCESS

diff --git a/...main/java/com/michaldrabik/ui_show/sections/seasons/cases/ShowDetailsQuickProgressCase.kt b/...main/java/com/michaldrabik/ui_show/sections/seasons/cases/ShowDetailsQuickProgressCase.kt
@@ -61,6 +61,7 @@ class ShowDetailsQuickProgressCase @Inject constructor(
       quickSyncManager.scheduleEpisodes(
         episodesIds = episodesIds,
         showId = show.traktId,
+        customDate = customDate,
         clearProgress = true
       )
     }

diff --git a/...main/java/com/michaldrabik/ui_show/sections/seasons/cases/ShowDetailsWatchedSeasonCase.kt b/...main/java/com/michaldrabik/ui_show/sections/seasons/cases/ShowDetailsWatchedSeasonCase.kt
@@ -41,7 +41,8 @@ class ShowDetailsWatchedSeasonCase @Inject constructor(
         if (isMyShows) {
           quickSyncManager.scheduleEpisodes(
             showId = show.traktId,
-            episodesIds = episodesAdded.map { it.ids.trakt.id }
+            episodesIds = episodesAdded.map { it.ids.trakt.id },
+            customDate = customDate
           )
         }
         return Result.SUCCESS

diff --git a/...s/src/main/java/com/michaldrabik/ui_widgets/progress/ProgressWidgetEpisodeCheckService.kt b/...s/src/main/java/com/michaldrabik/ui_widgets/progress/ProgressWidgetEpisodeCheckService.kt
@@ -63,7 +63,8 @@ class ProgressWidgetEpisodeCheckService : JobIntentService(), CoroutineScope {
       episodesManager.setEpisodeWatched(episodeId, seasonId, IdTrakt(showId))
       quickSyncManager.scheduleEpisodes(
         showId = showId,
-        episodesIds = listOf(episodeId)
+        episodesIds = listOf(episodeId),
+        customDate = null
       )
       (applicationContext as WidgetsProvider).requestShowsWidgetsUpdate()
     }