Update to v3.0.5 direct select Ids type because Expression Constant c…

…annot set List<object> as specific type

src/OfX.EntityFrameworkCore/EfQueryOfHandler.cs

@@ -4,10 +4,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using OfX.Abstractions;
-using OfX.ApplicationModels;
 using OfX.Attributes;
-using OfX.Cached;
 using OfX.EntityFrameworkCore.Delegates;
+using OfX.Exceptions;
 using OfX.Responses;
 
 namespace OfX.EntityFrameworkCore;
@@ -46,18 +45,25 @@ public async Task<ItemsResponse<OfXDataResponse>> GetDataAsync(RequestContext<TA
     // May I should cache the containsMethod, idAsString first!
     private Expression<Func<TModel, bool>> BuildFilter(RequestOf<TAttribute> query)
     {
-        var modelIdData = GetModelData();
-        var selectorsConstant = Expression.Constant(query.SelectorIds);
-        var containsCall = Expression.Call(selectorsConstant, OfXCached.IdsContainsMethodLazy.Value,
-            modelIdData.MethodCallExpression);
-        return Expression.Lambda<Func<TModel, bool>>(containsCall, modelIdData.ParameterExpression);
+        var parameter = Expression.Parameter(typeof(TModel), "x");
+        var idProperty = Expression.Property(parameter, idPropertyName);
+        var idType = idProperty.Type;
+        var containsMethod = typeof(List<>).MakeGenericType(idType).GetMethod("Contains");
+        var selectorsConstant = Helpers.GeneralHelpers.ConstantExpression(query.SelectorIds, idType);
+        var containsCall = Expression.Call(selectorsConstant, containsMethod!, idProperty);
+        return Expression.Lambda<Func<TModel, bool>>(containsCall, parameter);
     }
 
     private Expression<Func<TModel, OfXDataResponse>> BuildResponse(RequestOf<TAttribute> request)
     {
         return ExpressionMapModelStorage.Value.GetOrAdd(request.Expression, expression =>
         {
-            var (parameter, idAsString) = GetModelData();
+            var parameter = Expression.Parameter(typeof(TModel), "x");
+            // Access the Id property on the model
+            var idProperty = Expression.Property(parameter, idPropertyName);
+            var toStringMethod = typeof(object).GetMethod(nameof(ToString), Type.EmptyTypes);
+            var idAsString = Expression.Call(idProperty, toStringMethod!);
+
             var expressionParts = expression.Split('.');
             Expression currentExpression = parameter;
             var currentType = typeof(TModel);
@@ -123,14 +129,4 @@ private Expression<Func<TModel, OfXDataResponse>> BuildResponse(RequestOf<TAttri
             return Expression.Lambda<Func<TModel, OfXDataResponse>>(newExpression, parameter);
         });
     }
-
-    private ModelIdData GetModelData() => OfXCached.ModelIdDataCachedLazy
-        .Value.GetOrAdd(typeof(TModel), modelType =>
-        {
-            var parameter = Expression.Parameter(modelType, "x");
-            var idProperty = Expression.Property(parameter, idPropertyName);
-            var toStringMethod = idProperty.Type.GetMethod(nameof(ToString), Type.EmptyTypes);
-            var idAsString = Expression.Call(idProperty, toStringMethod!);
-            return new ModelIdData(parameter, idAsString);
-        });
 }

src/OfX.EntityFrameworkCore/OfX.EntityFrameworkCore.csproj

@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
         <LangVersion>default</LangVersion>
-        <Version>3.0.4</Version>
+        <Version>3.0.5</Version>
         <Authors>Quy Vu</Authors>
         <PackageId>OfX-EFCore</PackageId>
         <Description>OfX extension. Use EntityFramework as Data Querying</Description>

src/OfX.Grpc/OfX.Grpc.csproj

@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
         <LangVersion>default</LangVersion>
-        <Version>3.0.3</Version>
+        <Version>3.0.5</Version>
         <Authors>Quy Vu</Authors>
         <PackageId>OfX-gRPC</PackageId>
         <Description>OfX extension. Use gRPC as Data transporting</Description>

src/OfX/Cached/OfXCached.cs

@@ -12,11 +12,6 @@ public static class OfXCached
 
     private static readonly Lazy<ConcurrentDictionary<Type, Func<object[], object>>> ConstructorCache = new(() => []);
 
-    public static readonly Lazy<MethodInfo> IdsContainsMethodLazy =
-        new(() => typeof(List<string>).GetMethod("Contains", [typeof(string)]));
-
-    public static readonly Lazy<ConcurrentDictionary<Type, ModelIdData>> ModelIdDataCachedLazy = new(() => []);
-
     public static object CreateInstanceWithCache(Type type, params object[] args)
     {
         if (ConstructorCache.Value.TryGetValue(type, out var factory)) return factory(args);

src/OfX/Exceptions/OfXException.cs

@@ -7,4 +7,7 @@ public sealed class RequestMustNotBeAddMoreThanOneTimes()
 
     public sealed class AttributesFromNamespaceShouldBeAdded() :
         Exception("Attributes from namespaces should be added!");
+
+    public sealed class CurrentIdTypeWasNotSupported() :
+        Exception("Current Id type was not supported. Please create a join us to contribute more!");
 }

src/OfX/Helpers/GeneralHelpers.cs

@@ -0,0 +1,28 @@
+using System.Linq.Expressions;
+using OfX.Exceptions;
+
+namespace OfX.Helpers;
+
+public static class GeneralHelpers
+{
+    public static string GetAssemblyName(this Type type) => $"{type.FullName},{type.Assembly.GetName().Name}";
+
+    public static ConstantExpression ConstantExpression(List<string> selectorIds, Type idType)
+    {
+        if (idType == typeof(string)) return Expression.Constant(selectorIds);
+        if (idType == typeof(Guid))
+            return Expression.Constant(selectorIds
+                .Where(a => Guid.TryParse(a, out _)).Select(Guid.Parse).ToList());
+        if (idType == typeof(int))
+            return Expression.Constant(selectorIds
+                .Where(a => int.TryParse(a, out _)).Select(int.Parse).ToList());
+        if (idType == typeof(long))
+            return Expression.Constant(selectorIds
+                .Where(a => long.TryParse(a, out _)).Select(long.Parse).ToList());
+        if (idType == typeof(short))
+            return Expression.Constant(selectorIds
+                .Where(a => short.TryParse(a, out _)).Select(short.Parse).ToList());
+
+        throw new OfXException.CurrentIdTypeWasNotSupported();
+    }
+}

src/OfX/OfX.csproj

@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
         <LangVersion>default</LangVersion>
-        <Version>3.0.3</Version>
+        <Version>3.0.5</Version>
         <Authors>Quy Vu</Authors>
         <PackageId>OfX</PackageId>
         <Description>The high performance and easiest way to play with microservices for .NET</Description>