AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused code, always restrict against age rating

Browse source 
Make comments more clear
This commit is contained in:
Amelia 2025-06-23 15:01:34 +02:00
parent 51e1201ff3
commit b40b25a4e7
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
API.Tests/Repository/PersonRepositoryTests.cs
View file

@ -189,9 +189,9 @@ public class PersonRepositoryTests : AbstractDbTest
foreach (var person in allPeople) foreach (var person in allPeople)
Assert.Contains(fullAccessPeople, ContainsPersonCheck(person)); Assert.Contains(fullAccessPeople, ContainsPersonCheck(person));
// 1 lib0, 2 Lib1 // 1 series in lib0, 2 series in lib1
Assert.Equal(3, fullAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).SeriesCount); Assert.Equal(3, fullAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).SeriesCount);
// 2* the above // 3 series with each 2 chapters
Assert.Equal(6, fullAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).ChapterCount); Assert.Equal(6, fullAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).ChapterCount);
// 1 series in lib0 // 1 series in lib0
Assert.Equal(1, fullAccessPeople.First(dto => dto.Id == lib0SeriesPerson.Id).SeriesCount); Assert.Equal(1, fullAccessPeople.First(dto => dto.Id == lib0SeriesPerson.Id).SeriesCount);
@ -212,11 +212,11 @@ public class PersonRepositoryTests : AbstractDbTest
Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Lib1 Chapters Person"))); Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Lib1 Chapters Person")));
Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Lib1 Chapter Age Person"))); Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Lib1 Chapter Age Person")));
// 2 series in lib1, 0 in lib0 // 2 series in lib1, no series in lib0
Assert.Equal(2, restrictedAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).SeriesCount); Assert.Equal(2, restrictedAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).SeriesCount);
// 2* the above // 2 series with each 2 chapters
Assert.Equal(4, restrictedAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).ChapterCount); Assert.Equal(4, restrictedAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).ChapterCount);
// Access to both series // 2 series in lib1
Assert.Equal(2, restrictedAccessPeople.First(dto => dto.Id == lib1SeriesPerson.Id).SeriesCount); Assert.Equal(2, restrictedAccessPeople.First(dto => dto.Id == lib1SeriesPerson.Id).SeriesCount);
var restrictedAgeAccessPeople = await UnitOfWork.PersonRepository.GetBrowsePersonDtos(_restrictedAgeAccess.Id, var restrictedAgeAccessPeople = await UnitOfWork.PersonRepository.GetBrowsePersonDtos(_restrictedAgeAccess.Id,
@ -225,6 +225,7 @@ public class PersonRepositoryTests : AbstractDbTest
// Note: There is a potential bug here where a person in a different chapter of an age restricted series will show up // Note: There is a potential bug here where a person in a different chapter of an age restricted series will show up
Assert.Equal(6, restrictedAgeAccessPeople.TotalCount); Assert.Equal(6, restrictedAgeAccessPeople.TotalCount);
// No access to the age restricted chapter
Assert.DoesNotContain(restrictedAgeAccessPeople, ContainsPersonCheck(lib1ChapterAgePerson)); Assert.DoesNotContain(restrictedAgeAccessPeople, ContainsPersonCheck(lib1ChapterAgePerson));
} }
@ -322,7 +323,7 @@ public class PersonRepositoryTests : AbstractDbTest
Assert.Empty(restrictedChapters); Assert.Empty(restrictedChapters);
Assert.Empty(restrictedAgeChapters); Assert.Empty(restrictedAgeChapters);
// Lib1 - age restricted // Lib1 - age restricted series
chapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _fullAccess.Id, PersonRole.Imprint); chapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _fullAccess.Id, PersonRole.Imprint);
restrictedChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAccess.Id, PersonRole.Imprint); restrictedChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAccess.Id, PersonRole.Imprint);
restrictedAgeChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAgeAccess.Id, PersonRole.Imprint); restrictedAgeChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAgeAccess.Id, PersonRole.Imprint);
@ -330,7 +331,7 @@ public class PersonRepositoryTests : AbstractDbTest
Assert.Single(restrictedChapters); Assert.Single(restrictedChapters);
Assert.Empty(restrictedAgeChapters); Assert.Empty(restrictedAgeChapters);
// Lib1 - not age restricted // Lib1 - not age restricted series
chapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _fullAccess.Id, PersonRole.Team); chapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _fullAccess.Id, PersonRole.Team);
restrictedChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAccess.Id, PersonRole.Team); restrictedChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAccess.Id, PersonRole.Team);
restrictedAgeChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAgeAccess.Id, PersonRole.Team); restrictedAgeChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAgeAccess.Id, PersonRole.Team);

6
API/Data/Repositories/GenreRepository.cs
View file

@ -193,13 +193,11 @@ public class GenreRepository : IGenreRepository
SeriesCount = g.SeriesMetadatas SeriesCount = g.SeriesMetadatas
.Where(sm => seriesIds.Contains(sm.SeriesId)) .Where(sm => seriesIds.Contains(sm.SeriesId))
.RestrictAgainstAgeRestriction(ageRating) .RestrictAgainstAgeRestriction(ageRating)
//.Select(sm => sm.Id)
.Distinct() .Distinct()
.Count(), .Count(),
ChapterCount = g.Chapters ChapterCount = g.Chapters
.Where(cp => seriesIds.Contains(cp.Volume.SeriesId)) .Where(cp => seriesIds.Contains(cp.Volume.SeriesId))
.RestrictAgainstAgeRestriction(ageRating) .RestrictAgainstAgeRestriction(ageRating)
//.Select(ch => ch.Id)
.Distinct() .Distinct()
.Count() .Count()
}) })
@ -212,11 +210,11 @@ public class GenreRepository : IGenreRepository
Id = g.Id, Id = g.Id,
Title = g.Title, Title = g.Title,
SeriesCount = g.SeriesMetadatas SeriesCount = g.SeriesMetadatas
.Select(sm => sm.Id) .RestrictAgainstAgeRestriction(ageRating)
.Distinct() .Distinct()
.Count(), .Count(),
ChapterCount = g.Chapters ChapterCount = g.Chapters
.Select(ch => ch.Id) .RestrictAgainstAgeRestriction(ageRating)
.Distinct() .Distinct()
.Count() .Count()
}) })

6
API/Data/Repositories/TagRepository.cs
View file

@ -132,13 +132,11 @@ public class TagRepository : ITagRepository
SeriesCount = g.SeriesMetadatas SeriesCount = g.SeriesMetadatas
.Where(sm => seriesIds.Contains(sm.SeriesId)) .Where(sm => seriesIds.Contains(sm.SeriesId))
.RestrictAgainstAgeRestriction(ageRating) .RestrictAgainstAgeRestriction(ageRating)
//.Select(sm => sm.SeriesId)
.Distinct() .Distinct()
.Count(), .Count(),
ChapterCount = g.Chapters ChapterCount = g.Chapters
.Where(ch => seriesIds.Contains(ch.Volume.SeriesId)) .Where(ch => seriesIds.Contains(ch.Volume.SeriesId))
.RestrictAgainstAgeRestriction(ageRating) .RestrictAgainstAgeRestriction(ageRating)
//.Select(ch => ch.Id)
.Distinct() .Distinct()
.Count() .Count()
}) })
@ -152,11 +150,11 @@ public class TagRepository : ITagRepository
Id = g.Id, Id = g.Id,
Title = g.Title, Title = g.Title,
SeriesCount = g.SeriesMetadatas SeriesCount = g.SeriesMetadatas
.Select(sm => sm.Id) .RestrictAgainstAgeRestriction(ageRating)
.Distinct() .Distinct()
.Count(), .Count(),
ChapterCount = g.Chapters ChapterCount = g.Chapters
.Select(ch => ch.Id) .RestrictAgainstAgeRestriction(ageRating)
.Distinct() .Distinct()
.Count() .Count()
}) })