Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

webfront profile loading optimizations

Browse Source
This commit is contained in:
RaidMax 2022-01-28 14:33:08 -06:00
parent 7ccdee7d1b
commit 3539101a40
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Data/MigrationContext/PostgresqlDatabaseContext.cs
View File

@ -25,10 +25,10 @@ namespace Data.MigrationContext
{ {
optionsBuilder.UseNpgsql( optionsBuilder.UseNpgsql(
"Host=127.0.0.1;Database=IW4MAdmin_Migration;Username=postgres;Password=password;", "Host=127.0.0.1;Database=IW4MAdmin_Migration;Username=postgres;Password=password;",
options => options.SetPostgresVersion(new Version("9.4"))) options => options.SetPostgresVersion(new Version("12.9")))
.EnableDetailedErrors(true) .EnableDetailedErrors(true)
.EnableSensitiveDataLogging(true); .EnableSensitiveDataLogging(true);
} }
} }
} }
} }

10
Plugins/Stats/Plugin.cs
View File

@ -11,7 +11,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Data.Abstractions; using Data.Abstractions;
using Data.Models.Client;
using Data.Models.Client.Stats; using Data.Models.Client.Stats;
using Data.Models.Server; using Data.Models.Server;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -195,7 +194,6 @@ namespace IW4MAdmin.Plugins.Stats
int messageCount = 0; int messageCount = 0;
await using var ctx = _databaseContextFactory.CreateContext(enableTracking: false); await using var ctx = _databaseContextFactory.CreateContext(enableTracking: false);
clientStats = await ctx.Set<EFClientStatistics>().Where(c => c.ClientId == request.ClientId).ToListAsync(); clientStats = await ctx.Set<EFClientStatistics>().Where(c => c.ClientId == request.ClientId).ToListAsync();
messageCount = await ctx.Set<EFClientMessage>().CountAsync(_message => _message.ClientId == request.ClientId);
int kills = clientStats.Sum(c => c.Kills); int kills = clientStats.Sum(c => c.Kills);
int deaths = clientStats.Sum(c => c.Deaths); int deaths = clientStats.Sum(c => c.Deaths);
@ -254,14 +252,6 @@ namespace IW4MAdmin.Plugins.Stats
Column = 0, Column = 0,
Order = 5, Order = 5,
Type = MetaType.Information Type = MetaType.Information
},
new InformationResponse()
{
Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PROFILE_MESSAGES"],
Value = messageCount.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
Column = 1,
Order = 4,
Type = MetaType.Information
} }
}; };
} }

31
SharedLibraryCore/Services/PenaltyService.cs
View File

@ -181,19 +181,36 @@ namespace SharedLibraryCore.Services
var aliasIps = await context.Aliases.Where(alias => alias.LinkId == linkId && alias.IPAddress != null) var aliasIps = await context.Aliases.Where(alias => alias.LinkId == linkId && alias.IPAddress != null)
.Select(alias => alias.IPAddress) .Select(alias => alias.IPAddress)
.ToListAsync(); .ToListAsync();
if (ip != null) if (ip != null)
{ {
aliasIps.Add(ip); aliasIps.Add(ip);
} }
iqIpPenalties = context.Penalties var clientIds = new List<int>();
.Where(penalty => aliasIps.Contains(penalty.Offender.CurrentAlias.IPAddress))
.Where(filter); if (aliasIps.Any())
{
clientIds = await context.Clients.Where(client => aliasIps.Contains(client.CurrentAlias.IPAddress))
.Select(client => client.ClientId).ToListAsync();
}
if (clientIds.Any())
{
iqIpPenalties = context.Penalties.Where(penalty => clientIds.Contains(penalty.OffenderId))
.Where(filter);
}
else
{
iqIpPenalties = Enumerable.Empty<EFPenalty>().AsQueryable();
}
} }
var activePenalties = (await iqLinkPenalties.ToListAsync()) var activeLinkPenalties = await iqLinkPenalties.ToListAsync();
.Union(await iqIpPenalties.ToListAsync()) var activeIpPenalties = await iqIpPenalties.ToListAsync();
.Distinct(); var activePenalties = activeLinkPenalties.Concat(activeIpPenalties).Distinct();
// this is a bit more performant in memory (ordering) // this is a bit more performant in memory (ordering)
return activePenalties.OrderByDescending(p => p.When).ToList(); return activePenalties.OrderByDescending(p => p.When).ToList();
@ -221,4 +238,4 @@ namespace SharedLibraryCore.Services
await context.SaveChangesAsync(); await context.SaveChangesAsync();
} }
} }
} }