Simplify ObserveNextShowEpisodeToWatch

data/db-sqldelight/src/commonMain/kotlin/app/tivi/data/daos/SqlDelightWatchedShowsDao.kt

@@ -73,6 +73,15 @@ class SqlDelightWatchedShowsDao(
         ).executeAsList()
     }
 
+    override fun observeUpNextShow(): Flow<UpNextEntry?> {
+        return provideUpNextShowsQuery(
+            followedOnly = false,
+            sort = SortOption.LAST_WATCHED,
+            limit = 1,
+            offset = 0,
+        ).asFlow().mapToOneOrNull(dispatchers.io)
+    }
+
     override fun entryShowViewStats(showId: Long): Flow<ShowsWatchStats?> {
         return db.shows_view_watch_statsQueries.watchStatsForShowId(showId, ::ShowsWatchStats)
             .asFlow()

data/db/src/commonMain/kotlin/app/tivi/data/daos/WatchedShowDao.kt

@@ -26,6 +26,8 @@ interface WatchedShowDao : EntryDao<WatchedShowEntry, WatchedShowEntryWithShow>
 
     fun getUpNextShows(): List<UpNextEntry>
 
+    fun observeUpNextShow(): Flow<UpNextEntry?>
+
     fun entryShowViewStats(showId: Long): Flow<ShowsWatchStats?>
 
     fun observeNextShowToWatch(): Flow<TiviShow?>

domain/src/commonMain/kotlin/app/tivi/domain/observers/ObserveNextShowEpisodeToWatch.kt

@@ -3,26 +3,17 @@
 
 package app.tivi.domain.observers
 
-import app.tivi.data.compoundmodels.EpisodeWithSeasonWithShow
+import app.tivi.data.compoundmodels.UpNextEntry
 import app.tivi.data.daos.WatchedShowDao
-import app.tivi.data.episodes.SeasonsEpisodesRepository
 import app.tivi.domain.SubjectInteractor
-import app.tivi.extensions.flatMapLatestNullable
-import app.tivi.extensions.mapNullable
 import kotlinx.coroutines.flow.Flow
 import me.tatarka.inject.annotations.Inject
 
 @Inject
 class ObserveNextShowEpisodeToWatch(
     private val watchedShowDao: WatchedShowDao,
-    private val seasonsEpisodesRepository: SeasonsEpisodesRepository,
-) : SubjectInteractor<Unit, EpisodeWithSeasonWithShow?>() {
-
-    override fun createObservable(params: Unit): Flow<EpisodeWithSeasonWithShow?> {
-        return watchedShowDao.observeNextShowToWatch().flatMapLatestNullable { nextShow ->
-            seasonsEpisodesRepository.observeNextEpisodeToWatch(nextShow.id).mapNullable {
-                EpisodeWithSeasonWithShow(it.episode, it.season, nextShow)
-            }
-        }
+) : SubjectInteractor<Unit, UpNextEntry?>() {
+    override fun createObservable(params: Unit): Flow<UpNextEntry?> {
+        return watchedShowDao.observeUpNextShow()
     }
 }

ui/discover/src/commonMain/kotlin/app/tivi/home/discover/DiscoverUiState.kt

@@ -5,10 +5,10 @@ package app.tivi.home.discover
 
 import androidx.compose.runtime.Immutable
 import app.tivi.common.compose.UiMessage
-import app.tivi.data.compoundmodels.EpisodeWithSeasonWithShow
 import app.tivi.data.compoundmodels.PopularEntryWithShow
 import app.tivi.data.compoundmodels.RecommendedEntryWithShow
 import app.tivi.data.compoundmodels.TrendingEntryWithShow
+import app.tivi.data.compoundmodels.UpNextEntry
 import app.tivi.data.models.TraktUser
 import app.tivi.data.traktauth.TraktAuthState
 import com.slack.circuit.runtime.CircuitUiEvent
@@ -24,7 +24,7 @@ data class DiscoverUiState(
     val popularRefreshing: Boolean = false,
     val recommendedItems: List<RecommendedEntryWithShow> = emptyList(),
     val recommendedRefreshing: Boolean = false,
-    val nextEpisodeWithShowToWatch: EpisodeWithSeasonWithShow? = null,
+    val nextEpisodeWithShowToWatch: UpNextEntry? = null,
     val message: UiMessage? = null,
     val eventSink: (DiscoverUiEvent) -> Unit,
 ) : CircuitUiState {