Skip to content

Commit 76d4f7c

Browse files
committed
fix(queryParser): remove access to obsolete key
1 parent 16b47a9 commit 76d4f7c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/JsonApiDotNetCore/Services/QueryAccessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private string GetFilterValue(string key) {
6969
return publicValue;
7070

7171
var internalValue = _jsonApiContext.QuerySet.Filters
72-
.FirstOrDefault(f => string.Equals(f.Key, key, StringComparison.OrdinalIgnoreCase))?.Value;
72+
.FirstOrDefault(f => string.Equals(f.Attribute, key, StringComparison.OrdinalIgnoreCase))?.Value;
7373

7474
if(internalValue != null) {
7575
_logger.LogWarning("Locating filters by the internal propterty name is deprecated. You should use the public attribute name instead.");

src/JsonApiDotNetCore/Services/QueryParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ protected virtual AttrAttribute GetAttribute(string propertyName) {
197197
string.Equals(attr.PublicAttributeName, propertyName, StringComparison.OrdinalIgnoreCase)
198198
);
199199
} catch (InvalidOperationException e) {
200-
throw new JsonApiException(400, $"Attribute '{propertyName}' does not exist on resource '{_controllerContext.RequestEntity.EntityName}'");
200+
throw new JsonApiException(400, $"Attribute '{propertyName}' does not exist on resource '{_controllerContext.RequestEntity.EntityName}'", e);
201201
}
202202
}
203203
}

test/UnitTests/Services/QueryParser_Tests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void Can_Build_Filters()
4343
var querySet = queryParser.Parse(_queryCollectionMock.Object);
4444

4545
// assert
46-
Assert.Equal("value", querySet.Filters.Single(f => f.Key == "Key").Value);
46+
Assert.Equal("value", querySet.Filters.Single(f => f.Attribute == "key").Value);
4747
}
4848

4949
[Fact]
@@ -69,8 +69,8 @@ public void Filters_Properly_Parses_DateTime_With_Operation()
6969
var querySet = queryParser.Parse(_queryCollectionMock.Object);
7070

7171
// assert
72-
Assert.Equal(dt, querySet.Filters.Single(f => f.Key == "Key").Value);
73-
Assert.Equal("le", querySet.Filters.Single(f => f.Key == "Key").Operation);
72+
Assert.Equal(dt, querySet.Filters.Single(f => f.Attribute == "key").Value);
73+
Assert.Equal("le", querySet.Filters.Single(f => f.Attribute == "key").Operation);
7474
}
7575

7676
[Fact]
@@ -96,8 +96,8 @@ public void Filters_Properly_Parses_DateTime_Without_Operation()
9696
var querySet = queryParser.Parse(_queryCollectionMock.Object);
9797

9898
// assert
99-
Assert.Equal(dt, querySet.Filters.Single(f => f.Key == "Key").Value);
100-
Assert.Equal(string.Empty, querySet.Filters.Single(f => f.Key == "Key").Operation);
99+
Assert.Equal(dt, querySet.Filters.Single(f => f.Attribute == "key").Value);
100+
Assert.Equal(string.Empty, querySet.Filters.Single(f => f.Attribute == "key").Operation);
101101
}
102102

103103
[Fact]

0 commit comments

Comments
 (0)