.NET 7 + Spring Cleaning (#1677)
* Updated to net7.0 * Updated GA to .net 7 * Updated System.IO.Abstractions to use New factory. * Converted Regex into SourceGenerator in Parser. * Updated more regex to source generators. * Enabled Nullability and more regex changes throughout codebase. * Parser is 100% GeneratedRegexified * Lots of nullability code * Enabled nullability for all repositories. * Fixed another unit test * Refactored some code around and took care of some todos. * Updating code for nullability and cleaning up methods that aren't used anymore. Refctored all uses of Parser.Normalize() to use new extension * More nullability exercises. 500 warnings to go. * Fixed a bug where custom file uploads for entities wouldn't save in webP. * Nullability is done for all DTOs * Fixed all unit tests and nullability for the project. Only OPDS is left which will be done with an upcoming OPDS enhancement. * Use localization in book service after validating * Code smells * Switched to preview build of swashbuckle for .net7 support * Fixed up merge issues * Disable emulate comic book when on single page reader * Fixed a regression where double page renderer wouldn't layout the images correctly * Updated to swashbuckle which support .net 7 * Fixed a bad GA action * Some code cleanup * More code smells * Took care of most of nullable issues * Fixed a broken test due to having more than one test run in parallel * I'm really not sure why the unit tests are failing or are so extremely slow on .net 7 * Updated all dependencies * Fixed up build and removed hardcoded framework from build scripts. (this merge removes Regex Source generators). Unit tests are completely busted. * Unit tests and code cleanup. Needs shakeout now. * Adjusted Series model since a few fields are not-nullable. Removed dead imports on the project. * Refactored to use Builder pattern for all unit tests. * Switched nullability down to warnings. It wasn't possible to switch due to constraint issues in DB Migration.
This commit is contained in:
parent
76fe3fd64a
commit
5d1dd7b3f0
283 changed files with 4221 additions and 4593 deletions
58
API.Tests/Helpers/Builders/ChapterBuilder.cs
Normal file
58
API.Tests/Helpers/Builders/ChapterBuilder.cs
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
using System.Collections.Generic;
|
||||
using API.Data;
|
||||
using API.Entities;
|
||||
using API.Entities.Enums;
|
||||
|
||||
namespace API.Tests.Helpers.Builders;
|
||||
|
||||
public class ChapterBuilder : IEntityBuilder<Chapter>
|
||||
{
|
||||
private Chapter _chapter;
|
||||
public Chapter Build() => _chapter;
|
||||
|
||||
public ChapterBuilder(string number, string? range=null)
|
||||
{
|
||||
_chapter = new Chapter()
|
||||
{
|
||||
Range = string.IsNullOrEmpty(range) ? number : range,
|
||||
Title = string.IsNullOrEmpty(range) ? number : range,
|
||||
Number = API.Services.Tasks.Scanner.Parser.Parser.MinNumberFromRange(number) + string.Empty,
|
||||
Files = new List<MangaFile>(),
|
||||
Pages = 1
|
||||
};
|
||||
}
|
||||
|
||||
public ChapterBuilder WithAgeRating(AgeRating rating)
|
||||
{
|
||||
_chapter.AgeRating = rating;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ChapterBuilder WithPages(int pages)
|
||||
{
|
||||
_chapter.Pages = pages;
|
||||
return this;
|
||||
}
|
||||
public ChapterBuilder WithCoverImage(string cover)
|
||||
{
|
||||
_chapter.CoverImage = cover;
|
||||
return this;
|
||||
}
|
||||
public ChapterBuilder WithIsSpecial(bool isSpecial)
|
||||
{
|
||||
_chapter.IsSpecial = isSpecial;
|
||||
return this;
|
||||
}
|
||||
public ChapterBuilder WithTitle(string title)
|
||||
{
|
||||
_chapter.Title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ChapterBuilder WithFile(MangaFile file)
|
||||
{
|
||||
_chapter.Files ??= new List<MangaFile>();
|
||||
_chapter.Files.Add(file);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
6
API.Tests/Helpers/Builders/EntityBuilder.cs
Normal file
6
API.Tests/Helpers/Builders/EntityBuilder.cs
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
namespace API.Tests.Helpers.Builders;
|
||||
|
||||
public interface IEntityBuilder<out T>
|
||||
{
|
||||
public T Build();
|
||||
}
|
||||
71
API.Tests/Helpers/Builders/SeriesBuilder.cs
Normal file
71
API.Tests/Helpers/Builders/SeriesBuilder.cs
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using API.Entities;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.Metadata;
|
||||
using API.Extensions;
|
||||
|
||||
namespace API.Tests.Helpers.Builders;
|
||||
|
||||
public class SeriesBuilder : IEntityBuilder<Series>
|
||||
{
|
||||
private readonly Series _series;
|
||||
public Series Build()
|
||||
{
|
||||
_series.Pages = _series.Volumes.Sum(v => v.Chapters.Sum(c => c.Pages));
|
||||
return _series;
|
||||
}
|
||||
|
||||
public SeriesBuilder(string name)
|
||||
{
|
||||
_series = new Series()
|
||||
{
|
||||
Name = name,
|
||||
LocalizedName = name.ToNormalized(),
|
||||
OriginalName = name,
|
||||
SortName = name,
|
||||
NormalizedName = name.ToNormalized(),
|
||||
NormalizedLocalizedName = name.ToNormalized(),
|
||||
Metadata = new SeriesMetadata(),
|
||||
Volumes = new List<Volume>()
|
||||
};
|
||||
}
|
||||
|
||||
public SeriesBuilder WithLocalizedName(string localizedName)
|
||||
{
|
||||
_series.LocalizedName = localizedName;
|
||||
_series.NormalizedLocalizedName = localizedName.ToNormalized();
|
||||
return this;
|
||||
}
|
||||
|
||||
public SeriesBuilder WithFormat(MangaFormat format)
|
||||
{
|
||||
_series.Format = format;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SeriesBuilder WithVolume(Volume volume)
|
||||
{
|
||||
_series.Volumes ??= new List<Volume>();
|
||||
_series.Volumes.Add(volume);
|
||||
return this;
|
||||
}
|
||||
|
||||
public SeriesBuilder WithVolumes(List<Volume> volumes)
|
||||
{
|
||||
_series.Volumes = volumes;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SeriesBuilder WithMetadata(SeriesMetadata metadata)
|
||||
{
|
||||
_series.Metadata = metadata;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SeriesBuilder WithPages(int pages)
|
||||
{
|
||||
_series.Pages = pages;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
37
API.Tests/Helpers/Builders/SeriesMetadataBuilder.cs
Normal file
37
API.Tests/Helpers/Builders/SeriesMetadataBuilder.cs
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
using System.Collections.Generic;
|
||||
using API.Data;
|
||||
using API.Entities;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.Metadata;
|
||||
|
||||
namespace API.Tests.Helpers.Builders;
|
||||
|
||||
public class SeriesMetadataBuilder : IEntityBuilder<SeriesMetadata>
|
||||
{
|
||||
private SeriesMetadata _seriesMetadata;
|
||||
public SeriesMetadata Build() => _seriesMetadata;
|
||||
|
||||
public SeriesMetadataBuilder()
|
||||
{
|
||||
_seriesMetadata = new SeriesMetadata()
|
||||
{
|
||||
CollectionTags = new List<CollectionTag>(),
|
||||
Genres = new List<Genre>(),
|
||||
Tags = new List<Tag>(),
|
||||
People = new List<Person>()
|
||||
};
|
||||
}
|
||||
|
||||
public SeriesMetadataBuilder WithCollectionTag(CollectionTag tag)
|
||||
{
|
||||
_seriesMetadata.CollectionTags ??= new List<API.Entities.CollectionTag>();
|
||||
_seriesMetadata.CollectionTags.Add(tag);
|
||||
return this;
|
||||
}
|
||||
public SeriesMetadataBuilder WithPublicationStatus(PublicationStatus status)
|
||||
{
|
||||
_seriesMetadata.PublicationStatus = status;
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
43
API.Tests/Helpers/Builders/VolumeBuilder.cs
Normal file
43
API.Tests/Helpers/Builders/VolumeBuilder.cs
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using API.Data;
|
||||
using API.Entities;
|
||||
|
||||
namespace API.Tests.Helpers.Builders;
|
||||
|
||||
public class VolumeBuilder : IEntityBuilder<Volume>
|
||||
{
|
||||
private readonly Volume _volume;
|
||||
public Volume Build() => _volume;
|
||||
|
||||
public VolumeBuilder(string volumeNumber)
|
||||
{
|
||||
_volume = DbFactory.Volume(volumeNumber);
|
||||
}
|
||||
|
||||
public VolumeBuilder WithName(string name)
|
||||
{
|
||||
_volume.Name = name;
|
||||
return this;
|
||||
}
|
||||
|
||||
public VolumeBuilder WithNumber(int number)
|
||||
{
|
||||
_volume.Number = number;
|
||||
return this;
|
||||
}
|
||||
|
||||
public VolumeBuilder WithChapters(List<Chapter> chapters)
|
||||
{
|
||||
_volume.Chapters = chapters;
|
||||
return this;
|
||||
}
|
||||
|
||||
public VolumeBuilder WithChapter(Chapter chapter)
|
||||
{
|
||||
_volume.Chapters ??= new List<Chapter>();
|
||||
_volume.Chapters.Add(chapter);
|
||||
_volume.Pages = _volume.Chapters.Sum(c => c.Pages);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue