Angular 19 + Even more bugfixes (#3675)

API/Controllers/ChapterController.cs

@@ -235,131 +235,121 @@ public class ChapterController : BaseApiController
 
 
         #region Genres
-        if (dto.Genres is {Count: > 0})
-        {
-            chapter.Genres ??= new List<Genre>();
-            await GenreHelper.UpdateChapterGenres(chapter, dto.Genres.Select(t => t.Title), _unitOfWork);
-        }
+        chapter.Genres ??= [];
+        await GenreHelper.UpdateChapterGenres(chapter, dto.Genres.Select(t => t.Title), _unitOfWork);
         #endregion
 
         #region Tags
-        if (dto.Tags is {Count: > 0})
-        {
-            chapter.Tags ??= new List<Tag>();
-            await TagHelper.UpdateChapterTags(chapter, dto.Tags.Select(t => t.Title), _unitOfWork);
-        }
+        chapter.Tags ??= [];
+        await TagHelper.UpdateChapterTags(chapter, dto.Tags.Select(t => t.Title), _unitOfWork);
         #endregion
 
         #region People
-        if (PersonHelper.HasAnyPeople(dto))
-        {
-            chapter.People ??= new List<ChapterPeople>();
+        chapter.People ??= [];
 
+        // Update writers
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Writers.Select(p => p.Name).ToList(),
+            PersonRole.Writer,
+            _unitOfWork
+        );
 
-            // Update writers
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Writers.Select(p => p.Name).ToList(),
-                PersonRole.Writer,
-                _unitOfWork
-            );
+        // Update characters
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Characters.Select(p => p.Name).ToList(),
+            PersonRole.Character,
+            _unitOfWork
+        );
 
-            // Update characters
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Characters.Select(p => p.Name).ToList(),
-                PersonRole.Character,
-                _unitOfWork
-            );
+        // Update pencillers
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Pencillers.Select(p => p.Name).ToList(),
+            PersonRole.Penciller,
+            _unitOfWork
+        );
 
-            // Update pencillers
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Pencillers.Select(p => p.Name).ToList(),
-                PersonRole.Penciller,
-                _unitOfWork
-            );
+        // Update inkers
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Inkers.Select(p => p.Name).ToList(),
+            PersonRole.Inker,
+            _unitOfWork
+        );
 
-            // Update inkers
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Inkers.Select(p => p.Name).ToList(),
-                PersonRole.Inker,
-                _unitOfWork
-            );
+        // Update colorists
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Colorists.Select(p => p.Name).ToList(),
+            PersonRole.Colorist,
+            _unitOfWork
+        );
 
-            // Update colorists
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Colorists.Select(p => p.Name).ToList(),
-                PersonRole.Colorist,
-                _unitOfWork
-            );
+        // Update letterers
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Letterers.Select(p => p.Name).ToList(),
+            PersonRole.Letterer,
+            _unitOfWork
+        );
 
-            // Update letterers
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Letterers.Select(p => p.Name).ToList(),
-                PersonRole.Letterer,
-                _unitOfWork
-            );
+        // Update cover artists
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.CoverArtists.Select(p => p.Name).ToList(),
+            PersonRole.CoverArtist,
+            _unitOfWork
+        );
 
-            // Update cover artists
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.CoverArtists.Select(p => p.Name).ToList(),
-                PersonRole.CoverArtist,
-                _unitOfWork
-            );
+        // Update editors
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Editors.Select(p => p.Name).ToList(),
+            PersonRole.Editor,
+            _unitOfWork
+        );
 
-            // Update editors
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Editors.Select(p => p.Name).ToList(),
-                PersonRole.Editor,
-                _unitOfWork
-            );
+        // Update publishers
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Publishers.Select(p => p.Name).ToList(),
+            PersonRole.Publisher,
+            _unitOfWork
+        );
 
-            // Update publishers
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Publishers.Select(p => p.Name).ToList(),
-                PersonRole.Publisher,
-                _unitOfWork
-            );
+        // Update translators
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Translators.Select(p => p.Name).ToList(),
+            PersonRole.Translator,
+            _unitOfWork
+        );
 
-            // Update translators
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Translators.Select(p => p.Name).ToList(),
-                PersonRole.Translator,
-                _unitOfWork
-            );
+        // Update imprints
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Imprints.Select(p => p.Name).ToList(),
+            PersonRole.Imprint,
+            _unitOfWork
+        );
 
-            // Update imprints
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Imprints.Select(p => p.Name).ToList(),
-                PersonRole.Imprint,
-                _unitOfWork
-            );
+        // Update teams
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Teams.Select(p => p.Name).ToList(),
+            PersonRole.Team,
+            _unitOfWork
+        );
 
-            // Update teams
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Teams.Select(p => p.Name).ToList(),
-                PersonRole.Team,
-                _unitOfWork
-            );
-
-            // Update locations
-            await PersonHelper.UpdateChapterPeopleAsync(
-                chapter,
-                dto.Locations.Select(p => p.Name).ToList(),
-                PersonRole.Location,
-                _unitOfWork
-            );
-        }
+        // Update locations
+        await PersonHelper.UpdateChapterPeopleAsync(
+            chapter,
+            dto.Locations.Select(p => p.Name).ToList(),
+            PersonRole.Location,
+            _unitOfWork
+        );
         #endregion
 
         #region Locks

API/Controllers/SettingsController.cs

@@ -34,29 +34,26 @@ public class SettingsController : BaseApiController
 {
     private readonly ILogger<SettingsController> _logger;
     private readonly IUnitOfWork _unitOfWork;
-    private readonly ITaskScheduler _taskScheduler;
-    private readonly IDirectoryService _directoryService;
     private readonly IMapper _mapper;
     private readonly IEmailService _emailService;
-    private readonly ILibraryWatcher _libraryWatcher;
     private readonly ILocalizationService _localizationService;
     private readonly ISettingsService _settingsService;
 
-    public SettingsController(ILogger<SettingsController> logger, IUnitOfWork unitOfWork, ITaskScheduler taskScheduler,
-        IDirectoryService directoryService, IMapper mapper, IEmailService emailService, ILibraryWatcher libraryWatcher,
-        ILocalizationService localizationService, ISettingsService settingsService)
+    public SettingsController(ILogger<SettingsController> logger, IUnitOfWork unitOfWork, IMapper mapper,
+        IEmailService emailService, ILocalizationService localizationService, ISettingsService settingsService)
     {
         _logger = logger;
         _unitOfWork = unitOfWork;
-        _taskScheduler = taskScheduler;
-        _directoryService = directoryService;
         _mapper = mapper;
         _emailService = emailService;
-        _libraryWatcher = libraryWatcher;
         _localizationService = localizationService;
         _settingsService = settingsService;
     }
 
+    /// <summary>
+    /// Returns the base url for this instance (if set)
+    /// </summary>
+    /// <returns></returns>
     [HttpGet("base-url")]
     public async Task<ActionResult<string>> GetBaseUrl()
     {

API/Controllers/VolumeController.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace API.Controllers;
+#nullable enable
 
 public class VolumeController : BaseApiController
 {
@@ -23,13 +24,15 @@ public class VolumeController : BaseApiController
         _eventHub = eventHub;
     }
 
+    /// <summary>
+    /// Returns the appropriate Volume
+    /// </summary>
+    /// <param name="volumeId"></param>
+    /// <returns></returns>
     [HttpGet]
-    public async Task<ActionResult<VolumeDto>> GetVolume(int volumeId)
+    public async Task<ActionResult<VolumeDto?>> GetVolume(int volumeId)
     {
-        var volume =
-            await _unitOfWork.VolumeRepository.GetVolumeDtoAsync(volumeId, User.GetUserId());
-
-        return Ok(volume);
+        return Ok(await _unitOfWork.VolumeRepository.GetVolumeDtoAsync(volumeId, User.GetUserId()));
     }
 
     [Authorize(Policy = "RequireAdminRole")]
@@ -39,7 +42,7 @@ public class VolumeController : BaseApiController
         var volume = await _unitOfWork.VolumeRepository.GetVolumeAsync(volumeId,
             VolumeIncludes.Chapters | VolumeIncludes.People | VolumeIncludes.Tags);
         if (volume == null)
-            return BadRequest(_localizationService.Translate(User.GetUserId(), "chapter-doesnt-exist"));
+            return BadRequest(_localizationService.Translate(User.GetUserId(), "volume-doesnt-exist"));
 
         _unitOfWork.VolumeRepository.Remove(volume);