Skip to content

Commit 99fa769

Browse files
PascalSennPascalSenn
authoredApr 28, 2021
Fixed mongodb date time filtering (#3613)
·
16.0.0-p.111.3.0-preview.4
1 parent 7156ab0 commit 99fa769

13 files changed

+192
-8
lines changed
 

‎src/HotChocolate/MongoDb/src/Data/Driver/MongoDbFilterOperation.cs

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
using System;
12
using System.Collections;
23
using MongoDB.Bson;
34
using MongoDB.Bson.IO;
45
using MongoDB.Bson.Serialization;
6+
using MongoDB.Bson.Serialization.Serializers;
57

68
namespace HotChocolate.Data.MongoDb
79
{
@@ -67,7 +69,22 @@ public override BsonDocument Render(
6769
}
6870
else
6971
{
70-
resolvedFieldSerializer.Serialize(context, _value);
72+
if (_value is DateTimeOffset dateTimeOffset &&
73+
resolvedFieldSerializer is DateTimeSerializer or NullableSerializer<DateTime>)
74+
{
75+
if (dateTimeOffset.Offset == TimeSpan.Zero)
76+
{
77+
resolvedFieldSerializer.Serialize(context, dateTimeOffset.UtcDateTime);
78+
}
79+
else
80+
{
81+
resolvedFieldSerializer.Serialize(context, dateTimeOffset.DateTime);
82+
}
83+
}
84+
else
85+
{
86+
resolvedFieldSerializer.Serialize(context, _value);
87+
}
7188
}
7289

7390
bsonWriter.WriteEndDocument();

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbFilterVisitorComparableTests.cs

+100-7
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,113 @@ public class MongoDbFilterVisitorComparableTests
1414
{
1515
private static readonly Foo[] _fooEntities =
1616
{
17-
new Foo { BarShort = 12 },
18-
new Foo { BarShort = 14 },
19-
new Foo { BarShort = 13 }
17+
new()
18+
{
19+
BarShort = 12,
20+
BarDateTime = new DateTime(2000, 1, 12, 0, 0, 0, DateTimeKind.Utc)
21+
},
22+
new()
23+
{
24+
BarShort = 14,
25+
BarDateTime = new DateTime(2000, 1, 14, 0, 0, 0, DateTimeKind.Utc)
26+
},
27+
new()
28+
{
29+
BarShort = 13,
30+
BarDateTime = new DateTime(2000, 1, 13, 0, 0, 0, DateTimeKind.Utc)
31+
}
2032
};
2133

2234
private static readonly FooNullable[] _fooNullableEntities =
2335
{
24-
new FooNullable { BarShort = 12 },
25-
new FooNullable { BarShort = null },
26-
new FooNullable { BarShort = 14 },
27-
new FooNullable { BarShort = 13 }
36+
new()
37+
{
38+
BarShort = 12,
39+
BarDateTime = new DateTime(2000, 1, 12, 0, 0, 0, DateTimeKind.Utc)
40+
},
41+
new() { BarShort = null, BarDateTime = null },
42+
new()
43+
{
44+
BarShort = 14,
45+
BarDateTime = new DateTime(2000, 1, 14, 0, 0, 0, DateTimeKind.Utc)
46+
},
47+
new()
48+
{
49+
BarShort = 13,
50+
BarDateTime = new DateTime(2000, 1, 13, 0, 0, 0, DateTimeKind.Utc)
51+
}
2852
};
2953

3054
public MongoDbFilterVisitorComparableTests(MongoResource resource)
3155
{
3256
Init(resource);
3357
}
3458

59+
[Fact]
60+
public async Task Create_ShortEqual_Expression_DateTime()
61+
{
62+
// arrange
63+
IRequestExecutor tester = CreateSchema<Foo, FooFilterType>(_fooEntities);
64+
65+
// act
66+
// assert
67+
IExecutionResult res1 = await tester.ExecuteAsync(
68+
QueryRequestBuilder.New()
69+
.SetQuery("{ root(where: { barDateTime: { eq: \"2000-01-12T00:00Z\"}})" +
70+
"{ barDateTime}}")
71+
.Create());
72+
73+
res1.MatchDocumentSnapshot("12");
74+
75+
IExecutionResult res2 = await tester.ExecuteAsync(
76+
QueryRequestBuilder.New()
77+
.SetQuery("{ root(where: { barDateTime: { eq: \"2000-01-12T00:00Z\"}})" +
78+
"{ barDateTime}}")
79+
.Create());
80+
81+
res2.MatchDocumentSnapshot("13");
82+
83+
IExecutionResult res3 = await tester.ExecuteAsync(
84+
QueryRequestBuilder.New()
85+
.SetQuery("{ root(where: { barDateTime: { eq: null}}){ barDateTime}}")
86+
.Create());
87+
88+
res3.MatchDocumentSnapshot("null");
89+
}
90+
91+
[Fact]
92+
public async Task Create_ShortEqual_Expression_DateTime_Nullable()
93+
{
94+
// arrange
95+
IRequestExecutor tester =
96+
CreateSchema<FooNullable, FooNullableFilterType>(_fooNullableEntities);
97+
98+
// act
99+
// assert
100+
IExecutionResult res1 = await tester.ExecuteAsync(
101+
QueryRequestBuilder.New()
102+
.SetQuery("{ root(where: { barDateTime: { eq: \"2000-01-12T00:00:00Z\"}})" +
103+
"{ barDateTime}}")
104+
.Create());
105+
106+
res1.MatchDocumentSnapshot("12");
107+
108+
IExecutionResult res2 = await tester.ExecuteAsync(
109+
QueryRequestBuilder.New()
110+
.SetQuery("{ root(where: { barDateTime: { eq: \"2000-01-12T00:00:00Z\"}})" +
111+
"{ barDateTime}}")
112+
.Create());
113+
114+
res2.MatchDocumentSnapshot("13");
115+
116+
IExecutionResult res3 = await tester.ExecuteAsync(
117+
QueryRequestBuilder.New()
118+
.SetQuery("{ root(where: { barDateTime: { eq: null}}){ barDateTime}}")
119+
.Create());
120+
121+
res3.MatchDocumentSnapshot("null");
122+
}
123+
35124
[Fact]
36125
public async Task Create_ShortEqual_Expression()
37126
{
@@ -867,6 +956,8 @@ public class Foo
867956
public double BarDouble { get; set; }
868957

869958
public decimal BarDecimal { get; set; }
959+
960+
public DateTime BarDateTime { get; set; }
870961
}
871962

872963
public class FooNullable
@@ -875,6 +966,8 @@ public class FooNullable
875966
public Guid Id { get; set; } = Guid.NewGuid();
876967

877968
public short? BarShort { get; set; }
969+
970+
public DateTime? BarDateTime { get; set; }
878971
}
879972

880973
public class FooFilterType

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_12.snap

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"data": {
3+
"root": [
4+
{
5+
"barDateTime": "2000-01-12T00:00:00.000Z"
6+
}
7+
]
8+
}
9+
}

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_12_query.snap

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
find({ "BarDateTime" : { "$eq" : ISODate("2000-01-12T00:00:00Z") } })

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_13.snap

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"data": {
3+
"root": [
4+
{
5+
"barDateTime": "2000-01-12T00:00:00.000Z"
6+
}
7+
]
8+
}
9+
}

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_13_query.snap

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
find({ "BarDateTime" : { "$eq" : ISODate("2000-01-12T00:00:00Z") } })

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_Nullable_12.snap

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"data": {
3+
"root": [
4+
{
5+
"barDateTime": "2000-01-12T00:00:00.000Z"
6+
}
7+
]
8+
}
9+
}

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_Nullable_12_query.snap

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
find({ "BarDateTime" : { "$eq" : ISODate("2000-01-12T00:00:00Z") } })

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_Nullable_13.snap

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"data": {
3+
"root": [
4+
{
5+
"barDateTime": "2000-01-12T00:00:00.000Z"
6+
}
7+
]
8+
}
9+
}

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_Nullable_13_query.snap

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
find({ "BarDateTime" : { "$eq" : ISODate("2000-01-12T00:00:00Z") } })

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_Nullable_null.snap

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"data": {
3+
"root": [
4+
{
5+
"barDateTime": null
6+
}
7+
]
8+
}
9+
}

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_Nullable_null_query.snap

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
find({ "BarDateTime" : { "$eq" : null } })

‎src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/__snapshots__/MongoDbFilterVisitorComparableTests.Create_ShortEqual_Expression_DateTime_null.snap

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"errors": [
3+
{
4+
"message": "The provided value for filter \u0060eq\u0060 of type ComparableDateTimeOperationFilterInput is invalid. Null values are not supported.",
5+
"locations": [
6+
{
7+
"line": 1,
8+
"column": 36
9+
}
10+
],
11+
"path": [
12+
"root"
13+
],
14+
"extensions": {
15+
"code": "HC0026",
16+
"expectedType": "DateTime!",
17+
"filterType": "ComparableDateTimeOperationFilterInput"
18+
}
19+
}
20+
],
21+
"data": {
22+
"root": []
23+
}
24+
}

0 commit comments

Comments
 (0)
Please sign in to comment.