From ab9a2092328fc48a4d9f1ef0c63da627665b595e Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 5 Aug 2019 09:53:15 +0300 Subject: [PATCH] Revert "adde GetAllBetweenDatesAsync to IAuditLogRepository" This reverts commit 3592b7293b20bcac29559114362dae2d16ad9e87. --- .../Volo/Abp/AuditLogging/IAuditLogRepository.cs | 5 ----- .../EntityFrameworkCore/EfCoreAuditLogRepository.cs | 10 ++-------- .../AuditLogging/MongoDB/MongoAuditLogRepository.cs | 6 ------ 3 files changed, 2 insertions(+), 19 deletions(-) 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 ee72072c75..489a07a0ce 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,10 +36,5 @@ 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 71a6d6fb7a..043c3d8988 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(cancellationToken: cancellationToken); + .ToListAsync(); return auditLogs; } @@ -58,17 +58,11 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore { var query = GetListQuery(httpMethod, url, userName, applicationName, correlationId, maxExecutionDuration, minExecutionDuration, hasException, httpStatusCode); - var totalCount = await query.LongCountAsync(cancellationToken: cancellationToken); + var totalCount = await query.LongCountAsync(); 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 b1fd7d95cb..f70bd1deaf 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,12 +62,6 @@ 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,