From eedc8753c3cdeaebad05ac4323c5b975a7e44b78 Mon Sep 17 00:00:00 2001 From: sephrat <34862846+sephrat@users.noreply.github.com> Date: Fri, 10 Mar 2023 18:16:02 +0100 Subject: [PATCH] Change TMDB id format to integer This will better integrate with TMDB id type in the request model --- src/Ombi.Schedule/Jobs/Emby/EmbyPlayedSync.cs | 4 ++-- src/Ombi.Store/Entities/MovieUserPlayed.cs | 10 ---------- src/Ombi.Store/Entities/UserPlayedMovie.cs | 8 ++++++++ ...r.cs => 20230310130339_MovieUserPlayed.Designer.cs} | 6 +++--- ...UserPlayed.cs => 20230310130339_MovieUserPlayed.cs} | 2 +- .../ExternalSqliteContextModelSnapshot.cs | 4 ++-- .../Repository/IUserPlayedMovieRepository.cs | 2 +- src/Ombi.Store/Repository/UserPlayedMovieRepository.cs | 2 +- 8 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 src/Ombi.Store/Entities/MovieUserPlayed.cs create mode 100644 src/Ombi.Store/Entities/UserPlayedMovie.cs rename src/Ombi.Store/Migrations/ExternalSqlite/{20230309182556_MovieUserPlayed.Designer.cs => 20230310130339_MovieUserPlayed.Designer.cs} (99%) rename src/Ombi.Store/Migrations/ExternalSqlite/{20230309182556_MovieUserPlayed.cs => 20230310130339_MovieUserPlayed.cs} (91%) diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyPlayedSync.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyPlayedSync.cs index 05f0666d0..5af5a9756 100644 --- a/src/Ombi.Schedule/Jobs/Emby/EmbyPlayedSync.cs +++ b/src/Ombi.Schedule/Jobs/Emby/EmbyPlayedSync.cs @@ -65,7 +65,7 @@ namespace Ombi.Schedule.Jobs.Emby var totalCount = movies.TotalRecordCount; var processed = 0; var mediaToAdd = new HashSet(); - _logger.LogCritical($"Adding {totalCount.ToString()} for {user.UserName}"); + while (processed < totalCount) { foreach (var movie in movies.Items) @@ -94,7 +94,7 @@ namespace Ombi.Schedule.Jobs.Emby } var userPlayedMovie = new UserPlayedMovie() { - TheMovieDbId = movieInfo.ProviderIds.Tmdb, + TheMovieDbId = int.Parse(movieInfo.ProviderIds.Tmdb), UserId = user.Id }; // Check if it exists diff --git a/src/Ombi.Store/Entities/MovieUserPlayed.cs b/src/Ombi.Store/Entities/MovieUserPlayed.cs deleted file mode 100644 index 85f6ba6d3..000000000 --- a/src/Ombi.Store/Entities/MovieUserPlayed.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.ComponentModel.DataAnnotations.Schema; - -namespace Ombi.Store.Entities -{ - public class UserPlayedMovie : Entity - { - public string TheMovieDbId { get; set; } - public string UserId { get; set; } - } -} \ No newline at end of file diff --git a/src/Ombi.Store/Entities/UserPlayedMovie.cs b/src/Ombi.Store/Entities/UserPlayedMovie.cs new file mode 100644 index 000000000..7f28e9d99 --- /dev/null +++ b/src/Ombi.Store/Entities/UserPlayedMovie.cs @@ -0,0 +1,8 @@ +namespace Ombi.Store.Entities +{ + public class UserPlayedMovie : Entity + { + public int TheMovieDbId { get; set; } + public string UserId { get; set; } + } +} \ No newline at end of file diff --git a/src/Ombi.Store/Migrations/ExternalSqlite/20230309182556_MovieUserPlayed.Designer.cs b/src/Ombi.Store/Migrations/ExternalSqlite/20230310130339_MovieUserPlayed.Designer.cs similarity index 99% rename from src/Ombi.Store/Migrations/ExternalSqlite/20230309182556_MovieUserPlayed.Designer.cs rename to src/Ombi.Store/Migrations/ExternalSqlite/20230310130339_MovieUserPlayed.Designer.cs index d01d63968..f1162e20f 100644 --- a/src/Ombi.Store/Migrations/ExternalSqlite/20230309182556_MovieUserPlayed.Designer.cs +++ b/src/Ombi.Store/Migrations/ExternalSqlite/20230310130339_MovieUserPlayed.Designer.cs @@ -11,7 +11,7 @@ using Ombi.Store.Context.Sqlite; namespace Ombi.Store.Migrations.ExternalSqlite { [DbContext(typeof(ExternalSqliteContext))] - [Migration("20230309182556_MovieUserPlayed")] + [Migration("20230310130339_MovieUserPlayed")] partial class MovieUserPlayed { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -494,8 +494,8 @@ namespace Ombi.Store.Migrations.ExternalSqlite .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); - b.Property("TheMovieDbId") - .HasColumnType("TEXT"); + b.Property("TheMovieDbId") + .HasColumnType("INTEGER"); b.Property("UserId") .HasColumnType("TEXT"); diff --git a/src/Ombi.Store/Migrations/ExternalSqlite/20230309182556_MovieUserPlayed.cs b/src/Ombi.Store/Migrations/ExternalSqlite/20230310130339_MovieUserPlayed.cs similarity index 91% rename from src/Ombi.Store/Migrations/ExternalSqlite/20230309182556_MovieUserPlayed.cs rename to src/Ombi.Store/Migrations/ExternalSqlite/20230310130339_MovieUserPlayed.cs index f24fbf40c..23345e7a1 100644 --- a/src/Ombi.Store/Migrations/ExternalSqlite/20230309182556_MovieUserPlayed.cs +++ b/src/Ombi.Store/Migrations/ExternalSqlite/20230310130339_MovieUserPlayed.cs @@ -14,7 +14,7 @@ namespace Ombi.Store.Migrations.ExternalSqlite { Id = table.Column(type: "INTEGER", nullable: false) .Annotation("Sqlite:Autoincrement", true), - TheMovieDbId = table.Column(type: "TEXT", nullable: true), + TheMovieDbId = table.Column(type: "INTEGER", nullable: false), UserId = table.Column(type: "TEXT", nullable: true) }, constraints: table => diff --git a/src/Ombi.Store/Migrations/ExternalSqlite/ExternalSqliteContextModelSnapshot.cs b/src/Ombi.Store/Migrations/ExternalSqlite/ExternalSqliteContextModelSnapshot.cs index 092ec9c33..857259ab1 100644 --- a/src/Ombi.Store/Migrations/ExternalSqlite/ExternalSqliteContextModelSnapshot.cs +++ b/src/Ombi.Store/Migrations/ExternalSqlite/ExternalSqliteContextModelSnapshot.cs @@ -492,8 +492,8 @@ namespace Ombi.Store.Migrations.ExternalSqlite .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); - b.Property("TheMovieDbId") - .HasColumnType("TEXT"); + b.Property("TheMovieDbId") + .HasColumnType("INTEGER"); b.Property("UserId") .HasColumnType("TEXT"); diff --git a/src/Ombi.Store/Repository/IUserPlayedMovieRepository.cs b/src/Ombi.Store/Repository/IUserPlayedMovieRepository.cs index cad79fd96..966171b3a 100644 --- a/src/Ombi.Store/Repository/IUserPlayedMovieRepository.cs +++ b/src/Ombi.Store/Repository/IUserPlayedMovieRepository.cs @@ -8,6 +8,6 @@ namespace Ombi.Store.Repository { public interface IUserPlayedMovieRepository : IExternalRepository { - Task Get(string theMovieDbId, string userId); + Task Get(int theMovieDbId, string userId); } } \ No newline at end of file diff --git a/src/Ombi.Store/Repository/UserPlayedMovieRepository.cs b/src/Ombi.Store/Repository/UserPlayedMovieRepository.cs index 77cb08bb2..aaff5f2b1 100644 --- a/src/Ombi.Store/Repository/UserPlayedMovieRepository.cs +++ b/src/Ombi.Store/Repository/UserPlayedMovieRepository.cs @@ -18,7 +18,7 @@ namespace Ombi.Store.Repository Db = db; } - public async Task Get(string theMovieDbId, string userId) + public async Task Get(int theMovieDbId, string userId) { return await Db.UserPlayedMovie.FirstOrDefaultAsync(x => x.TheMovieDbId == theMovieDbId && x.UserId == userId);