From b9932383c6ff94fac5ca8e6fa67eaa74f32e4b8c Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Tue, 14 Nov 2023 17:28:53 +0100 Subject: [PATCH] Nit picks files names --- back/src/Kyoo.Abstractions/Models/Resources/Episode.cs | 4 ++-- back/src/Kyoo.Abstractions/Models/Resources/Movie.cs | 6 +++--- back/src/Kyoo.Abstractions/Models/Resources/Show.cs | 4 ++-- .../Models/Resources/{WatchInfo.cs => WatchStatus.cs} | 4 ++-- back/src/Kyoo.Core/CoreModule.cs | 1 + back/src/Kyoo.Postgresql/DatabaseContext.cs | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) rename back/src/Kyoo.Abstractions/Models/Resources/{WatchInfo.cs => WatchStatus.cs} (97%) diff --git a/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs b/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs index 8e9852d7..aef11180 100644 --- a/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs +++ b/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs @@ -238,7 +238,7 @@ namespace Kyoo.Abstractions.Models || (x.SeasonNumber == SeasonNumber && x.EpisodeNumber > EpisodeNumber) ); - [SerializeIgnore] public ICollection Watched { get; set; } + [SerializeIgnore] public ICollection? Watched { get; set; } /// /// Metadata of what an user as started/planned to watch. @@ -247,7 +247,7 @@ namespace Kyoo.Abstractions.Models [LoadableRelation] public EpisodeWatchStatus? WatchStatus { get; set; } // There is a global query filter to filter by user so we just need to do single. - private EpisodeWatchStatus? _WatchStatus => Watched.FirstOrDefault(); + private EpisodeWatchStatus? _WatchStatus => Watched!.FirstOrDefault(); /// /// Links to watch this episode. diff --git a/back/src/Kyoo.Abstractions/Models/Resources/Movie.cs b/back/src/Kyoo.Abstractions/Models/Resources/Movie.cs index bef6b871..14d9e035 100644 --- a/back/src/Kyoo.Abstractions/Models/Resources/Movie.cs +++ b/back/src/Kyoo.Abstractions/Models/Resources/Movie.cs @@ -146,16 +146,16 @@ namespace Kyoo.Abstractions.Models Hls = $"/video/movie/{Slug}/master.m3u8", }; - [SerializeIgnore] public ICollection Watched { get; set; } + [SerializeIgnore] public ICollection? Watched { get; set; } /// /// Metadata of what an user as started/planned to watch. /// [Projectable(UseMemberBody = nameof(_WatchStatus), OnlyOnInclude = true)] - [LoadableRelation] public MovieWatchStatus WatchStatus { get; set; } + [LoadableRelation] public MovieWatchStatus? WatchStatus { get; set; } // There is a global query filter to filter by user so we just need to do single. - private MovieWatchStatus? _WatchStatus => Watched.FirstOrDefault(); + private MovieWatchStatus? _WatchStatus => Watched!.FirstOrDefault(); /// public void OnMerge(object merged) diff --git a/back/src/Kyoo.Abstractions/Models/Resources/Show.cs b/back/src/Kyoo.Abstractions/Models/Resources/Show.cs index ac178071..61906b4d 100644 --- a/back/src/Kyoo.Abstractions/Models/Resources/Show.cs +++ b/back/src/Kyoo.Abstractions/Models/Resources/Show.cs @@ -187,7 +187,7 @@ namespace Kyoo.Abstractions.Models private int _EpisodesCount => Episodes!.Count; - [SerializeIgnore] public ICollection Watched { get; set; } + [SerializeIgnore] public ICollection? Watched { get; set; } /// /// Metadata of what an user as started/planned to watch. @@ -196,7 +196,7 @@ namespace Kyoo.Abstractions.Models [LoadableRelation] public ShowWatchStatus? WatchStatus { get; set; } // There is a global query filter to filter by user so we just need to do single. - private ShowWatchStatus? _WatchStatus => Watched.FirstOrDefault(); + private ShowWatchStatus? _WatchStatus => Watched!.FirstOrDefault(); /// public void OnMerge(object merged) diff --git a/back/src/Kyoo.Abstractions/Models/Resources/WatchInfo.cs b/back/src/Kyoo.Abstractions/Models/Resources/WatchStatus.cs similarity index 97% rename from back/src/Kyoo.Abstractions/Models/Resources/WatchInfo.cs rename to back/src/Kyoo.Abstractions/Models/Resources/WatchStatus.cs index de51f1d3..36c4f6fc 100644 --- a/back/src/Kyoo.Abstractions/Models/Resources/WatchInfo.cs +++ b/back/src/Kyoo.Abstractions/Models/Resources/WatchStatus.cs @@ -217,7 +217,7 @@ namespace Kyoo.Abstractions.Models [NotMapped] public int? WatchedTime { get; set; } - private int? _WatchedTime => NextEpisode?.Watched.FirstOrDefault()?.WatchedTime; + private int? _WatchedTime => NextEpisode?.Watched!.FirstOrDefault()?.WatchedTime; /// /// Where the player has stopped watching the episode (in percentage between 0 and 100). @@ -229,6 +229,6 @@ namespace Kyoo.Abstractions.Models [NotMapped] public int? WatchedPercent { get; set; } - private int? _WatchedPercent => NextEpisode?.Watched.FirstOrDefault()?.WatchedPercent; + private int? _WatchedPercent => NextEpisode?.Watched!.FirstOrDefault()?.WatchedPercent; } } diff --git a/back/src/Kyoo.Core/CoreModule.cs b/back/src/Kyoo.Core/CoreModule.cs index db85763a..71035c07 100644 --- a/back/src/Kyoo.Core/CoreModule.cs +++ b/back/src/Kyoo.Core/CoreModule.cs @@ -67,6 +67,7 @@ namespace Kyoo.Core builder.RegisterRepository(); builder.RegisterRepository(); builder.RegisterRepository(); + builder.RegisterType().As().AsSelf().InstancePerLifetimeScope(); } /// diff --git a/back/src/Kyoo.Postgresql/DatabaseContext.cs b/back/src/Kyoo.Postgresql/DatabaseContext.cs index 643551ea..3a52ea5b 100644 --- a/back/src/Kyoo.Postgresql/DatabaseContext.cs +++ b/back/src/Kyoo.Postgresql/DatabaseContext.cs @@ -175,7 +175,7 @@ namespace Kyoo.Postgresql { // TODO: Waiting for https://github.com/dotnet/efcore/issues/29825 // modelBuilder.Entity() - // .OwnsOne(x => x.ExternalIDs, x => + // .OwnsOne(x => x.ExternalId, x => // { // x.ToJson(); // });