Open-Harbor/dotnet-dynamic-query
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/fix-serialization-contract'

Browse Source
This commit is contained in:
David Lebee 2019-04-22 22:09:57 -05:00
commit 74e16d8560
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PoweredSoft.DynamicQuery.AspNetCore/Json/DynamicQueryJsonConverter.cs
View File

@ -60,7 +60,8 @@ namespace PoweredSoft.DynamicQuery.AspNetCore.Json
}
var filterObj = ServiceProvider.GetService(isComposite ? typeof(ICompositeFilter) : typeof(ISimpleFilter));
filterObj = jo.ToObject(filterObj.GetType());
var filterType = filterObj.GetType();
filterObj = jo.ToObject(filterType, serializer);
return filterObj;
}

34
PoweredSoft.DynamicQuery.Test/DeserializeTests.cs Normal file
View File

@ -0,0 +1,34 @@
using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using PoweredSoft.DynamicQuery.AspNetCore.Json;
using PoweredSoft.DynamicQuery.Core;
using System;
using System.Collections.Generic;
using System.Text;
using Xunit;
namespace PoweredSoft.DynamicQuery.Test
{
public class SerializationTests
{
[Fact]
public void QueryCriteria()
{
var json = @"{""page"":1,""pageSize"":20,""filters"":[{""type"":""composite"",""filters"":[{""path"":""title"",""value"":""Qui"",""type"":""StartsWith"",""and"":false}]}]}";
var serviceCollection = new ServiceCollection();
serviceCollection.AddPoweredSoftDynamicQuery();
var serviceProvider = serviceCollection.BuildServiceProvider();
var settings = new JsonSerializerSettings();
settings.Converters.Add(new StringEnumConverter());
settings.Converters.Add(new DynamicQueryJsonConverter(serviceProvider));
var data = JsonConvert.DeserializeObject<IQueryCriteria>(json, settings);
Assert.NotNull(data);
}
}
}

1
PoweredSoft.DynamicQuery.Test/PoweredSoft.DynamicQuery.Test.csproj
View File

@ -17,6 +17,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PoweredSoft.DynamicQuery.AspNetCore\PoweredSoft.DynamicQuery.AspNetCore.csproj" />
<ProjectReference Include="..\PoweredSoft.DynamicQuery\PoweredSoft.DynamicQuery.csproj" />
</ItemGroup>