Upgrades mediatr to 12.x

RaythaHQ · Apr 6, 2024 · 783242d · 783242d
1 parent ef1cd7e
commit 783242d
Show file tree

Hide file tree

Showing 51 changed files with 175 additions and 130 deletions.
diff --git a/src/Raytha.Application/Admins/Queries/GetAdminById.cs b/src/Raytha.Application/Admins/Queries/GetAdminById.cs
@@ -12,14 +12,15 @@ public record Query : GetEntityByIdInputDto, IRequest<IQueryResponseDto<AdminDto
     {
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<AdminDto>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<AdminDto>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<AdminDto> Handle(Query request)
+
+        public async Task<IQueryResponseDto<AdminDto>> Handle(Query request, CancellationToken cancellationToken)
         {                   
             var entity = _db.Users
                 .Include(p => p.Roles)

diff --git a/src/Raytha.Application/Admins/Queries/GetAdmins.cs b/src/Raytha.Application/Admins/Queries/GetAdmins.cs
@@ -16,14 +16,15 @@ public record Query : GetPagedEntitiesInputDto, IRequest<IQueryResponseDto<ListR
         public override string OrderBy { get; init; } = $"LastLoggedInTime {SortOrder.DESCENDING}";
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ListResultDto<AdminDto>>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ListResultDto<AdminDto>>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<ListResultDto<AdminDto>> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ListResultDto<AdminDto>>> Handle(Query request, CancellationToken cancellationToken)
         {                   
             var query = _db.Users.AsQueryable()
                 .Include(p => p.Roles)
@@ -41,7 +42,7 @@ protected override IQueryResponseDto<ListResultDto<AdminDto>> Handle(Query reque
                         d.Roles.Any(p => p.Label.Contains(searchQuery)));              
             }
 
-            var total = query.Count();
+            var total = await query.CountAsync();
             var items = query.ApplyPaginationInput(request).Select(AdminDto.GetProjection()).ToArray();
 
             return new QueryResponseDto<ListResultDto<AdminDto>>(new ListResultDto<AdminDto>(items, total));

diff --git a/src/Raytha.Application/Admins/Queries/GetApiKeysForAdmin.cs b/src/Raytha.Application/Admins/Queries/GetApiKeysForAdmin.cs
@@ -15,14 +15,15 @@ public record Query : GetPagedEntitiesInputDto, IRequest<IQueryResponseDto<ListR
         public override string OrderBy { get; init; } = $"CreationTime {SortOrder.ASCENDING}";
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ListResultDto<ApiKeyDto>>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ListResultDto<ApiKeyDto>>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<ListResultDto<ApiKeyDto>> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ListResultDto<ApiKeyDto>>> Handle(Query request, CancellationToken cancellationToken)
         {
             var query = _db.ApiKeys.Where(p => p.UserId == request.UserId.Guid).AsQueryable();
 

diff --git a/src/Raytha.Application/AuditLogs/Queries/GetAuditLogs.cs b/src/Raytha.Application/AuditLogs/Queries/GetAuditLogs.cs
@@ -5,6 +5,7 @@
 using Raytha.Application.Common.Interfaces;
 using CSharpVitamins;
 using Raytha.Application.Common.Utils;
+using Microsoft.EntityFrameworkCore;
 
 namespace Raytha.Application.AuditLogs.Queries;
 
@@ -26,14 +27,15 @@ public class Validator : AbstractValidator<Query> {
         }
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ListResultDto<AuditLogDto>>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ListResultDto<AuditLogDto>>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<ListResultDto<AuditLogDto>> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ListResultDto<AuditLogDto>>> Handle(Query request, CancellationToken cancellationToken)
         {
             var query = _db.AuditLogs
                 .AsQueryable();
@@ -62,7 +64,7 @@ protected override IQueryResponseDto<ListResultDto<AuditLogDto>> Handle(Query re
                     .Where(d => d.Category == request.Category);         
             }
 
-            var total = query.Count();
+            var total = await query.CountAsync();
             var items = query.ApplyPaginationInput(request).Select(AuditLogDto.GetProjection()).ToArray();
 
             return new QueryResponseDto<ListResultDto<AuditLogDto>>(new ListResultDto<AuditLogDto>(items, total));

diff --git a/src/Raytha.Application/AuthenticationSchemes/Queries/GetAuthenticationSchemeById.cs b/src/Raytha.Application/AuthenticationSchemes/Queries/GetAuthenticationSchemeById.cs
@@ -11,14 +11,14 @@ public record Query : GetEntityByIdInputDto, IRequest<IQueryResponseDto<Authenti
     {
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<AuthenticationSchemeDto>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<AuthenticationSchemeDto>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<AuthenticationSchemeDto> Handle(Query request)
+        public async Task<IQueryResponseDto<AuthenticationSchemeDto>> Handle(Query request, CancellationToken cancellationToken)
         {
             var entity = _db.AuthenticationSchemes.FirstOrDefault(p => p.Id == request.Id.Guid);
 

diff --git a/src/Raytha.Application/AuthenticationSchemes/Queries/GetAuthenticationSchemeByName.cs b/src/Raytha.Application/AuthenticationSchemes/Queries/GetAuthenticationSchemeByName.cs
@@ -14,14 +14,15 @@ public record Query : IRequest<IQueryResponseDto<AuthenticationSchemeDto>>
         public string DeveloperName { get; init; } = null!;
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<AuthenticationSchemeDto>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<AuthenticationSchemeDto>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<AuthenticationSchemeDto> Handle(Query request)
+
+        public async Task<IQueryResponseDto<AuthenticationSchemeDto>> Handle(Query request, CancellationToken cancellationToken)
         {
             var entity = _db.AuthenticationSchemes.FirstOrDefault(p => p.DeveloperName == request.DeveloperName.ToDeveloperName());
 

diff --git a/src/Raytha.Application/AuthenticationSchemes/Queries/GetAuthenticationSchemes.cs b/src/Raytha.Application/AuthenticationSchemes/Queries/GetAuthenticationSchemes.cs
@@ -17,15 +17,15 @@ public record Query : GetPagedEntitiesInputDto, IRequest<IQueryResponseDto<ListR
         public override string OrderBy { get; init; } = $"Label {SortOrder.Ascending}";
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ListResultDto<AuthenticationSchemeDto>>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ListResultDto<AuthenticationSchemeDto>>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
 
-        protected override IQueryResponseDto<ListResultDto<AuthenticationSchemeDto>> Handle(Query request)
+        public async Task<IQueryResponseDto<ListResultDto<AuthenticationSchemeDto>>> Handle(Query request, CancellationToken cancellationToken)
         {
             var query = _db.AuthenticationSchemes
                 .Include(p => p.LastModifierUser)
@@ -46,7 +46,7 @@ protected override IQueryResponseDto<ListResultDto<AuthenticationSchemeDto>> Han
                         d.DeveloperName.ToLower().Contains(searchQuery));           
             }
 
-            var total = query.Count();
+            var total = await query.CountAsync();
             var items = query.ApplyPaginationInput(request).Select(AuthenticationSchemeDto.GetProjection()).ToArray();
 
             return new QueryResponseDto<ListResultDto<AuthenticationSchemeDto>>(new ListResultDto<AuthenticationSchemeDto>(items, total));

diff --git a/src/Raytha.Application/BackgroundTasks/Queries/GetBackgroundTaskById.cs b/src/Raytha.Application/BackgroundTasks/Queries/GetBackgroundTaskById.cs
@@ -11,14 +11,15 @@ public record Query : GetEntityByIdInputDto, IRequest<IQueryResponseDto<Backgrou
     {
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<BackgroundTaskDto>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<BackgroundTaskDto>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<BackgroundTaskDto> Handle(Query request)
+
+        public async Task<IQueryResponseDto<BackgroundTaskDto>> Handle(Query request, CancellationToken cancellationToken)
         {
             var entity = _db.BackgroundTasks.FirstOrDefault(p => p.Id == request.Id.Guid);
 

diff --git a/src/Raytha.Application/ConfigureServices.cs b/src/Raytha.Application/ConfigureServices.cs
@@ -13,10 +13,13 @@ public static class ConfigureServices
     public static IServiceCollection AddApplicationServices(this IServiceCollection services)
     {
         services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly());
-        services.AddMediatR(Assembly.GetExecutingAssembly());
-        services.AddTransient(typeof(IPipelineBehavior<,>), typeof(UnhandledExceptionBehaviour<,>));
-        services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehaviour<,>));
-        services.AddTransient(typeof(IPipelineBehavior<,>), typeof(AuditBehavior<,>));
+        services.AddMediatR(cfg =>
+        {
+            cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
+            cfg.AddBehavior(typeof(IPipelineBehavior<,>), typeof(UnhandledExceptionBehaviour<,>));
+            cfg.AddBehavior(typeof(IPipelineBehavior<,>), typeof(ValidationBehaviour<,>));
+            cfg.AddBehavior(typeof(IPipelineBehavior<,>), typeof(AuditBehavior<,>));
+        });
         services.AddScoped<BeginExportContentItemsToCsv.BackgroundTask>();
         services.AddScoped<BeginImportContentItemsFromCsv.BackgroundTask>();
         services.AddScoped<FieldValueConverter>();

diff --git a/src/Raytha.Application/ContentItems/Queries/GetContentItemById.cs b/src/Raytha.Application/ContentItems/Queries/GetContentItemById.cs
@@ -11,7 +11,7 @@ public record Query : GetEntityByIdInputDto, IRequest<IQueryResponseDto<ContentI
     {
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ContentItemDto>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ContentItemDto>>
     {
         private readonly IRaythaDbJsonQueryEngine _db;
         private readonly IContentTypeInRoutePath _contentTypeInRoutePath;
@@ -20,10 +20,12 @@ public Handler(IRaythaDbJsonQueryEngine db, IContentTypeInRoutePath contentTypeI
             _db = db;
             _contentTypeInRoutePath = contentTypeInRoutePath;
         }
-        protected override IQueryResponseDto<ContentItemDto> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ContentItemDto>> Handle(Query request, CancellationToken cancellationToken)
         {
             var entity = _db
                 .FirstOrDefault(request.Id.Guid);
+
             if (entity == null)
                 throw new NotFoundException("Content item", request.Id);
 

diff --git a/src/Raytha.Application/ContentItems/Queries/GetContentItemRevisionsByContentItemId.cs b/src/Raytha.Application/ContentItems/Queries/GetContentItemRevisionsByContentItemId.cs
@@ -15,7 +15,7 @@ public record Query : GetPagedEntitiesInputDto, IRequest<IQueryResponseDto<ListR
         public ShortGuid Id { get; init; }
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ListResultDto<ContentItemRevisionDto>>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ListResultDto<ContentItemRevisionDto>>>
     {
         private readonly IRaythaDbContext _db;
         private readonly IContentTypeInRoutePath _contentTypeInRoutePath;
@@ -24,7 +24,8 @@ public Handler(IRaythaDbContext db, IContentTypeInRoutePath contentTypeInRoutePa
             _db = db;
             _contentTypeInRoutePath = contentTypeInRoutePath;
         }
-        protected override IQueryResponseDto<ListResultDto<ContentItemRevisionDto>> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ListResultDto<ContentItemRevisionDto>>> Handle(Query request, CancellationToken cancellationToken)
         {
             var entity = _db.ContentItems
                 .Include(p => p.ContentType)
@@ -40,7 +41,7 @@ protected override IQueryResponseDto<ListResultDto<ContentItemRevisionDto>> Hand
                 .Include(p => p.CreatorUser)
                 .Where(p => p.ContentItemId == request.Id.Guid);
 
-            var total = query.Count();
+            var total = await query.CountAsync();
             var items = query.ApplyPaginationInput(request).Select(ContentItemRevisionDto.GetProjection()).ToArray();
 
             return new QueryResponseDto<ListResultDto<ContentItemRevisionDto>>(new ListResultDto<ContentItemRevisionDto>(items, total));

diff --git a/src/Raytha.Application/ContentItems/Queries/GetContentItems.cs b/src/Raytha.Application/ContentItems/Queries/GetContentItems.cs
@@ -20,7 +20,7 @@ public record Query : GetPagedEntitiesInputDto, IRequest<IQueryResponseDto<ListR
         public string? Filter { get; init; }
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ListResultDto<ContentItemDto>>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ListResultDto<ContentItemDto>>>
     {
         private readonly IRaythaDbJsonQueryEngine _db;
         private readonly IRaythaDbContext _entityFrameworkDb;
@@ -31,7 +31,8 @@ public Handler(IRaythaDbJsonQueryEngine db, IRaythaDbContext entityFrameworkDb,
             _entityFrameworkDb = entityFrameworkDb;
             _contentTypeInRoutePath = contentTypeInRoutePath;
         }
-        protected override IQueryResponseDto<ListResultDto<ContentItemDto>> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ListResultDto<ContentItemDto>>> Handle(Query request, CancellationToken cancellationToken)
         {
             IEnumerable<ContentItemDto> items;
             int count = 0;

diff --git a/src/Raytha.Application/ContentItems/Queries/GetDeletedContentItems.cs b/src/Raytha.Application/ContentItems/Queries/GetDeletedContentItems.cs
@@ -17,14 +17,15 @@ public record Query : GetPagedEntitiesInputDto, IRequest<IQueryResponseDto<ListR
         public override string OrderBy { get; init; } = $"Label {SortOrder.ASCENDING}";
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ListResultDto<DeletedContentItemDto>>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ListResultDto<DeletedContentItemDto>>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<ListResultDto<DeletedContentItemDto>> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ListResultDto<DeletedContentItemDto>>> Handle(Query request, CancellationToken cancellationToken)
         {
             var query = _db.DeletedContentItems
                 .Include(p => p.ContentType)
@@ -42,7 +43,7 @@ protected override IQueryResponseDto<ListResultDto<DeletedContentItemDto>> Handl
                         d.CreatorUser.LastName.ToLower().Contains(searchQuery)));
             }
 
-            var total = query.Count();
+            var total = await query.CountAsync();
             var items = query.ApplyPaginationInput(request).Select(DeletedContentItemDto.GetProjection()).ToArray();
 
             return new QueryResponseDto<ListResultDto<DeletedContentItemDto>>(new ListResultDto<DeletedContentItemDto>(items, total));

diff --git a/src/Raytha.Application/ContentTypes/Queries/GetContentTypeByDeveloperName.cs b/src/Raytha.Application/ContentTypes/Queries/GetContentTypeByDeveloperName.cs
@@ -17,14 +17,15 @@ public record Query : IRequest<IQueryResponseDto<ContentTypeDto>>
         public string DeveloperName { get; init; } = null!;
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ContentTypeDto>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ContentTypeDto>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<ContentTypeDto> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ContentTypeDto>> Handle(Query request, CancellationToken cancellationToken)
         {
             var entity = _db.ContentTypes
                 .Include(p => p.ContentTypeFields.OrderBy(c => c.FieldOrder))

diff --git a/src/Raytha.Application/ContentTypes/Queries/GetContentTypeById.cs b/src/Raytha.Application/ContentTypes/Queries/GetContentTypeById.cs
@@ -12,14 +12,15 @@ public record Query : GetEntityByIdInputDto, IRequest<IQueryResponseDto<ContentT
     {
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ContentTypeDto>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ContentTypeDto>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<ContentTypeDto> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ContentTypeDto>> Handle(Query request, CancellationToken cancellationToken)
         {
             var entity = _db.ContentTypes
                 .Include(p => p.ContentTypeFields.OrderBy(c => c.FieldOrder))

diff --git a/src/Raytha.Application/ContentTypes/Queries/GetContentTypeFieldById.cs b/src/Raytha.Application/ContentTypes/Queries/GetContentTypeFieldById.cs
@@ -12,15 +12,15 @@ public record Query : GetEntityByIdInputDto, IRequest<IQueryResponseDto<ContentT
     {
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ContentTypeFieldDto>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ContentTypeFieldDto>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
 
-        protected override IQueryResponseDto<ContentTypeFieldDto> Handle(Query request)
+        public async Task<IQueryResponseDto<ContentTypeFieldDto>> Handle(Query request, CancellationToken cancellationToken)
         {
             var entity = _db.ContentTypeFields
                 .Include(p => p.ContentType)

diff --git a/src/Raytha.Application/ContentTypes/Queries/GetContentTypeFields.cs b/src/Raytha.Application/ContentTypes/Queries/GetContentTypeFields.cs
@@ -18,14 +18,15 @@ public record Query : GetPagedEntitiesInputDto, IRequest<IQueryResponseDto<ListR
         public bool ShowDeletedOnly { get; init; } = false;
     }
 
-    public class Handler : RequestHandler<Query, IQueryResponseDto<ListResultDto<ContentTypeFieldDto>>>
+    public class Handler : IRequestHandler<Query, IQueryResponseDto<ListResultDto<ContentTypeFieldDto>>>
     {
         private readonly IRaythaDbContext _db;
         public Handler(IRaythaDbContext db)
         {
             _db = db;
         }
-        protected override IQueryResponseDto<ListResultDto<ContentTypeFieldDto>> Handle(Query request)
+
+        public async Task<IQueryResponseDto<ListResultDto<ContentTypeFieldDto>>> Handle(Query request, CancellationToken cancellationToken)
         {
             var query = _db.ContentTypeFields
                 .Include(p => p.ContentType)
@@ -54,7 +55,7 @@ protected override IQueryResponseDto<ListResultDto<ContentTypeFieldDto>> Handle(
                         d.DeveloperName.Contains(searchQuery)));
             }
 
-            var total = query.Count();
+            var total = await query.CountAsync();
             var items = query.ApplyPaginationInput(request).Select(ContentTypeFieldDto.GetProjection()).ToArray();
 
             return new QueryResponseDto<ListResultDto<ContentTypeFieldDto>>(new ListResultDto<ContentTypeFieldDto>(items, total));