rename where to filter, refactor

Author: pokornyd

Kontent.Ai.Delivery.Abstractions/QueryBuilders/Filtering/IItemFilters.cs

@@ -38,13 +38,29 @@ public interface IItemFilters
     /// </summary>
     IFilter Range(IPropertyPath path, RangeTuple range);
     /// <summary>
-    /// Retrieves items where the property specified by path is in the specified collection.
+    /// Retrieves items where the property specified by path is in the specified collection of strings.
     /// </summary>
-    IFilter In(IPropertyPath path, ScalarArray values);
+    IFilter In(IPropertyPath path, string[] values);
     /// <summary>
-    /// Retrieves items where the property specified by path is not in the specified collection.
+    /// Retrieves items where the property specified by path is not in the specified collection of strings.
     /// </summary>
-    IFilter NotIn(IPropertyPath path, ScalarArray values);
+    IFilter NotIn(IPropertyPath path, string[] values);
+    /// <summary>
+    /// Retrieves items where the property specified by path is in the specified collection of numbers.
+    /// </summary>
+    IFilter In(IPropertyPath path, double[] values);
+    /// <summary>
+    /// Retrieves items where the property specified by path is not in the specified collection of numbers.
+    /// </summary>
+    IFilter NotIn(IPropertyPath path, double[] values);
+    /// <summary>
+    /// Retrieves items where the property specified by path is in the specified collection of dates.
+    /// </summary>
+    IFilter In(IPropertyPath path, System.DateTime[] values);
+    /// <summary>
+    /// Retrieves items where the property specified by path is not in the specified collection of dates.
+    /// </summary>
+    IFilter NotIn(IPropertyPath path, System.DateTime[] values);
     /// <summary>
     /// Retrieves items where the property specified by path contains the specified value.
     /// </summary>

Kontent.Ai.Delivery.Abstractions/QueryBuilders/Filtering/PropertyPaths.cs

@@ -10,7 +10,7 @@ public interface IPropertyPath
 }
 
 /// <summary>
-/// Strongly-typed system property path for content items.
+/// Strongly-typed system property path for content items. Implicitly converts to string.
 /// </summary>
 public readonly record struct ItemSystemPath
     : IPropertyPath
@@ -68,12 +68,17 @@ public readonly record struct ItemSystemPath
     /// </summary>
     public static ItemSystemPath SitemapLocations { get; } = new("system.sitemap_locations");
 
+    /// <summary>
+    /// Implicitly converts an <see cref="ItemSystemPath"/> to a string.
+    /// </summary>
+    public static implicit operator string(ItemSystemPath path) => path._value;
+
     /// <inheritdoc />
     public string Serialize() => _value;
 }
 
 /// <summary>
-/// Strongly-typed system property path for content types.
+/// Strongly-typed system property path for content types. Implicitly converts to string.
 /// </summary>
 public readonly record struct TypeSystemPath
     : IPropertyPath
@@ -106,7 +111,7 @@ public readonly record struct TypeSystemPath
 }
 
 /// <summary>
-/// Strongly-typed system property path for taxonomy groups.
+/// Strongly-typed system property path for taxonomy groups. Implicitly converts to string.
 /// </summary>
 public readonly record struct TaxonomySystemPath
     : IPropertyPath
@@ -134,12 +139,17 @@ public readonly record struct TaxonomySystemPath
     /// </summary>
     public static TaxonomySystemPath LastModified { get; } = new("system.last_modified");
 
+    /// <summary>
+    /// Implicitly converts an <see cref="TaxonomySystemPath"/> to a string.
+    /// </summary>
+    public static implicit operator string(TaxonomySystemPath path) => path._value;
+
     /// <inheritdoc />
     public string Serialize() => _value;
 }
 
 /// <summary>
-/// Strongly-typed element property path.
+/// Strongly-typed element property path. Implicitly converts to string.
 /// </summary>
 public readonly record struct ElementPath
     : IPropertyPath
@@ -157,6 +167,11 @@ internal static ElementPath FromCodename(string codename)
     /// </summary>
     /// <inheritdoc />
     public string Serialize() => _value;
+
+    /// <summary>
+    /// Implicitly converts an <see cref="ElementPath"/> to a string.
+    /// </summary>
+    public static implicit operator string(ElementPath path) => path._value;
 }
 
 /// <summary>

Kontent.Ai.Delivery.Abstractions/QueryBuilders/IMultipleItemsQuery.cs

@@ -54,7 +54,7 @@ public interface IMultipleItemsQuery<T>
     /// Adds a filter to the query using a filter builder function.
     /// </summary>
     /// <param name="filterBuilder">Function that builds a filter using the items filter builder.</param>
-    IMultipleItemsQuery<T> Where(Func<IItemFilters, IFilter> filterBuilder);
+    IMultipleItemsQuery<T> Filter(Func<IItemFilters, IFilter> filterBuilder);
 
     /// <summary>
     /// Adds a filter to the query.

Kontent.Ai.Delivery/Api/QueryBuilders/Filtering/FilterValueMapper.cs

@@ -11,12 +11,6 @@ public static IFilterValue From(Scalar s) => s.Match<IFilterValue>(
         BooleanValue.From
     );
 
-    public static IFilterValue From(ScalarArray arr) => arr.Match<IFilterValue>(
-        StringArrayValue.From,
-        NumericArrayValue.From,
-        DateTimeArrayValue.From
-    );
-
     public static IFilterValue From(RangeTuple r) => r.Match<IFilterValue>(
         NumericRangeValue.From,
         DateRangeValue.From

Kontent.Ai.Delivery/Api/QueryBuilders/Filtering/ItemFilters.cs

@@ -29,12 +29,6 @@ public IFilter GreaterThanOrEqual(IPropertyPath path, Comparable value)
     public IFilter Range(IPropertyPath path, RangeTuple bounds)
         => new Filter(path.Serialize(), FilterOperator.Range, FilterValueMapper.From(bounds));
 
-    public IFilter In(IPropertyPath path, ScalarArray values)
-        => new Filter(path.Serialize(), FilterOperator.In, FilterValueMapper.From(values));
-
-    public IFilter NotIn(IPropertyPath path, ScalarArray values)
-        => new Filter(path.Serialize(), FilterOperator.NotIn, FilterValueMapper.From(values));
-
     public IFilter Contains(IPropertyPath path, string value)
         => new Filter(path.Serialize(), FilterOperator.Contains, StringValue.From(value));
 
@@ -50,4 +44,22 @@ public IFilter Empty(IPropertyPath path)
     public IFilter NotEmpty(IPropertyPath path)
         => new Filter(path.Serialize(), FilterOperator.NotEmpty, EmptyValue.From(string.Empty));
 
+    public IFilter In(IPropertyPath path, string[] values)
+        => new Filter(path.Serialize(), FilterOperator.In, StringArrayValue.From(values));
+
+    public IFilter NotIn(IPropertyPath path, string[] values)
+        => new Filter(path.Serialize(), FilterOperator.NotIn, StringArrayValue.From(values));
+
+    public IFilter In(IPropertyPath path, double[] values)
+        => new Filter(path.Serialize(), FilterOperator.In, NumericArrayValue.From(values));
+
+    public IFilter NotIn(IPropertyPath path, double[] values)
+        => new Filter(path.Serialize(), FilterOperator.NotIn, NumericArrayValue.From(values));
+
+    public IFilter In(IPropertyPath path, System.DateTime[] values)
+        => new Filter(path.Serialize(), FilterOperator.In, DateTimeArrayValue.From(values));
+
+    public IFilter NotIn(IPropertyPath path, System.DateTime[] values)
+        => new Filter(path.Serialize(), FilterOperator.NotIn, DateTimeArrayValue.From(values));
+
 }

Kontent.Ai.Delivery/Api/QueryBuilders/MultipleItemsQuery.cs

@@ -59,7 +59,7 @@ public IMultipleItemsQuery<T> WithTotalCount()
         return this;
     }
 
-    public IMultipleItemsQuery<T> Where(Func<IItemFilters, IFilter> filterBuilder)
+    public IMultipleItemsQuery<T> Filter(Func<IItemFilters, IFilter> filterBuilder)
     {
         var filter = filterBuilder(_filters);
         _appliedFilters.Add(filter);