INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-07-10 14:00:00 -05:00
Code Issues Releases Wiki Activity

Using Code from EFPerformanceBucket for references

Browse Source
This commit is contained in:
Ayymoss
2024-09-07 18:41:18 +01:00
parent 79bd6ca8e1
commit 98e2be8623
17 changed files with 154 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Plugins/Stats/Helpers/AdvancedClientStatsResourceQueryHelper.cs
View File

@ -66,8 +66,8 @@ namespace Stats.Helpers
.ThenInclude(attachment => attachment.Attachment3)
.Where(stat => stat.ClientId == query.ClientId);
iqHitStats = !string.IsNullOrEmpty(query.PerformanceBucket)
? iqHitStats.Where(stat => stat.Server.PerformanceBucket == query.PerformanceBucket)
iqHitStats = !string.IsNullOrEmpty(query.PerformanceBucketCode)
? iqHitStats.Where(stat => stat.Server.PerformanceBucket.Code == query.PerformanceBucketCode)
: iqHitStats.Where(stat => stat.ServerId == serverId);
var hitStats = await iqHitStats.ToListAsync();
@ -76,7 +76,7 @@ namespace Stats.Helpers
.Where(r => r.ClientId == clientInfo.ClientId)
.Where(r => r.ServerId == serverId)
.Where(r => r.Ranking != null)
.Where(r => r.PerformanceBucket == query.PerformanceBucket)
.Where(r => r.PerformanceBucket.Code == query.PerformanceBucketCode)
.OrderByDescending(r => r.CreatedDateTime)
.Take(250)
.ToListAsync();
@ -85,7 +85,7 @@ namespace Stats.Helpers
{
ClientId = query.ClientId,
ServerEndpoint = query.ServerEndpoint,
PerformanceBucket = query.PerformanceBucket
PerformanceBucketCode = query.PerformanceBucketCode
})).Results.First();
var mostRecentRanking = ratings.FirstOrDefault(ranking => ranking.Newest);
@ -95,7 +95,7 @@ namespace Stats.Helpers
var legacyStats = await context.Set<EFClientStatistics>()
.Where(stat => stat.ClientId == query.ClientId)
.Where(stat => serverId == null || stat.ServerId == serverId)
.Where(stat => stat.Server.PerformanceBucket == query.PerformanceBucket)
.Where(stat => stat.Server.PerformanceBucket.Code == query.PerformanceBucketCode)
.ToListAsync();
var bucketConfig = await statManager.GetBucketConfig(serverId);
@ -126,12 +126,12 @@ namespace Stats.Helpers
{
Name = server.Hostname, IPAddress = server.ListenAddress, Port = server.ListenPort,
Game = (Reference.Game)server.GameName,
PerformanceBucket = server.PerformanceBucket
PerformanceBucket = server.PerformanceCode
})
.Where(server => server.Game == clientInfo.GameName)
.ToList(),
Aggregate = hitStats.FirstOrDefault(hit =>
hit.HitLocationId == null && (string.IsNullOrEmpty(query.PerformanceBucket) || hit.ServerId == serverId) && hit.WeaponId == null &&
hit.HitLocationId == null && (string.IsNullOrEmpty(query.PerformanceBucketCode) || hit.ServerId == serverId) && hit.WeaponId == null &&
hit.MeansOfDeathId == null),
ByHitLocation = hitStats
.Where(hit => hit.HitLocationId != null)
@ -186,9 +186,9 @@ namespace Stats.Helpers
var currentRanking = 0;
int totalRankedClients;
string performanceBucket;
string performanceBucketCode;
if (string.IsNullOrEmpty(query.PerformanceBucket) && serverId is null)
if (string.IsNullOrEmpty(query.PerformanceBucketCode) && serverId is null)
{
var maxPerformance = await context.Set<EFClientRankingHistory>()
.Where(r => r.ClientId == query.ClientId)
@ -204,27 +204,27 @@ namespace Stats.Helpers
{
currentRanking = 0;
totalRankedClients = 0;
performanceBucket = null;
performanceBucketCode = null;
}
else
{
currentRanking =
await statManager.GetClientOverallRanking(query.ClientId!.Value, null, maxPerformance.Key);
totalRankedClients = await serverDataViewer.RankedClientsCountAsync(null, maxPerformance.Key);
performanceBucket = maxPerformance.Key;
await statManager.GetClientOverallRanking(query.ClientId!.Value, null, maxPerformance.Key.Code);
totalRankedClients = await serverDataViewer.RankedClientsCountAsync(null, maxPerformance.Key.Code);
performanceBucketCode = maxPerformance.Key.Code;
}
}
else
{
performanceBucket = query.PerformanceBucket;
performanceBucketCode = query.PerformanceBucketCode;
currentRanking =
await statManager.GetClientOverallRanking(query.ClientId!.Value, serverId, performanceBucket);
totalRankedClients = await serverDataViewer.RankedClientsCountAsync(serverId, performanceBucket);
await statManager.GetClientOverallRanking(query.ClientId!.Value, serverId, performanceBucketCode);
totalRankedClients = await serverDataViewer.RankedClientsCountAsync(serverId, performanceBucketCode);
}
return new ResourceQueryHelperResult<ClientRankingInfo>
{
Results = [new ClientRankingInfo(currentRanking, totalRankedClients, performanceBucket)]
Results = [new ClientRankingInfo(currentRanking, totalRankedClients, performanceBucketCode)]
};
}
}

53
Plugins/Stats/Helpers/StatManager.cs
View File

@ -115,7 +115,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
return 0;
}
private Expression<Func<EFClientRankingHistory, bool>> GetNewRankingFunc(TimeSpan oldestStat, TimeSpan minPlayTime, long? serverId = null, string performanceBucket = null)
private Expression<Func<EFClientRankingHistory, bool>> GetNewRankingFunc(TimeSpan oldestStat, TimeSpan minPlayTime, long? serverId = null, string performanceBucketCode = null)
{
var oldestDate = DateTime.UtcNow - oldestStat;
return ranking => ranking.ServerId == serverId
@ -124,7 +124,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
&& ranking.ZScore != null
&& ranking.PerformanceMetric != null
&& ranking.Newest
&& ranking.PerformanceBucket == performanceBucket
&& ranking.PerformanceBucket.Code == performanceBucketCode
&& ranking.Client.TotalConnectionTime >= (int)minPlayTime.TotalSeconds;
}
@ -150,13 +150,13 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
public DateTime CreatedDateTime { get; set; }
}
public async Task<List<TopStatsInfo>> GetNewTopStats(int start, int count, long? serverId = null, string performanceBucket = null)
public async Task<List<TopStatsInfo>> GetNewTopStats(int start, int count, long? serverId = null, string performanceBucketCode = null)
{
var bucketConfig = await GetBucketConfig(serverId);
await using var context = _contextFactory.CreateContext(false);
var clientIdsList = await context.Set<EFClientRankingHistory>()
.Where(GetNewRankingFunc(bucketConfig.RankingExpiration, bucketConfig.ClientMinPlayTime, serverId: serverId, performanceBucket))
.Where(GetNewRankingFunc(bucketConfig.RankingExpiration, bucketConfig.ClientMinPlayTime, serverId: serverId, performanceBucketCode))
.OrderByDescending(ranking => ranking.PerformanceMetric)
.Select(ranking => ranking.ClientId)
.Skip(start)
@ -170,7 +170,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
var eachRank = await context.Set<EFClientRankingHistory>()
.Where(ranking => ranking.ClientId == clientId)
.Where(ranking => ranking.ServerId == serverId)
.Where(ranking => ranking.PerformanceBucket == performanceBucket)
.Where(ranking => ranking.PerformanceBucket.Code == performanceBucketCode)
.OrderByDescending(ranking => ranking.CreatedDateTime)
.Select(ranking => new RankingSnapshot
{
@ -278,14 +278,14 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
foreach (var customMetricFunc in Plugin.ServerManager.CustomStatsMetrics)
{
await customMetricFunc(finished.ToDictionary(kvp => kvp.ClientId, kvp => kvp.Metrics), serverId,
performanceBucket, true);
performanceBucketCode, true);
}
return finished;
}
public async Task<PerformanceBucketConfiguration> GetBucketConfig(long? serverId = null,
string bucketName = null)
string performanceBucketCode = null)
{
var defaultConfig = new PerformanceBucketConfiguration
{
@ -293,26 +293,26 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
RankingExpiration = DateTime.UtcNow - Extensions.FifteenDaysAgo()
};
if (serverId is null && bucketName is null)
if (serverId is null && performanceBucketCode is null)
{
return defaultConfig;
}
if (bucketName is not null)
if (performanceBucketCode is not null)
{
return _config.PerformanceBuckets.FirstOrDefault(bucket => bucket.Name == bucketName) ??
return _config.PerformanceBuckets.FirstOrDefault(bucket => bucket.Code == performanceBucketCode) ??
defaultConfig;
}
var performanceBucket =
(await _serverCache.FirstAsync(server => server.Id == serverId)).PerformanceBucket;
(await _serverCache.FirstAsync(server => server.Id == serverId))?.PerformanceBucket?.Code;
if (string.IsNullOrEmpty(performanceBucket))
{
return defaultConfig;
}
return _config.PerformanceBuckets.FirstOrDefault(bucket => bucket.Name == performanceBucket) ??
return _config.PerformanceBuckets.FirstOrDefault(bucket => bucket.Code == performanceBucket) ??
defaultConfig;
}
@ -1268,7 +1268,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
.Include(stat => stat.Server)
.Where(stat => stat.ClientId == clientId)
.Where(stat => stat.ServerId != serverId) // ignore the one we're currently tracking
.Where(stat => stat.Server.PerformanceBucket == bucketConfig.Name)
.Where(stat => stat.Server.PerformanceBucket.Code == bucketConfig.Code)
.Where(stats => stats.UpdatedAt >= oldestStateDate)
.Where(stats => stats.TimePlayed >= (int)bucketConfig.ClientMinPlayTime.TotalSeconds)
.ToListAsync();
@ -1293,7 +1293,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
var aggregateRanking = await context.Set<EFClientStatistics>()
.Where(stat => stat.ClientId != clientId)
.Where(stat => bucketConfig.Name == stat.Server.PerformanceBucket)
.Where(stat => bucketConfig.Code == stat.Server.PerformanceBucket.Code)
.Where(AdvancedClientStatsResourceQueryHelper.GetRankingFunc((int)bucketConfig.ClientMinPlayTime.TotalSeconds, bucketConfig.RankingExpiration))
.GroupBy(stat => stat.ClientId)
.Where(group =>
@ -1302,7 +1302,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
.Select(c => c.Key)
.CountAsync();
var newPerformanceMetric = await _serverDistributionCalculator.GetRatingForZScore(aggregateZScore, bucketConfig.Name);
var newPerformanceMetric = await _serverDistributionCalculator.GetRatingForZScore(aggregateZScore, bucketConfig.Code);
if (newPerformanceMetric == null)
{
@ -1311,19 +1311,23 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
return;
}
// TODO: CACHE THE EFPERFORMANCEBUCKET SO WE DON'T NEED TO LOOK IT UP - THERE WILL BE A REALISTIC LIMIT TO HOW MANY BUCKETS SHOULD BE LIVE
var performanceBucketId = (await context.PerformanceBuckets.FirstOrDefaultAsync(x => x.Code == bucketConfig.Code))
?.PerformanceBucketId;
var aggregateRankingSnapshot = new EFClientRankingHistory
{
ClientId = clientId,
ZScore = aggregateZScore,
Ranking = aggregateRanking,
PerformanceMetric = newPerformanceMetric,
PerformanceBucket = bucketConfig.Name,
PerformanceBucketId = performanceBucketId,
Newest = true,
};
context.Add(aggregateRankingSnapshot);
await PruneOldRankings(context, clientId, performanceBucket: bucketConfig.Name);
await PruneOldRankings(context, clientId, performanceBucketCode: bucketConfig.Code);
await context.SaveChangesAsync();
}
@ -1354,18 +1358,18 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
await context.SaveChangesAsync();
}
private async Task PruneOldRankings(DatabaseContext context, int clientId, long? serverId = null, string performanceBucket = null)
private async Task PruneOldRankings(DatabaseContext context, int clientId, long? serverId = null, string performanceBucketCode = null)
{
var totalRankingEntries = await context.Set<EFClientRankingHistory>()
.Where(r => r.ClientId == clientId)
.Where(r => r.ServerId == serverId)
.Where(r => r.PerformanceBucket == performanceBucket)
.Where(r => r.PerformanceBucket.Code == performanceBucketCode)
.CountAsync();
var mostRecent = await context.Set<EFClientRankingHistory>()
.Where(r => r.ClientId == clientId)
.Where(r => r.ServerId == serverId)
.Where(r => r.PerformanceBucket == performanceBucket)
.Where(r => r.PerformanceBucket.Code == performanceBucketCode)
.FirstOrDefaultAsync(r => r.Newest);
if (mostRecent != null)
@ -1381,7 +1385,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
var lastRating = await context.Set<EFClientRankingHistory>()
.Where(r => r.ClientId == clientId)
.Where(r => r.ServerId == serverId)
.Where(r => r.PerformanceBucket == performanceBucket)
.Where(r => r.PerformanceBucket.Code == performanceBucketCode)
.OrderBy(r => r.CreatedDateTime)
.FirstOrDefaultAsync();
@ -1397,6 +1401,8 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
/// </summary>
/// <param name="attackerStats">Stats of the attacker</param>
/// <param name="victimStats">Stats of the victim</param>
/// <param name="attacker">Attacker</param>
/// <param name="victim">Victim</param>
public void CalculateKill(EFClientStatistics attackerStats, EFClientStatistics victimStats,
EFClient attacker, EFClient victim)
{
@ -1438,8 +1444,9 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
attackerStats.EloRating =
attackerEloRatingFunc?.Invoke(attacker, attackerStats) ?? attackerStats.EloRating;
var victimEloRatingFunc =
victim.GetAdditionalProperty<Func<EFClient, EFClientStatistics, double>>("EloRatingFunction");
// Unused? New code. TODO: Check if needed?
//var victimEloRatingFunc =
// victim.GetAdditionalProperty<Func<EFClient, EFClientStatistics, double>>("EloRatingFunction");
victimStats.EloRating =
attackerEloRatingFunc?.Invoke(victim, victimStats) ?? victimStats.EloRating;