3.1.0

Attribute simplification
PandaTechAM · Oct 27, 2023 · bb892a0 · bb892a0
1 parent f118b5b
commit bb892a0
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 45 deletions.
diff --git a/IEnumerableExtenders/Attributes/MappedToPropertyAttribute.cs b/IEnumerableExtenders/Attributes/MappedToPropertyAttribute.cs
@@ -6,33 +6,15 @@ namespace PandaTech.IEnumerableFilters.Attributes;
 [AttributeUsage(AttributeTargets.Property)]
 public class MappedToPropertyAttribute : Attribute
 {
-    public Type? TargetConverterType;
-    public Type? BackwardConverterType;
+    public Type? ConverterType;
     public readonly string TargetPropertyName;
     public ComparisonType[]? ComparisonTypes;
 
-    public readonly bool Sortable = true;
+    public bool Encrypted = false;
+    public bool Sortable = true;
 
     public MappedToPropertyAttribute(string property)
     {
         TargetPropertyName = property;
     }
-
-    public ComparisonTypesDefault ComparisonTypesDefault
-    {
-        get => throw new Exception("This property is only for serialization");
-        set
-        {
-            ComparisonTypes = value switch
-            {
-                ComparisonTypesDefault.Numeric => DefaultComparisonTypes.Numeric,
-                ComparisonTypesDefault.String => DefaultComparisonTypes.String,
-                ComparisonTypesDefault.DateTime => DefaultComparisonTypes.DateTime,
-                ComparisonTypesDefault.Bool => DefaultComparisonTypes.Bool,
-                ComparisonTypesDefault.Guid => DefaultComparisonTypes.Guid,
-                ComparisonTypesDefault.Enum => DefaultComparisonTypes.Enum,
-                _ => throw new ArgumentOutOfRangeException(nameof(value), value, null)
-            };
-        }
-    }
 }
diff --git a/IEnumerableExtenders/EnumerableExtendersV3.cs b/IEnumerableExtenders/EnumerableExtendersV3.cs
@@ -12,6 +12,39 @@ namespace PandaTech.IEnumerableFilters;
 
 public static class EnumerableExtendersV3
 {
+    private static ComparisonType[]? ComparisonTypes(ComparisonTypesDefault typesDefault) =>
+        typesDefault switch
+        {
+            ComparisonTypesDefault.Numeric => DefaultComparisonTypes.Numeric,
+            ComparisonTypesDefault.String => DefaultComparisonTypes.String,
+            ComparisonTypesDefault.DateTime => DefaultComparisonTypes.DateTime,
+            ComparisonTypesDefault.Bool => DefaultComparisonTypes.Bool,
+            ComparisonTypesDefault.Guid => DefaultComparisonTypes.Guid,
+            ComparisonTypesDefault.Enum => DefaultComparisonTypes.Enum,
+            ComparisonTypesDefault.ByteArray => DefaultComparisonTypes.ByteArray,
+            _ => null
+        };
+
+    private static ComparisonTypesDefault GetComparisonTypesDefault(Type type)
+    {
+        if (type == typeof(int) || type == typeof(long) || type == typeof(decimal) || type == typeof(double) ||
+            type == typeof(float))
+            return ComparisonTypesDefault.Numeric;
+        if (type == typeof(string))
+            return ComparisonTypesDefault.String;
+        if (type == typeof(DateTime))
+            return ComparisonTypesDefault.DateTime;
+        if (type == typeof(bool))
+            return ComparisonTypesDefault.Bool;
+        if (type == typeof(Guid))
+            return ComparisonTypesDefault.Guid;
+        if (type.IsEnum)
+            return ComparisonTypesDefault.Enum;
+        if (type == typeof(byte[]))
+            return ComparisonTypesDefault.ByteArray;
+        throw new ArgumentOutOfRangeException(nameof(type), type, null);
+    }
+
     public static IQueryable<TModel> ApplyFilters<TModel, TDto>(this IQueryable<TModel> dbSet, List<FilterDto> filters)
     {
         var q = dbSet;
@@ -47,8 +80,8 @@ public static IQueryable<TModel> ApplyFilters<TModel, TDto>(this IQueryable<TMod
                 throw new PropertyNotFoundException(
                     $"Property {filter.Attribute.TargetPropertyName} not found in {typeof(TModel).Name}");
 
-            var filterType = filter.Attribute.TargetConverterType is not null
-                ? filter.Attribute.TargetConverterType.GenericTypeArguments.First()
+            var filterType = filter.Attribute.ConverterType is not null
+                ? filter.Attribute.ConverterType.GenericTypeArguments.First()
                 : filter.Type;
 
             var filterTypeName = filterType.Name;
@@ -91,7 +124,7 @@ public static IQueryable<TModel> ApplyFilters<TModel, TDto>(this IQueryable<TMod
             }
 
             var converter =
-                Activator.CreateInstance(filter.Attribute.TargetConverterType ?? typeof(DirectConverter));
+                Activator.CreateInstance(filter.Attribute.ConverterType ?? typeof(DirectConverter));
 
 
             var finalLambda = FilterLambdaBuilder.BuildLambdaString(new FilterKey
@@ -101,7 +134,7 @@ public static IQueryable<TModel> ApplyFilters<TModel, TDto>(this IQueryable<TMod
                 TargetPropertyName = targetProperty.Name
             });
 
-            var method = converter!.GetType().GetMethods().First(x => x.Name == "Convert");
+            var method = converter!.GetType().GetMethods().First(x => x.Name == "ConvertTo");
 
             for (var index = 0; index < filterDto.Values.Count; index++)
             {
@@ -212,8 +245,8 @@ public static DistinctColumnValuesResult DistinctColumnValues<T, TDto>(this IQue
             query2 = query.Select<object>(filter.Attribute.TargetPropertyName);
         }
 
-        var converter = Activator.CreateInstance(filter.Attribute.BackwardConverterType ?? typeof(DirectConverter));
-        var method = converter!.GetType().GetMethods().First(x => x.Name == "Convert");
+        var converter = Activator.CreateInstance(filter.Attribute.ConverterType ?? typeof(DirectConverter));
+        var method = converter!.GetType().GetMethods().First(x => x.Name == "ConvertFrom");
 
         IQueryable<object> query3;
         try
@@ -285,8 +318,8 @@ public static async Task<DistinctColumnValuesResult> DistinctColumnValuesAsync<T
             query2 = query.Select<object>(filter.Attribute.TargetPropertyName);
         }
 
-        var converter = Activator.CreateInstance(filter.Attribute.BackwardConverterType ?? typeof(DirectConverter));
-        var method = converter!.GetType().GetMethods().First(x => x.Name == "Convert");
+        var converter = Activator.CreateInstance(filter.Attribute.ConverterType ?? typeof(DirectConverter));
+        var method = converter!.GetType().GetMethods().First(x => x.Name == "ConvertFrom");
 
         IQueryable<object> query3;
         try
@@ -337,7 +370,9 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
             {
                 PropertyName = x.Name,
                 Table = tableName,
-                ComparisonTypes = (x.GetCustomAttribute<MappedToPropertyAttribute>()!.ComparisonTypes ?? new[]
+                ComparisonTypes = (x.GetCustomAttribute<MappedToPropertyAttribute>()!.ComparisonTypes ??
+                    ComparisonTypes(GetComparisonTypesDefault(x.PropertyType))
+                    ?? new[]
                 {
                     ComparisonType.Equal,
                     ComparisonType.NotEqual,
@@ -426,7 +461,7 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
                 continue;
             }
 
-            if (property.PropertyType == typeof(int))
+            if (targetProperty.PropertyType == typeof(int))
             {
                 var lambda = Lambda<Func<TModel, int>>(propertyAccess, parameter);
 
@@ -484,7 +519,7 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
                 continue;
             }
 
-            if (property.PropertyType == typeof(long))
+            if (targetProperty.PropertyType == typeof(long))
             {
                 var lambda = Lambda<Func<TModel, long>>(propertyAccess, parameter);
 
@@ -542,7 +577,7 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
                 continue;
             }
 
-            if (property.PropertyType == typeof(DateTime))
+            if (targetProperty.PropertyType == typeof(DateTime))
             {
                 var lambda = Lambda<Func<TModel, DateTime>>(propertyAccess, parameter);
                 var res = aggregate.AggregateType switch
@@ -571,7 +606,7 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
                 continue;
             }
 
-            if (property.PropertyType == typeof(decimal))
+            if (targetProperty.PropertyType == typeof(decimal))
             {
                 var lambda = Lambda<Func<TModel, decimal>>(propertyAccess, parameter);
 
@@ -630,7 +665,7 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
                 continue;
             }
 
-            if (property.PropertyType == typeof(double))
+            if (targetProperty.PropertyType == typeof(double))
             {
                 var lambda = Lambda<Func<TModel, double>>(propertyAccess, parameter);
 
@@ -689,12 +724,12 @@ public static List<FilterInfo> GetFilters(Assembly assembly, string tableName)
                 continue;
             }
 
-            if (property.PropertyType == typeof(Guid))
+            if (targetProperty.PropertyType == typeof(Guid))
             {
                 throw new NotImplementedException();
             }
 
-            if (property.PropertyType.IsClass)
+            if (targetProperty.PropertyType.IsClass)
             {
                 throw new NotImplementedException();
             }

diff --git a/IEnumerableExtenders/FilterProvider.cs b/IEnumerableExtenders/FilterProvider.cs
@@ -6,10 +6,15 @@ namespace PandaTech.IEnumerableFilters;
 
 public class DirectConverter : IConverter<object, object>
 {
-    public object Convert(object from)
+    public object ConvertTo(object from)
     {
         return from;
     }
+
+    public object ConvertFrom(object to)
+    {
+        return to;
+    }
 }
 
 public static class FilterLambdaBuilder

diff --git a/IEnumerableExtenders/Helpers/ComparisonTypeHelper.cs b/IEnumerableExtenders/Helpers/ComparisonTypeHelper.cs
@@ -9,11 +9,28 @@ public enum ComparisonTypesDefault
     DateTime,
     Bool,
     Guid,
-    Enum
+    Enum,
+    ByteArray
 }
 
 public static class DefaultComparisonTypes
 {
+    public static readonly ComparisonType[] Default =
+    {
+        ComparisonType.In,
+        ComparisonType.NotIn,
+        ComparisonType.Equal,
+        ComparisonType.NotEqual,
+    };
+
+    public static readonly ComparisonType[] ByteArray =
+    {
+        ComparisonType.In,
+        ComparisonType.NotIn,
+        ComparisonType.Equal,
+        ComparisonType.NotEqual,
+    };
+
     public static readonly ComparisonType[] Numeric =
     {
         ComparisonType.In,

diff --git a/IEnumerableExtenders/IConverter.cs b/IEnumerableExtenders/IConverter.cs
@@ -1,6 +1,8 @@
 namespace PandaTech.IEnumerableFilters;
 
-public interface IConverter<in TFrom, out TTo>
+public interface IConverter<TFrom, TTo>
 {
-    public TTo Convert(TFrom from);
+    public TTo ConvertTo(TFrom from);
+
+    public TFrom ConvertFrom(TTo to);
 }
diff --git a/IEnumerableExtenders/IEnumerableExtenders.csproj b/IEnumerableExtenders/IEnumerableExtenders.csproj
@@ -5,7 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>PandaTech.IEnumerableFilters</RootNamespace>
-        <Version>3.0.9</Version>
+        <Version>3.1.0</Version>
         <Authors>PandaTech</Authors>
         <Description>This NuGet helps with filtering tables.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-ienumerable-extenders-filters.git</RepositoryUrl>

diff --git a/TestFilters/Controllers/Models/CatDto.cs b/TestFilters/Controllers/Models/CatDto.cs
@@ -11,13 +11,13 @@ public class CatDto
 {
     [JsonConverter(typeof(PandaJsonBaseConverterNotNullable))]
     [MappedToProperty(nameof(Cat.Id),
-        TargetConverterType = typeof(PandaFilterBaseConverter))]
+        ConverterType = typeof(PandaFilterBaseConverter))]
     public long Id { get; set; }
 
     [MappedToProperty(nameof(Cat.Name))]
     public string Name { get; set; } = null!;
 
-    [MappedToProperty(nameof(Cat.Age), ComparisonTypesDefault = ComparisonTypesDefault.Numeric)]
+    [MappedToProperty(nameof(Cat.Age))]
     public int Age { get; set; }
 }
 
@@ -27,5 +27,15 @@ public long Convert(string from)
     {
         return PandaBaseConverter.Base36ToBase10(from)!.Value;
     }
+
+    public long ConvertTo(string from)
+    {
+        return PandaBaseConverter.Base36ToBase10(from)!.Value;
+    }
+
+    public string ConvertFrom(long to)
+    {
+        return PandaBaseConverter.Base10ToBase36(to)!;
+    }
 }
 
diff --git a/Tests/CounterpartyDto.cs b/Tests/CounterpartyDto.cs
@@ -5,7 +5,7 @@ namespace Tests;
 [MappedToClass(typeof(Counterparty))]
 public class CounterpartyDto
 {
-    [MappedToProperty(nameof(Counterparty.Id), TargetConverterType = typeof(SomeConverter))]
+    [MappedToProperty(nameof(Counterparty.Id), ConverterType = typeof(SomeConverter))]
     public string Id { get; set; }
 
     [MappedToProperty(nameof(Counterparty.Name))]

diff --git a/Tests/SomeConverter.cs b/Tests/SomeConverter.cs
@@ -8,4 +8,14 @@ public int Convert(string from)
     {
         return int.Parse(from);
     }
+
+    public int ConvertTo(string from)
+    {
+        return int.Parse(from);
+    }
+
+    public string ConvertFrom(int to)
+    {
+        return to.ToString();
+    }
 }