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

Fix trades date

Browse Source
This commit is contained in:
cryptooda
2025-10-04 16:47:22 +07:00
parent 8c672b8c38
commit b473ad6ad8
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Managing.Application.Abstractions/Repositories/ITradingRepository.cs
View File

@@ -34,6 +34,5 @@ public interface ITradingRepository
Task UpdateStrategyAsync(IndicatorBase indicatorBase); Task UpdateStrategyAsync(IndicatorBase indicatorBase);
Task<IndicatorBase> GetStrategyByNameUserAsync(string name, User user); Task<IndicatorBase> GetStrategyByNameUserAsync(string name, User user);
Task<Scenario> GetScenarioByNameUserAsync(string scenarioName, User user); Task<Scenario> GetScenarioByNameUserAsync(string scenarioName, User user);
Task UpdateTradeAsync(Trade trade);
Task<IEnumerable<Position>> GetPositionByUserIdAsync(int userId); Task<IEnumerable<Position>> GetPositionByUserIdAsync(int userId);
} }

60
src/Managing.Infrastructure.Database/PostgreSql/PostgreSqlTradingRepository.cs
View File

@@ -391,70 +391,71 @@ public class PostgreSqlTradingRepository : ITradingRepository
{ {
var entity = _context.Positions var entity = _context.Positions
.AsTracking() .AsTracking()
.Include(p => p.OpenTrade)
.Include(p => p.StopLossTrade)
.Include(p => p.TakeProfit1Trade)
.Include(p => p.TakeProfit2Trade)
.FirstOrDefault(p => p.Identifier == position.Identifier); .FirstOrDefault(p => p.Identifier == position.Identifier);
if (entity != null) if (entity != null)
{ {
entity.Date = position.Date;
entity.ProfitAndLoss = position.ProfitAndLoss?.Realized ?? 0; entity.ProfitAndLoss = position.ProfitAndLoss?.Realized ?? 0;
entity.NetPnL = position.ProfitAndLoss?.Net ?? 0; entity.NetPnL = position.ProfitAndLoss?.Net ?? 0;
entity.UiFees = position.UiFees; entity.UiFees = position.UiFees;
entity.OriginDirection = position.OriginDirection; entity.OriginDirection = position.OriginDirection;
entity.GasFees = position.GasFees; entity.GasFees = position.GasFees;
entity.Status = position.Status; entity.Status = position.Status;
entity.SignalIdentifier = position.SignalIdentifier;
entity.MoneyManagementJson = position.MoneyManagement != null entity.MoneyManagementJson = position.MoneyManagement != null
? JsonConvert.SerializeObject(position.MoneyManagement) ? JsonConvert.SerializeObject(position.MoneyManagement)
: null; : null;
entity.UpdatedAt = DateTime.UtcNow; entity.UpdatedAt = DateTime.UtcNow;
// Update related trades // Update related trades directly through the position's trade references
if (position.Open != null) // This ensures we're updating the correct trade records for this specific position
if (position.Open != null && entity.OpenTrade != null)
{ {
await UpdateTradeAsync(position.Open); UpdateTradeEntity(entity.OpenTrade, position.Open);
} }
if (position.StopLoss != null) if (position.StopLoss != null && entity.StopLossTrade != null)
{ {
await UpdateTradeAsync(position.StopLoss); UpdateTradeEntity(entity.StopLossTrade, position.StopLoss);
} }
if (position.TakeProfit1 != null) if (position.TakeProfit1 != null && entity.TakeProfit1Trade != null)
{ {
await UpdateTradeAsync(position.TakeProfit1); UpdateTradeEntity(entity.TakeProfit1Trade, position.TakeProfit1);
} }
if (position.TakeProfit2 != null) if (position.TakeProfit2 != null && entity.TakeProfit2Trade != null)
{ {
await UpdateTradeAsync(position.TakeProfit2); UpdateTradeEntity(entity.TakeProfit2Trade, position.TakeProfit2);
} }
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
} }
} }
public async Task UpdateTradeAsync(Trade trade) /// <summary>
/// Updates a trade entity with data from a domain trade object
/// Only updates the date if the trade status is changing from Requested to Filled
/// </summary>
private void UpdateTradeEntity(TradeEntity entity, Trade trade)
{ {
var entity = _context.Trades // Only update the date if the trade status is changing from Requested to Filled
.AsTracking() // This prevents overwriting dates for trades that are already filled
.FirstOrDefault(t => t.ExchangeOrderId == trade.ExchangeOrderId); if (entity.Status != TradeStatus.Filled && trade.Status == TradeStatus.Filled)
if (entity != null)
{ {
entity.Date = trade.Date; entity.Date = trade.Date;
entity.Direction = trade.Direction;
entity.Status = trade.Status;
entity.TradeType = trade.TradeType;
entity.Ticker = trade.Ticker;
entity.Quantity = trade.Quantity;
entity.Price = trade.Price;
entity.Leverage = trade.Leverage;
entity.ExchangeOrderId = trade.ExchangeOrderId;
entity.Message = trade.Message;
entity.UpdatedAt = DateTime.UtcNow;
await _context.SaveChangesAsync();
} }
entity.Status = trade.Status;
entity.Quantity = trade.Quantity;
entity.Price = trade.Price;
entity.Leverage = trade.Leverage;
entity.ExchangeOrderId = trade.ExchangeOrderId;
entity.Message = trade.Message;
entity.UpdatedAt = DateTime.UtcNow;
} }
public async Task<IEnumerable<Position>> GetPositionsByInitiatorIdentifierAsync(Guid initiatorIdentifier) public async Task<IEnumerable<Position>> GetPositionsByInitiatorIdentifierAsync(Guid initiatorIdentifier)
@@ -627,6 +628,7 @@ public class PostgreSqlTradingRepository : ITradingRepository
.Include(p => p.TakeProfit1Trade) .Include(p => p.TakeProfit1Trade)
.Include(p => p.TakeProfit2Trade) .Include(p => p.TakeProfit2Trade)
.Where(p => p.UserId == userId) .Where(p => p.UserId == userId)
.OrderBy(p => p.Date)
.ToListAsync() .ToListAsync()
.ConfigureAwait(false); .ConfigureAwait(false);
return PostgreSqlMappers.Map(positions); return PostgreSqlMappers.Map(positions);