Skip to content

[EventGrid] Add Remaining Advanced Filters #19670

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

Merged
merged 1 commit into from
Sep 28, 2022
Merged

[EventGrid] Add Remaining Advanced Filters #19670

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions src/EventGrid/EventGrid/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
- Additional information about change #1
-->
## Upcoming Release
* Add remaining advanced filters
- StringNotContains
- StringNotBeginsWith
- StringNotEndsWith
- NumberInRange
- NumberNotInRange
- IsNullOrUndefined
- IsNotNull

## Version 1.4.0
* Updated to use the 2021-12-01 API version.
Expand Down
99 changes: 95 additions & 4 deletions src/EventGrid/EventGrid/Utilities/EventGridClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,12 @@ void PrepareInputSchemaMappingParameters(
}
}

List<string> NoValueOperators = new List<string>() { "IsNullOrUndefined", "IsNotNull" };
bool IsValueRequired(string operatorValue)
{
return !NoValueOperators.Exists(o => string.Equals(o, operatorValue, StringComparison.OrdinalIgnoreCase));
}

void UpdatedAdvancedFilterParameters(Hashtable[] advancedFilter, EventSubscriptionFilter filter)
{
filter.AdvancedFilters = new List<AdvancedFilter>();
Expand All @@ -1856,15 +1862,14 @@ void UpdatedAdvancedFilterParameters(Hashtable[] advancedFilter, EventSubscripti
for (int i = 0; i < advancedFilter.Count(); i++)
{
// Validate entries.
if (advancedFilter[i].Count != 3)
if (advancedFilter[i].Count < 2 || advancedFilter[i].Count > 3)
{
throw new Exception($"Invalid Advanced Filter parameter:. Unexpected number of entries for advanced filter #{i + 1} as we expect 3 key-value pair while we received {advancedFilter[i].Count}");
throw new Exception($"Invalid Advanced Filter parameter:. Unexpected number of entries for advanced filter #{i + 1} as we expect 2-3 key-value pair while we received {advancedFilter[i].Count}");
}

if (!advancedFilter[i].ContainsKey("Operator") ||
!advancedFilter[i].ContainsKey("keY") ||
!(advancedFilter[i].ContainsKey("value")
|| advancedFilter[i].ContainsKey("values")))
(IsValueRequired((string)advancedFilter[i]["operator"]) && !(advancedFilter[i].ContainsKey("value") || advancedFilter[i].ContainsKey("values"))))
{
throw new Exception($"Invalid Advanced Filter parameter:. At least one of the key parameters is invalid for advanced filter #{i + 1}. The expected keys are either: Operator, key, and value or values.");
}
Expand All @@ -1885,6 +1890,7 @@ void UpdatedAdvancedFilterParameters(Hashtable[] advancedFilter, EventSubscripti

List<string> keyValuesList = null;
List<double?> keyValuesListForDouble = null;
List<IList<double?>> keyValuesListForDoubleRanges = null;
Object[] tempValues = (Object[])advancedFilter[i]["values"];

if (tempValues != null)
Expand All @@ -1897,6 +1903,23 @@ void UpdatedAdvancedFilterParameters(Hashtable[] advancedFilter, EventSubscripti
keyValuesList.Add((string)tempValues[val]);
}
}
else if (operatorValue.ToLower().Contains("range"))
{
keyValuesListForDoubleRanges = new List<IList<double?>>();
for (int val = 0; val < tempValues.Count(); val++)
{
var range = ((object[])tempValues[val]);
double? minimum = Convert.ToDouble(range[0]);
double? maximum = Convert.ToDouble(range[1]);

if (minimum > maximum)
{
throw new Exception($"Invalid Advanced Filter parameter. The minimum value of the range cannot be greater than the maximum value for advanced filter #{i + 1}");
}

keyValuesListForDoubleRanges.Add(new List<double?>() { minimum, maximum });
}
}
else if (operatorValue.ToLower().Contains("number"))
{
keyValuesListForDouble = new List<double?>();
Expand Down Expand Up @@ -1944,6 +1967,16 @@ void UpdatedAdvancedFilterParameters(Hashtable[] advancedFilter, EventSubscripti

filter.AdvancedFilters.Add(stringContainsAdvFilter);
}
else if (string.Equals(operatorValue, "StringNotContains", StringComparison.OrdinalIgnoreCase))
{
var stringNotContainsAdvFilter = new StringNotContainsAdvancedFilter
{
Key = keyValue,
Values = keyValuesList
};

filter.AdvancedFilters.Add(stringNotContainsAdvFilter);
}
else if (string.Equals(operatorValue, "StringBeginsWith", StringComparison.OrdinalIgnoreCase))
{
var stringBeginsWithAdvFilter = new StringBeginsWithAdvancedFilter
Expand All @@ -1954,6 +1987,16 @@ void UpdatedAdvancedFilterParameters(Hashtable[] advancedFilter, EventSubscripti

filter.AdvancedFilters.Add(stringBeginsWithAdvFilter);
}
else if (string.Equals(operatorValue, "StringNotBeginsWith", StringComparison.OrdinalIgnoreCase))
{
var stringNotBeginsWithAdvFilter = new StringNotBeginsWithAdvancedFilter
{
Key = keyValue,
Values = keyValuesList
};

filter.AdvancedFilters.Add(stringNotBeginsWithAdvFilter);
}
else if (string.Equals(operatorValue, "StringEndsWith", StringComparison.OrdinalIgnoreCase))
{
var stringEndsWithAdvFilter = new StringEndsWithAdvancedFilter
Expand All @@ -1964,6 +2007,16 @@ void UpdatedAdvancedFilterParameters(Hashtable[] advancedFilter, EventSubscripti

filter.AdvancedFilters.Add(stringEndsWithAdvFilter);
}
else if (string.Equals(operatorValue, "StringNotEndsWith", StringComparison.OrdinalIgnoreCase))
{
var stringNotEndsWithAdvFilter = new StringNotEndsWithAdvancedFilter
{
Key = keyValue,
Values = keyValuesList
};

filter.AdvancedFilters.Add(stringNotEndsWithAdvFilter);
}
else if (string.Equals(operatorValue, "NumberIn", StringComparison.OrdinalIgnoreCase))
{
var numberInAdvFilter = new NumberInAdvancedFilter
Expand Down Expand Up @@ -2024,6 +2077,26 @@ void UpdatedAdvancedFilterParameters(Hashtable[] advancedFilter, EventSubscripti

filter.AdvancedFilters.Add(numberLessThanOrEqualsAdvFilter);
}
else if (string.Equals(operatorValue, "NumberInRange", StringComparison.OrdinalIgnoreCase))
{
var numberInRangeAdvFilter = new NumberInRangeAdvancedFilter
{
Key = keyValue,
Values = (IList<IList<double?>>)keyValuesListForDoubleRanges
};

filter.AdvancedFilters.Add(numberInRangeAdvFilter);
}
else if (string.Equals(operatorValue, "NumberNotInRange", StringComparison.OrdinalIgnoreCase))
{
var numberNotInRangeAdvFilter = new NumberNotInRangeAdvancedFilter
{
Key = keyValue,
Values = (IList<IList<double?>>)keyValuesListForDoubleRanges
};

filter.AdvancedFilters.Add(numberNotInRangeAdvFilter);
}
else if (string.Equals(operatorValue, "BoolEquals", StringComparison.OrdinalIgnoreCase))
{
var boolEqualsAdvFilter = new BoolEqualsAdvancedFilter
Expand All @@ -2034,6 +2107,24 @@ void UpdatedAdvancedFilterParameters(Hashtable[] advancedFilter, EventSubscripti

filter.AdvancedFilters.Add(boolEqualsAdvFilter);
}
else if (string.Equals(operatorValue, "IsNullOrUndefined", StringComparison.OrdinalIgnoreCase))
{
var isNullOrUndefinedAdvFilter = new IsNullOrUndefinedAdvancedFilter
{
Key = keyValue
};

filter.AdvancedFilters.Add(isNullOrUndefinedAdvFilter);
}
else if (string.Equals(operatorValue, "IsNotNull", StringComparison.OrdinalIgnoreCase))
{
var isNotNullAdvFilter = new IsNotNullAdvancedFilter
{
Key = keyValue
};

filter.AdvancedFilters.Add(isNotNullAdvFilter);
}
else
{
throw new Exception($"Invalid Advanced Filter parameter. Unsupported operator for advanced filter #{i + 1}.");
Expand Down