Atualiza dependências e refatora métodos de busca

Mudanças nas configurações e dependências do projeto.

* Atualização do arquivo `Directory.Build.props`
  - Alterado `SearchesPreview` e `ProblemsVer` para novas versões.
  - Atualizados `LibTargets` e `AspTargets` para incluir `net8` e `net9`.

* Refatoração dos métodos em `SearchExtensions.cs`
  - Renomeados métodos de `MapFirstDto` para `MapSelectFirst`.
  - Atualizada lógica interna para usar `FirstModelEndpoint`.

Mudanças nas dependências de teste.

* Atualização do arquivo `tests.targets`
  - Versões de `Microsoft.NET.Test.Sdk`, `xunit.runner.visualstudio` e `FluentAssertions` atualizadas.

Adição de nova funcionalidade para critérios de busca.

* Inclusão do arquivo `EFSearchesExtensions.cs`
  - Adicionada classe `EFSearchesExtensions` com método `Criteria<TEntity>` para `DbContext`.

Author: eglauko

src/Directory.Build.props

@@ -5,7 +5,7 @@
 	</PropertyGroup>
 	<PropertyGroup>
 		<SearchesVer>0.8.0</SearchesVer>
-		<SearchesPreview>-preview-2</SearchesPreview>
+		<SearchesPreview>-preview-3</SearchesPreview>
 	</PropertyGroup>
 	<PropertyGroup>
 		<DotNetCoreVersion Condition="'$(TargetFramework)' == 'net8'">8.0.2</DotNetCoreVersion>
@@ -14,6 +14,6 @@
 	<PropertyGroup>
 		<PropSelVer>1.0.2</PropSelVer>
 		<OpHintVer>1.0.0</OpHintVer>
-		<ProblemsVer>1.0.0-preview-4.0</ProblemsVer>
+		<ProblemsVer>1.0.0-preview-4.3</ProblemsVer>
 	</PropertyGroup>
 </Project>

src/RoyalCode.SmartSearch.AspNetCore/Extensions/SearchExtensions.cs

@@ -445,83 +445,92 @@ public static RouteHandlerBuilder MapFirst<TEntity, TFilter, TId1, TId2, TId3>(t
     /// Maps a GET endpoint to a first DTO based on the applied filter.
     /// </summary>
     /// <typeparam name="TEntity">The type of the entity to be queried.</typeparam>
+    /// <typeparam name="TDto">The type of the DTO to be returned.</typeparam>
     /// <typeparam name="TFilter">The type of the applied filter.</typeparam>
     /// <param name="builder">The route builder.</param>
     /// <param name="pattern">The route pattern.</param>
     /// <returns>A builder for additional endpoint configuration.</returns>
-    public static RouteHandlerBuilder MapFirstDto<TEntity, TFilter>(this IEndpointRouteBuilder builder,
+    public static RouteHandlerBuilder MapSelectFirst<TEntity, TDto, TFilter>(this IEndpointRouteBuilder builder,
         [StringSyntax("Route")] string pattern)
         where TEntity : class
+        where TDto : class
         where TFilter : class
     {
-        var first = new FirstEntityEndpoint<TEntity, TFilter>();
+        var first = new FirstModelEndpoint<TEntity, TDto, TFilter>();
         return builder.MapGet(pattern, first.First);
     }
 
     /// <summary>
     /// Maps a GET endpoint to a first DTO based on the applied filter.
     /// </summary>
     /// <typeparam name="TEntity">The type of the entity to be queried.</typeparam>
+    /// <typeparam name="TDto">The type of the DTO to be returned.</typeparam>
     /// <typeparam name="TFilter">The type of the applied filter.</typeparam>
     /// <param name="builder">The route builder.</param>
     /// <param name="pattern">The route pattern.</param>
     /// <param name="searchAction">Action to apply additional logic to the search criteria.</param>
     /// <returns>A builder for additional endpoint configuration.</returns>
-    public static RouteHandlerBuilder MapFirstDto<TEntity, TFilter>(this IEndpointRouteBuilder builder,
+    public static RouteHandlerBuilder MapSelectFirst<TEntity, TDto, TFilter>(this IEndpointRouteBuilder builder,
         [StringSyntax("Route")] string pattern,
         Action<ICriteria<TEntity>> searchAction)
         where TEntity : class
+        where TDto : class
         where TFilter : class
     {
-        var first = new FirstEntityEndpoint<TEntity, TFilter>(searchAction);
+        var first = new FirstModelEndpoint<TEntity, TDto, TFilter>(searchAction);
         return builder.MapGet(pattern, first.First);
     }
 
     /// <summary>
     /// Maps a GET endpoint to a first DTO based on the applied filter with an additional identifier.
     /// </summary>
     /// <typeparam name="TEntity">The type of the entity to be queried.</typeparam>
+    /// <typeparam name="TDto">The type of the DTO to be returned.</typeparam>
     /// <typeparam name="TFilter">The type of the applied filter.</typeparam>
     /// <typeparam name="TId">The type of the first additional identifier.</typeparam>
     /// <param name="builder">The route builder.</param>
     /// <param name="pattern">The route pattern.</param>
     /// <param name="searchAction">Action to apply additional logic to the search criteria.</param>
     /// <returns>A builder for additional endpoint configuration.</returns>
-    public static RouteHandlerBuilder MapFirstDto<TEntity, TFilter, TId>(this IEndpointRouteBuilder builder,
+    public static RouteHandlerBuilder MapSelectFirst<TEntity, TDto, TFilter, TId>(this IEndpointRouteBuilder builder,
         [StringSyntax("Route")] string pattern,
         Action<TId, ICriteria<TEntity>> searchAction)
         where TEntity : class
+        where TDto : class
         where TFilter : class
     {
-        var first = new FirstEntityEndpoint<TEntity, TFilter, TId>(searchAction);
+        var first = new FirstModelEndpoint<TEntity, TDto, TFilter, TId>(searchAction);
         return builder.MapGet(pattern, first.First);
     }
 
     /// <summary>
     /// Maps a GET endpoint to a first DTO based on the applied filter with two additional identifiers.
     /// </summary>
     /// <typeparam name="TEntity">The type of the entity to be queried.</typeparam>
+    /// <typeparam name="TDto">The type of the DTO to be returned.</typeparam>
     /// <typeparam name="TFilter">The type of the applied filter.</typeparam>
     /// <typeparam name="TId1">The type of the first additional identifier.</typeparam>
     /// <typeparam name="TId2">The type of the second additional identifier.</typeparam>
     /// <param name="builder">The route builder.</param>
     /// <param name="pattern">The route pattern.</param>
     /// <param name="searchAction">Action to apply additional logic to the search criteria.</param>
     /// <returns>A builder for additional endpoint configuration.</returns>
-    public static RouteHandlerBuilder MapFirstDto<TEntity, TFilter, TId1, TId2>(this IEndpointRouteBuilder builder,
+    public static RouteHandlerBuilder MapSelectFirst<TEntity, TDto, TFilter, TId1, TId2>(this IEndpointRouteBuilder builder,
         [StringSyntax("Route")] string pattern,
         Action<TId1, TId2, ICriteria<TEntity>> searchAction)
         where TEntity : class
+        where TDto : class
         where TFilter : class
     {
-        var first = new FirstEntityEndpoint<TEntity, TFilter, TId1, TId2>(searchAction);
+        var first = new FirstModelEndpoint<TEntity, TDto, TFilter, TId1, TId2>(searchAction);
         return builder.MapGet(pattern, first.First);
     }
 
     /// <summary>
     /// Maps a GET endpoint to a first DTO based on the applied filter with three additional identifiers.
     /// </summary>
     /// <typeparam name="TEntity">The type of the entity to be queried.</typeparam>
+    /// <typeparam name="TDto">The type of the DTO to be returned.</typeparam>
     /// <typeparam name="TFilter">The type of the applied filter.</typeparam>
     /// <typeparam name="TId1">The type of the first additional identifier.</typeparam>
     /// <typeparam name="TId2">The type of the second additional identifier.</typeparam>
@@ -530,13 +539,14 @@ public static RouteHandlerBuilder MapFirstDto<TEntity, TFilter, TId1, TId2>(this
     /// <param name="pattern">The route pattern.</param>
     /// <param name="searchAction">Action to apply additional logic to the search criteria.</param>
     /// <returns>A builder for additional endpoint configuration.</returns>
-    public static RouteHandlerBuilder MapFirstDto<TEntity, TFilter, TId1, TId2, TId3>(this IEndpointRouteBuilder builder,
+    public static RouteHandlerBuilder MapSelectFirst<TEntity, TDto, TFilter, TId1, TId2, TId3>(this IEndpointRouteBuilder builder,
         [StringSyntax("Route")] string pattern,
         Action<TId1, TId2, TId3, ICriteria<TEntity>> searchAction)
         where TEntity : class
+        where TDto : class
         where TFilter : class
     {
-        var first = new FirstEntityEndpoint<TEntity, TFilter, TId1, TId2, TId3>(searchAction);
+        var first = new FirstModelEndpoint<TEntity, TDto, TFilter, TId1, TId2, TId3>(searchAction);
         return builder.MapGet(pattern, first.First);
     }
 

src/RoyalCode.SmartSearch.EntityFramework/Extensions/EFSearchesExtensions.cs

@@ -0,0 +1,41 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using RoyalCode.SmartSearch;
+using RoyalCode.SmartSearch.Defaults;
+using RoyalCode.SmartSearch.EntityFramework.Services;
+using RoyalCode.SmartSearch.Linq.Services;
+using RoyalCode.SmartSearch.Linq.Sortings;
+
+namespace Microsoft.EntityFrameworkCore;
+
+/// <summary>
+/// Extensions methods for <see cref="DbContext"/> to create <see cref="ICriteria{TEntity}"/>.
+/// </summary>
+public static class EFSearchesExtensions
+{
+    /// <summary>
+    /// <para>
+    ///     Creates a new <see cref="ICriteria{TEntity}"/> for the entity <typeparamref name="TEntity"/>
+    ///     using the <see cref="DbContext"/> used by the unit of work.
+    /// </para>
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type to create the criteria for.</typeparam>
+    /// <param name="db">The <see cref="DbContext"/> to use for performing the searches.</param>
+    /// <returns>A new <see cref="ICriteria{TEntity}"/> instance.</returns>
+    public static ICriteria<TEntity> Criteria<TEntity>(this DbContext db)
+        where TEntity : class
+    {
+        var specifierFactory = db.GetService<ISpecifierFactory>();
+        var orderByFactory = db.GetService<IOrderByProvider>();
+        var selectorFactory = db.GetService<ISelectorFactory>();
+
+        var preparer = new CriteriaPerformer<DbContext, TEntity>(
+            db,
+            specifierFactory,
+            orderByFactory,
+            selectorFactory);
+
+        var criteria = new Criteria<TEntity>(preparer);
+
+        return criteria;
+    }
+}

src/RoyalCode.SmartSearch.EntityFramework/Extensions/EntityFrameworkSearchesServiceCollectionExtensions.cs

@@ -1,13 +1,9 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using RoyalCode.SmartSearch;
-using RoyalCode.SmartSearch.Defaults;
 using RoyalCode.SmartSearch.EntityFramework.Configurations;
 using RoyalCode.SmartSearch.EntityFramework.Services;
 using RoyalCode.SmartSearch.Linq;
-using RoyalCode.SmartSearch.Linq.Services;
-using RoyalCode.SmartSearch.Linq.Sortings;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -72,31 +68,4 @@ public static IServiceCollection AddSearchManager<TDbContext>(this IServiceColle
 
         return services;
     }
-
-    /// <summary>
-    /// <para>
-    ///     Creates a new <see cref="ICriteria{TEntity}"/> for the entity <typeparamref name="TEntity"/>
-    ///     using the <see cref="DbContext"/> used by the unit of work.
-    /// </para>
-    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <param name="db"></param>
-    /// <returns></returns>
-    public static ICriteria<TEntity> Criteria<TEntity>(this DbContext db)
-        where TEntity : class
-    {
-        var specifierFactory = db.GetService<ISpecifierFactory>();
-        var orderByFactory = db.GetService<IOrderByProvider>();
-        var selectorFactory = db.GetService<ISelectorFactory>();
-
-        var preparer = new CriteriaPerformer<DbContext, TEntity>(
-            db,
-            specifierFactory,
-            orderByFactory,
-            selectorFactory);
-
-        var criteria = new Criteria<TEntity>(preparer);
-
-        return criteria;
-    }
 }

src/tests.targets

@@ -11,9 +11,9 @@
 		<DotNetCoreVersion>8.0.0</DotNetCoreVersion>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
 		<PackageReference Include="xunit" Version="2.9.3" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
@@ -22,7 +22,7 @@
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 
-		<PackageReference Include="FluentAssertions" Version="8.2.0" />
+		<PackageReference Include="FluentAssertions" Version="8.5.0" />
 		<PackageReference Include="Moq" Version="4.20.72" />
 
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(DotNetCoreVersion)" />