Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make DataSourceResult generic and fix tests. #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make DataSourceResult generic and fix tests. #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/DataSourceResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;

Expand All @@ -10,17 +11,17 @@ namespace Kendo.DynamicLinqCore
/// Describes the result of Kendo DataSource read operation.
/// </summary>
[KnownType("GetKnownTypes")]
public class DataSourceResult
public class DataSourceResult<T>
{
/// <summary>
/// Represents a single page of processed data.
/// </summary>
public IEnumerable Data { get; set; }
public IEnumerable<T> Data { get; set; }

/// <summary>
/// Represents a single page of processed grouped data.
/// </summary>
public IEnumerable Groups { get; set; }
public IEnumerable<GroupResult> Groups { get; set; }

/// <summary>
/// Represents a requested aggregates.
Expand Down
14 changes: 7 additions & 7 deletions src/QueryableExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Reflection;
Expand All @@ -20,7 +20,7 @@ public static class QueryableExtensions
/// <param name="sort">Specifies the current sort order.</param>
/// <param name="filter">Specifies the current filter.</param>
/// <returns>A DataSourceResult object populated from the processed IQueryable.</returns>
public static DataSourceResult ToDataSourceResult<T>(this IQueryable<T> queryable, int take, int skip, IEnumerable<Sort> sort, Filter filter)
public static DataSourceResult<T> ToDataSourceResult<T>(this IQueryable<T> queryable, int take, int skip, IEnumerable<Sort> sort, Filter filter)
{
return queryable.ToDataSourceResult(take, skip, sort, filter, null, null);
}
Expand All @@ -32,9 +32,9 @@ public static DataSourceResult ToDataSourceResult<T>(this IQueryable<T> queryabl
/// <param name="queryable">The IQueryable which should be processed.</param>
/// <param name="request">The DataSourceRequest object containing take, skip, sort, filter, aggregates, and groups data.</param>
/// <returns>A DataSourceResult object populated from the processed IQueryable.</returns>
public static DataSourceResult ToDataSourceResult<T>(this IQueryable<T> queryable, DataSourceRequest request)
public static DataSourceResult<T> ToDataSourceResult<T>(this IQueryable<T> queryable, DataSourceRequest request)
{
return queryable.ToDataSourceResult(request.Take, request.Skip, request.Sort, request.Filter, request.Aggregate, request.Group);
return queryable.ToDataSourceResult<T>(request.Take, request.Skip, request.Sort, request.Filter, request.Aggregate, request.Group);
}

/// <summary>
Expand All @@ -49,7 +49,7 @@ public static DataSourceResult ToDataSourceResult<T>(this IQueryable<T> queryabl
/// <param name="aggregates">Specifies the current aggregates.</param>
/// <param name="group">Specifies the current groups.</param>
/// <returns>A DataSourceResult object populated from the processed IQueryable.</returns>
public static DataSourceResult ToDataSourceResult<T>(this IQueryable<T> queryable, int take, int skip, IEnumerable<Sort> sort, Filter filter, IEnumerable<Aggregator> aggregates, IEnumerable<Group> group)
public static DataSourceResult<T> ToDataSourceResult<T>(this IQueryable<T> queryable, int take, int skip, IEnumerable<Sort> sort, Filter filter, IEnumerable<Aggregator> aggregates, IEnumerable<Group> group)
{
var errors = new List<object>();

Expand Down Expand Up @@ -86,7 +86,7 @@ public static DataSourceResult ToDataSourceResult<T>(this IQueryable<T> queryabl
queryable = Page(queryable, take, skip);
}

var result = new DataSourceResult
var result = new DataSourceResult<T>
{
Total = total,
Aggregates = aggregate
Expand Down Expand Up @@ -124,7 +124,7 @@ public static DataSourceResult ToDataSourceResult<T>(this IQueryable<T> queryabl
/// <param name="aggregates">Specifies the current aggregates.</param>
/// <param name="group">Specifies the current groups.</param>
/// <returns>A DataSourceResult object populated from the processed IQueryable.</returns>
public static Task<DataSourceResult> ToDataSourceResultAsync<T>(this IQueryable<T> queryable, int take, int skip, IEnumerable<Sort> sort, Filter filter, IEnumerable<Aggregator> aggregates = null, IEnumerable<Group> group = null)
public static Task<DataSourceResult<T>> ToDataSourceResultAsync<T>(this IQueryable<T> queryable, int take, int skip, IEnumerable<Sort> sort, Filter filter, IEnumerable<Aggregator> aggregates = null, IEnumerable<Group> group = null)
{
return Task.Run(() => queryable.ToDataSourceResult(take, skip, sort, filter, aggregates, group));
}
Expand Down
12 changes: 6 additions & 6 deletions test/Kendo.DynamicLinqCore.Tests/Data/MockContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
Weight = 48.5,
Salary = 1000,
Gender = Gender.F,
Birthday = new DateTime(2000,5,5),
Birthday = new DateTime(2000,5,5,0,0,0,DateTimeKind.Utc),
CompanyId = Guid.Parse("c2cbfe28-f82a-4904-8075-bf98729d434f")
},
new Employee {
Expand All @@ -53,7 +53,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
Salary = 2500,
Weight = 69.2,
Gender = Gender.M,
Birthday = new DateTime(1986,10,10),
Birthday = new DateTime(1986,10,10, 0, 0, 0, DateTimeKind.Utc),
CompanyId = Guid.Parse("c2cbfe28-f82a-4904-8075-bf98729d434f")
},
new Employee {
Expand All @@ -63,7 +63,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
Introduce = "I'm Kirin",
Weight = 73.8,
Gender = Gender.M,
Birthday = new DateTime(1984,7,8),
Birthday = new DateTime(1984,7,8, 0, 0, 0, DateTimeKind.Utc),
CompanyId = Guid.Parse("5dd641dd-2ba4-4dfd-9572-81325ecd8940")
},
new Employee {
Expand All @@ -74,7 +74,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
Salary = 1750,
Weight = 82.1,
Gender = Gender.M,
Birthday = new DateTime(1976,11,6),
Birthday = new DateTime(1976,11,6, 0, 0, 0, DateTimeKind.Utc),
CompanyId = Guid.Parse("80a6570c-ca98-4661-adde-e4d5a8637ee5")
},
new Employee {
Expand All @@ -85,7 +85,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
Salary = 6600,
Weight = 52.9,
Gender = Gender.P,
Birthday = new DateTime(2005,3,16),
Birthday = new DateTime(2005,3,16, 0, 0, 0, DateTimeKind.Utc),
CompanyId = Guid.Parse("80a6570c-ca98-4661-adde-e4d5a8637ee5")
},
new Employee {
Expand All @@ -96,7 +96,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
Salary = 3000,
Weight = 71.6,
Gender = Gender.M,
Birthday = new DateTime(2003,1,22),
Birthday = new DateTime(2003,1,22, 0, 0, 0, DateTimeKind.Utc),
CompanyId = Guid.Parse("80a6570c-ca98-4661-adde-e4d5a8637ee5")
}
);
Expand Down
10 changes: 5 additions & 5 deletions test/Kendo.DynamicLinqCore.Tests/FilterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ public void InputDataSourceRequest_ManyConditions_CheckResultCount()
{
// source string = {\"take\":10,\"skip\":0,\"filter\":{\"logic\":\"and\",\"filters\":[{\"logic\":\"or\",\"filters\":[{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1986-10-09T16:00:00.000Z\"},{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1976-11-05T16:00:00.000Z\"}]},{\"logic\":\"and\",\"filters\":[{\"field\":\"Salary\",\"operator\":\"gte\",\"value\":1000},{\"field\":\"Salary\",\"operator\":\"lte\",\"value\":6000}]}]}}

#if NETCOREAPP3_1
var request = JsonSerializer.Deserialize<DataSourceRequest>("{\"take\":10,\"skip\":0,\"filter\":{\"logic\":\"and\",\"filters\":[{\"logic\":\"or\",\"filters\":[{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1986-10-09T16:00:00.000Z\"},{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1976-11-05T16:00:00.000Z\"}]},{\"logic\":\"and\",\"filters\":[{\"field\":\"Salary\",\"operator\":\"gte\",\"value\":1000},{\"field\":\"Salary\",\"operator\":\"lte\",\"value\":6000}]}]}}", jsonSerializerOptions);
#else
var request = JsonConvert.DeserializeObject<DataSourceRequest>("{\"take\":10,\"skip\":0,\"filter\":{\"logic\":\"and\",\"filters\":[{\"logic\":\"or\",\"filters\":[{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1986-10-09T16:00:00.000Z\"},{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1976-11-05T16:00:00.000Z\"}]},{\"logic\":\"and\",\"filters\":[{\"field\":\"Salary\",\"operator\":\"gte\",\"value\":1000},{\"field\":\"Salary\",\"operator\":\"lte\",\"value\":6000}]}]}}");
#endif
#if NETCOREAPP3_1
var request = JsonSerializer.Deserialize<DataSourceRequest>("{\"take\":10,\"skip\":0,\"filter\":{\"logic\":\"and\",\"filters\":[{\"logic\":\"or\",\"filters\":[{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1986-10-10T00:00:00.000Z\"},{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1976-11-06T00:00:00.000Z\"}]},{\"logic\":\"and\",\"filters\":[{\"field\":\"Salary\",\"operator\":\"gte\",\"value\":1000},{\"field\":\"Salary\",\"operator\":\"lte\",\"value\":6000}]}]}}", jsonSerializerOptions);
#else
var request = JsonConvert.DeserializeObject<DataSourceRequest>("{\"take\":10,\"skip\":0,\"filter\":{\"logic\":\"and\",\"filters\":[{\"logic\":\"or\",\"filters\":[{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1986-10-10T00:00:00.000Z\"},{\"field\":\"Birthday\",\"operator\":\"eq\",\"value\":\"1976-11-06T00:00:00.000Z\"}]},{\"logic\":\"and\",\"filters\":[{\"field\":\"Salary\",\"operator\":\"gte\",\"value\":1000},{\"field\":\"Salary\",\"operator\":\"lte\",\"value\":6000}]}]}}");
#endif

var result = _dbContext.Employee.AsQueryable().ToDataSourceResult(request);
Assert.AreEqual(2, result.Total);
Expand Down
2 changes: 1 addition & 1 deletion test/Kendo.DynamicLinqCore.Tests/Kendo.DynamicLinqCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.1" />
</ItemGroup>
Expand Down