Stability (I hope) (#2688)

API/Data/Repositories/ExternalSeriesMetadataRepository.cs

@@ -27,9 +27,12 @@ public interface IExternalSeriesMetadataRepository
     void Remove(IEnumerable<ExternalRating>? ratings);
     void Remove(IEnumerable<ExternalRecommendation>? recommendations);
     Task<ExternalSeriesMetadata?> GetExternalSeriesMetadata(int seriesId);
-    Task<bool> ExternalSeriesMetadataNeedsRefresh(int seriesId, DateTime expireTime);
+    Task<bool> ExternalSeriesMetadataNeedsRefresh(int seriesId);
     Task<SeriesDetailPlusDto> GetSeriesDetailPlusDto(int seriesId);
     Task LinkRecommendationsToSeries(Series series);
+    Task<bool> IsBlacklistedSeries(int seriesId);
+    Task CreateBlacklistedSeries(int seriesId);
+    Task RemoveFromBlacklist(int seriesId);
 }
 
 public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepository
@@ -92,12 +95,12 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor
             .FirstOrDefaultAsync();
     }
 
-    public async Task<bool> ExternalSeriesMetadataNeedsRefresh(int seriesId, DateTime expireTime)
+    public async Task<bool> ExternalSeriesMetadataNeedsRefresh(int seriesId)
     {
         var row = await _context.ExternalSeriesMetadata
             .Where(s => s.SeriesId == seriesId)
             .FirstOrDefaultAsync();
-        return row == null || row.LastUpdatedUtc <= expireTime;
+        return row == null || row.ValidUntilUtc <= DateTime.UtcNow;
     }
 
     public async Task<SeriesDetailPlusDto> GetSeriesDetailPlusDto(int seriesId)
@@ -184,4 +187,41 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor
 
         await _context.SaveChangesAsync();
     }
+
+    public Task<bool> IsBlacklistedSeries(int seriesId)
+    {
+        return _context.SeriesBlacklist.AnyAsync(s => s.SeriesId == seriesId);
+    }
+
+    /// <summary>
+    /// Creates a new instance against SeriesId and Saves to the DB
+    /// </summary>
+    /// <param name="seriesId"></param>
+    public async Task CreateBlacklistedSeries(int seriesId)
+    {
+        if (seriesId <= 0) return;
+        await _context.SeriesBlacklist.AddAsync(new SeriesBlacklist()
+        {
+            SeriesId = seriesId
+        });
+        await _context.SaveChangesAsync();
+    }
+
+    /// <summary>
+    /// Removes the Series from Blacklist and Saves to the DB
+    /// </summary>
+    /// <param name="seriesId"></param>
+    public async Task RemoveFromBlacklist(int seriesId)
+    {
+        var seriesBlacklist = await _context.SeriesBlacklist.FirstOrDefaultAsync(sb => sb.SeriesId == seriesId);
+
+        if (seriesBlacklist != null)
+        {
+            // Remove the SeriesBlacklist entity from the context
+            _context.SeriesBlacklist.Remove(seriesBlacklist);
+
+            // Save the changes to the database
+            await _context.SaveChangesAsync();
+        }
+    }
 }

API/Data/Repositories/LibraryRepository.cs

@@ -43,6 +43,7 @@ public interface ILibraryRepository
     Task<IEnumerable<Library>> GetLibrariesForUserIdAsync(int userId);
     IEnumerable<int> GetLibraryIdsForUserIdAsync(int userId, QueryContext queryContext = QueryContext.None);
     Task<LibraryType> GetLibraryTypeAsync(int libraryId);
+    Task<LibraryType> GetLibraryTypeBySeriesIdAsync(int seriesId);
     Task<IEnumerable<Library>> GetLibraryForIdsAsync(IEnumerable<int> libraryIds, LibraryIncludes includes = LibraryIncludes.None);
     Task<int> GetTotalFiles();
     IEnumerable<JumpKeyDto> GetJumpBarAsync(int libraryId);
@@ -54,6 +55,7 @@ public interface ILibraryRepository
     Task<IList<string>> GetAllCoverImagesAsync();
     Task<IList<Library>> GetAllWithCoversInDifferentEncoding(EncodeFormat encodeFormat);
     Task<bool> GetAllowsScrobblingBySeriesId(int seriesId);
+
 }
 
 public class LibraryRepository : ILibraryRepository
@@ -142,6 +144,14 @@ public class LibraryRepository : ILibraryRepository
             .FirstAsync();
     }
 
+    public async Task<LibraryType> GetLibraryTypeBySeriesIdAsync(int seriesId)
+    {
+        return await _context.Series
+            .Where(s => s.Id == seriesId)
+            .Select(s => s.Library.Type)
+            .FirstAsync();
+    }
+
     public async Task<IEnumerable<Library>> GetLibraryForIdsAsync(IEnumerable<int> libraryIds, LibraryIncludes includes = LibraryIncludes.None)
     {
         return await _context.Library

API/Data/Repositories/SeriesRepository.cs

@@ -13,6 +13,7 @@ using API.DTOs.Filtering;
 using API.DTOs.Filtering.v2;
 using API.DTOs.Metadata;
 using API.DTOs.ReadingLists;
+using API.DTOs.Scrobbling;
 using API.DTOs.Search;
 using API.DTOs.SeriesDetail;
 using API.DTOs.Settings;
@@ -25,6 +26,7 @@ using API.Extensions.QueryExtensions.Filtering;
 using API.Helpers;
 using API.Helpers.Converters;
 using API.Services;
+using API.Services.Plus;
 using API.Services.Tasks;
 using API.Services.Tasks.Scanner;
 using AutoMapper;
@@ -151,7 +153,7 @@ public interface ISeriesRepository
     Task RemoveFromOnDeck(int seriesId, int userId);
     Task ClearOnDeckRemoval(int seriesId, int userId);
     Task<PagedList<SeriesDto>> GetSeriesDtoForLibraryIdV2Async(int userId, UserParams userParams, FilterV2Dto filterDto);
-
+    Task<PlusSeriesDto?> GetPlusSeriesDto(int seriesId);
 }
 
 public class SeriesRepository : ISeriesRepository
@@ -701,6 +703,30 @@ public class SeriesRepository : ISeriesRepository
         return await PagedList<SeriesDto>.CreateAsync(retSeries, userParams.PageNumber, userParams.PageSize);
     }
 
+    public async Task<PlusSeriesDto?> GetPlusSeriesDto(int seriesId)
+    {
+        return await _context.Series
+            .Where(s => s.Id == seriesId)
+            .Select(series => new PlusSeriesDto()
+            {
+                MediaFormat = LibraryTypeHelper.GetFormat(series.Library.Type),
+                SeriesName = series.Name,
+                AltSeriesName = series.LocalizedName,
+                AniListId = ScrobblingService.ExtractId<int?>(series.Metadata.WebLinks,
+                    ScrobblingService.AniListWeblinkWebsite),
+                MalId = ScrobblingService.ExtractId<long?>(series.Metadata.WebLinks,
+                    ScrobblingService.MalWeblinkWebsite),
+                GoogleBooksId = ScrobblingService.ExtractId<string?>(series.Metadata.WebLinks,
+                    ScrobblingService.GoogleBooksWeblinkWebsite),
+                MangaDexId = ScrobblingService.ExtractId<string?>(series.Metadata.WebLinks,
+                    ScrobblingService.MangaDexWeblinkWebsite),
+                VolumeCount = series.Volumes.Count,
+                ChapterCount = series.Volumes.SelectMany(v => v.Chapters).Count(c => !c.IsSpecial),
+                Year = series.Metadata.ReleaseYear
+            })
+            .FirstOrDefaultAsync();
+    }
+
     public async Task AddSeriesModifiers(int userId, IList<SeriesDto> series)
     {
         var userProgress = await _context.AppUserProgresses