diff --git a/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs b/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs index 14f20bb2297..5159fa7fb37 100644 --- a/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs +++ b/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs @@ -366,13 +366,11 @@ public IAggregation GetRangeAggregation(JsonReader reader, JsonSerializer serial reader.Read(); break; case "from_as_string": - reader.Read(); - fromAsString = reader.Value as string; + fromAsString = reader.ReadAsString(); reader.Read(); break; case "to_as_string": - reader.Read(); - toAsString = reader.Value as string; + toAsString = reader.ReadAsString(); reader.Read(); break; case "doc_count": diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/ParseResponseItemsTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/ParseResponseItemsTests.cs index be1a1de580a..963b8b27b73 100644 --- a/src/Tests/Nest.Tests.Integration/Aggregations/ParseResponseItemsTests.cs +++ b/src/Tests/Nest.Tests.Integration/Aggregations/ParseResponseItemsTests.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using Elasticsearch.Net; using FluentAssertions; using Nest.Tests.MockData.Domain; @@ -180,6 +181,20 @@ public void DateRangeItem() firstAgg.Items.Should().NotBeEmpty(); var grams = firstAgg.Items.OfType(); grams.Should().NotBeEmpty(); + var firstRange = grams.FirstOrDefault(); + firstRange.Should().NotBeNull(); + firstRange.To.Should().HaveValue(); + firstRange.ToAsString.Should().NotBeNull(); + var firstRangeToDateLeft = firstRange.To.Value.JavaTimeStampToDateTime(); + var firstRangeToDateRight = DateTime.Parse(firstRange.ToAsString); + firstRangeToDateLeft.Should().Be(firstRangeToDateRight); + var lastRange = grams.LastOrDefault(); + lastRange.Should().NotBeNull(); + lastRange.From.Should().HaveValue(); + lastRange.FromAsString.Should().NotBeNull(); + var LastRangeFromDateLeft = lastRange.From.Value.JavaTimeStampToDateTime(); + var LastRangeFromDateRight = DateTime.Parse(lastRange.FromAsString); + LastRangeFromDateLeft.Should().Be(LastRangeFromDateRight); } [Test] public void IpRangeItem()