mirror of
https://github.com/DrMboga/WotBlitzStatisticsBlazor.git
synced 2026-10-21 02:17:20 +02:00
Tank info history query
This commit is contained in:
1 parent
9b9f2b141e
commit
eef4e9255b
14 files changed
+352
-32
No files matched your search
+11
@@ -0,0 +1,11 @@
|
||||
using WotBlitzStatisticsPro.DataAccess.Model.Accounts;
|
||||
|
||||
namespace WotBlitzStatisticsPro.Logic.AccountInformationPipeline
|
||||
{
|
||||
public interface IDatabaseTankPipelineContextData
|
||||
{
|
||||
long TankId { get; }
|
||||
|
||||
TankInfo? DbTankInfo { get; set; }
|
||||
}
|
||||
}
|
||||
+61
@@ -0,0 +1,61 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using WotBlitzStatisticsPro.Common.Model;
|
||||
using WotBlitzStatisticsPro.DataAccess;
|
||||
using WotBlitzStatisticsPro.Logic.AccountInformationPipeline.OperationContext;
|
||||
using WotBlitzStatisticsPro.Logic.Calculations;
|
||||
using WotBlitzStatisticsPro.Logic.Pipeline;
|
||||
|
||||
namespace WotBlitzStatisticsPro.Logic.AccountInformationPipeline.Operations
|
||||
{
|
||||
public class FillTankHistoryResponseOperation : IOperation<IOperationContext>
|
||||
{
|
||||
private readonly IDictionariesDataAccessor _wargamingDictionaries;
|
||||
|
||||
public FillTankHistoryResponseOperation(IDictionariesDataAccessor wargamingDictionaries)
|
||||
{
|
||||
_wargamingDictionaries = wargamingDictionaries;
|
||||
}
|
||||
|
||||
public async Task Invoke(IOperationContext context, Func<IOperationContext, Task>? next)
|
||||
{
|
||||
var contextData = context.Get<TankHistoryInformationContextData>();
|
||||
|
||||
if (contextData?.DbTankInfo == null)
|
||||
{
|
||||
if (next != null) await next.Invoke(context);
|
||||
return;
|
||||
}
|
||||
|
||||
var nations = await _wargamingDictionaries.GetNations(context.Request.RequestLanguage);
|
||||
var tankTypes = await _wargamingDictionaries.GetTankTypes(context.Request.RequestLanguage);
|
||||
|
||||
var vehicleInfos = await _wargamingDictionaries.GetVehicles(new[] {contextData.TankId});
|
||||
var vehicleInfo = vehicleInfos[contextData.TankId];
|
||||
|
||||
contextData.Response = new TankInfoHistoryResponse
|
||||
{
|
||||
TankId = contextData.TankId,
|
||||
LastBattleTime = contextData.DbTankInfo.LastBattleTime.ToDateTime(),
|
||||
BattleLifeTimeInSeconds = contextData.DbTankInfo.BattleLifeTimeInSeconds,
|
||||
MarkOfMastery = contextData.DbTankInfo.MarkOfMastery,
|
||||
Name = vehicleInfo.Name.FirstOrDefault(n => n.Language == context.Request.RequestLanguage)?.Value,
|
||||
IsPremium = vehicleInfo.IsPremium,
|
||||
Tier = vehicleInfo.Tier,
|
||||
NormalImage = vehicleInfo.NormalImage,
|
||||
PreviewImage = vehicleInfo.PreviewImage,
|
||||
Nation = nations[vehicleInfo.NationId],
|
||||
Type = tankTypes[vehicleInfo.TypeId],
|
||||
|
||||
AccountId = context.Request.AccountId,
|
||||
PeriodDifference = contextData.PeriodDifference,
|
||||
StatisticsHistory = contextData.StatisticsHistory,
|
||||
TankPeriodStatistics = contextData.PeriodAccountStatistics,
|
||||
OverallTankStatistics = contextData.OverallStatistics
|
||||
};
|
||||
|
||||
if (next != null) await next.Invoke(context);
|
||||
}
|
||||
}
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using WotBlitzStatisticsPro.DataAccess;
|
||||
using WotBlitzStatisticsPro.Logic.AccountInformationPipeline.OperationContext;
|
||||
using WotBlitzStatisticsPro.Logic.Calculations;
|
||||
using WotBlitzStatisticsPro.Logic.Pipeline;
|
||||
|
||||
namespace WotBlitzStatisticsPro.Logic.AccountInformationPipeline.Operations
|
||||
{
|
||||
public class ReadTankHistoryFromDbOperation : IOperation<IOperationContext>
|
||||
{
|
||||
private readonly IWargamingAccountDataAccessor _accountDataAccessor;
|
||||
|
||||
public ReadTankHistoryFromDbOperation(IWargamingAccountDataAccessor accountDataAccessor)
|
||||
{
|
||||
_accountDataAccessor = accountDataAccessor;
|
||||
}
|
||||
|
||||
public async Task Invoke(IOperationContext context, Func<IOperationContext, Task>? next)
|
||||
{
|
||||
var contextData = context.Get<TankHistoryInformationContextData>();
|
||||
|
||||
contextData.History = (await _accountDataAccessor.GetTankHistory(context.Request.AccountId, contextData.TankId, contextData.LastBattleSince.ToUnixTimestamp())).ToArray();
|
||||
if (next != null) await next.Invoke(context);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using WotBlitzStatisticsPro.DataAccess;
|
||||
using WotBlitzStatisticsPro.Logic.AccountInformationPipeline.OperationContext;
|
||||
using WotBlitzStatisticsPro.Logic.Pipeline;
|
||||
|
||||
namespace WotBlitzStatisticsPro.Logic.AccountInformationPipeline.Operations
|
||||
{
|
||||
public class ReadTankInfoFromDbOperation : IOperation<IOperationContext>
|
||||
{
|
||||
private readonly IWargamingAccountDataAccessor _accountDataAccessor;
|
||||
|
||||
public ReadTankInfoFromDbOperation(IWargamingAccountDataAccessor accountDataAccessor)
|
||||
{
|
||||
_accountDataAccessor = accountDataAccessor;
|
||||
}
|
||||
|
||||
public async Task Invoke(IOperationContext context, Func<IOperationContext, Task>? next)
|
||||
{
|
||||
var contextData = context.Get<IDatabaseTankPipelineContextData>();
|
||||
|
||||
contextData.DbTankInfo = await _accountDataAccessor.ReadTankInfo(context.Request.AccountId, contextData.TankId);
|
||||
if (next != null) await next.Invoke(context);
|
||||
}
|
||||
}
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
using System;
|
||||
using WotBlitzStatisticsPro.Common.Model;
|
||||
using WotBlitzStatisticsPro.DataAccess.Model.Accounts;
|
||||
|
||||
namespace WotBlitzStatisticsPro.Logic.AccountInformationPipeline
|
||||
{
|
||||
public class TankHistoryInformationContextData: IDatabaseTankPipelineContextData, IStatisticsPipelineData
|
||||
{
|
||||
public TankHistoryInformationContextData(DateTime lastBattleSince, long tankId)
|
||||
{
|
||||
LastBattleSince = lastBattleSince;
|
||||
TankId = tankId;
|
||||
}
|
||||
|
||||
public DateTime LastBattleSince { get; }
|
||||
|
||||
public long TankId { get; }
|
||||
|
||||
public TankInfo? DbTankInfo { get; set; }
|
||||
|
||||
public IStatistics[]? History { get; set; }
|
||||
public ShortStatistics? OverallStatistics { get; set; }
|
||||
public ShortStatistics? PeriodAccountStatistics { get; set; }
|
||||
public StatisticsDifference? PeriodDifference { get; set; }
|
||||
public StatisticsDifference[]? StatisticsHistory { get; set; }
|
||||
|
||||
public TankInfoHistoryResponse? Response { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,7 @@ namespace WotBlitzStatisticsPro.Logic.Calculations
|
||||
{
|
||||
if (tankTires.ContainsKey(tank.TankId) && tank.Battles > 0)
|
||||
{
|
||||
x += tankTires[tank.TankId] * tank.Battles;
|
||||
x += tankTires[tank.TankId] * tank.Battles.DoubleValue();
|
||||
}
|
||||
}
|
||||
if (account.Battles > 0)
|
||||
|
||||
@@ -26,13 +26,18 @@ namespace WotBlitzStatisticsPro.Logic.Calculations
|
||||
|
||||
public static void CalculateWn7(this TankInfoHistory tank, double tier)
|
||||
{
|
||||
double avdFrags = (double) tank.Frags / tank.Battles;
|
||||
double avgDamage = (double)tank.DamageDealt / tank.Battles;
|
||||
double avgSpot = (double)tank.Spotted / tank.Battles;
|
||||
double avgDef = (double)tank.DroppedCapturePoints / tank.Battles;
|
||||
double winRate = (100d * (double) tank.Wins / tank.Battles); // - 48;
|
||||
if (!tank.Battles.HasValue)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
tank.Wn7 = CalculateWn7(tank.Battles, tier, avdFrags, avgDamage, avgSpot, avgDef, winRate);
|
||||
double avdFrags = (double) tank.Frags.DoubleValue() / tank.Battles.DoubleValue();
|
||||
double avgDamage = (double)tank.DamageDealt.DoubleValue() / tank.Battles.DoubleValue();
|
||||
double avgSpot = (double)tank.Spotted.DoubleValue() / tank.Battles.DoubleValue();
|
||||
double avgDef = (double)tank.DroppedCapturePoints.DoubleValue() / tank.Battles.DoubleValue();
|
||||
double winRate = (100d * (double) tank.Wins.DoubleValue() / tank.Battles.DoubleValue()); // - 48;
|
||||
|
||||
tank.Wn7 = CalculateWn7(tank.Battles.Value, tier, avdFrags, avgDamage, avgSpot, avgDef, winRate);
|
||||
}
|
||||
|
||||
public static void CalculateWn7(this AccountInfoHistory account)
|
||||
|
||||
@@ -12,5 +12,8 @@ namespace WotBlitzStatisticsPro.Logic
|
||||
|
||||
Task<AccountInfoHistoryResponse> GetAccountInfoHistory(RealmType realm, long accountId, DateTime startDate,
|
||||
RequestLanguage requestLanguage);
|
||||
|
||||
Task<TankInfoHistoryResponse> GetTankInfoHistory(RealmType realm, long accountId, long tankId, DateTime startDate,
|
||||
RequestLanguage requestLanguage);
|
||||
}
|
||||
}
|
||||
@@ -126,5 +126,41 @@ namespace WotBlitzStatisticsPro.Logic
|
||||
}
|
||||
return contextData?.Response ?? new AccountInfoHistoryResponse();
|
||||
}
|
||||
|
||||
public async Task<TankInfoHistoryResponse> GetTankInfoHistory(RealmType realm, long accountId, long tankId, DateTime startDate,
|
||||
RequestLanguage requestLanguage)
|
||||
{
|
||||
var contextData = new TankHistoryInformationContextData(startDate, tankId);
|
||||
try
|
||||
{
|
||||
var context = new OperationContext(new AccountRequest(accountId, realm, requestLanguage));
|
||||
context.AddOrReplace(contextData);
|
||||
var pipeline = new Pipeline<IOperationContext>(_operationFactory);
|
||||
|
||||
pipeline.AddOperation<ReadTankInfoFromDbOperation>()
|
||||
.AddOperation<ReadTankHistoryFromDbOperation>()
|
||||
.AddOperation<CheckIfHistoryIsEmptyOperation>()
|
||||
.AddOperation<FillOverallStatisticsOperation>()
|
||||
.AddOperation<FillPeriodStatisticsOperation>()
|
||||
.AddOperation<FillPeriodDifferenceOperation>()
|
||||
.AddOperation<FillStatisticsDifferenceOperation>()
|
||||
.AddOperation<FillTankHistoryResponseOperation>()
|
||||
;
|
||||
|
||||
var firstOperation = pipeline.Build();
|
||||
if (firstOperation != null)
|
||||
{
|
||||
await firstOperation
|
||||
.Invoke(context, null)
|
||||
.ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_logger.LogError(e, "GetAccountInfoHistory error");
|
||||
throw;
|
||||
}
|
||||
return contextData?.Response ?? new TankInfoHistoryResponse();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -70,6 +70,9 @@ namespace WotBlitzStatisticsPro.Logic
|
||||
services.AddTransient<FillPeriodDifferenceOperation>();
|
||||
services.AddTransient<FillStatisticsDifferenceOperation>();
|
||||
services.AddTransient<FillAccountInfoHistoryResponse>();
|
||||
services.AddTransient<ReadTankInfoFromDbOperation>();
|
||||
services.AddTransient<ReadTankHistoryFromDbOperation>();
|
||||
services.AddTransient<FillTankHistoryResponseOperation>();
|
||||
|
||||
services.AddTransient<IOperationFactory>(serviceProvider =>
|
||||
new ServiceProviderOperationFactory(serviceProvider));
|
||||
|
||||
Reference in new issue
Block a user