cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 02:18:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix GetOrderBy and add tests

Browse Source
This commit is contained in:
Bond_009 2021-01-24 11:43:05 +01:00
parent b4d04f9ca5
commit d24e7f60c7
No known key found for this signature in database
GPG Key ID: 63AB4E6262A96A87
2 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Jellyfin.Api/Helpers/RequestHelpers.cs
View File

@ -25,22 +25,25 @@ namespace Jellyfin.Api.Helpers
/// <param name="sortBy">Sort By. Comma delimited string.</param> /// <param name="sortBy">Sort By. Comma delimited string.</param>
/// <param name="requestedSortOrder">Sort Order. Comma delimited string.</param> /// <param name="requestedSortOrder">Sort Order. Comma delimited string.</param>
/// <returns>Order By.</returns> /// <returns>Order By.</returns>
public static ValueTuple<string, SortOrder>[] GetOrderBy(IReadOnlyList<string> sortBy, IReadOnlyList<SortOrder> requestedSortOrder) public static (string, SortOrder)[] GetOrderBy(IReadOnlyList<string> sortBy, IReadOnlyList<SortOrder> requestedSortOrder)
{ {
if (sortBy.Count == 0) if (sortBy.Count == 0)
{ {
return Array.Empty<ValueTuple<string, SortOrder>>(); return Array.Empty<ValueTuple<string, SortOrder>>();
} }
var result = new ValueTuple<string, SortOrder>[sortBy.Count]; var result = new (string, SortOrder)[sortBy.Count];
for (var i = 0; i < sortBy.Count; i++) var i = 0;
// Add elements which have a SortOrder specified
for (; i < requestedSortOrder.Count; i++)
{ {
var sortOrderIndex = requestedSortOrder.Count > i ? i : 0; result[i] = (sortBy[i], requestedSortOrder[i]);
}
var sortOrder = requestedSortOrder.Count > sortOrderIndex // Add remaining elements with the default SortOrder
? requestedSortOrder[sortOrderIndex] for (; i < sortBy.Count; i++)
: SortOrder.Ascending; {
result[i] = new ValueTuple<string, SortOrder>(sortBy[i], sortOrder); result[i] = (sortBy[i], SortOrder.Ascending);
} }
return result; return result;

59
tests/Jellyfin.Api.Tests/Helpers/RequestHelpersTests.cs Normal file
View File

@ -0,0 +1,59 @@
using System;
using System.Collections.Generic;
using Jellyfin.Api.Helpers;
using Jellyfin.Data.Enums;
using Xunit;
namespace Jellyfin.Api.Tests.Helpers
{
public class RequestHelpersTests
{
[Theory]
[MemberData(nameof(GetOrderBy_Success_TestData))]
public void GetOrderBy_Success(IReadOnlyList<string> sortBy, IReadOnlyList<SortOrder> requestedSortOrder, (string, SortOrder)[] expected)
{
Assert.Equal(expected, RequestHelpers.GetOrderBy(sortBy, requestedSortOrder));
}
public static IEnumerable<object[]> GetOrderBy_Success_TestData()
{
yield return new object[]
{
Array.Empty<string>(),
Array.Empty<SortOrder>(),
Array.Empty<(string, SortOrder)>()
};
yield return new object[]
{
new string[]
{
"IsFavoriteOrLiked",
"Random"
},
Array.Empty<SortOrder>(),
new (string, SortOrder)[]
{
("IsFavoriteOrLiked", SortOrder.Ascending),
("Random", SortOrder.Ascending),
}
};
yield return new object[]
{
new string[]
{
"SortName",
"ProductionYear"
},
new SortOrder[]
{
SortOrder.Descending
},
new (string, SortOrder)[]
{
("SortName", SortOrder.Descending),
("ProductionYear", SortOrder.Ascending),
}
};
}
}
}