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

Fix db and fix endpoints

Browse Source
This commit is contained in:
cryptooda
2025-08-05 22:30:18 +07:00
parent 2dcbcc3ef2
commit 36529ae403
36 changed files with 5073 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Managing.Infrastructure.Database/PostgreSql/AgentSummaryRepository.cs
View File

@@ -229,4 +229,14 @@ public class AgentSummaryRepository : IAgentSummaryRepository
User = PostgreSqlMappers.Map(entity.User)
};
}
public async Task<IEnumerable<AgentSummary>> GetAllAgentWithRunningBots()
{
var agentSummaries = await _context.AgentSummaries
.Include(a => a.User)
.Where(a => _context.Bots.Any(b => b.UserId == a.UserId && b.Status == BotStatus.Up))
.ToListAsync();
return agentSummaries.Select(MapToDomain);
}
}

21
src/Managing.Infrastructure.Database/PostgreSql/Entities/AccountEntity.cs
View File

@@ -1,20 +1,23 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using static Managing.Common.Enums;
namespace Managing.Infrastructure.Databases.PostgreSql.Entities;
[Table("Accounts")]
public class AccountEntity
{
public int Id { get; set; }
public string Name { get; set; }
public TradingExchanges Exchange { get; set; }
public AccountType Type { get; set; }
public string? Key { get; set; }
[Key] public int Id { get; set; }
[Required] public string Name { get; set; }
[Required] public TradingExchanges Exchange { get; set; }
[Required] public AccountType Type { get; set; }
[Required] public string? Key { get; set; }
public string? Secret { get; set; }
public int? UserId { get; set; }
[Required] public int UserId { get; set; }
// Navigation properties
public UserEntity? User { get; set; }
// Store balances as JSON if needed, or skip them entirely
// public string? BalancesJson { get; set; }
}
}

6
src/Managing.Infrastructure.Database/PostgreSql/Entities/BacktestEntity.cs
View File

@@ -56,8 +56,10 @@ public class BacktestEntity
public string MoneyManagementJson { get; set; } = string.Empty;
[Required]
[MaxLength(255)]
public string UserName { get; set; } = string.Empty;
public int UserId { get; set; }
// Navigation property
public UserEntity? User { get; set; }
[Column(TypeName = "jsonb")]
public string? StatisticsJson { get; set; }

2
src/Managing.Infrastructure.Database/PostgreSql/Entities/BotEntity.cs
View File

@@ -15,7 +15,7 @@ public class BotEntity
public int UserId { get; set; }
[Required] [ForeignKey("UserId")] public required UserEntity User { get; set; }
[ForeignKey("UserId")] public UserEntity User { get; set; }
public BotStatus Status { get; set; }
public DateTime CreateDate { get; set; }

4
src/Managing.Infrastructure.Database/PostgreSql/Entities/BundleBacktestRequestEntity.cs
View File

@@ -15,10 +15,6 @@ public class BundleBacktestRequestEntity
[MaxLength(255)]
public string RequestId { get; set; } = string.Empty;
[Required]
[MaxLength(255)]
public string UserName { get; set; } = string.Empty;
// Foreign key to User entity
public int? UserId { get; set; }

2
src/Managing.Infrastructure.Database/PostgreSql/Entities/GeneticRequestEntity.cs
View File

@@ -1,7 +1,9 @@
using System.ComponentModel.DataAnnotations.Schema;
using static Managing.Common.Enums;
namespace Managing.Infrastructure.Databases.PostgreSql.Entities;
[Table("GeneticRequests")]
public class GeneticRequestEntity
{
public int Id { get; set; }

6
src/Managing.Infrastructure.Database/PostgreSql/Entities/IndicatorEntity.cs
View File

@@ -28,12 +28,14 @@ public class IndicatorEntity
public int? SmoothPeriods { get; set; }
public int? CyclePeriods { get; set; }
[MaxLength(255)]
public string? UserName { get; set; }
public int? UserId { get; set; }
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
// Navigation properties
public UserEntity? User { get; set; }
// Navigation property for the many-to-many relationship with scenarios
public virtual ICollection<ScenarioIndicatorEntity> ScenarioIndicators { get; set; } = new List<ScenarioIndicatorEntity>();
}

4
src/Managing.Infrastructure.Database/PostgreSql/Entities/PositionEntity.cs
View File

@@ -22,7 +22,7 @@ public class PositionEntity
[MaxLength(255)] public string AccountName { get; set; }
[MaxLength(255)] public string? UserName { get; set; }
public int? UserId { get; set; }
// Foreign keys to trades
public int? OpenTradeId { get; set; }
@@ -37,6 +37,8 @@ public class PositionEntity
public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
// Navigation properties
public UserEntity? User { get; set; }
[ForeignKey("OpenTradeId")] public virtual TradeEntity? OpenTrade { get; set; }
[ForeignKey("StopLossTradeId")] public virtual TradeEntity? StopLossTrade { get; set; }

7
src/Managing.Infrastructure.Database/PostgreSql/Entities/ScenarioEntity.cs
View File

@@ -15,12 +15,15 @@ public class ScenarioEntity
public int LoopbackPeriod { get; set; }
[MaxLength(255)]
public string? UserName { get; set; }
[Required]
public int UserId { get; set; }
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
// Navigation properties
public UserEntity? User { get; set; }
// Navigation property for the many-to-many relationship with indicators
public virtual ICollection<ScenarioIndicatorEntity> ScenarioIndicators { get; set; } = new List<ScenarioIndicatorEntity>();
}

6
src/Managing.Infrastructure.Database/PostgreSql/Entities/SignalEntity.cs
View File

@@ -26,8 +26,10 @@ public class SignalEntity
[MaxLength(255)]
public string IndicatorName { get; set; }
[MaxLength(255)]
public string? UserName { get; set; }
public int? UserId { get; set; }
// Navigation property
public UserEntity? User { get; set; }
// Candle data stored as JSON
[Column(TypeName = "text")]

2
src/Managing.Infrastructure.Database/PostgreSql/Entities/UserEntity.cs
View File

@@ -1,9 +1,11 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace Managing.Infrastructure.Databases.PostgreSql.Entities;
[Table("Users")]
[Index(nameof(Name), IsUnique = true)]
public class UserEntity
{
[Key] public int Id { get; set; }

68
src/Managing.Infrastructure.Database/PostgreSql/ManagingDbContext.cs
View File

@@ -130,7 +130,7 @@ public class ManagingDbContext : DbContext
entity.HasKey(e => e.Id);
entity.Property(e => e.Identifier).IsRequired().HasMaxLength(255);
entity.Property(e => e.RequestId).IsRequired().HasMaxLength(255);
entity.Property(e => e.UserName).IsRequired().HasMaxLength(255);
entity.Property(e => e.UserId).IsRequired();
entity.Property(e => e.FinalPnl).HasColumnType("decimal(18,8)");
entity.Property(e => e.GrowthPercentage).HasColumnType("decimal(18,8)");
entity.Property(e => e.HodlPercentage).HasColumnType("decimal(18,8)");
@@ -143,14 +143,20 @@ public class ManagingDbContext : DbContext
entity.Property(e => e.ScoreMessage).HasMaxLength(1000);
entity.Property(e => e.Metadata).HasColumnType("text");
// Configure relationship with User
entity.HasOne(e => e.User)
.WithMany()
.HasForeignKey(e => e.UserId)
.OnDelete(DeleteBehavior.SetNull);
// Create indexes for common queries
entity.HasIndex(e => e.Identifier).IsUnique();
entity.HasIndex(e => e.RequestId);
entity.HasIndex(e => e.UserName);
entity.HasIndex(e => e.UserId);
entity.HasIndex(e => e.Score);
// Composite indexes for efficient pagination and filtering
entity.HasIndex(e => new { e.UserName, e.Score });
entity.HasIndex(e => new { e.UserId, e.Score });
entity.HasIndex(e => new { e.RequestId, e.Score });
});
@@ -159,7 +165,7 @@ public class ManagingDbContext : DbContext
{
entity.HasKey(e => e.Id);
entity.Property(e => e.RequestId).IsRequired().HasMaxLength(255);
entity.Property(e => e.UserName).IsRequired().HasMaxLength(255);
entity.Property(e => e.UserId);
entity.Property(e => e.Name).IsRequired().HasMaxLength(255);
entity.Property(e => e.Status)
.IsRequired()
@@ -178,11 +184,11 @@ public class ManagingDbContext : DbContext
// Create indexes for common queries
entity.HasIndex(e => e.RequestId).IsUnique();
entity.HasIndex(e => e.UserName);
entity.HasIndex(e => e.UserId);
entity.HasIndex(e => e.Status);
// Composite index for user queries ordered by creation date
entity.HasIndex(e => new { e.UserName, e.CreatedAt });
entity.HasIndex(e => new { e.UserId, e.CreatedAt });
});
// Configure Scenario entity
@@ -190,13 +196,19 @@ public class ManagingDbContext : DbContext
{
entity.HasKey(e => e.Id);
entity.Property(e => e.Name).IsRequired().HasMaxLength(255);
entity.Property(e => e.UserName).HasMaxLength(255);
entity.Property(e => e.UserId).IsRequired();
// Configure relationship with User
entity.HasOne(e => e.User)
.WithMany()
.HasForeignKey(e => e.UserId)
.OnDelete(DeleteBehavior.SetNull);
// Create indexes
entity.HasIndex(e => e.UserName);
entity.HasIndex(e => e.UserId);
// Composite index for user scenarios
entity.HasIndex(e => new { e.UserName, e.Name });
entity.HasIndex(e => new { e.UserId, e.Name });
});
// Configure Indicator entity
@@ -207,13 +219,19 @@ public class ManagingDbContext : DbContext
entity.Property(e => e.Type).IsRequired().HasConversion<string>();
entity.Property(e => e.Timeframe).IsRequired().HasConversion<string>();
entity.Property(e => e.SignalType).IsRequired().HasConversion<string>();
entity.Property(e => e.UserName).HasMaxLength(255);
entity.Property(e => e.UserId);
// Configure relationship with User
entity.HasOne(e => e.User)
.WithMany()
.HasForeignKey(e => e.UserId)
.OnDelete(DeleteBehavior.SetNull);
// Create indexes
entity.HasIndex(e => e.UserName);
entity.HasIndex(e => e.UserId);
// Composite index for user indicators
entity.HasIndex(e => new { e.UserName, e.Name });
entity.HasIndex(e => new { e.UserId, e.Name });
});
// Configure ScenarioIndicator junction table
@@ -249,19 +267,25 @@ public class ManagingDbContext : DbContext
entity.Property(e => e.Type).IsRequired().HasConversion<string>();
entity.Property(e => e.SignalType).IsRequired().HasConversion<string>();
entity.Property(e => e.IndicatorName).IsRequired().HasMaxLength(255);
entity.Property(e => e.UserName).HasMaxLength(255);
entity.Property(e => e.UserId);
entity.Property(e => e.CandleJson).HasColumnType("text");
// Configure relationship with User
entity.HasOne(e => e.User)
.WithMany()
.HasForeignKey(e => e.UserId)
.OnDelete(DeleteBehavior.SetNull);
// Create indexes
entity.HasIndex(e => e.Identifier);
entity.HasIndex(e => e.UserName);
entity.HasIndex(e => e.UserId);
entity.HasIndex(e => e.Date);
entity.HasIndex(e => e.Ticker);
entity.HasIndex(e => e.Status);
// Composite indexes for common queries
entity.HasIndex(e => new { e.UserName, e.Date });
entity.HasIndex(e => new { e.Identifier, e.Date, e.UserName }).IsUnique();
entity.HasIndex(e => new { e.UserId, e.Date });
entity.HasIndex(e => new { e.Identifier, e.Date, e.UserId }).IsUnique();
});
// Configure Position entity
@@ -275,9 +299,15 @@ public class ManagingDbContext : DbContext
entity.Property(e => e.Initiator).IsRequired().HasConversion<string>();
entity.Property(e => e.SignalIdentifier).IsRequired().HasMaxLength(255);
entity.Property(e => e.AccountName).IsRequired().HasMaxLength(255);
entity.Property(e => e.UserName).HasMaxLength(255);
entity.Property(e => e.UserId);
entity.Property(e => e.MoneyManagementJson).HasColumnType("text");
// Configure relationship with User
entity.HasOne(e => e.User)
.WithMany()
.HasForeignKey(e => e.UserId)
.OnDelete(DeleteBehavior.SetNull);
// Configure relationships with trades
entity.HasOne(e => e.OpenTrade)
.WithMany()
@@ -301,12 +331,12 @@ public class ManagingDbContext : DbContext
// Create indexes
entity.HasIndex(e => e.Identifier).IsUnique();
entity.HasIndex(e => e.UserName);
entity.HasIndex(e => e.UserId);
entity.HasIndex(e => e.Status);
entity.HasIndex(e => e.Date);
// Composite indexes
entity.HasIndex(e => new { e.UserName, e.Identifier });
entity.HasIndex(e => new { e.UserId, e.Identifier });
});
// Configure Trade entity

22
src/Managing.Infrastructure.Database/PostgreSql/PostgreSqlAccountRepository.cs
View File

@@ -131,28 +131,12 @@ public class PostgreSqlAccountRepository : IAccountRepository
{
var accountEntity = PostgreSqlMappers.Map(account);
// Handle User relationship - check if user exists or create new one
if (account.User != null)
// Handle User relationship - user should always have an ID at this point
if (account.User == null)
{
var existingUser = await _context.Users
.AsTracking() // Explicitly enable tracking for this operation
.FirstOrDefaultAsync(u => u.Name == account.User.Name)
.ConfigureAwait(false);
if (existingUser != null)
{
accountEntity.UserId = existingUser.Id;
accountEntity.User = null; // Prevent EF from trying to insert duplicate user
}
else
{
// Let EF handle the new user creation
accountEntity.UserId = null;
}
throw new Exception($"Cannot create account {account.Name} without a user");
}
// Balances are not stored in PostgreSQL, they remain in domain logic only
_context.Accounts.Add(accountEntity);
await _context.SaveChangesAsync().ConfigureAwait(false);
}

38
src/Managing.Infrastructure.Database/PostgreSql/PostgreSqlBacktestRepository.cs
View File

@@ -72,7 +72,8 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entities = _context.Backtests
.AsNoTracking()
.Where(b => b.UserName == user.Name)
.Include(b => b.User)
.Where(b => b.UserId == user.Id)
.ToList();
return entities.Select(PostgreSqlMappers.Map);
@@ -82,7 +83,8 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entities = await _context.Backtests
.AsNoTracking()
.Where(b => b.UserName == user.Name)
.Include(b => b.User)
.Where(b => b.UserId == user.Id)
.ToListAsync()
.ConfigureAwait(false);
@@ -259,7 +261,8 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entity = _context.Backtests
.AsNoTracking()
.FirstOrDefault(b => b.Identifier == id && b.UserName == user.Name);
.Include(b => b.User)
.FirstOrDefault(b => b.Identifier == id && b.UserId == user.Id);
return entity != null ? PostgreSqlMappers.Map(entity) : null;
}
@@ -268,7 +271,8 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entity = await _context.Backtests
.AsNoTracking()
.FirstOrDefaultAsync(b => b.Identifier == id && b.UserName == user.Name)
.Include(b => b.User)
.FirstOrDefaultAsync(b => b.Identifier == id && b.UserId == user.Id)
.ConfigureAwait(false);
return entity != null ? PostgreSqlMappers.Map(entity) : null;
@@ -278,7 +282,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entity = _context.Backtests
.AsTracking()
.FirstOrDefault(b => b.Identifier == id && b.UserName == user.Name);
.FirstOrDefault(b => b.Identifier == id && b.UserId == user.Id);
if (entity != null)
{
@@ -291,7 +295,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entity = await _context.Backtests
.AsTracking()
.FirstOrDefaultAsync(b => b.Identifier == id && b.UserName == user.Name)
.FirstOrDefaultAsync(b => b.Identifier == id && b.UserId == user.Id)
.ConfigureAwait(false);
if (entity != null)
@@ -305,7 +309,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entities = _context.Backtests
.AsTracking()
.Where(b => b.UserName == user.Name && ids.Contains(b.Identifier))
.Where(b => b.UserId == user.Id && ids.Contains(b.Identifier))
.ToList();
if (entities.Any())
@@ -319,7 +323,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entities = await _context.Backtests
.AsTracking()
.Where(b => b.UserName == user.Name && ids.Contains(b.Identifier))
.Where(b => b.UserId == user.Id && ids.Contains(b.Identifier))
.ToListAsync()
.ConfigureAwait(false);
@@ -334,7 +338,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entities = _context.Backtests
.AsTracking()
.Where(b => b.UserName == user.Name)
.Where(b => b.UserId == user.Id)
.ToList();
if (entities.Any())
@@ -380,7 +384,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
var baseQuery = _context.Backtests
.AsNoTracking()
.Where(b => b.UserName == user.Name);
.Where(b => b.UserId == user.Id);
var afterQueryMs = stopwatch.ElapsedMilliseconds;
var totalCount = baseQuery.Count();
@@ -452,7 +456,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
var baseQuery = _context.Backtests
.AsNoTracking()
.Where(b => b.UserName == user.Name);
.Where(b => b.UserId == user.Id);
var afterQueryMs = stopwatch.ElapsedMilliseconds;
var totalCount = await baseQuery.CountAsync().ConfigureAwait(false);
@@ -556,7 +560,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
var entities = _context.BundleBacktestRequests
.AsNoTracking()
.Include(b => b.User)
.Where(b => b.UserName == user.Name)
.Where(b => b.UserId == user.Id)
.OrderByDescending(b => b.CreatedAt)
.ToList();
@@ -568,7 +572,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
var entities = await _context.BundleBacktestRequests
.AsNoTracking()
.Include(b => b.User)
.Where(b => b.UserName == user.Name)
.Where(b => b.UserId == user.Id)
.OrderByDescending(b => b.CreatedAt)
.ToListAsync()
.ConfigureAwait(false);
@@ -581,7 +585,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
var entity = _context.BundleBacktestRequests
.AsNoTracking()
.Include(b => b.User)
.FirstOrDefault(b => b.RequestId == id && b.UserName == user.Name);
.FirstOrDefault(b => b.RequestId == id && b.UserId == user.Id);
return entity != null ? PostgreSqlMappers.Map(entity) : null;
}
@@ -591,7 +595,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
var entity = await _context.BundleBacktestRequests
.AsNoTracking()
.Include(b => b.User)
.FirstOrDefaultAsync(b => b.RequestId == id && b.UserName == user.Name)
.FirstOrDefaultAsync(b => b.RequestId == id && b.UserId == user.Id)
.ConfigureAwait(false);
return entity != null ? PostgreSqlMappers.Map(entity) : null;
@@ -682,7 +686,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entity = _context.BundleBacktestRequests
.AsTracking()
.FirstOrDefault(b => b.RequestId == id && b.UserName == user.Name);
.FirstOrDefault(b => b.RequestId == id && b.UserId == user.Id);
if (entity != null)
{
@@ -695,7 +699,7 @@ public class PostgreSqlBacktestRepository : IBacktestRepository
{
var entity = await _context.BundleBacktestRequests
.AsTracking()
.FirstOrDefaultAsync(b => b.RequestId == id && b.UserName == user.Name)
.FirstOrDefaultAsync(b => b.RequestId == id && b.UserId == user.Id)
.ConfigureAwait(false);
if (entity != null)

36
src/Managing.Infrastructure.Database/PostgreSql/PostgreSqlMappers.cs
View File

@@ -49,7 +49,7 @@ public static class PostgreSqlMappers
Type = account.Type,
Key = account.Key,
Secret = account.Secret,
User = account.User != null ? Map(account.User) : null
UserId = account.User.Id,
};
}
@@ -88,8 +88,7 @@ public static class PostgreSqlMappers
StopLoss = moneyManagement.StopLoss,
TakeProfit = moneyManagement.TakeProfit,
Leverage = moneyManagement.Leverage,
UserName = moneyManagement.User?.Name,
User = moneyManagement.User != null ? Map(moneyManagement.User) : null
UserId = moneyManagement.User?.Id ?? 0
};
}
@@ -204,7 +203,7 @@ public static class PostgreSqlMappers
var entity = new GeneticRequestEntity
{
RequestId = geneticRequest.RequestId,
User = geneticRequest.User != null ? Map(geneticRequest.User) : null,
UserId = geneticRequest.User?.Id ?? 0,
CreatedAt = geneticRequest.CreatedAt,
CompletedAt = geneticRequest.CompletedAt,
UpdatedAt = DateTime.UtcNow,
@@ -268,7 +267,8 @@ public static class PostgreSqlMappers
var config = JsonConvert.DeserializeObject<TradingBotConfig>(entity.ConfigJson);
var positionsList = JsonConvert.DeserializeObject<List<Position>>(entity.PositionsJson) ?? new List<Position>();
var positions = positionsList.ToDictionary(p => p.Identifier, p => p);
var signalsList = JsonConvert.DeserializeObject<List<LightSignal>>(entity.SignalsJson) ?? new List<LightSignal>();
var signalsList = JsonConvert.DeserializeObject<List<LightSignal>>(entity.SignalsJson) ??
new List<LightSignal>();
var signals = signalsList.ToDictionary(s => s.Identifier, s => s);
var statistics = !string.IsNullOrEmpty(entity.StatisticsJson)
? JsonConvert.DeserializeObject<PerformanceMetrics>(entity.StatisticsJson)
@@ -283,7 +283,7 @@ public static class PostgreSqlMappers
HodlPercentage = entity.HodlPercentage,
StartDate = entity.StartDate,
EndDate = entity.EndDate,
User = new User { Name = entity.UserName },
User = entity.User != null ? Map(entity.User) : null,
Statistics = statistics,
Fees = entity.Fees,
Score = entity.Score,
@@ -313,7 +313,7 @@ public static class PostgreSqlMappers
StartDate = backtest.StartDate,
EndDate = backtest.EndDate,
MoneyManagementJson = JsonConvert.SerializeObject(backtest.Config?.MoneyManagement),
UserName = backtest.User?.Name ?? string.Empty,
UserId = backtest.User?.Id ?? 0,
StatisticsJson = backtest.Statistics != null ? JsonConvert.SerializeObject(backtest.Statistics) : null,
Fees = backtest.Fees,
Score = backtest.Score,
@@ -339,7 +339,7 @@ public static class PostgreSqlMappers
var bundleRequest = new BundleBacktestRequest(entity.RequestId)
{
User = entity.User != null ? Map(entity.User) : new User { Name = entity.UserName },
User = entity.User != null ? Map(entity.User) : null,
CreatedAt = entity.CreatedAt,
CompletedAt = entity.CompletedAt,
Status = entity.Status,
@@ -378,8 +378,7 @@ public static class PostgreSqlMappers
var entity = new BundleBacktestRequestEntity
{
RequestId = bundleRequest.RequestId,
UserName = bundleRequest.User?.Name ?? string.Empty,
UserId = null, // Will be set by the repository when saving
UserId = bundleRequest.User?.Id ?? 0,
CreatedAt = bundleRequest.CreatedAt,
CompletedAt = bundleRequest.CompletedAt,
Status = bundleRequest.Status,
@@ -431,7 +430,7 @@ public static class PostgreSqlMappers
return new Scenario(entity.Name, entity.LoopbackPeriod)
{
User = entity.UserName != null ? new User { Name = entity.UserName } : null,
User = entity.User != null ? Map(entity.User) : null,
Indicators = new List<IndicatorBase>() // Will be populated separately when needed
};
}
@@ -444,7 +443,7 @@ public static class PostgreSqlMappers
{
Name = scenario.Name,
LoopbackPeriod = scenario.LoopbackPeriod ?? 1,
UserName = scenario.User?.Name
UserId = scenario.User?.Id ?? 0
};
}
@@ -465,7 +464,7 @@ public static class PostgreSqlMappers
SmoothPeriods = entity.SmoothPeriods,
StochPeriods = entity.StochPeriods,
CyclePeriods = entity.CyclePeriods,
User = entity.UserName != null ? new User { Name = entity.UserName } : null
User = entity.User != null ? Map(entity.User) : null
};
}
@@ -488,7 +487,7 @@ public static class PostgreSqlMappers
SmoothPeriods = indicatorBase.SmoothPeriods,
StochPeriods = indicatorBase.StochPeriods,
CyclePeriods = indicatorBase.CyclePeriods,
UserName = indicatorBase.User?.Name
UserId = indicatorBase.User?.Id ?? 0
};
}
@@ -511,7 +510,7 @@ public static class PostgreSqlMappers
entity.Type,
entity.SignalType,
entity.IndicatorName,
entity.UserName != null ? new User { Name = entity.UserName } : null)
entity.User != null ? Map(entity.User) : null)
{
Status = entity.Status
};
@@ -533,7 +532,7 @@ public static class PostgreSqlMappers
Type = signal.IndicatorType,
SignalType = signal.SignalType,
IndicatorName = signal.IndicatorName,
UserName = signal.User?.Name,
UserId = signal.User?.Id ?? 0,
CandleJson = signal.Candle != null ? JsonConvert.SerializeObject(signal.Candle) : null
};
}
@@ -559,7 +558,7 @@ public static class PostgreSqlMappers
moneyManagement,
entity.Initiator,
entity.Date,
entity.UserName != null ? new User { Name = entity.UserName } : null)
entity.User != null ? Map(entity.User) : null)
{
Status = entity.Status,
SignalIdentifier = entity.SignalIdentifier
@@ -596,7 +595,7 @@ public static class PostgreSqlMappers
Initiator = position.Initiator,
SignalIdentifier = position.SignalIdentifier,
AccountName = position.AccountName,
UserName = position.User?.Name,
UserId = position.User?.Id ?? 0,
MoneyManagementJson = position.MoneyManagement != null
? JsonConvert.SerializeObject(position.MoneyManagement)
: null
@@ -703,7 +702,6 @@ public static class PostgreSqlMappers
{
Identifier = bot.Identifier,
UserId = bot.User.Id,
User = bot.User != null ? Map(bot.User) : null,
Status = bot.Status,
CreateDate = bot.CreateDate,
Name = bot.Name,

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

@@ -40,6 +40,7 @@ public class PostgreSqlTradingRepository : ITradingRepository
{
var scenario = await _context.Scenarios
.AsNoTracking()
.Include(s => s.User)
.Include(s => s.ScenarioIndicators)
.ThenInclude(si => si.Indicator)
.FirstOrDefaultAsync(s => s.Name == name)
@@ -80,14 +81,36 @@ public class PostgreSqlTradingRepository : ITradingRepository
});
}
public async Task<IEnumerable<Scenario>> GetScenariosByUserAsync(User user)
{
var userId = user?.Id ?? 0;
var scenarios = await _context.Scenarios
.AsNoTracking()
.Include(s => s.User)
.Include(s => s.ScenarioIndicators)
.ThenInclude(si => si.Indicator)
.Where(s => s.UserId == userId)
.ToListAsync()
.ConfigureAwait(false);
return scenarios.Select(scenario =>
{
var mappedScenario = PostgreSqlMappers.Map(scenario);
mappedScenario.Indicators = scenario.ScenarioIndicators
.Select(si => PostgreSqlMappers.Map(si.Indicator))
.ToList();
return mappedScenario;
});
}
public async Task InsertScenarioAsync(Scenario scenario)
{
var userId = scenario.User?.Id ?? 0;
// Check if scenario already exists for the same user
var existingScenario = await _context.Scenarios
.AsNoTracking()
.FirstOrDefaultAsync(s => s.Name == scenario.Name &&
((scenario.User == null && s.UserName == null) ||
(scenario.User != null && s.UserName == scenario.User.Name)));
.FirstOrDefaultAsync(s => s.Name == scenario.Name && s.UserId == userId);
if (existingScenario != null)
{
@@ -104,11 +127,10 @@ public class PostgreSqlTradingRepository : ITradingRepository
{
foreach (var indicator in scenario.Indicators)
{
var indicatorUserId = indicator.User?.Id ?? 0;
var indicatorEntity = await _context.Indicators
.AsNoTracking()
.FirstOrDefaultAsync(i => i.Name == indicator.Name &&
((indicator.User == null && i.UserName == null) ||
(indicator.User != null && i.UserName == indicator.User.Name)));
.FirstOrDefaultAsync(i => i.Name == indicator.Name && i.UserId == indicatorUserId);
if (indicatorEntity != null)
{
@@ -134,7 +156,7 @@ public class PostgreSqlTradingRepository : ITradingRepository
if (entity != null)
{
entity.LoopbackPeriod = scenario.LoopbackPeriod ?? 1;
entity.UserName = scenario.User?.Name;
entity.UserId = scenario.User?.Id ?? 0;
entity.UpdatedAt = DateTime.UtcNow;
await _context.SaveChangesAsync();
@@ -196,12 +218,11 @@ public class PostgreSqlTradingRepository : ITradingRepository
public async Task InsertIndicatorAsync(IndicatorBase indicatorBase)
{
var indicatorUserId = indicatorBase.User?.Id ?? 0;
// Check if indicator already exists for the same user
var existingIndicator = await _context.Indicators
.AsNoTracking()
.FirstOrDefaultAsync(i => i.Name == indicatorBase.Name &&
((indicatorBase.User == null && i.UserName == null) ||
(indicatorBase.User != null && i.UserName == indicatorBase.User.Name)));
.FirstOrDefaultAsync(i => i.Name == indicatorBase.Name && i.UserId == indicatorUserId);
if (existingIndicator != null)
{
@@ -233,7 +254,7 @@ public class PostgreSqlTradingRepository : ITradingRepository
entity.SmoothPeriods = indicatorBase.SmoothPeriods;
entity.StochPeriods = indicatorBase.StochPeriods;
entity.CyclePeriods = indicatorBase.CyclePeriods;
entity.UserName = indicatorBase.User?.Name;
entity.UserId = indicatorBase.User?.Id ?? 0;
entity.UpdatedAt = DateTime.UtcNow;
await _context.SaveChangesAsync();
@@ -249,6 +270,7 @@ public class PostgreSqlTradingRepository : ITradingRepository
{
var position = await _context.Positions
.AsNoTracking()
.Include(p => p.User)
.Include(p => p.OpenTrade)
.Include(p => p.StopLossTrade)
.Include(p => p.TakeProfit1Trade)
@@ -268,6 +290,7 @@ public class PostgreSqlTradingRepository : ITradingRepository
{
var positions = await _context.Positions
.AsNoTracking()
.Include(p => p.User)
.Include(p => p.OpenTrade)
.Include(p => p.StopLossTrade)
.Include(p => p.TakeProfit1Trade)
@@ -288,6 +311,7 @@ public class PostgreSqlTradingRepository : ITradingRepository
{
var positions = await _context.Positions
.AsNoTracking()
.Include(p => p.User)
.Include(p => p.OpenTrade)
.Include(p => p.StopLossTrade)
.Include(p => p.TakeProfit1Trade)
@@ -301,12 +325,11 @@ public class PostgreSqlTradingRepository : ITradingRepository
public async Task InsertPositionAsync(Position position)
{
var positionUserId = position.User?.Id ?? 0;
// Check if position already exists for the same user
var existingPosition = await _context.Positions
.AsNoTracking()
.FirstOrDefaultAsync(p => p.Identifier == position.Identifier &&
((position.User == null && p.UserName == null) ||
(position.User != null && p.UserName == position.User.Name)));
.FirstOrDefaultAsync(p => p.Identifier == position.Identifier && p.UserId == positionUserId);
if (existingPosition != null)
{
@@ -385,10 +408,11 @@ public class PostgreSqlTradingRepository : ITradingRepository
public async Task<IEnumerable<Signal>> GetSignalsByUserAsync(User user)
{
var userId = user?.Id ?? 0;
var signals = await _context.Signals
.AsNoTracking()
.Where(s => (user == null && s.UserName == null) ||
(user != null && s.UserName == user.Name))
.Include(s => s.User)
.Where(s => s.UserId == userId)
.ToListAsync()
.ConfigureAwait(false);
@@ -402,11 +426,11 @@ public class PostgreSqlTradingRepository : ITradingRepository
public async Task<Signal> GetSignalByIdentifierAsync(string identifier, User user = null)
{
var userId = user?.Id ?? 0;
var signal = await _context.Signals
.AsNoTracking()
.FirstOrDefaultAsync(s => s.Identifier == identifier &&
((user == null && s.UserName == null) ||
(user != null && s.UserName == user.Name)))
.Include(s => s.User)
.FirstOrDefaultAsync(s => s.Identifier == identifier && s.UserId == userId)
.ConfigureAwait(false);
return PostgreSqlMappers.Map(signal);
@@ -414,13 +438,13 @@ public class PostgreSqlTradingRepository : ITradingRepository
public async Task InsertSignalAsync(Signal signal)
{
var signalUserId = signal.User?.Id ?? 0;
// Check if signal already exists with the same identifier, date, and user
var existingSignal = _context.Signals
.AsNoTracking()
.FirstOrDefault(s => s.Identifier == signal.Identifier &&
s.Date == signal.Date &&
((s.UserName == null && signal.User == null) ||
(s.UserName != null && signal.User != null && s.UserName == signal.User.Name)));
s.UserId == signalUserId);
if (existingSignal != null)
{
@@ -435,21 +459,21 @@ public class PostgreSqlTradingRepository : ITradingRepository
public async Task<IndicatorBase> GetStrategyByNameUserAsync(string name, User user)
{
var userId = user?.Id ?? 0;
var indicator = await _context.Indicators
.AsNoTracking()
.FirstOrDefaultAsync(i => i.Name == name &&
((user == null && i.UserName == null) ||
(user != null && i.UserName == user.Name)));
.Include(i => i.User)
.FirstOrDefaultAsync(i => i.Name == name && i.UserId == userId);
return PostgreSqlMappers.Map(indicator);
}
public async Task<Scenario> GetScenarioByNameUserAsync(string scenarioName, User user)
{
var userId = user?.Id ?? 0;
var scenario = await _context.Scenarios
.AsNoTracking()
.FirstOrDefaultAsync(s => s.Name == scenarioName &&
((user == null && s.UserName == null) ||
(user != null && s.UserName == user.Name)));
.Include(s => s.User)
.FirstOrDefaultAsync(s => s.Name == scenarioName && s.UserId == userId);
return PostgreSqlMappers.Map(scenario);
}

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

@@ -41,12 +41,12 @@ public class PostgreSqlUserRepository : IUserRepository
try
{
await EnsureConnectionOpenAsync();
var userEntity = await _context.Users
.AsNoTracking()
.FirstOrDefaultAsync(u => u.AgentName == agentName)
.ConfigureAwait(false);
return PostgreSqlMappers.Map(userEntity);
}
catch (Exception)
@@ -62,12 +62,12 @@ public class PostgreSqlUserRepository : IUserRepository
try
{
await EnsureConnectionOpenAsync();
var userEntity = await _context.Users
.AsNoTracking()
.FirstOrDefaultAsync(u => u.Name == name)
.ConfigureAwait(false);
return PostgreSqlMappers.Map(userEntity);
}
catch (Exception)
@@ -78,25 +78,17 @@ public class PostgreSqlUserRepository : IUserRepository
}
}
public async Task InsertUserAsync(User user)
{
var userEntity = PostgreSqlMappers.Map(user);
_context.Users.Add(userEntity);
await _context.SaveChangesAsync().ConfigureAwait(false);
}
public async Task<IEnumerable<User>> GetAllUsersAsync()
{
try
{
await EnsureConnectionOpenAsync();
var userEntities = await _context.Users
.AsNoTracking()
.ToListAsync()
.ConfigureAwait(false);
return userEntities.Select(PostgreSqlMappers.Map);
}
catch (Exception)
@@ -107,31 +99,45 @@ public class PostgreSqlUserRepository : IUserRepository
}
}
public async Task UpdateUser(User user)
public async Task SaveOrUpdateUserAsync(User user)
{
try
{
var userEntity = await _context.Users
.AsTracking() // Explicitly enable tracking for update operations
var existingUser = await _context.Users
.AsTracking()
.FirstOrDefaultAsync(u => u.Name == user.Name)
.ConfigureAwait(false);
if (userEntity == null)
if (existingUser != null)
{
throw new InvalidOperationException($"User with name '{user.Name}' not found");
// Update existing user
existingUser.AgentName = user.AgentName;
existingUser.AvatarUrl = user.AvatarUrl;
existingUser.TelegramChannel = user.TelegramChannel;
_context.Users.Update(existingUser);
// Update the user object with the existing user's ID
user.Id = existingUser.Id;
}
else
{
// Insert new user
var userEntity = PostgreSqlMappers.Map(user);
_context.Users.Add(userEntity);
// Update the user object with the database-generated ID after save
await _context.SaveChangesAsync().ConfigureAwait(false);
user.Id = userEntity.Id;
return; // Exit early since we already saved
}
userEntity.AgentName = user.AgentName;
userEntity.AvatarUrl = user.AvatarUrl;
userEntity.TelegramChannel = user.TelegramChannel;
_context.Users.Update(userEntity);
await _context.SaveChangesAsync().ConfigureAwait(false);
}
catch (Exception e)
{
Console.WriteLine(e);
throw new Exception("Cannot update user");
throw new Exception("Cannot save or update user");
}
}
}
}