Small fixes (#4978)

* fix(tv-requests): 🐛 Fixed a small bug where an exception can get thrown when attempting to view TV Requests * fix(user-importer): 🐛 Fixed an issue where the cleanup wouldn't delete users #4812
Ombi-app · Jul 3, 2023 · 5bc87b3 · 5bc87b3
1 parent 3c3edf6
commit 5bc87b3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/src/Ombi.Core/Engine/TvRequestEngine.cs b/src/Ombi.Core/Engine/TvRequestEngine.cs
@@ -929,7 +929,14 @@ private void CheckForPlayed(HideResult shouldHide, List<ChildRequests> childRequ
 
                 var playedCount = playedEpisodes.Count();
                 var toWatchCount = requestedEpisodes.Count();
-                request.RequestedUserPlayedProgress = 100 * playedCount / toWatchCount;
+                if (playedCount == 0 || toWatchCount == 0)
+                {
+                    request.RequestedUserPlayedProgress = 0;
+                }
+                else
+                {
+                    request.RequestedUserPlayedProgress = 100 * playedCount / toWatchCount;
+                }
 
             }
         }

diff --git a/src/Ombi.Core/Engine/UserDeletionEngine.cs b/src/Ombi.Core/Engine/UserDeletionEngine.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.VisualBasic;
 using Ombi.Core.Authentication;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;

diff --git a/src/Ombi.Schedule.Tests/PlexUserImporterTests.cs b/src/Ombi.Schedule.Tests/PlexUserImporterTests.cs
@@ -6,6 +6,7 @@
 using Ombi.Api.Plex.Models;
 using Ombi.Api.Plex.Models.Friends;
 using Ombi.Core.Authentication;
+using Ombi.Core.Engine;
 using Ombi.Core.Settings;
 using Ombi.Core.Settings.Models.External;
 using Ombi.Helpers;
@@ -365,7 +366,7 @@ public async Task Import_Cleanup_Missing_Plex_Users()
 
             await _subject.Execute(null);
 
-            _mocker.Verify<OmbiUserManager>(x => x.DeleteAsync(It.Is<OmbiUser>(x => x.ProviderUserId == "PLEX_ID" && x.Email == "dupe" && x.UserName == "plex")), Times.Once);
+            _mocker.Verify<IUserDeletionEngine>(x => x.DeleteUser(It.Is<OmbiUser>(x => x.ProviderUserId == "PLEX_ID" && x.Email == "dupe" && x.UserName == "plex")), Times.Once);
         }
 
         [Test]
@@ -401,7 +402,7 @@ public async Task Import_Cleanup_Missing_Plex_Admin()
 
             await _subject.Execute(null);
 
-            _mocker.Verify<OmbiUserManager>(x => x.DeleteAsync(It.Is<OmbiUser>(x => x.ProviderUserId == "PLEX_ID" && x.Email == "dupe" && x.UserName == "plex")), Times.Once);
+            _mocker.Verify<IUserDeletionEngine>(x => x.DeleteUser(It.Is<OmbiUser>(x => x.ProviderUserId == "PLEX_ID" && x.Email == "dupe" && x.UserName == "plex")), Times.Once);
         }
     }
 }
diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs b/src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Logging;
 using Ombi.Api.Plex;
 using Ombi.Core.Authentication;
+using Ombi.Core.Engine;
 using Ombi.Core.Settings;
 using Ombi.Core.Settings.Models.External;
 using Ombi.Helpers;
@@ -20,14 +21,16 @@ namespace Ombi.Schedule.Jobs.Plex
     public class PlexUserImporter : IPlexUserImporter
     {
         public PlexUserImporter(IPlexApi api, OmbiUserManager um, ILogger<PlexUserImporter> log,
-            ISettingsService<PlexSettings> plexSettings, ISettingsService<UserManagementSettings> ums, INotificationHubService notificationHubService)
+            ISettingsService<PlexSettings> plexSettings, ISettingsService<UserManagementSettings> ums, INotificationHubService notificationHubService,
+            IUserDeletionEngine userDeletionEngine)
         {
             _api = api;
             _userManager = um;
             _log = log;
             _plexSettings = plexSettings;
             _userManagementSettings = ums;
             _notification = notificationHubService;
+            _userDeletionEngine = userDeletionEngine;
             _plexSettings.ClearCache();
             _userManagementSettings.ClearCache();
         }
@@ -38,7 +41,7 @@ public PlexUserImporter(IPlexApi api, OmbiUserManager um, ILogger<PlexUserImport
         private readonly ISettingsService<PlexSettings> _plexSettings;
         private readonly ISettingsService<UserManagementSettings> _userManagementSettings;
         private readonly INotificationHubService _notification;
-
+        private readonly IUserDeletionEngine _userDeletionEngine;
 
         public async Task Execute(IJobExecutionContext job)
         {
@@ -90,7 +93,7 @@ public async Task Execute(IJobExecutionContext job)
                 foreach (var ombiUser in missingUsers)
                 {
                     _log.LogInformation("Deleting user {0} not found in Plex Server.", ombiUser.UserName);
-                    await _userManager.DeleteAsync(ombiUser);
+                    await _userDeletionEngine.DeleteUser(ombiUser);
                 }
             }