From 55f70add44a0ce4cbe1b867d65b97b4aac97cd6a Mon Sep 17 00:00:00 2001 From: cryptooda Date: Thu, 20 Nov 2025 14:52:55 +0700 Subject: [PATCH] Include master bot for all query on Botentity --- .../PostgreSql/PostgreSqlBotRepository.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Managing.Infrastructure.Database/PostgreSql/PostgreSqlBotRepository.cs b/src/Managing.Infrastructure.Database/PostgreSql/PostgreSqlBotRepository.cs index 5908d23a..970e3104 100644 --- a/src/Managing.Infrastructure.Database/PostgreSql/PostgreSqlBotRepository.cs +++ b/src/Managing.Infrastructure.Database/PostgreSql/PostgreSqlBotRepository.cs @@ -43,6 +43,7 @@ public class PostgreSqlBotRepository : IBotRepository var entities = await _context.Bots .AsNoTracking() .Include(m => m.User) + .Include(m => m.MasterBotUser) .ToListAsync() .ConfigureAwait(false); @@ -105,6 +106,7 @@ public class PostgreSqlBotRepository : IBotRepository var entity = await _context.Bots .AsNoTracking() .Include(m => m.User) + .Include(m => m.MasterBotUser) .FirstOrDefaultAsync(b => b.Identifier == identifier) .ConfigureAwait(false); return PostgreSqlMappers.Map(entity); @@ -142,6 +144,7 @@ public class PostgreSqlBotRepository : IBotRepository var entities = await _context.Bots .AsNoTracking() .Include(m => m.User) + .Include(m => m.MasterBotUser) .Where(b => b.Status == status) .ToListAsync() .ConfigureAwait(false); @@ -153,6 +156,7 @@ public class PostgreSqlBotRepository : IBotRepository var entity = await _context.Bots .AsNoTracking() .Include(m => m.User) + .Include(m => m.MasterBotUser) .FirstOrDefaultAsync(b => b.Name == name) .ConfigureAwait(false); return PostgreSqlMappers.Map(entity); @@ -167,6 +171,7 @@ public class PostgreSqlBotRepository : IBotRepository var entities = await _context.Bots .AsNoTracking() .Include(m => m.User) + .Include(m => m.MasterBotUser) .Where(b => identifiers.Contains(b.Identifier)) .ToListAsync() .ConfigureAwait(false); @@ -243,8 +248,10 @@ public class PostgreSqlBotRepository : IBotRepository ? query.OrderBy(b => b.Pnl) : query.OrderByDescending(b => b.Pnl), BotSortableColumn.WinRate => sortDirection.ToLower() == "asc" - ? query.OrderBy(b => (b.TradeWins + b.TradeLosses) > 0 ? (double)b.TradeWins / (b.TradeWins + b.TradeLosses) : 0) - : query.OrderByDescending(b => (b.TradeWins + b.TradeLosses) > 0 ? (double)b.TradeWins / (b.TradeWins + b.TradeLosses) : 0), + ? query.OrderBy(b => + (b.TradeWins + b.TradeLosses) > 0 ? (double)b.TradeWins / (b.TradeWins + b.TradeLosses) : 0) + : query.OrderByDescending(b => + (b.TradeWins + b.TradeLosses) > 0 ? (double)b.TradeWins / (b.TradeWins + b.TradeLosses) : 0), BotSortableColumn.AgentName => sortDirection.ToLower() == "asc" ? query.OrderBy(b => b.User.AgentName) : query.OrderByDescending(b => b.User.AgentName), @@ -270,6 +277,7 @@ public class PostgreSqlBotRepository : IBotRepository var entities = await _context.Bots .AsNoTracking() .Include(m => m.User) + .Include(m => m.MasterBotUser) .Where(b => statuses.Contains(b.Status)) .OrderByDescending(b => b.Pnl) .Take(count) @@ -284,6 +292,7 @@ public class PostgreSqlBotRepository : IBotRepository var entities = await _context.Bots .AsNoTracking() .Include(m => m.User) + .Include(m => m.MasterBotUser) .Where(b => statuses.Contains(b.Status)) .OrderByDescending(b => b.Roi) .Take(count)