Oda/managing-apps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ROI calculation for Strategy

Browse Source
This commit is contained in:
cryptooda
2025-10-08 19:37:24 +07:00
parent 76b087a6e4
commit 1a99224d18
5 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Managing.Application/Bots/Grains/AgentGrain.cs
View File

@@ -182,8 +182,8 @@ public class AgentGrain : Grain, IAgentGrain
_state.State.TotalFees = totalFees;
// Calculate wins/losses from position PnL
var totalWins = positions.Count(p => (p.ProfitAndLoss?.Realized ?? 0) > 0);
var totalLosses = positions.Count(p => (p.ProfitAndLoss?.Realized ?? 0) <= 0);
var totalWins = positions.Count(p => (p.ProfitAndLoss?.Net ?? 0) > 0);
var totalLosses = positions.Count(p => (p.ProfitAndLoss?.Net ?? 0) <= 0);
// Calculate ROI based on PnL minus fees
var netPnL = totalPnL - totalFees;

14
src/Managing.Application/Bots/Grains/LiveTradingBotGrain.cs
View File

@@ -791,12 +791,18 @@ public class LiveTradingBotGrain : Grain, ILiveTradingBotGrain, IRemindable
}
}
var positionForMetrics = _tradingBot.Positions.Where(p => p.Value.IsValidForMetrics())
.Select(p => p.Value).ToList();
var positionForMetrics = await ServiceScopeHelpers.WithScopedService<ITradingService, List<Position>>(
_scopeFactory,
async tradingService =>
{
return (await tradingService.GetPositionsByInitiatorIdentifierAsync(this.GetPrimaryKey()))
.Where(p => p.IsValidForMetrics()).ToList();
});
// Calculate statistics using TradingBox helpers
var (tradeWins, tradeLosses) = TradingBox.GetWinLossCount(positionForMetrics);
var pnl = _tradingBot.GetProfitAndLoss();
var fees = _tradingBot.GetTotalFees();
var pnl = positionForMetrics.Sum(p => p.ProfitAndLoss.Realized);
var fees = positionForMetrics.Sum(p => p.CalculateTotalFees());
var netPnl = pnl - fees; // Net PnL after fees
var volume = TradingBox.GetTotalVolumeTraded(positionForMetrics);