From c31c5d1d34b89a64c047c824561a15c8dcfff6e7 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 19 Jul 2018 10:39:04 +0300 Subject: [PATCH] Audit Logging getalllistasync fixes --- .../Volo/Abp/AuditLogging/IAuditLogRepository.cs | 2 +- .../EntityFrameworkCore/EfCoreAuditLogRepository.cs | 2 +- .../AuditLogging/MongoDB/MongoAuditLogRepository.cs | 10 ++++++---- 3 files changed, 8 insertions(+), 6 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 f02d84102e..e746063b49 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 @@ -16,7 +16,7 @@ namespace Volo.Abp.AuditLogging string url = null, string userName = null, HttpStatusCode? httpStatusCode = null, - bool includeDetails = false); + bool includeDetails = true); Task GetCountAsync( string httpMethod = null, 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 5e5dbe6d9b..1fb7fcad7f 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 @@ -30,7 +30,7 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore { var query = GetListQuery(httpMethod, url, userName, httpStatusCode, includeDetails); - var auditLogs = await query.OrderBy(sorting) + var auditLogs = await query.OrderBy(sorting ?? "executionTime desc") .PageBy(skipCount, maxResultCount) .ToListAsync(); 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 992da23369..662cfdbc2e 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 @@ -20,20 +20,22 @@ namespace Volo.Abp.AuditLogging.MongoDB } public async Task> GetListAsync(string sorting = null, int maxResultCount = 50, int skipCount = 0, - string httpMethod = null, string url = null, string userName = null, HttpStatusCode? httpStatusCode = null, bool includeDetails = false) + string httpMethod = null, string url = null, string userName = null, HttpStatusCode? httpStatusCode = null, bool includeDetails = true) { var query = GetListQuery(httpMethod, url, userName, httpStatusCode, includeDetails); - return await query.OrderBy(sorting).As>() + return await query.OrderBy(sorting ?? "executionTime desc").As>() .PageBy>(skipCount, maxResultCount) .ToListAsync(); } - public async Task GetCountAsync(string httpMethod = null, string url = null, string userName = null, HttpStatusCode? httpStatusCode = null, bool includeDetails = false) + public async Task GetCountAsync(string httpMethod = null, string url = null, string userName = null, HttpStatusCode? httpStatusCode = null, bool includeDetails = true) { var query = GetListQuery(httpMethod, url, userName, httpStatusCode, includeDetails); - return await query.As>().LongCountAsync(); + var count = await query.As>().LongCountAsync(); + + return count; } private IQueryable GetListQuery(