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

Fix bot TOP 3

Browse Source
This commit is contained in:
cryptooda
2025-09-25 11:08:28 +07:00
parent 253c448acb
commit c297429b18
7 changed files with 128 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Managing.Api/Controllers/DataController.cs
View File

@@ -329,31 +329,24 @@ public class DataController : ControllerBase
}
/// <summary>
/// Retrieves the top 3 performing strategies based on ROI.
/// Retrieves the top 3 performing strategies based on PnL.
/// </summary>
/// <returns>A <see cref="TopStrategiesViewModel"/> containing the top performing strategies.</returns>
[HttpGet("GetTopStrategies")]
public async Task<ActionResult<TopStrategiesViewModel>> GetTopStrategies()
{
// Get active bots
var activeBots = await _mediator.Send(new GetBotsByStatusCommand(BotStatus.Running));
// Calculate PnL for each bot once and store in a list of tuples
var botsWithPnL = activeBots
.Select(bot => new { Bot = bot, PnL = bot.Pnl, agentName = bot.User.AgentName })
.OrderByDescending(item => item.PnL)
.Take(3)
.ToList();
// Get top 3 bots by PnL directly from database (both running and stopped)
var bots = await _mediator.Send(new GetTopBotsByPnLCommand(new[] { BotStatus.Running, BotStatus.Stopped }, 3));
// Map to view model
var topStrategies = new TopStrategiesViewModel
{
TopStrategies = botsWithPnL
.Select(item => new StrategyPerformance
TopStrategies = bots
.Select(bot => new StrategyPerformance
{
StrategyName = item.Bot.Name,
PnL = item.PnL,
AgentName = item.agentName,
StrategyName = bot.Name,
PnL = bot.Pnl,
AgentName = bot.User.AgentName,
})
.ToList()
};
@@ -368,26 +361,19 @@ public class DataController : ControllerBase
[HttpGet("GetTopStrategiesByRoi")]
public async Task<ActionResult<TopStrategiesByRoiViewModel>> GetTopStrategiesByRoi()
{
// Get active bots
var activeBots = await _mediator.Send(new GetBotsByStatusCommand(BotStatus.Running));
// Filter bots with valid ROI data and order by ROI
var botsWithRoi = activeBots
.Select(bot => new { Bot = bot, Roi = bot.Roi, PnL = bot.Pnl, Volume = bot.Volume })
.OrderByDescending(item => item.Roi)
.Take(3)
.ToList();
// Get top 3 bots by ROI directly from database (both running and stopped)
var bots = await _mediator.Send(new GetTopBotsByRoiCommand(new[] { BotStatus.Running, BotStatus.Stopped }, 3));
// Map to view model
var topStrategiesByRoi = new TopStrategiesByRoiViewModel
{
TopStrategiesByRoi = botsWithRoi
.Select(item => new StrategyRoiPerformance
TopStrategiesByRoi = bots
.Select(bot => new StrategyRoiPerformance
{
StrategyName = item.Bot.Name,
Roi = item.Roi,
PnL = item.PnL,
Volume = item.Volume
StrategyName = bot.Name,
Roi = bot.Roi,
PnL = bot.Pnl,
Volume = bot.Volume
})
.ToList()
};

16
src/Managing.Application.Abstractions/Repositories/IBotRepository.cs
View File

@@ -37,4 +37,20 @@ public interface IBotRepository
string? agentName = null,
string sortBy = "CreateDate",
string sortDirection = "Desc");
/// <summary>
/// Gets the top performing bots by PnL from the specified statuses
/// </summary>
/// <param name="statuses">Bot statuses to include in the query</param>
/// <param name="count">Number of top performers to return (default: 3)</param>
/// <returns>Top performing bots ordered by PnL descending</returns>
Task<IEnumerable<Bot>> GetTopBotsByPnLAsync(IEnumerable<BotStatus> statuses, int count = 3);
/// <summary>
/// Gets the top performing bots by ROI from the specified statuses
/// </summary>
/// <param name="statuses">Bot statuses to include in the query</param>
/// <param name="count">Number of top performers to return (default: 3)</param>
/// <returns>Top performing bots ordered by ROI descending</returns>
Task<IEnumerable<Bot>> GetTopBotsByRoiAsync(IEnumerable<BotStatus> statuses, int count = 3);
}

18
src/Managing.Application/ManageBot/Commands/GetTopBotsByPnLCommand.cs Normal file
View File

@@ -0,0 +1,18 @@
using Managing.Domain.Bots;
using MediatR;
using static Managing.Common.Enums;
namespace Managing.Application.ManageBot.Commands
{
public class GetTopBotsByPnLCommand : IRequest<IEnumerable<Bot>>
{
public IEnumerable<BotStatus> Statuses { get; }
public int Count { get; }
public GetTopBotsByPnLCommand(IEnumerable<BotStatus> statuses, int count = 3)
{
Statuses = statuses;
Count = count;
}
}
}

18
src/Managing.Application/ManageBot/Commands/GetTopBotsByRoiCommand.cs Normal file
View File

@@ -0,0 +1,18 @@
using Managing.Domain.Bots;
using MediatR;
using static Managing.Common.Enums;
namespace Managing.Application.ManageBot.Commands
{
public class GetTopBotsByRoiCommand : IRequest<IEnumerable<Bot>>
{
public IEnumerable<BotStatus> Statuses { get; }
public int Count { get; }
public GetTopBotsByRoiCommand(IEnumerable<BotStatus> statuses, int count = 3)
{
Statuses = statuses;
Count = count;
}
}
}

16
src/Managing.Application/ManageBot/GetTopBotsByPnLCommandHandler.cs Normal file
View File

@@ -0,0 +1,16 @@
using Managing.Application.Abstractions.Repositories;
using Managing.Application.ManageBot.Commands;
using Managing.Domain.Bots;
using MediatR;
namespace Managing.Application.ManageBot
{
public class GetTopBotsByPnLCommandHandler(IBotRepository botRepository)
: IRequestHandler<GetTopBotsByPnLCommand, IEnumerable<Bot>>
{
public async Task<IEnumerable<Bot>> Handle(GetTopBotsByPnLCommand request, CancellationToken cancellationToken)
{
return await botRepository.GetTopBotsByPnLAsync(request.Statuses, request.Count);
}
}
}

16
src/Managing.Application/ManageBot/GetTopBotsByRoiCommandHandler.cs Normal file
View File

@@ -0,0 +1,16 @@
using Managing.Application.Abstractions.Repositories;
using Managing.Application.ManageBot.Commands;
using Managing.Domain.Bots;
using MediatR;
namespace Managing.Application.ManageBot
{
public class GetTopBotsByRoiCommandHandler(IBotRepository botRepository)
: IRequestHandler<GetTopBotsByRoiCommand, IEnumerable<Bot>>
{
public async Task<IEnumerable<Bot>> Handle(GetTopBotsByRoiCommand request, CancellationToken cancellationToken)
{
return await botRepository.GetTopBotsByRoiAsync(request.Statuses, request.Count);
}
}
}

28
src/Managing.Infrastructure.Database/PostgreSql/PostgreSqlBotRepository.cs
View File

@@ -239,4 +239,32 @@ public class PostgreSqlBotRepository : IBotRepository
var bots = PostgreSqlMappers.Map(entities);
return (bots, totalCount);
}
public async Task<IEnumerable<Bot>> GetTopBotsByPnLAsync(IEnumerable<BotStatus> statuses, int count = 3)
{
var entities = await _context.Bots
.AsNoTracking()
.Include(m => m.User)
.Where(b => statuses.Contains(b.Status))
.OrderByDescending(b => b.Pnl)
.Take(count)
.ToListAsync()
.ConfigureAwait(false);
return PostgreSqlMappers.Map(entities);
}
public async Task<IEnumerable<Bot>> GetTopBotsByRoiAsync(IEnumerable<BotStatus> statuses, int count = 3)
{
var entities = await _context.Bots
.AsNoTracking()
.Include(m => m.User)
.Where(b => statuses.Contains(b.Status))
.OrderByDescending(b => b.Roi)
.Take(count)
.ToListAsync()
.ConfigureAwait(false);
return PostgreSqlMappers.Map(entities);
}
}