Add availability to search modified user since specified date

fxt88 · Feb 7, 2019 · df02b02 · df02b02
1 parent 853d66a
commit df02b02
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 9 deletions.
diff --git a/VirtoCommerce.Platform.Core/Security/ApplicationUserExtended.cs b/VirtoCommerce.Platform.Core/Security/ApplicationUserExtended.cs
@@ -7,7 +7,7 @@
 
 namespace VirtoCommerce.Platform.Core.Security
 {
-    public class ApplicationUserExtended : Entity, IHasChangesHistory
+    public class ApplicationUserExtended : AuditableEntity, IHasChangesHistory
     {
         public string UserName { get; set; }
         public string Email { get; set; }

diff --git a/VirtoCommerce.Platform.Core/Security/UserDetails.cs b/VirtoCommerce.Platform.Core/Security/UserDetails.cs
@@ -1,10 +1,11 @@
-namespace VirtoCommerce.Platform.Core.Security
+namespace VirtoCommerce.Platform.Core.Security
 {
     public enum UserDetails
     {
         Undefined,
         Full,
         Reduced,
         Export,
+        Info
     }
 }
diff --git a/VirtoCommerce.Platform.Core/Security/UserSearchRequest.cs b/VirtoCommerce.Platform.Core/Security/UserSearchRequest.cs
@@ -1,12 +1,23 @@
-namespace VirtoCommerce.Platform.Core.Security
+using System;
+using System.Linq;
+using VirtoCommerce.Platform.Core.Common;
+
+namespace VirtoCommerce.Platform.Core.Security
 {
     public class UserSearchRequest
     {
         public UserSearchRequest()
         {
             TakeCount = 20;
         }
+        public string ResponseGroup { get; set; }
+        /// <summary>
+        /// Sorting expression property1:asc;property2:desc
+        /// </summary>
+        public string Sort { get; set; }
+        public virtual SortInfo[] SortInfos => SortInfo.Parse(Sort).ToArray();
 
+        public DateTime? ModifiedSinceDate { get; set; }
         public string[] AccountTypes { get; set; }
         public string Keyword { get; set; }
         public string MemberId { get; set; }

diff --git a/VirtoCommerce.Platform.Data.Security/SecurityService.cs b/VirtoCommerce.Platform.Data.Security/SecurityService.cs
@@ -366,21 +366,42 @@ public virtual async Task<UserSearchResponse> SearchUsersAsync(UserSearchRequest
                 {
                     query = query.Where(x => request.AccountTypes.Contains(x.UserType));
                 }
+
+                if (request.ModifiedSinceDate != null && request.ModifiedSinceDate != default(DateTime))
+                {
+                    query = query.Where(x => x.ModifiedDate > request.ModifiedSinceDate);
+                }
+
                 result.TotalCount = await query.CountAsync();
 
-                users = await query.OrderBy(x => x.UserName)
-                                 .Skip(request.SkipCount)
+                var sortInfos = request.SortInfos;
+                if (sortInfos.IsNullOrEmpty())
+                {
+                    sortInfos = new[] { new SortInfo { SortColumn = "UserName", SortDirection = SortDirection.Descending } };
+                }
+                query = query.OrderBySortInfos(sortInfos);
+
+
+                users = await query.Skip(request.SkipCount)
                                  .Take(request.TakeCount)
                                  .ToArrayAsync();
             }
             var extendedUsers = new List<ApplicationUserExtended>();
 
-            foreach (var user in users)
+            var userDetail = EnumUtility.SafeParse(request.ResponseGroup, UserDetails.Full);
+            if (userDetail == UserDetails.Info)
+            {
+                extendedUsers = users.Select(x => new ApplicationUser().ToCoreModel(x, _permissionScopeService)).ToList();
+            }
+            else
             {
-                var extendedUser = await FindByNameAsync(user.UserName, UserDetails.Reduced);
-                if (extendedUser != null)
+                foreach (var user in users)
                 {
-                    extendedUsers.Add(extendedUser);
+                    var extendedUser = await FindByNameAsync(user.UserName, UserDetails.Reduced);
+                    if (extendedUser != null)
+                    {
+                        extendedUsers.Add(extendedUser);
+                    }
                 }
             }
             result.Users = extendedUsers.ToArray();