Skip to content

Commit

Permalink
Merge pull request #18 from ZEXSM/bugfix/boolean-values
Browse files Browse the repository at this point in the history
bugfix/boolean values
  • Loading branch information
ZEXSM authored Aug 19, 2019
2 parents ca80536 + 729e707 commit f5738f3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/OData.QueryBuilder/Extensions/ExpressionExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,12 @@ public static string ToODataQuery(this Expression expression, string queryString
return $"'{memberExpressionValue}'";
}

return memberExpressionValue.ToString();
if (memberExpressionValue is bool)
{
return $"{memberExpressionValue}".ToLower();
}

return $"{memberExpressionValue}";
}

var parentMemberExpressionQuery = memberExpression.Expression.ToODataQuery(queryString);
Expand Down
10 changes: 8 additions & 2 deletions test/OData.QueryBuilder.Test/ODataQueryBuilderByListTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,19 @@ public void ODataQueryBuilderList_Operator_In_Empty_Success()
[Fact(DisplayName = "(ODataQueryBuilderList) Filter boolean values => Success")]
public void ODataQueryBuilderList_Filter_Boolean_Values_Success()
{
var constValue = false;
var newObject = new ODataTypeEntity { IsOpen = false };

var uri = _odataQueryBuilder
.For<ODataTypeEntity>(s => s.ODataType)
.ByList()
.Filter(s => s.IsActive && s.IsOpen == true && s.ODataKind.ODataCode.IdActive == false)
.Filter(s => s.IsActive
&& s.IsOpen == constValue
&& s.IsOpen == true
&& s.ODataKind.ODataCode.IdActive == newObject.IsOpen)
.ToUri();

uri.OriginalString.Should().Be("http://mock/odata/ODataType?$filter=IsActive and IsOpen eq true and ODataKind/ODataCode/IdActive eq false");
uri.OriginalString.Should().Be("http://mock/odata/ODataType?$filter=IsActive and IsOpen eq false and IsOpen eq true and ODataKind/ODataCode/IdActive eq false");
}

[Fact(DisplayName = "(ODataQueryBuilderList) Filter brackets => Success")]
Expand Down

0 comments on commit f5738f3

Please sign in to comment.