From 726d91f771639508b0ad6c31c1a38bcd41b804cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Mon, 15 Mar 2021 21:18:17 +0300
Subject: [PATCH] Improve default sorting fallback expressions

---
 .../EntityFrameworkCore/EFCoreIdentitySecurityLogRepository.cs  | 2 +-
 .../Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EFCoreIdentitySecurityLogRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EFCoreIdentitySecurityLogRepository.cs
index c985680455..97de4c0ecf 100644
--- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EFCoreIdentitySecurityLogRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EFCoreIdentitySecurityLogRepository.cs
@@ -49,7 +49,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 cancellationToken
             );
 
-            return await query.OrderBy(sorting ?? nameof(IdentitySecurityLog.CreationTime) + " desc")
+            return await query.OrderBy(sorting.IsNullOrWhiteSpace() ? $"{nameof(IdentitySecurityLog.CreationTime)} desc" : sorting)
                 .PageBy(skipCount, maxResultCount)
                 .ToListAsync(cancellationToken);
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs
index 1ac54cfc82..adb5883e16 100644
--- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs
@@ -48,7 +48,7 @@ namespace Volo.Abp.Identity.MongoDB
                 cancellationToken
             );
 
-            return await query.OrderBy(sorting ?? nameof(IdentitySecurityLog.CreationTime) + " desc")
+            return await query.OrderBy(sorting.IsNullOrWhiteSpace() ? $"{nameof(IdentitySecurityLog.CreationTime)} desc" : sorting)
                 .As<IMongoQueryable<IdentitySecurityLog>>()
                 .PageBy<IdentitySecurityLog, IMongoQueryable<IdentitySecurityLog>>(skipCount, maxResultCount)
                 .ToListAsync(GetCancellationToken(cancellationToken));