Merge pull request #6 from Jakab-Laszlo/feature/add-query-filter-extension

+semver:patch

Author: tibitoth

AutSoftCore.sln

@@ -36,7 +36,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutSoft.AspNetCore.Auth", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutSoft.AspNetCore.Blazor", "src\AutSoft.AspNetCore.Blazor\AutSoft.AspNetCore.Blazor.csproj", "{1E00D30A-1EF0-4DAD-98C9-61FEE3EA7EF6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutSoft.Mud.Blazor", "src\AutSoft.Mud.Blazor\AutSoft.Mud.Blazor.csproj", "{91EDCF80-45C8-4728-9240-52DA8DAD8F02}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutSoft.Mud.Blazor", "src\AutSoft.Mud.Blazor\AutSoft.Mud.Blazor.csproj", "{91EDCF80-45C8-4728-9240-52DA8DAD8F02}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutSoft.EntityFrameworkCore", "src\AutSoft.EntityFrameworkCore\AutSoft.EntityFrameworkCore.csproj", "{A1B22128-F657-474E-ADD1-2CFB6994F14F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -80,6 +82,10 @@ Global
 		{91EDCF80-45C8-4728-9240-52DA8DAD8F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{91EDCF80-45C8-4728-9240-52DA8DAD8F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91EDCF80-45C8-4728-9240-52DA8DAD8F02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1B22128-F657-474E-ADD1-2CFB6994F14F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1B22128-F657-474E-ADD1-2CFB6994F14F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B22128-F657-474E-ADD1-2CFB6994F14F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1B22128-F657-474E-ADD1-2CFB6994F14F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -94,6 +100,7 @@ Global
 		{6B158B44-E28E-4276-BB65-72CDA4163F39} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
 		{1E00D30A-1EF0-4DAD-98C9-61FEE3EA7EF6} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
 		{91EDCF80-45C8-4728-9240-52DA8DAD8F02} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
+		{A1B22128-F657-474E-ADD1-2CFB6994F14F} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E4767DF1-41A6-4BF0-A957-2718986D8BC7}

src/AutSoft.All/AutSoft.All.csproj

@@ -10,6 +10,7 @@
     <ProjectReference Include="..\AutSoft.AspNetCore.Auth\AutSoft.AspNetCore.Auth.csproj" />
     <ProjectReference Include="..\AutSoft.AspNetCore.Blazor\AutSoft.AspNetCore.Blazor.csproj" />
     <ProjectReference Include="..\AutSoft.DbScaffolding.Identity\AutSoft.DbScaffolding.Identity.csproj" />
+    <ProjectReference Include="..\AutSoft.EntityFrameworkCore\AutSoft.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\AutSoft.Linq\AutSoft.Linq.csproj" />
     <ProjectReference Include="..\AutSoft.Mud.Blazor\AutSoft.Mud.Blazor.csproj" />
   </ItemGroup>

src/AutSoft.EntityFrameworkCore/AutSoft.EntityFrameworkCore.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+  </ItemGroup>
+
+</Project>

src/AutSoft.EntityFrameworkCore/EntityTypeBuilders/AddQueryFilterExtension.cs

@@ -0,0 +1,37 @@
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Query;
+
+using System.Linq.Expressions;
+
+namespace AutSoft.EntityFrameworkCore.EntityTypeBuilders;
+
+/// <summary>
+/// Extension method for <see cref="EntityTypeBuilder"/> to help configure a query filter
+/// </summary>
+public static class AddQueryFilterExtension
+{
+    /// <summary>
+    /// Replace the parameters of the <paramref name="expression"/>
+    /// and after that register it for query filter as an <see cref="LambdaExpression"/>
+    /// </summary>
+    /// <typeparam name="T">Type of the parameter of <paramref name="expression"/></typeparam>
+    /// <param name="entityTypeBuilder">An <see cref="EntityTypeBuilder"/> object</param>
+    /// <param name="expression">The filter logic of the query filter</param>
+    public static void AddQueryFilter<T>(this EntityTypeBuilder entityTypeBuilder, Expression<Func<T, bool>> expression)
+    {
+        var parameterType = Expression.Parameter(entityTypeBuilder.Metadata.ClrType);
+        var expressionFilter = ReplacingExpressionVisitor.Replace(
+            expression.Parameters.Single(), parameterType, expression.Body);
+
+        var currentQueryFilter = entityTypeBuilder.Metadata.GetQueryFilter();
+        if (currentQueryFilter != null)
+        {
+            var currentExpressionFilter = ReplacingExpressionVisitor.Replace(
+                currentQueryFilter.Parameters.Single(), parameterType, currentQueryFilter.Body);
+            expressionFilter = Expression.AndAlso(currentExpressionFilter, expressionFilter);
+        }
+
+        var lambdaExpression = Expression.Lambda(expressionFilter, parameterType);
+        entityTypeBuilder.HasQueryFilter(lambdaExpression);
+    }
+}