diff --git a/AsbCloudApp/Data/RequestLogUserDto.cs b/AsbCloudApp/Data/RequestLogUserDto.cs index 151a4b57..80e7a740 100644 --- a/AsbCloudApp/Data/RequestLogUserDto.cs +++ b/AsbCloudApp/Data/RequestLogUserDto.cs @@ -1,19 +1,16 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AsbCloudApp.Data { public class RequestLogUserDto { - public int Id { get; set; } + public int UserId { get; set; } public string Login { get; set; } public string Ip { get; set; } public long ElapsedMs { get; set; } public DateTime LastDate { get; set; } public long Requests { get; set; } - public long Errors { get; set; } + public long Errors { get; set; } + public UserDto User { get; set; } } } diff --git a/AsbCloudInfrastructure/Services/RequerstTrackerService.cs b/AsbCloudInfrastructure/Services/RequerstTrackerService.cs index 695d0dd6..d1454eb9 100644 --- a/AsbCloudInfrastructure/Services/RequerstTrackerService.cs +++ b/AsbCloudInfrastructure/Services/RequerstTrackerService.cs @@ -22,7 +22,7 @@ namespace AsbCloudInfrastructure.Services private readonly ConcurrentQueue slowRequests = new ConcurrentQueue(); private readonly ConcurrentQueue errorRequests = new ConcurrentQueue(); private readonly ConcurrentDictionary users = new ConcurrentDictionary(); - + private static IEnumerable Get(IEnumerable list, int take = -1) { IEnumerable orderedlist = list.OrderByDescending(r => r.Date); @@ -35,7 +35,7 @@ namespace AsbCloudInfrastructure.Services { IEnumerable result = users.Values.OrderByDescending(u => u.LastDate); if (take > 0) - result = result.Take(take); + result = result.Take(take); return result; } @@ -109,9 +109,10 @@ namespace AsbCloudInfrastructure.Services if (!users.ContainsKey(key)) users[key] = new RequestLogUserDto { - Id = requestLog.UserId, + UserId = requestLog.UserId, Ip = requestLog.UserIp, Login = requestLog.UserLogin, + //User = userService.Get(requestLog.UserId), }; users[key].ElapsedMs += requestLog.ElapsedMilliseconds; users[key].LastDate = requestLog.Date;