Merge pull request #150 from AntonioFalcao/release

Updating

Author: AntonioFalcaoJr

Directory.Build.props

@@ -14,15 +14,15 @@
 
         <!--GraphQL-->
         <GraphQL_Server_Version>4.4.1</GraphQL_Server_Version>
-        <GraphQL_Client_Version>3.2.1</GraphQL_Client_Version>
+        <GraphQL_Client_Version>3.2.2</GraphQL_Client_Version>
         <GraphQL_Version>3.3.2</GraphQL_Version>
 
         <!--AutoMapper-->
         <AutoMapper_DependencyInjection_Version>8.1.1</AutoMapper_DependencyInjection_Version>
         <AutoMapper_Version>10.1.1</AutoMapper_Version>
 
         <!--Others-->
-        <FluentValidation_Version>9.5.0</FluentValidation_Version>
+        <FluentValidation_Version>9.5.1</FluentValidation_Version>
         <Scrutor_Version>3.3.0</Scrutor_Version>
 
     </PropertyGroup>

README.md

@@ -347,29 +347,27 @@ networks:
 
 Based on cloud-native concepts, **Readiness** and **Liveness** integrity verification strategies were implemented.
 
-Web API
-
-`http://localhost:5000/health/ready`
+> `/health`   
+> Just check if the instance is running.
 
-![Readiness](./.assets/img/Readiness.png)
+> `/health/live`  
+> Check if the instance is running and all the dependencies too.
 
+> `/health/ready`
+> Check if the instance and all the dependencies are ready to attend to all functionalities.
 
-`http://localhost:5000/health/live`
+Web API
 
-![Liveness](./.assets/img/Liveness.png)
+`http://localhost:5000/health/ready`
 
----
+![Readiness](./.assets/img/Readiness.png)
 
 Web MVC
 
 `http://localhost:7000/health/ready`
 
 ![Readiness](./.assets/img/ReadinessMVC.png)
 
-`http://localhost:7000/health/live`
-
-![Liveness](./.assets/img/LivenessMVC.png)
-
 ---
 
 ### GraphQL Playground 
@@ -685,14 +683,8 @@ We use [SemVer](http://semver.org/) for versioning. For the versions available,
 
 ## Authors
 
-* **Antônio Falcão** - [GitHub](https://github.com/AntonioFalcao)
-
-> See also the list of [contributors](https://github.com/AntonioFalcao/Dotnet5.GraphQL.WebApplication/graphs/contributors) who participated in this project.
+> See the list of [contributors](https://github.com/AntonioFalcao/Dotnet5.GraphQL.WebApplication/graphs/contributors) who participated in this project.
 
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE](./LICENSE) file for details
-
-## Acknowledgments
-
-* Nothing more, for now.

src/Dotnet5.GraphQL3.CrossCutting/Application.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Dotnet5.GraphQL3.CrossCutting
+{
+    public static class Application
+    {
+        public static string Prefix { get; } = Assembly.GetEntryAssembly()?.FullName?.Substring(0, 16);
+        public static IEnumerable<Assembly> Assemblies { get; } =
+            AppDomain.CurrentDomain.GetAssemblies().Where(assembly => assembly.FullName?.StartsWith(Prefix) ?? false);
+    }
+}

src/Dotnet5.GraphQL3.CrossCutting/Extensions/LocalAssemblyExtensions.cs

@@ -1,4 +1,4 @@
-using Dotnet5.GraphQL3.CrossCutting.Extensions;
+using Dotnet5.GraphQL3.CrossCutting;
 using Dotnet5.GraphQL3.Domain.Abstractions.Builders;
 using Microsoft.Extensions.DependencyInjection;
 using Scrutor;
@@ -8,12 +8,9 @@ namespace Dotnet5.GraphQL3.Domain.Abstractions.Extensions.DependencyInjection
     public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddBuilders(this IServiceCollection services)
-            => services.Scan(selector
-                => selector
-                    .FromApplicationDependencies(assembly
-                        => assembly.FullName?.StartsWith(assembly.GetEntryAssemblySuffix()) ?? default)
-                    .AddClasses(filter
-                        => filter.AssignableTo(typeof(IBuilder<,>)))
+            => services
+                .Scan(selector => selector.FromAssemblies(Application.Assemblies)
+                    .AddClasses(filter => filter.AssignableTo(typeof(IBuilder<,>)))
                     .UsingRegistrationStrategy(RegistrationStrategy.Skip)
                     .AsImplementedInterfaces()
                     .WithScopedLifetime());

src/Dotnet5.GraphQL3.Domain.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
+        <PackageReference Include="AutoMapper" Version="$(AutoMapper_Version)" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(Microsoft_EntityFrameworkCore_Version)" />
         <PackageReference Include="Scrutor" Version="$(Scrutor_Version)" />
     </ItemGroup>

src/Dotnet5.GraphQL3.Repositories.Abstractions/Dotnet5.GraphQL3.Repositories.Abstractions.csproj

@@ -1,4 +1,4 @@
-using Dotnet5.GraphQL3.CrossCutting.Extensions;
+using Dotnet5.GraphQL3.CrossCutting;
 using Dotnet5.GraphQL3.Repositories.Abstractions.UnitsOfWork;
 using Microsoft.Extensions.DependencyInjection;
 using Scrutor;
@@ -8,12 +8,9 @@ namespace Dotnet5.GraphQL3.Repositories.Abstractions.Extensions.DependencyInject
     public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddRepositories(this IServiceCollection services)
-            => services.Scan(selector
-                => selector
-                    .FromApplicationDependencies(assembly
-                        => assembly.FullName?.StartsWith(assembly.GetEntryAssemblySuffix()) ?? default)
-                    .AddClasses(filter
-                        => filter.AssignableTo(typeof(IRepository<,>)))
+            => services
+                .Scan(selector => selector.FromAssemblies(Application.Assemblies)
+                    .AddClasses(filter => filter.AssignableTo(typeof(IRepository<,>)))
                     .UsingRegistrationStrategy(RegistrationStrategy.Skip)
                     .AsImplementedInterfaces()
                     .WithScopedLifetime());

src/Dotnet5.GraphQL3.Repositories.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

@@ -14,38 +14,50 @@ public interface IRepository<TEntity, in TId>
         where TId : struct
     {
         TEntity Add(TEntity entity);
-        Task<TEntity> AddAsync(TEntity entity, CancellationToken cancellationToken = default);
+        Task<TEntity> AddAsync(TEntity entity, CancellationToken cancellationToken);
 
         void Delete(TId id);
         void Delete(TEntity entity);
-        Task DeleteAsync(TId id, CancellationToken cancellationToken = default);
+        Task DeleteAsync(TId id, CancellationToken cancellationToken);
+        Task DeleteAsync(TEntity entity, CancellationToken cancellationToken);
 
         bool Exists(TId id);
-        Task<bool> ExistsAsync(TId id, CancellationToken cancellationToken = default);
+        Task<bool> ExistsAsync(TId id, CancellationToken cancellationToken);
 
-        TEntity GetById(TId id, Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> include = default,
-            bool asTracking = default);
-
-        Task<TEntity> GetByIdAsync(TId id, CancellationToken cancellationToken,
-            Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> include = default,
-            bool asTracking = default);
+        TEntity GetById(TId id, Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> include = default, bool asTracking = default);
+        Task<TEntity> GetByIdAsync(TId id, CancellationToken cancellationToken, Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> include = default, bool asTracking = default);
 
         void Update(TEntity entity);
-        Task UpdateAsync(TEntity entity, CancellationToken cancellationToken = default);
+        Task UpdateAsync(TEntity entity, CancellationToken cancellationToken);
 
-        PagedResult<TResult> GetAll<TResult>(
+        PagedResult<TEntity> GetAll(
             PageParams pageParams,
-            Expression<Func<TEntity, TResult>> selector,
-            Expression<Func<TEntity, bool>> predicate,
+            Expression<Func<TEntity, bool>> predicate = default,
+            Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderBy = default,
+            Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> include = default,
+            bool asTracking = default);
+        
+        PagedResult<TResult> GetAllProjections<TResult>(
+            PageParams pageParams,
+            Expression<Func<TEntity, TResult>> selector = default,
+            Expression<Func<TEntity, bool>> predicate = default,
             Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderBy = default,
             Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> include = default,
             bool asTracking = default);
 
-        Task<PagedResult<TResult>> GetAllAsync<TResult>(
+        Task<PagedResult<TEntity>> GetAllAsync(
+            PageParams pageParams,
+            CancellationToken cancellationToken,
+            Expression<Func<TEntity, bool>> predicate = default,
+            Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderBy = default,
+            Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> include = default,
+            bool asTracking = default);
+        
+        Task<PagedResult<TResult>> GetAllProjectionsAsync<TResult>(
             PageParams pageParams,
-            Expression<Func<TEntity, TResult>> selector,
-            Expression<Func<TEntity, bool>> predicate,
             CancellationToken cancellationToken,
+            Expression<Func<TEntity, TResult>> selector = default,
+            Expression<Func<TEntity, bool>> predicate = default,
             Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderBy = default,
             Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, object>> include = default,
             bool asTracking = default);

src/Dotnet5.GraphQL3.Repositories.Abstractions/IRepository.cs

@@ -8,40 +8,41 @@ namespace Dotnet5.GraphQL3.Repositories.Abstractions.Pages
 {
     public class PagedResult<T>
     {
+        private readonly IReadOnlyCollection<T> _items;
         private readonly int _index;
-        private readonly IEnumerable<T> _items;
         private readonly int _size;
 
-        public PagedResult(IEnumerable<T> items, int index, int size)
+        public PagedResult(IReadOnlyCollection<T> items, int index, int size)
         {
             _items = items;
             _index = index;
             _size = size;
         }
 
-        public IEnumerable<T> Items => _items.Take(_size);
+        public IReadOnlyCollection<T> Items
+            => _items.Take(_size).ToList();
 
         public PageInfo PageInfo
             => new()
             {
                 Current = _index, 
-                Size = Items.Count(), 
-                HasNext = _size < _items.Count(), 
+                Size = Items.Count, 
+                HasNext = _size < _items.Count, 
                 HasPrevious = _index > 1
             };
 
         public static async Task<PagedResult<T>> CreateAsync(IQueryable<T> source, PageParams pageParams, CancellationToken cancellationToken)
         {
-            pageParams ??= new PageParams();
+            pageParams ??= new();
             var items = await ApplyPagination(source, pageParams).ToListAsync(cancellationToken);
-            return new PagedResult<T>(items, pageParams.Index, pageParams.Size);
+            return new(items, pageParams.Index, pageParams.Size);
         }
 
         public static PagedResult<T> Create(IQueryable<T> source, PageParams pageParams)
         {
-            pageParams ??= new PageParams();
-            var items = ApplyPagination(source, pageParams);
-            return new PagedResult<T>(items, pageParams.Index, pageParams.Size);
+            pageParams ??= new();
+            var items = ApplyPagination(source, pageParams).ToList();
+            return new(items, pageParams.Index, pageParams.Size);
         }
 
         private static IQueryable<T> ApplyPagination(IQueryable<T> source, PageParams pageParams)