Merge pull request #296 from neozhu/ISpecification

refactoring IncludableQueryable
neozhu · Feb 24, 2023 · 05378ef · 05378ef
2 parents 8286def + 7989bc3
commit 05378ef
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/src/Application/Common/Extensions/QueryableExtensions.cs b/src/Application/Common/Extensions/QueryableExtensions.cs
@@ -11,7 +11,7 @@ public static IQueryable<T> Specify<T>(this IQueryable<T> query, ISpecification<
     {
         var queryableResultWithIncludes = spec.Includes
            .Aggregate(query,
-               (current, include) => current.Include(include));
+               (current, include) => include(current));
         var secondaryResult = spec.IncludeStrings
             .Aggregate(queryableResultWithIncludes,
                 (current, include) => current.Include(include));

diff --git a/src/Application/Common/Interfaces/ISpecification.cs b/src/Application/Common/Interfaces/ISpecification.cs
@@ -3,13 +3,14 @@
 
 using System.Linq.Expressions;
 using CleanArchitecture.Blazor.Domain.Common;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace CleanArchitecture.Blazor.Application.Common.Interfaces;
 
 public interface ISpecification<T> where T : class, IEntity
 {
     Expression<Func<T, bool>> Criteria { get; }
-    List<Expression<Func<T, object>>> Includes { get; }
+    List<Func<IQueryable<T>, IIncludableQueryable<T, object>>> Includes { get; }
     List<string> IncludeStrings { get; }
     Expression<Func<T, bool>> And(Expression<Func<T, bool>> query);
     Expression<Func<T, bool>> Or(Expression<Func<T, bool>> query);

diff --git a/src/Application/Common/Specification/Specification.cs b/src/Application/Common/Specification/Specification.cs
@@ -3,16 +3,17 @@
 
 using System.Linq.Expressions;
 using CleanArchitecture.Blazor.Domain.Common;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace CleanArchitecture.Blazor.Application.Common.Specification;
 #nullable disable
 public abstract class Specification<T> : ISpecification<T> where T : class, IEntity
 {
     public Expression<Func<T, bool>> Criteria { get; set; }
-    public List<Expression<Func<T, object>>> Includes { get; } = new();
+    public List<Func<IQueryable<T>, IIncludableQueryable<T, object>>> Includes { get; } = new();
     public List<string> IncludeStrings { get; } = new();
 
-    protected virtual void AddInclude(Expression<Func<T, object>> includeExpression)
+    protected virtual void AddInclude(Func<IQueryable<T>, IIncludableQueryable<T, object>> includeExpression)
     {
         Includes.Add(includeExpression);
     }

diff --git a/src/Application/Features/Documents/DTOs/DocumentDto.cs b/src/Application/Features/Documents/DTOs/DocumentDto.cs
@@ -25,5 +25,5 @@ public void Mapping(Profile profile)
     public JobStatus Status { get; set; } = JobStatus.NotStart;
     public string? Content { get; set; }
 
-    public ApplicationUserDto Owner { get; set; }
+    public ApplicationUserDto? Owner { get; set; }
 }
diff --git a/src/Application/Features/Documents/Queries/PaginationQuery/DocumentsWithPaginationQuery.cs b/src/Application/Features/Documents/Queries/PaginationQuery/DocumentsWithPaginationQuery.cs
@@ -52,8 +52,8 @@ internal class DocumentsQuery : Specification<Document>
     {
         public DocumentsQuery(string userId,string tenantId,string? keyword)
         {
-            AddInclude(x => x.Owner);
-            AddInclude(x => x.Editor);
+            AddInclude(x=>x.Include(x=>x.Owner).ThenInclude(x=>x.Superior));
+            AddInclude(x => x.Include(x=>x.Editor).ThenInclude(x=>x.Superior));
             this.Criteria = p => (p.CreatedBy == userId && p.IsPublic == false) || p.IsPublic == true;
             And(x => x.TenantId == tenantId);
             if (!string.IsNullOrEmpty(keyword))

diff --git a/src/Application/Features/Identity/Dto/ApplicationUserDto.cs b/src/Application/Features/Identity/Dto/ApplicationUserDto.cs
@@ -3,11 +3,18 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using CleanArchitecture.Blazor.Application.Features.Documents.DTOs;
 using CleanArchitecture.Blazor.Domain.Identity;
 
 namespace CleanArchitecture.Blazor.Application.Features.Identity.Dto;
 public class ApplicationUserDto:IMapFrom<ApplicationUser>
 {
+    public void Mapping(Profile profile)
+    {
+        profile.CreateMap<ApplicationUser, ApplicationUserDto>(MemberList.None)
+           .ForMember(x => x.SuperiorName, s => s.MapFrom(y => y.Superior.UserName));
+
+    }
     public string Id { get; set; } = string.Empty;
     public string UserName { get; set; } = string.Empty;
     public string? DisplayName { get; set; }

diff --git a/src/Blazor.Server.UI/Pages/Documents/Documents.razor b/src/Blazor.Server.UI/Pages/Documents/Documents.razor
@@ -171,8 +171,8 @@
                 </MudTd>
                 <MudTd DataLabel="@L["Owner Name"]">
                     <div class="d-flex flex-column">
-                        <MudText>@context.Owner.DisplayName</MudText>
-                        <MudText Typo="Typo.body2">@context.Owner.Email</MudText>
+                        <MudText>@context.Owner?.DisplayName</MudText>
+                        <MudText Typo="Typo.body2">@context.Owner?.Email</MudText>
                     </div>
                 </MudTd>
                 <MudTd DataLabel="@L["Tenant Name"]">