diff --git a/KLHZ.Trader.Core/DataLayer/TraderDbContext.cs b/KLHZ.Trader.Core/DataLayer/TraderDbContext.cs index 66222b6..4b8b13b 100644 --- a/KLHZ.Trader.Core/DataLayer/TraderDbContext.cs +++ b/KLHZ.Trader.Core/DataLayer/TraderDbContext.cs @@ -10,7 +10,7 @@ namespace KLHZ.Trader.Core.DataLayer { public DbSet Declisions { get; set; } public DbSet Trades { get; set; } - public DbSet PriceChanges { get; set; } + //public DbSet PriceChanges { get; set; } public DbSet ProcessedPrices { get; set; } public DbSet ExperimentsResults { get; set; } public DbSet OrderbookItems { get; set; } @@ -33,15 +33,15 @@ namespace KLHZ.Trader.Core.DataLayer v => DateTime.SpecifyKind(v, DateTimeKind.Utc)); }); - modelBuilder.Entity(entity => - { - entity.HasKey(e1 => e1.Id); - entity.Ignore(e1 => e1.IsHistoricalData); - entity.Property(e => e.Time) - .HasConversion( - v => v.ToUniversalTime(), - v => DateTime.SpecifyKind(v, DateTimeKind.Utc)); - }); + //modelBuilder.Entity(entity => + //{ + // entity.HasKey(e1 => e1.Id); + // entity.Ignore(e1 => e1.IsHistoricalData); + // entity.Property(e => e.Time) + // .HasConversion( + // v => v.ToUniversalTime(), + // v => DateTime.SpecifyKind(v, DateTimeKind.Utc)); + //}); modelBuilder.Entity(entity => { diff --git a/KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs b/KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs index ee76758..7f6112f 100644 --- a/KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs +++ b/KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs @@ -204,7 +204,7 @@ namespace KLHZ.Trader.Core.Exchange.Services try { using var context = await _dbContextFactory.CreateDbContextAsync(); - context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; + //context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; lastWrite = DateTime.UtcNow; if (orderbookItemsBuffer.Count > 0) { diff --git a/KLHZ.Trader.Core/Exchange/Services/TraderDataProvider.cs b/KLHZ.Trader.Core/Exchange/Services/TraderDataProvider.cs index c74fa4c..a4801bb 100644 --- a/KLHZ.Trader.Core/Exchange/Services/TraderDataProvider.cs +++ b/KLHZ.Trader.Core/Exchange/Services/TraderDataProvider.cs @@ -130,7 +130,7 @@ namespace KLHZ.Trader.Core.Exchange.Services var time = DateTime.UtcNow.AddHours(-20); using var context1 = await _dbContextFactory.CreateDbContextAsync(); context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; - var data = await context1.PriceChanges + var data = await context1.Trades .Where(c => _tradingInstrumentsFigis.Contains(c.Figi) && c.Time >= time) .OrderBy(c => c.Time) .Select(c => new TradeDataItem() diff --git a/KLHZ.Trader.Service/Controllers/PlayController.cs b/KLHZ.Trader.Service/Controllers/PlayController.cs index da4d7ae..1b33e2e 100644 --- a/KLHZ.Trader.Service/Controllers/PlayController.cs +++ b/KLHZ.Trader.Service/Controllers/PlayController.cs @@ -47,7 +47,7 @@ namespace KLHZ.Trader.Service.Controllers .Where(oi => (oi.Figi == figi1 || oi.Figi == figi2) && oi.Time >= time1 && oi.Time < time2) .OrderBy(c => c.Time) .ToArrayAsync(); - var prices = await context1.PriceChanges + var prices = await context1.Trades .Where(c => (c.Figi == figi1 || c.Figi == figi2) && c.Time >= time1 && c.Time < time2) .OrderBy(c => c.Time) .Select(c => new TradeDataItem() @@ -255,7 +255,7 @@ namespace KLHZ.Trader.Service.Controllers context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; var time1 = time2.AddHours(-3); - var prices = await context1.PriceChanges + var prices = await context1.Trades .Where(c => (c.Figi == figi1 || c.Figi == figi2) && c.Time >= time1 && c.Time < time2 && c.Direction == 1) .OrderBy(c => c.Time) .Select(c => new TradeDataItem() @@ -360,7 +360,7 @@ namespace KLHZ.Trader.Service.Controllers using var context1 = await _dbContextFactory.CreateDbContextAsync(); context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; - var figis = context1.PriceChanges.Select(p => p.Figi).Distinct().ToArray(); + var figis = context1.Trades.Select(p => p.Figi).Distinct().ToArray(); foreach (var f in figis) { @@ -371,7 +371,7 @@ namespace KLHZ.Trader.Service.Controllers while (time1 < DateTime.UtcNow) { var time2 = time1.AddDays(7); - var prices = await context1.PriceChanges + var prices = await context1.Trades .Where(c => (c.Figi == f) && c.Time >= time1 && c.Time < time2) .OrderBy(c => c.Time) .ToArrayAsync();