diff --git a/back/src/Kyoo.Abstractions/Models/News.cs b/back/src/Kyoo.Abstractions/Models/News.cs
index feb763f4..5c30915f 100644
--- a/back/src/Kyoo.Abstractions/Models/News.cs
+++ b/back/src/Kyoo.Abstractions/Models/News.cs
@@ -95,6 +95,11 @@ namespace Kyoo.Abstractions.Models
///
public DateTime? AirDate { get; set; }
+ ///
+ /// The date this movie aired.
+ ///
+ public DateTime? ReleaseDate => AirDate;
+
///
public DateTime AddedDate { get; set; }
diff --git a/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs
index 9ae11a87..94342047 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs
@@ -79,7 +79,6 @@ namespace Kyoo.Core.Controllers
{
return await Sort(
_database.Episodes
- .Include(x => x.Show)
.Where(x => x.EpisodeNumber != null || x.AbsoluteNumber != null)
.Where(_database.Like(x => x.Name!, $"%{query}%"))
)
diff --git a/back/src/Kyoo.Core/Controllers/Repositories/NewsRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/NewsRepository.cs
index 708ead3b..3a005094 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/NewsRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/NewsRepository.cs
@@ -31,7 +31,7 @@ namespace Kyoo.Core.Controllers
public class NewsRepository : LocalRepository
{
///
- protected override Sort DefaultSort => new Sort.By(x => x.AddedDate);
+ protected override Sort DefaultSort => new Sort.By(x => x.AddedDate, true);
public NewsRepository(DatabaseContext database, IThumbnailsManager thumbs)
: base(database, thumbs)
diff --git a/back/src/Kyoo.Core/Views/Resources/NewsApi.cs b/back/src/Kyoo.Core/Views/Resources/NewsApi.cs
index e82e832b..c75b7a8f 100644
--- a/back/src/Kyoo.Core/Views/Resources/NewsApi.cs
+++ b/back/src/Kyoo.Core/Views/Resources/NewsApi.cs
@@ -50,9 +50,9 @@ namespace Kyoo.Core.Api
[FromQuery] Dictionary where,
[FromQuery] Pagination pagination)
{
- ICollection resources = await _news.GetNews(
+ ICollection resources = await _news.GetAll(
ApiHelper.ParseWhere(where),
- pagination
+ limit: pagination
);
return Page(resources, pagination.Limit);
diff --git a/back/src/Kyoo.Postgresql/Migrations/20231029233109_news.Designer.cs b/back/src/Kyoo.Postgresql/Migrations/20231029233109_news.Designer.cs
new file mode 100644
index 00000000..b34f5094
--- /dev/null
+++ b/back/src/Kyoo.Postgresql/Migrations/20231029233109_news.Designer.cs
@@ -0,0 +1,1728 @@
+//
+using System;
+using System.Collections.Generic;
+using Kyoo.Abstractions.Models;
+using Kyoo.Postgresql;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Kyoo.Postgresql.Migrations
+{
+ [DbContext(typeof(PostgresContext))]
+ [Migration("20231029233109_news")]
+ partial class News
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "7.0.12")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "genre", new[] { "action", "adventure", "animation", "comedy", "crime", "documentary", "drama", "family", "fantasy", "history", "horror", "music", "mystery", "romance", "science_fiction", "thriller", "war", "western" });
+ NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "item_kind", new[] { "show", "movie", "collection" });
+ NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "news_kind", new[] { "episode", "movie" });
+ NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "status", new[] { "unknown", "finished", "airing", "planned" });
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Collection", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.HasKey("Id")
+ .HasName("pk_collections");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_collections_slug");
+
+ b.ToTable("collections", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Episode", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AbsoluteNumber")
+ .HasColumnType("integer")
+ .HasColumnName("absolute_number");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("EpisodeNumber")
+ .HasColumnType("integer")
+ .HasColumnName("episode_number");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Name")
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("path");
+
+ b.Property("ReleaseDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("release_date");
+
+ b.Property("SeasonId")
+ .HasColumnType("integer")
+ .HasColumnName("season_id");
+
+ b.Property("SeasonNumber")
+ .HasColumnType("integer")
+ .HasColumnName("season_number");
+
+ b.Property("ShowId")
+ .HasColumnType("integer")
+ .HasColumnName("show_id");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.HasKey("Id")
+ .HasName("pk_episodes");
+
+ b.HasIndex("SeasonId")
+ .HasDatabaseName("ix_episodes_season_id");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_episodes_slug");
+
+ b.HasIndex("ShowId", "SeasonNumber", "EpisodeNumber", "AbsoluteNumber")
+ .IsUnique()
+ .HasDatabaseName("ix_episodes_show_id_season_number_episode_number_absolute_numb");
+
+ b.ToTable("episodes", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.LibraryItem", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("AirDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("air_date");
+
+ b.Property("Aliases")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("aliases");
+
+ b.Property("EndAir")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("end_air");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Genres")
+ .IsRequired()
+ .HasColumnType("genre[]")
+ .HasColumnName("genres");
+
+ b.Property("Kind")
+ .HasColumnType("item_kind")
+ .HasColumnName("kind");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Path")
+ .HasColumnType("text")
+ .HasColumnName("path");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("StartAir")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("start_air");
+
+ b.Property("Status")
+ .HasColumnType("status")
+ .HasColumnName("status");
+
+ b.Property("Tagline")
+ .HasColumnType("text")
+ .HasColumnName("tagline");
+
+ b.Property("Tags")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("tags");
+
+ b.Property("Trailer")
+ .HasColumnType("text")
+ .HasColumnName("trailer");
+
+ b.HasKey("Id")
+ .HasName("pk_library_items");
+
+ b.ToTable("library_items", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Movie", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("AirDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("air_date");
+
+ b.Property("Aliases")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("aliases");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Genres")
+ .IsRequired()
+ .HasColumnType("genre[]")
+ .HasColumnName("genres");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("path");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("Status")
+ .HasColumnType("status")
+ .HasColumnName("status");
+
+ b.Property("StudioID")
+ .HasColumnType("integer")
+ .HasColumnName("studio_id");
+
+ b.Property("Tagline")
+ .HasColumnType("text")
+ .HasColumnName("tagline");
+
+ b.Property("Tags")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("tags");
+
+ b.Property("Trailer")
+ .HasColumnType("text")
+ .HasColumnName("trailer");
+
+ b.HasKey("Id")
+ .HasName("pk_movies");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_movies_slug");
+
+ b.HasIndex("StudioID")
+ .HasDatabaseName("ix_movies_studio_id");
+
+ b.ToTable("movies", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.News", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AbsoluteNumber")
+ .HasColumnType("integer")
+ .HasColumnName("absolute_number");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("AirDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("air_date");
+
+ b.Property("Aliases")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("aliases");
+
+ b.Property("EpisodeNumber")
+ .HasColumnType("integer")
+ .HasColumnName("episode_number");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Genres")
+ .IsRequired()
+ .HasColumnType("genre[]")
+ .HasColumnName("genres");
+
+ b.Property("Kind")
+ .HasColumnType("news_kind")
+ .HasColumnName("kind");
+
+ b.Property("Name")
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("path");
+
+ b.Property("SeasonNumber")
+ .HasColumnType("integer")
+ .HasColumnName("season_number");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("Status")
+ .HasColumnType("status")
+ .HasColumnName("status");
+
+ b.Property("Tagline")
+ .HasColumnType("text")
+ .HasColumnName("tagline");
+
+ b.Property("Tags")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("tags");
+
+ b.Property("Trailer")
+ .HasColumnType("text")
+ .HasColumnName("trailer");
+
+ b.HasKey("Id")
+ .HasName("pk_news");
+
+ b.ToTable("news", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.People", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.HasKey("Id")
+ .HasName("pk_people");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_people_slug");
+
+ b.ToTable("people", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.PeopleRole", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("MovieID")
+ .HasColumnType("integer")
+ .HasColumnName("movie_id");
+
+ b.Property("PeopleID")
+ .HasColumnType("integer")
+ .HasColumnName("people_id");
+
+ b.Property("Role")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("role");
+
+ b.Property("ShowID")
+ .HasColumnType("integer")
+ .HasColumnName("show_id");
+
+ b.Property("Type")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("type");
+
+ b.HasKey("Id")
+ .HasName("pk_people_roles");
+
+ b.HasIndex("MovieID")
+ .HasDatabaseName("ix_people_roles_movie_id");
+
+ b.HasIndex("PeopleID")
+ .HasDatabaseName("ix_people_roles_people_id");
+
+ b.HasIndex("ShowID")
+ .HasDatabaseName("ix_people_roles_show_id");
+
+ b.ToTable("people_roles", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Season", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("EndDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("end_date");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Name")
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("SeasonNumber")
+ .HasColumnType("integer")
+ .HasColumnName("season_number");
+
+ b.Property("ShowId")
+ .HasColumnType("integer")
+ .HasColumnName("show_id");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("StartDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("start_date");
+
+ b.HasKey("Id")
+ .HasName("pk_seasons");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_seasons_slug");
+
+ b.HasIndex("ShowId", "SeasonNumber")
+ .IsUnique()
+ .HasDatabaseName("ix_seasons_show_id_season_number");
+
+ b.ToTable("seasons", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Show", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property>("Aliases")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("aliases");
+
+ b.Property("EndAir")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("end_air");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property>("Genres")
+ .IsRequired()
+ .HasColumnType("genre[]")
+ .HasColumnName("genres");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("StartAir")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("start_air");
+
+ b.Property("Status")
+ .HasColumnType("status")
+ .HasColumnName("status");
+
+ b.Property("StudioId")
+ .HasColumnType("integer")
+ .HasColumnName("studio_id");
+
+ b.Property("Tagline")
+ .HasColumnType("text")
+ .HasColumnName("tagline");
+
+ b.Property>("Tags")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("tags");
+
+ b.Property("Trailer")
+ .HasColumnType("text")
+ .HasColumnName("trailer");
+
+ b.HasKey("Id")
+ .HasName("pk_shows");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_shows_slug");
+
+ b.HasIndex("StudioId")
+ .HasDatabaseName("ix_shows_studio_id");
+
+ b.ToTable("shows", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Studio", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.HasKey("Id")
+ .HasName("pk_studios");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_studios_slug");
+
+ b.ToTable("studios", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.User", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("Email")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("email");
+
+ b.Property("Password")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("password");
+
+ b.Property("Permissions")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("permissions");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("Username")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("username");
+
+ b.HasKey("Id")
+ .HasName("pk_users");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_users_slug");
+
+ b.ToTable("users", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.WatchedEpisode", b =>
+ {
+ b.Property("UserID")
+ .HasColumnType("integer")
+ .HasColumnName("user_id");
+
+ b.Property("EpisodeID")
+ .HasColumnType("integer")
+ .HasColumnName("episode_id");
+
+ b.Property("WatchedPercentage")
+ .HasColumnType("integer")
+ .HasColumnName("watched_percentage");
+
+ b.HasKey("UserID", "EpisodeID")
+ .HasName("pk_watched_episode");
+
+ b.HasIndex("EpisodeID")
+ .HasDatabaseName("ix_watched_episode_episode_id");
+
+ b.ToTable("watched_episode", (string)null);
+ });
+
+ modelBuilder.Entity("ShowUser", b =>
+ {
+ b.Property("UsersId")
+ .HasColumnType("integer")
+ .HasColumnName("users_id");
+
+ b.Property("WatchedId")
+ .HasColumnType("integer")
+ .HasColumnName("watched_id");
+
+ b.HasKey("UsersId", "WatchedId")
+ .HasName("pk_link_user_show");
+
+ b.HasIndex("WatchedId")
+ .HasDatabaseName("ix_link_user_show_watched_id");
+
+ b.ToTable("link_user_show", (string)null);
+ });
+
+ modelBuilder.Entity("link_collection_movie", b =>
+ {
+ b.Property("collection_id")
+ .HasColumnType("integer")
+ .HasColumnName("collection_id");
+
+ b.Property("movie_id")
+ .HasColumnType("integer")
+ .HasColumnName("movie_id");
+
+ b.HasKey("collection_id", "movie_id")
+ .HasName("pk_link_collection_movie");
+
+ b.HasIndex("movie_id")
+ .HasDatabaseName("ix_link_collection_movie_movie_id");
+
+ b.ToTable("link_collection_movie", (string)null);
+ });
+
+ modelBuilder.Entity("link_collection_show", b =>
+ {
+ b.Property("collection_id")
+ .HasColumnType("integer")
+ .HasColumnName("collection_id");
+
+ b.Property("show_id")
+ .HasColumnType("integer")
+ .HasColumnName("show_id");
+
+ b.HasKey("collection_id", "show_id")
+ .HasName("pk_link_collection_show");
+
+ b.HasIndex("show_id")
+ .HasDatabaseName("ix_link_collection_show_show_id");
+
+ b.ToTable("link_collection_show", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Collection", b =>
+ {
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("CollectionId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("CollectionId");
+
+ b1.ToTable("collections");
+
+ b1.WithOwner()
+ .HasForeignKey("CollectionId")
+ .HasConstraintName("fk_collections_collections_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("CollectionId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("poster_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("poster_source");
+
+ b1.HasKey("CollectionId");
+
+ b1.ToTable("collections");
+
+ b1.WithOwner()
+ .HasForeignKey("CollectionId")
+ .HasConstraintName("fk_collections_collections_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("CollectionId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("thumbnail_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("thumbnail_source");
+
+ b1.HasKey("CollectionId");
+
+ b1.ToTable("collections");
+
+ b1.WithOwner()
+ .HasForeignKey("CollectionId")
+ .HasConstraintName("fk_collections_collections_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Episode", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Season", "Season")
+ .WithMany("Episodes")
+ .HasForeignKey("SeasonId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .HasConstraintName("fk_episodes_seasons_season_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.Show", "Show")
+ .WithMany("Episodes")
+ .HasForeignKey("ShowId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_episodes_shows_show_id");
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("EpisodeId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("EpisodeId");
+
+ b1.ToTable("episodes");
+
+ b1.WithOwner()
+ .HasForeignKey("EpisodeId")
+ .HasConstraintName("fk_episodes_episodes_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("EpisodeId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("poster_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("poster_source");
+
+ b1.HasKey("EpisodeId");
+
+ b1.ToTable("episodes");
+
+ b1.WithOwner()
+ .HasForeignKey("EpisodeId")
+ .HasConstraintName("fk_episodes_episodes_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("EpisodeId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("thumbnail_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("thumbnail_source");
+
+ b1.HasKey("EpisodeId");
+
+ b1.ToTable("episodes");
+
+ b1.WithOwner()
+ .HasForeignKey("EpisodeId")
+ .HasConstraintName("fk_episodes_episodes_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Season");
+
+ b.Navigation("Show");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.LibraryItem", b =>
+ {
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("LibraryItemId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("LibraryItemId");
+
+ b1.ToTable("library_items");
+
+ b1.WithOwner()
+ .HasForeignKey("LibraryItemId")
+ .HasConstraintName("fk_library_items_library_items_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("LibraryItemId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("poster_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("poster_source");
+
+ b1.HasKey("LibraryItemId");
+
+ b1.ToTable("library_items");
+
+ b1.WithOwner()
+ .HasForeignKey("LibraryItemId")
+ .HasConstraintName("fk_library_items_library_items_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("LibraryItemId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("thumbnail_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("thumbnail_source");
+
+ b1.HasKey("LibraryItemId");
+
+ b1.ToTable("library_items");
+
+ b1.WithOwner()
+ .HasForeignKey("LibraryItemId")
+ .HasConstraintName("fk_library_items_library_items_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Movie", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Studio", "Studio")
+ .WithMany("Movies")
+ .HasForeignKey("StudioID")
+ .OnDelete(DeleteBehavior.SetNull)
+ .HasConstraintName("fk_movies_studios_studio_id");
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("MovieId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("MovieId");
+
+ b1.ToTable("movies");
+
+ b1.WithOwner()
+ .HasForeignKey("MovieId")
+ .HasConstraintName("fk_movies_movies_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("MovieId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("poster_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("poster_source");
+
+ b1.HasKey("MovieId");
+
+ b1.ToTable("movies");
+
+ b1.WithOwner()
+ .HasForeignKey("MovieId")
+ .HasConstraintName("fk_movies_movies_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("MovieId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("thumbnail_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("thumbnail_source");
+
+ b1.HasKey("MovieId");
+
+ b1.ToTable("movies");
+
+ b1.WithOwner()
+ .HasForeignKey("MovieId")
+ .HasConstraintName("fk_movies_movies_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Studio");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.News", b =>
+ {
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("NewsId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("NewsId");
+
+ b1.ToTable("news");
+
+ b1.WithOwner()
+ .HasForeignKey("NewsId")
+ .HasConstraintName("fk_news_news_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("NewsId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("poster_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("poster_source");
+
+ b1.HasKey("NewsId");
+
+ b1.ToTable("news");
+
+ b1.WithOwner()
+ .HasForeignKey("NewsId")
+ .HasConstraintName("fk_news_news_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("NewsId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("thumbnail_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("thumbnail_source");
+
+ b1.HasKey("NewsId");
+
+ b1.ToTable("news");
+
+ b1.WithOwner()
+ .HasForeignKey("NewsId")
+ .HasConstraintName("fk_news_news_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.People", b =>
+ {
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("PeopleId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("PeopleId");
+
+ b1.ToTable("people");
+
+ b1.WithOwner()
+ .HasForeignKey("PeopleId")
+ .HasConstraintName("fk_people_people_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("PeopleId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("poster_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("poster_source");
+
+ b1.HasKey("PeopleId");
+
+ b1.ToTable("people");
+
+ b1.WithOwner()
+ .HasForeignKey("PeopleId")
+ .HasConstraintName("fk_people_people_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("PeopleId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("thumbnail_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("thumbnail_source");
+
+ b1.HasKey("PeopleId");
+
+ b1.ToTable("people");
+
+ b1.WithOwner()
+ .HasForeignKey("PeopleId")
+ .HasConstraintName("fk_people_people_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.PeopleRole", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Movie", "Movie")
+ .WithMany("People")
+ .HasForeignKey("MovieID")
+ .HasConstraintName("fk_people_roles_movies_movie_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.People", "People")
+ .WithMany("Roles")
+ .HasForeignKey("PeopleID")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_people_roles_people_people_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.Show", "Show")
+ .WithMany("People")
+ .HasForeignKey("ShowID")
+ .HasConstraintName("fk_people_roles_shows_show_id");
+
+ b.Navigation("Movie");
+
+ b.Navigation("People");
+
+ b.Navigation("Show");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Season", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Show", "Show")
+ .WithMany("Seasons")
+ .HasForeignKey("ShowId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_seasons_shows_show_id");
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("SeasonId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("SeasonId");
+
+ b1.ToTable("seasons");
+
+ b1.WithOwner()
+ .HasForeignKey("SeasonId")
+ .HasConstraintName("fk_seasons_seasons_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("SeasonId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("poster_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("poster_source");
+
+ b1.HasKey("SeasonId");
+
+ b1.ToTable("seasons");
+
+ b1.WithOwner()
+ .HasForeignKey("SeasonId")
+ .HasConstraintName("fk_seasons_seasons_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("SeasonId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("thumbnail_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("thumbnail_source");
+
+ b1.HasKey("SeasonId");
+
+ b1.ToTable("seasons");
+
+ b1.WithOwner()
+ .HasForeignKey("SeasonId")
+ .HasConstraintName("fk_seasons_seasons_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Show");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Show", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Studio", "Studio")
+ .WithMany("Shows")
+ .HasForeignKey("StudioId")
+ .OnDelete(DeleteBehavior.SetNull)
+ .HasConstraintName("fk_shows_studios_studio_id");
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("ShowId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("ShowId");
+
+ b1.ToTable("shows");
+
+ b1.WithOwner()
+ .HasForeignKey("ShowId")
+ .HasConstraintName("fk_shows_shows_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("ShowId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("poster_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("poster_source");
+
+ b1.HasKey("ShowId");
+
+ b1.ToTable("shows");
+
+ b1.WithOwner()
+ .HasForeignKey("ShowId")
+ .HasConstraintName("fk_shows_shows_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("ShowId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("thumbnail_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("thumbnail_source");
+
+ b1.HasKey("ShowId");
+
+ b1.ToTable("shows");
+
+ b1.WithOwner()
+ .HasForeignKey("ShowId")
+ .HasConstraintName("fk_shows_shows_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Studio");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.User", b =>
+ {
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("UserId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("UserId");
+
+ b1.ToTable("users");
+
+ b1.WithOwner()
+ .HasForeignKey("UserId")
+ .HasConstraintName("fk_users_users_id");
+ });
+
+ b.Navigation("Logo");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.WatchedEpisode", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Episode", "Episode")
+ .WithMany()
+ .HasForeignKey("EpisodeID")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_watched_episode_episodes_episode_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.User", null)
+ .WithMany("CurrentlyWatching")
+ .HasForeignKey("UserID")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_watched_episode_users_user_id");
+
+ b.Navigation("Episode");
+ });
+
+ modelBuilder.Entity("ShowUser", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.User", null)
+ .WithMany()
+ .HasForeignKey("UsersId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_user_show_users_users_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.Show", null)
+ .WithMany()
+ .HasForeignKey("WatchedId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_user_show_shows_watched_id");
+ });
+
+ modelBuilder.Entity("link_collection_movie", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Collection", null)
+ .WithMany()
+ .HasForeignKey("collection_id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_collection_movie_collections_collection_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.Movie", null)
+ .WithMany()
+ .HasForeignKey("movie_id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_collection_movie_movies_movie_id");
+ });
+
+ modelBuilder.Entity("link_collection_show", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Collection", null)
+ .WithMany()
+ .HasForeignKey("collection_id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_collection_show_collections_collection_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.Show", null)
+ .WithMany()
+ .HasForeignKey("show_id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_collection_show_shows_show_id");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Movie", b =>
+ {
+ b.Navigation("People");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.People", b =>
+ {
+ b.Navigation("Roles");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Season", b =>
+ {
+ b.Navigation("Episodes");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Show", b =>
+ {
+ b.Navigation("Episodes");
+
+ b.Navigation("People");
+
+ b.Navigation("Seasons");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Studio", b =>
+ {
+ b.Navigation("Movies");
+
+ b.Navigation("Shows");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.User", b =>
+ {
+ b.Navigation("CurrentlyWatching");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/back/src/Kyoo.Postgresql/Migrations/20231029233109_news.cs b/back/src/Kyoo.Postgresql/Migrations/20231029233109_news.cs
new file mode 100644
index 00000000..a08ef3a5
--- /dev/null
+++ b/back/src/Kyoo.Postgresql/Migrations/20231029233109_news.cs
@@ -0,0 +1,60 @@
+// Kyoo - A portable and vast media library solution.
+// Copyright (c) Kyoo.
+//
+// See AUTHORS.md and LICENSE file in the project root for full license information.
+//
+// Kyoo is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// Kyoo is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Kyoo. If not, see .
+
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Kyoo.Postgresql.Migrations
+{
+ ///
+ public partial class News : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AlterDatabase()
+ .Annotation("Npgsql:Enum:news_kind", "episode,movie");
+
+ // language=PostgreSQL
+ migrationBuilder.Sql(@"
+ CREATE VIEW news AS
+ SELECT
+ e.id, e.slug, e.name, NULL AS tagline, '{}' AS aliases, e.path, e.overview, '{}' AS tags, '{}' AS genres,
+ NULL AS status, e.release_date AS air_date, e.poster_source, e.poster_blurhash, e.thumbnail_source, e.thumbnail_blurhash,
+ e.logo_source,e.logo_blurhash, NULL AS trailer, e.external_id, e.season_number, e.episode_number, e.absolute_number,
+ 'episode'::news_kind AS kind, e.added_date
+ FROM episodes AS e
+ UNION ALL
+ SELECT
+ -m.id, m.slug, m.name, m.tagline, m.aliases, m.path, m.overview, m.tags, m.genres,
+ m.status, m.air_date, m.poster_source, m.poster_blurhash, m.thumbnail_source, m.thumbnail_blurhash,
+ m.logo_source, m.logo_blurhash, m.trailer, m.external_id, NULL AS season_number, NULL AS episode_number, NULL as absolute_number,
+ 'movie'::news_kind AS kind, m.added_date
+ FROM movies AS m
+ ");
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ // language=PostgreSQL
+ migrationBuilder.Sql(@"DROP VIEW news");
+ }
+ }
+}
diff --git a/back/src/Kyoo.Postgresql/Migrations/PostgresContextModelSnapshot.cs b/back/src/Kyoo.Postgresql/Migrations/PostgresContextModelSnapshot.cs
index b6e422b8..51a155f7 100644
--- a/back/src/Kyoo.Postgresql/Migrations/PostgresContextModelSnapshot.cs
+++ b/back/src/Kyoo.Postgresql/Migrations/PostgresContextModelSnapshot.cs
@@ -19,11 +19,12 @@ namespace Kyoo.Postgresql.Migrations
{
#pragma warning disable 612, 618
modelBuilder
- .HasAnnotation("ProductVersion", "7.0.9")
+ .HasAnnotation("ProductVersion", "7.0.12")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "genre", new[] { "action", "adventure", "animation", "comedy", "crime", "documentary", "drama", "family", "fantasy", "history", "horror", "music", "mystery", "romance", "science_fiction", "thriller", "war", "western" });
NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "item_kind", new[] { "show", "movie", "collection" });
+ NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "news_kind", new[] { "episode", "movie" });
NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "status", new[] { "unknown", "finished", "airing", "planned" });
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -328,6 +329,98 @@ namespace Kyoo.Postgresql.Migrations
b.ToTable("movies", (string)null);
});
+ modelBuilder.Entity("Kyoo.Abstractions.Models.News", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AbsoluteNumber")
+ .HasColumnType("integer")
+ .HasColumnName("absolute_number");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("AirDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("air_date");
+
+ b.Property("Aliases")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("aliases");
+
+ b.Property("EpisodeNumber")
+ .HasColumnType("integer")
+ .HasColumnName("episode_number");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Genres")
+ .IsRequired()
+ .HasColumnType("genre[]")
+ .HasColumnName("genres");
+
+ b.Property("Kind")
+ .HasColumnType("news_kind")
+ .HasColumnName("kind");
+
+ b.Property("Name")
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("path");
+
+ b.Property("SeasonNumber")
+ .HasColumnType("integer")
+ .HasColumnName("season_number");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("Status")
+ .HasColumnType("status")
+ .HasColumnName("status");
+
+ b.Property("Tagline")
+ .HasColumnType("text")
+ .HasColumnName("tagline");
+
+ b.Property("Tags")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("tags");
+
+ b.Property("Trailer")
+ .HasColumnType("text")
+ .HasColumnName("trailer");
+
+ b.HasKey("Id")
+ .HasName("pk_news");
+
+ b.ToTable("news", (string)null);
+ });
+
modelBuilder.Entity("Kyoo.Abstractions.Models.People", b =>
{
b.Property("Id")
@@ -1099,6 +1192,93 @@ namespace Kyoo.Postgresql.Migrations
b.Navigation("Thumbnail");
});
+ modelBuilder.Entity("Kyoo.Abstractions.Models.News", b =>
+ {
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("NewsId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("logo_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("logo_source");
+
+ b1.HasKey("NewsId");
+
+ b1.ToTable("news");
+
+ b1.WithOwner()
+ .HasForeignKey("NewsId")
+ .HasConstraintName("fk_news_news_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("NewsId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("poster_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("poster_source");
+
+ b1.HasKey("NewsId");
+
+ b1.ToTable("news");
+
+ b1.WithOwner()
+ .HasForeignKey("NewsId")
+ .HasConstraintName("fk_news_news_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("NewsId")
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("thumbnail_blurhash");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("thumbnail_source");
+
+ b1.HasKey("NewsId");
+
+ b1.ToTable("news");
+
+ b1.WithOwner()
+ .HasForeignKey("NewsId")
+ .HasConstraintName("fk_news_news_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Thumbnail");
+ });
+
modelBuilder.Entity("Kyoo.Abstractions.Models.People", b =>
{
b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
diff --git a/back/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs b/back/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs
index 54435781..ef898fce 100644
--- a/back/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs
+++ b/back/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs
@@ -284,9 +284,6 @@ namespace Kyoo.Tests.Database
value.EpisodeNumber = 56;
await _repository.Create(value);
ICollection ret = await _repository.Search(query);
- value.Show = TestSample.Get();
- value.Show.AddedDate = DateTime.UnixEpoch;
- ret.First().Show.AddedDate = DateTime.UnixEpoch;
KAssert.DeepEqual(value, ret.First());
}
diff --git a/back/tests/Kyoo.Tests/KAssert.cs b/back/tests/Kyoo.Tests/KAssert.cs
index e0c43a99..d16f1c06 100644
--- a/back/tests/Kyoo.Tests/KAssert.cs
+++ b/back/tests/Kyoo.Tests/KAssert.cs
@@ -38,24 +38,6 @@ namespace Kyoo.Tests
[AssertionMethod]
public static void DeepEqual(T expected, T value)
{
- if (expected is IResource res and IThumbnails thumbs)
- {
- if (thumbs.Poster != null)
- thumbs.Poster.Path = $"/{expected.GetType().Name.ToLower()}/{res.Slug}/poster";
- if (thumbs.Thumbnail != null)
- thumbs.Thumbnail.Path = $"/{expected.GetType().Name.ToLower()}/{res.Slug}/thumbnail";
- if (thumbs.Logo != null)
- thumbs.Logo.Path = $"/{expected.GetType().Name.ToLower()}/{res.Slug}/logo";
- }
- if (value is IResource resV and IThumbnails thumbsV)
- {
- if (thumbsV.Poster != null)
- thumbsV.Poster.Path = $"/{value.GetType().Name.ToLower()}/{resV.Slug}/poster";
- if (thumbsV.Thumbnail != null)
- thumbsV.Thumbnail.Path = $"/{value.GetType().Name.ToLower()}/{resV.Slug}/thumbnail";
- if (thumbsV.Logo != null)
- thumbsV.Logo.Path = $"/{value.GetType().Name.ToLower()}/{resV.Slug}/logo";
- }
if (expected is IAddedDate ea && value is IAddedDate va)
{
ea.AddedDate = DateTime.UnixEpoch;