diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs index 489a07a0ce..ee72072c75 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/IAuditLogRepository.cs @@ -36,5 +36,10 @@ namespace Volo.Abp.AuditLogging bool? hasException = null, HttpStatusCode? httpStatusCode = null, CancellationToken cancellationToken = default); + + Task> GetAllBetweenDatesAsync( + DateTime startDate, + DateTime endDate, + CancellationToken cancellationToken = default); } } diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs index 043c3d8988..71a6d6fb7a 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs @@ -39,7 +39,7 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore var auditLogs = await query.OrderBy(sorting ?? "executionTime desc") .PageBy(skipCount, maxResultCount) - .ToListAsync(); + .ToListAsync(cancellationToken: cancellationToken); return auditLogs; } @@ -58,11 +58,17 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore { var query = GetListQuery(httpMethod, url, userName, applicationName, correlationId, maxExecutionDuration, minExecutionDuration, hasException, httpStatusCode); - var totalCount = await query.LongCountAsync(); + var totalCount = await query.LongCountAsync(cancellationToken: cancellationToken); return totalCount; } + public async Task> GetAllBetweenDatesAsync(DateTime startDate, DateTime endDate, + CancellationToken cancellationToken = default) + { + return await DbSet.Where(a => a.ExecutionTime < endDate && a.ExecutionTime > startDate).ToListAsync(cancellationToken: cancellationToken); + } + private IQueryable GetListQuery( string httpMethod = null, string url = null, diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs index f70bd1deaf..b1fd7d95cb 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs @@ -62,6 +62,12 @@ namespace Volo.Abp.AuditLogging.MongoDB return count; } + public async Task> GetAllBetweenDatesAsync(DateTime startDate, DateTime endDate, + CancellationToken cancellationToken = default) + { + return await GetMongoQueryable().Where(a => a.ExecutionTime < endDate && a.ExecutionTime > startDate).ToListAsync(cancellationToken: cancellationToken); + } + private IQueryable GetListQuery( string httpMethod = null, string url = null,