github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-16 10:03:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Error fetching paged records from API without a sort key

Browse source 
[common]
This commit is contained in:
ta264 2020-09-01 21:26:36 +01:00 • committed by Qstick
parent 7aa3ad10ef
commit 3e082df21d
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs
View file

@ -291,16 +291,32 @@ namespace NzbDrone.Core.Test.Datastore
Subject.All().ToList().Should().BeEmpty(); Subject.All().ToList().Should().BeEmpty();
} }
[Test] [TestCase(1, 2)]
public void get_paged_should_work() [TestCase(2, 2)]
[TestCase(3, 1)]
public void get_paged_should_work(int page, int count)
{ {
Subject.InsertMany(_basicList); Subject.InsertMany(_basicList);
var data = Subject.GetPaged(new PagingSpec<ScheduledTask>() { Page = 0, PageSize = 2, SortKey = "LastExecution", SortDirection = SortDirection.Descending }); var data = Subject.GetPaged(new PagingSpec<ScheduledTask>() { Page = page, PageSize = 2, SortKey = "LastExecution", SortDirection = SortDirection.Descending });
data.Page.Should().Be(0); data.Page.Should().Be(page);
data.PageSize.Should().Be(2); data.PageSize.Should().Be(2);
data.TotalRecords.Should().Be(_basicList.Count); data.TotalRecords.Should().Be(_basicList.Count);
data.Records.Should().BeEquivalentTo(_basicList.OrderByDescending(x => x.LastExecution).Take(2)); data.Records.Should().BeEquivalentTo(_basicList.OrderByDescending(x => x.LastExecution).Skip((page - 1) * 2).Take(2));
}
[TestCase(1, 2)]
[TestCase(2, 2)]
[TestCase(3, 1)]
public void get_paged_should_work_with_null_sort_key(int page, int count)
{
Subject.InsertMany(_basicList);
var data = Subject.GetPaged(new PagingSpec<ScheduledTask>() { Page = page, PageSize = 2, SortDirection = SortDirection.Descending });
data.Page.Should().Be(page);
data.PageSize.Should().Be(2);
data.TotalRecords.Should().Be(_basicList.Count);
data.Records.Should().BeEquivalentTo(_basicList.OrderByDescending(x => x.Id).Skip((page - 1) * 2).Take(2));
} }
} }
} }

5
src/NzbDrone.Core/Datastore/BasicRepository.cs
View file

@ -407,6 +407,11 @@ namespace NzbDrone.Core.Datastore
{ {
AddFilters(builder, pagingSpec); AddFilters(builder, pagingSpec);
if (pagingSpec.SortKey == null)
{
pagingSpec.SortKey = $"{_table}.{_keyProperty.Name}";
}
var sortDirection = pagingSpec.SortDirection == SortDirection.Descending ? "DESC" : "ASC"; var sortDirection = pagingSpec.SortDirection == SortDirection.Descending ? "DESC" : "ASC";
var pagingOffset = (pagingSpec.Page - 1) * pagingSpec.PageSize; var pagingOffset = (pagingSpec.Page - 1) * pagingSpec.PageSize;
builder.OrderBy($"{pagingSpec.SortKey} {sortDirection} LIMIT {pagingSpec.PageSize} OFFSET {pagingOffset}"); builder.OrderBy($"{pagingSpec.SortKey} {sortDirection} LIMIT {pagingSpec.PageSize} OFFSET {pagingOffset}");