Merge pull request #103 from c0de-wizard/database-cleanup

Make Databse IDs Great

android-features/shows-grid/src/main/kotlin/com/thomaskioko/tvmaniac/showsgrid/Mapper.kt

@@ -3,10 +3,8 @@ package com.thomaskioko.tvmaniac.showsgrid
 import com.thomaskioko.tvmaniac.core.db.ShowsByCategory
 import com.thomaskioko.tvmaniac.showsgrid.model.TvShow
 
-fun List<ShowsByCategory>.toTvShowList(): List<TvShow> = map { it.toTvShow() }
-
 fun ShowsByCategory.toTvShow(): TvShow = TvShow(
-    traktId = trakt_id,
+    traktId = id.id,
     tmdbId = tmdb_id,
     title = title,
     posterImageUrl = poster_url,

core/database/src/androidMain/kotlin/com/thomaskioko/tvmaniac/db/DatabaseComponent.kt

@@ -3,9 +3,17 @@ package com.thomaskioko.tvmaniac.db
 import android.app.Application
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
+import com.thomaskioko.tvmaniac.core.db.Episode
+import com.thomaskioko.tvmaniac.core.db.Episode_image
 import com.thomaskioko.tvmaniac.core.db.Last_requests
+import com.thomaskioko.tvmaniac.core.db.Season
 import com.thomaskioko.tvmaniac.core.db.Show
+import com.thomaskioko.tvmaniac.core.db.Show_category
+import com.thomaskioko.tvmaniac.core.db.Show_image
+import com.thomaskioko.tvmaniac.core.db.Similar_shows
+import com.thomaskioko.tvmaniac.core.db.Trailers
 import com.thomaskioko.tvmaniac.core.db.TvManiacDatabase
+import com.thomaskioko.tvmaniac.core.db.Watchlist
 import com.thomaskioko.tvmaniac.util.scope.ApplicationScope
 import me.tatarka.inject.annotations.Provides
 
@@ -29,9 +37,39 @@ actual interface DatabaseComponent {
         driver = sqlDriver,
         showAdapter = Show.Adapter(
             genresAdapter = stringColumnAdapter,
+            idAdapter = IdAdapter(),
         ),
         last_requestsAdapter = Last_requests.Adapter(
             timestampAdapter = InstantColumnAdapter,
         ),
+        episode_imageAdapter = Episode_image.Adapter(
+            idAdapter = IdAdapter(),
+            tmdb_idAdapter = IdAdapter(),
+        ),
+        episodeAdapter = Episode.Adapter(
+            idAdapter = IdAdapter(),
+            season_idAdapter = IdAdapter(),
+        ),
+        seasonAdapter = Season.Adapter(
+            idAdapter = IdAdapter(),
+            show_idAdapter = IdAdapter(),
+        ),
+        show_imageAdapter = Show_image.Adapter(
+            idAdapter = IdAdapter(),
+        ),
+        similar_showsAdapter = Similar_shows.Adapter(
+            idAdapter = IdAdapter(),
+            similar_show_idAdapter = IdAdapter(),
+        ),
+        watchlistAdapter = Watchlist.Adapter(
+            idAdapter = IdAdapter(),
+        ),
+        show_categoryAdapter = Show_category.Adapter(
+            idAdapter = IdAdapter(),
+            category_idAdapter = IdAdapter(),
+        ),
+        trailersAdapter = Trailers.Adapter(
+            show_idAdapter = IdAdapter(),
+        ),
     )
 }

core/database/src/commonMain/kotlin/com.thomaskioko.tvmaniac.db/DatabaseIdsExt.kt

@@ -0,0 +1,24 @@
+package com.thomaskioko.tvmaniac.db
+
+import kotlin.jvm.JvmInline
+
+@JvmInline
+value class CategoryId(val id: Long)
+
+@JvmInline
+value class EpisodeId(val traktId: Long)
+
+@JvmInline
+value class EpisodeImageId(val traktId: Long)
+
+@JvmInline
+value class SeasonId(val id: Long)
+
+@JvmInline
+value class ShowId(val traktId: Long)
+
+@JvmInline
+value class SimilarShowId(val id: Long)
+
+@JvmInline
+value class Id<out T>(val id: Long)

core/database/src/commonMain/kotlin/com.thomaskioko.tvmaniac.db/IdAdapter.kt

@@ -0,0 +1,8 @@
+package com.thomaskioko.tvmaniac.db
+
+import app.cash.sqldelight.ColumnAdapter
+
+internal class IdAdapter<T> : ColumnAdapter<Id<T>, Long> {
+    override fun decode(databaseValue: Long): Id<T> = Id(id = databaseValue)
+    override fun encode(value: Id<T>): Long = value.id
+}

core/database/src/commonMain/sqldelight/com/thomaskioko/tvmaniac/core/db/episode_image.sq

@@ -1,28 +1,35 @@
+import com.thomaskioko.tvmaniac.db.EpisodeId;
+import com.thomaskioko.tvmaniac.db.EpisodeImageId;
+import com.thomaskioko.tvmaniac.db.Id;
+
 CREATE TABLE episode_image (
-trakt_id INTEGER NOT NULL PRIMARY KEY,
-tmdb_id INTEGER NOT NULL,
-image_url TEXT DEFAULT NULL,
-FOREIGN KEY (trakt_id) REFERENCES episodes(trakt_id) ON DELETE CASCADE
+    id INTEGER AS Id<EpisodeId> NOT NULL PRIMARY KEY,
+    tmdb_id INTEGER AS Id<EpisodeImageId>,
+    image_url TEXT DEFAULT NULL,
+    FOREIGN KEY(id) REFERENCES episode(id) ON DELETE CASCADE,
+    UNIQUE(id)
 );
 
 insertOrReplace:
 INSERT OR REPLACE INTO episode_image(
-trakt_id,
-tmdb_id,
-image_url
+    id,
+    tmdb_id,
+    image_url
 )
 VALUES(?,?,?);
 
 episodeImage:
-SELECT show.tmdb_id, seasons.season_number, episodes.trakt_id, episodes.episode_number
-FROM episodes
-LEFT JOIN seasons ON seasons.id = episodes.season_id
-LEFT JOIN show ON show.trakt_id = seasons.show_trakt_id
-LEFT OUTER JOIN episode_image ON episode_image.trakt_id = episodes.trakt_id
-WHERE episode_image.image_url IS NULL;
-
-delete:
-DELETE FROM episode_image WHERE trakt_id = ?;
-
-deleteAll:
-DELETE FROM episode_image;
+SELECT
+    show.tmdb_id,
+    season.season_number,
+    episode.episode_number
+FROM
+    episode
+LEFT JOIN
+    season ON season.id = episode.season_id
+LEFT JOIN
+    show ON show.id = season.show_id
+LEFT OUTER JOIN
+    episode_image ON episode_image.id = episode.id
+WHERE
+    episode_image.image_url IS NULL;

core/database/src/commonMain/sqldelight/com/thomaskioko/tvmaniac/core/db/episodes.sq

@@ -1,40 +1,48 @@
-CREATE TABLE episodes (
-trakt_id INTEGER NOT NULL PRIMARY KEY,
-season_id INTEGER  NOT NULL,
-tmdb_id INTEGER,
-title TEXT NOT NULL,
-overview TEXT NOT NULL,
-ratings REAL NOT NULL,
-runtime INTEGER NOT NULL,
-votes INTEGER NOT NULL,
-episode_number TEXT NOT NULL,
-FOREIGN KEY (season_id) REFERENCES seasons(id)
+import com.thomaskioko.tvmaniac.db.EpisodeId;
+import com.thomaskioko.tvmaniac.db.Id;
+import com.thomaskioko.tvmaniac.db.SeasonId;
+
+CREATE TABLE episode (
+    id INTEGER AS Id<EpisodeId> NOT NULL PRIMARY KEY,
+    season_id INTEGER AS Id<SeasonId> NOT NULL,
+    tmdb_id INTEGER,
+    title TEXT NOT NULL,
+    overview TEXT NOT NULL,
+    ratings REAL NOT NULL,
+    runtime INTEGER NOT NULL,
+    votes INTEGER NOT NULL,
+    episode_number TEXT NOT NULL,
+    FOREIGN KEY(season_id) REFERENCES season(id)
 );
 
 insertOrReplace:
-INSERT OR REPLACE INTO episodes(
-trakt_id,
-season_id,
-tmdb_id,
-title,
-overview,
-ratings,
-runtime,
-votes,
-episode_number
+INSERT OR REPLACE INTO episode(
+    id,
+    season_id,
+    tmdb_id,
+    title,
+    overview,
+    ratings,
+    runtime,
+    votes,
+    episode_number
 )
 VALUES(?,?,?,?,?,?,?,?,?);
 
-episodeById:
+episodesById:
 SELECT *
-FROM episodes
-LEFT OUTER JOIN episode_image ON episode_image.trakt_id = episodes.trakt_id
-WHERE episodes.trakt_id = ?
-ORDER BY episode_number ASC ;
+FROM
+    episode
+LEFT OUTER JOIN
+    episode_image ON episode_image.id = episode.id
+WHERE
+    episode.id = ?
+ORDER BY
+    episode_number ASC;
 
 delete:
-DELETE FROM episodes WHERE trakt_id = ?;
+DELETE FROM episode WHERE id = ?;
 
 deleteAll:
-DELETE FROM episodes;
+DELETE FROM episode;
 

core/database/src/commonMain/sqldelight/com/thomaskioko/tvmaniac/core/db/season.sq

@@ -1,32 +1,76 @@
-CREATE TABLE seasons (
-id INTEGER NOT NULL PRIMARY KEY,
-show_trakt_id INTEGER NOT NULL,
-season_number INTEGER NOT NULL,
-episode_count INTEGER NOT NULL,
-name TEXT NOT NULL,
-overview TEXT,
-FOREIGN KEY (show_trakt_id) REFERENCES show(trakt_id)
+import com.thomaskioko.tvmaniac.db.Id;
+import com.thomaskioko.tvmaniac.db.SeasonId;
+import com.thomaskioko.tvmaniac.db.ShowId;
+
+CREATE TABLE season (
+    id INTEGER AS Id<SeasonId>  NOT NULL PRIMARY KEY,
+    show_id INTEGER AS Id<ShowId> NOT NULL,
+    season_number INTEGER NOT NULL,
+    title TEXT NOT NULL,
+    episode_count INTEGER NOT NULL,
+    overview TEXT,
+    FOREIGN KEY(show_id) REFERENCES show(id)
 );
 
 insertOrReplace:
-INSERT OR REPLACE INTO seasons(
-id,
-show_trakt_id,
-season_number,
-episode_count,
-name,
-overview
+INSERT OR REPLACE INTO season(
+    id,
+    show_id,
+    season_number,
+    episode_count,
+    title,
+    overview
 )
 VALUES(?,?,?,?,?,?);
 
-seasonById:
-SELECT *
-FROM seasons
-WHERE seasons.show_trakt_id = ? AND season_number != 0
-ORDER BY season_number ASC;
+seasonsByShowId:
+SELECT
+    show.id AS show_id,
+    season.id AS season_id,
+    season.title AS season_title,
+    season.season_number
+FROM
+    show
+JOIN
+    season ON show.id = season.show_id
+WHERE
+    show.id = ?;
+
+seasonEpisodeDetailsById:
+SELECT
+    show.id AS show_id,
+    show.title AS show_title,
+    season.id AS season_id,
+    season.title AS season_title,
+    season.overview AS season_overview,
+    season.season_number,
+    season.episode_count,
+    episode.id AS episode_id,
+    episode.season_id AS episode_season_id,
+    episode.title AS episode_title,
+    episode.episode_number,
+    episode.overview,
+    episode.runtime,
+    episode.ratings,
+    episode.votes,
+    episode_image.image_url AS episode_image_url
+FROM
+    show
+INNER JOIN
+    season ON season.show_id = show.id
+INNER JOIN
+    episode ON episode.season_id = season.id
+LEFT OUTER JOIN
+    episode_image ON episode_image.id = episode.id
+WHERE
+    show.id = ?
+AND
+    season_number != 0
+ORDER BY
+    season.season_number, episode_number ASC;
 
 delete:
-DELETE FROM seasons WHERE show_trakt_id = ?;
+DELETE FROM season WHERE show_id = ?;
 
 deleteAll:
-DELETE FROM seasons;
+DELETE FROM season;