Skip to content

Update FilterConverter.cs #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update FilterConverter.cs #354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/DataFilters/Serialization/FilterConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,22 +109,22 @@ public override Filter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
throw new JsonException($@"Missing ""{Filter.OperatorJsonPropertyName}"" property.");
}

reader.Read();
FilterOperator op = Operators[reader.GetString()];
if (!Filter.UnaryOperators.Contains(op))
{
if (reader.Read() && reader.TokenType == JsonTokenType.PropertyName && Filter.ValueJsonPropertyName == reader.GetString())
reader.Read();
FilterOperator op = Operators[reader.GetString()];
if (!Filter.UnaryOperators.Contains(op))
{
reader.Read();
value = reader.TokenType switch
if (reader.Read() && reader.TokenType == JsonTokenType.PropertyName && Filter.ValueJsonPropertyName == reader.GetString())
{
JsonTokenType.Number => reader.GetInt64(),
JsonTokenType.String => reader.GetString(),
JsonTokenType.False => reader.GetBoolean(),
JsonTokenType.True => reader.GetBoolean(),
_ => null
};
}
reader.Read();
value = reader.TokenType switch
{
JsonTokenType.Number => reader.GetInt64(),
JsonTokenType.String => reader.GetString(),
JsonTokenType.False => reader.GetBoolean(),
JsonTokenType.True => reader.GetBoolean(),
_ => null
};
}

if (!reader.Read() || reader.TokenType != JsonTokenType.EndObject)
{
Expand All @@ -138,6 +138,7 @@ public override Filter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
{
// empty loop to get to the end of the current JSON object
}
reader.Read();
}

return new Filter(field, op, value);
Expand Down