vladzvx
/
klhztrader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix
test / deploy_trader_prod (push) Successful in 2m41s Details

main
vlad zverzhkhovskiy 2025-10-20 15:54:44 +03:00
parent 61b98e88f7
commit e3ad8b214a
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
KLHZ.Trader.Core/DataLayer/TraderDbContext.cs
View File

@ -10,7 +10,7 @@ namespace KLHZ.Trader.Core.DataLayer
{ {
public DbSet<Declision> Declisions { get; set; } public DbSet<Declision> Declisions { get; set; }
public DbSet<Trade> Trades { get; set; } public DbSet<Trade> Trades { get; set; }
public DbSet<PriceChange> PriceChanges { get; set; } //public DbSet<PriceChange> PriceChanges { get; set; }
public DbSet<ProcessedPrice> ProcessedPrices { get; set; } public DbSet<ProcessedPrice> ProcessedPrices { get; set; }
public DbSet<ExperimentsResult> ExperimentsResults { get; set; } public DbSet<ExperimentsResult> ExperimentsResults { get; set; }
public DbSet<OrderbookItem> OrderbookItems { get; set; } public DbSet<OrderbookItem> OrderbookItems { get; set; }
@ -33,15 +33,15 @@ namespace KLHZ.Trader.Core.DataLayer
v => DateTime.SpecifyKind(v, DateTimeKind.Utc)); v => DateTime.SpecifyKind(v, DateTimeKind.Utc));
}); });
modelBuilder.Entity<PriceChange>(entity => //modelBuilder.Entity<PriceChange>(entity =>
{ //{
entity.HasKey(e1 => e1.Id); // entity.HasKey(e1 => e1.Id);
entity.Ignore(e1 => e1.IsHistoricalData); // entity.Ignore(e1 => e1.IsHistoricalData);
entity.Property(e => e.Time) // entity.Property(e => e.Time)
.HasConversion( // .HasConversion(
v => v.ToUniversalTime(), // v => v.ToUniversalTime(),
v => DateTime.SpecifyKind(v, DateTimeKind.Utc)); // v => DateTime.SpecifyKind(v, DateTimeKind.Utc));
}); //});
modelBuilder.Entity<Trade>(entity => modelBuilder.Entity<Trade>(entity =>
{ {

2
KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs
View File

@ -204,7 +204,7 @@ namespace KLHZ.Trader.Core.Exchange.Services
try try
{ {
using var context = await _dbContextFactory.CreateDbContextAsync(); using var context = await _dbContextFactory.CreateDbContextAsync();
context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; //context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
lastWrite = DateTime.UtcNow; lastWrite = DateTime.UtcNow;
if (orderbookItemsBuffer.Count > 0) if (orderbookItemsBuffer.Count > 0)
{ {

2
KLHZ.Trader.Core/Exchange/Services/TraderDataProvider.cs
View File

@ -130,7 +130,7 @@ namespace KLHZ.Trader.Core.Exchange.Services
var time = DateTime.UtcNow.AddHours(-20); var time = DateTime.UtcNow.AddHours(-20);
using var context1 = await _dbContextFactory.CreateDbContextAsync(); using var context1 = await _dbContextFactory.CreateDbContextAsync();
context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
var data = await context1.PriceChanges var data = await context1.Trades
.Where(c => _tradingInstrumentsFigis.Contains(c.Figi) && c.Time >= time) .Where(c => _tradingInstrumentsFigis.Contains(c.Figi) && c.Time >= time)
.OrderBy(c => c.Time) .OrderBy(c => c.Time)
.Select(c => new TradeDataItem() .Select(c => new TradeDataItem()

8
KLHZ.Trader.Service/Controllers/PlayController.cs
View File

@ -47,7 +47,7 @@ namespace KLHZ.Trader.Service.Controllers
.Where(oi => (oi.Figi == figi1 || oi.Figi == figi2) && oi.Time >= time1 && oi.Time < time2) .Where(oi => (oi.Figi == figi1 || oi.Figi == figi2) && oi.Time >= time1 && oi.Time < time2)
.OrderBy(c => c.Time) .OrderBy(c => c.Time)
.ToArrayAsync(); .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) .Where(c => (c.Figi == figi1 || c.Figi == figi2) && c.Time >= time1 && c.Time < time2)
.OrderBy(c => c.Time) .OrderBy(c => c.Time)
.Select(c => new TradeDataItem() .Select(c => new TradeDataItem()
@ -255,7 +255,7 @@ namespace KLHZ.Trader.Service.Controllers
context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
var time1 = time2.AddHours(-3); 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) .Where(c => (c.Figi == figi1 || c.Figi == figi2) && c.Time >= time1 && c.Time < time2 && c.Direction == 1)
.OrderBy(c => c.Time) .OrderBy(c => c.Time)
.Select(c => new TradeDataItem() .Select(c => new TradeDataItem()
@ -360,7 +360,7 @@ namespace KLHZ.Trader.Service.Controllers
using var context1 = await _dbContextFactory.CreateDbContextAsync(); using var context1 = await _dbContextFactory.CreateDbContextAsync();
context1.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; 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) foreach (var f in figis)
{ {
@ -371,7 +371,7 @@ namespace KLHZ.Trader.Service.Controllers
while (time1 < DateTime.UtcNow) while (time1 < DateTime.UtcNow)
{ {
var time2 = time1.AddDays(7); 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) .Where(c => (c.Figi == f) && c.Time >= time1 && c.Time < time2)
.OrderBy(c => c.Time) .OrderBy(c => c.Time)
.ToArrayAsync(); .ToArrayAsync();