Revert "Refactor QueryableExtensions and update version"

This reverts commit 8c78a90.

Author: MnatsakanMargaryan

src/GridifyExtensions/Extensions/QueryableExtensions.cs

@@ -87,7 +87,7 @@ public static async Task<PagedResponse<object>> ColumnDistinctValuesAsync<TEntit
 
         var item = await query
             .ApplyFiltering(model, mapper)
-            .Select(mapper.GetExpression(model.PropertyName))
+            .Select(CreateSelector<TEntity>(model.PropertyName))
             .FirstOrDefaultAsync(cancellationToken);
 
         if (item is null)
@@ -123,7 +123,7 @@ public static async Task<CursoredResponse<object>> ColumnDistinctValuesAsync<TEn
 
         var item = await query
             .ApplyFiltering(gridifyModel, mapper)
-            .Select(mapper.GetExpression(model.PropertyName))
+            .Select(CreateSelector<TEntity>(model.PropertyName))
             .FirstOrDefaultAsync(cancellationToken);
 
         if (item is null)
@@ -172,4 +172,13 @@ public static IEnumerable<MappingModel> GetMappings<TEntity>()
                     : x.To.Body.Type.Name,
         });
     }
+
+    private static Expression<Func<T, object>> CreateSelector<T>(string propertyName)
+    {
+        var parameter = Expression.Parameter(typeof(T), "x");
+        var property = Expression.Property(parameter, propertyName);
+        var converted = Expression.Convert(property, typeof(object));
+
+        return Expression.Lambda<Func<T, object>>(converted, parameter);
+    }
 }

src/GridifyExtensions/GridifyExtensions.csproj

@@ -8,7 +8,7 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.5.2</Version>
+        <Version>1.5.1</Version>
         <PackageId>Pandatech.GridifyExtensions</PackageId>
         <Title>Pandatech.Gridify.Extensions</Title>
         <PackageTags>Pandatech, library, Gridify, Pagination, Filters</PackageTags>