feat(trades): add live execution cockpit, closing cockpit, calculation cards and precision trade settings
This commit is contained in:
@@ -23,6 +23,19 @@ public class TradesDbContext : DbContext
|
||||
entity.HasIndex(e => e.Key);
|
||||
});
|
||||
|
||||
var stringListConverter =
|
||||
new Microsoft.EntityFrameworkCore.Storage.ValueConversion.ValueConverter<List<string>, string>(
|
||||
v => System.Text.Json.JsonSerializer.Serialize(v, (System.Text.Json.JsonSerializerOptions?)null),
|
||||
v => System.Text.Json.JsonSerializer.Deserialize<List<string>>(v,
|
||||
(System.Text.Json.JsonSerializerOptions?)null) ?? new List<string>()
|
||||
);
|
||||
|
||||
var stringListComparer = new Microsoft.EntityFrameworkCore.ChangeTracking.ValueComparer<List<string>>(
|
||||
(c1, c2) => c1 != null && c2 != null ? c1.SequenceEqual(c2) : c1 == c2,
|
||||
c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
|
||||
c => c.ToList()
|
||||
);
|
||||
|
||||
modelBuilder.Entity<TradeEntity>(entity =>
|
||||
{
|
||||
entity.HasIndex(e => e.TradeId).IsUnique();
|
||||
@@ -32,6 +45,9 @@ public class TradesDbContext : DbContext
|
||||
entity.HasIndex(e => e.Sector);
|
||||
entity.HasIndex(e => e.Isin);
|
||||
entity.HasIndex(e => e.CreatedAt);
|
||||
|
||||
entity.Property(e => e.DerivativeProductCategories)
|
||||
.HasConversion(stringListConverter, stringListComparer);
|
||||
});
|
||||
|
||||
modelBuilder.Entity<TradeHourlyUpdateEntity>(entity =>
|
||||
|
||||
@@ -68,6 +68,13 @@ public class TradeEntity
|
||||
[MaxLength(30)]
|
||||
public string InstrumentType { get; set; } = "Stock";
|
||||
|
||||
[MaxLength(50)]
|
||||
public string AssetType { get; set; } = "stock";
|
||||
|
||||
public bool HasCfd { get; set; }
|
||||
|
||||
public List<string> DerivativeProductCategories { get; set; } = new();
|
||||
|
||||
[MaxLength(20)]
|
||||
public string? DerivativeIsin { get; set; }
|
||||
|
||||
|
||||
Generated
+357
@@ -0,0 +1,357 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using FinlyticTrades.Database;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace FinlyticTrades.Migrations
|
||||
{
|
||||
[DbContext(typeof(TradesDbContext))]
|
||||
[Migration("20260815100019_AddAssetTypeAndDerivativeCategoriesToTrades")]
|
||||
partial class AddAssetTypeAndDerivativeCategoriesToTrades
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "10.0.9")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("FinlyticCore.Entities.Settings.SettingEntity", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("Key")
|
||||
.IsRequired()
|
||||
.HasMaxLength(150)
|
||||
.HasColumnType("character varying(150)");
|
||||
|
||||
b.Property<DateTime>("LastUpdatedUtc")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("ServiceIdentifier")
|
||||
.IsRequired()
|
||||
.HasMaxLength(100)
|
||||
.HasColumnType("character varying(100)");
|
||||
|
||||
b.Property<string>("ValueJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("Key");
|
||||
|
||||
b.ToTable("DynamicSettings");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("FinlyticTrades.Entities.TradeEntity", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<decimal?>("ActualEntryPrice")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<string>("AnalysisId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(100)
|
||||
.HasColumnType("character varying(100)");
|
||||
|
||||
b.Property<string>("AssetType")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("character varying(50)");
|
||||
|
||||
b.Property<string>("CloseReason")
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("character varying(50)");
|
||||
|
||||
b.Property<DateTime?>("ClosedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("CompanyName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(150)
|
||||
.HasColumnType("character varying(150)");
|
||||
|
||||
b.Property<DateTime>("CreatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("DerivativeIsin")
|
||||
.HasMaxLength(20)
|
||||
.HasColumnType("character varying(20)");
|
||||
|
||||
b.Property<string>("DerivativeProductCategories")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<decimal?>("EntryFee")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal>("EntryPrice")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("EntryZoneMax")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("EntryZoneMin")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<string>("EventId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(100)
|
||||
.HasColumnType("character varying(100)");
|
||||
|
||||
b.Property<DateTime?>("ExecutionTimestamp")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<decimal?>("ExitFee")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<string>("FundamentalRationale")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<bool>("HasCfd")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<string>("InstrumentType")
|
||||
.IsRequired()
|
||||
.HasMaxLength(30)
|
||||
.HasColumnType("character varying(30)");
|
||||
|
||||
b.Property<bool>("IsGlobalProposal")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("IsRecurring")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool?>("IsWin")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<string>("Isin")
|
||||
.IsRequired()
|
||||
.HasMaxLength(30)
|
||||
.HasColumnType("character varying(30)");
|
||||
|
||||
b.Property<decimal?>("KnockoutThreshold")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("LeverageUsed")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("MaxLeverage")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("PnlAbsolute")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("PnlPercent")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("PositionSize")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("Quantity")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<string>("Reasoning")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<decimal?>("RiskRewardRatio")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<string>("RiskTolerance")
|
||||
.IsRequired()
|
||||
.HasMaxLength(30)
|
||||
.HasColumnType("character varying(30)");
|
||||
|
||||
b.Property<string>("RiskWarning")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("Sector")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("character varying(50)");
|
||||
|
||||
b.Property<string>("SignalType")
|
||||
.IsRequired()
|
||||
.HasMaxLength(10)
|
||||
.HasColumnType("character varying(10)");
|
||||
|
||||
b.Property<int>("Status")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<decimal>("StopLoss")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<string>("Symbol")
|
||||
.IsRequired()
|
||||
.HasMaxLength(30)
|
||||
.HasColumnType("character varying(30)");
|
||||
|
||||
b.Property<decimal>("TakeProfit")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<string>("TakeProfitTargets")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("TechnicalRationale")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("Timeframe")
|
||||
.IsRequired()
|
||||
.HasMaxLength(20)
|
||||
.HasColumnType("character varying(20)");
|
||||
|
||||
b.Property<string>("TradeId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(100)
|
||||
.HasColumnType("character varying(100)");
|
||||
|
||||
b.Property<int>("TtlMinutes")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<decimal?>("UserExitPrice")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<DateTime?>("UserExitTimestamp")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("UserId")
|
||||
.HasMaxLength(100)
|
||||
.HasColumnType("character varying(100)");
|
||||
|
||||
b.Property<int>("VixRegime")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<decimal>("VixValue")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<double>("WinRate")
|
||||
.HasColumnType("double precision");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("AnalysisId");
|
||||
|
||||
b.HasIndex("CreatedAt");
|
||||
|
||||
b.HasIndex("EventId");
|
||||
|
||||
b.HasIndex("Isin");
|
||||
|
||||
b.HasIndex("Sector");
|
||||
|
||||
b.HasIndex("Status");
|
||||
|
||||
b.HasIndex("TradeId")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("trades");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("FinlyticTrades.Entities.TradeHourlyUpdateEntity", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<decimal>("CurrentPrice")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("FloatingPnlPercent")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<string>("Reasoning")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("Recommendation")
|
||||
.IsRequired()
|
||||
.HasMaxLength(30)
|
||||
.HasColumnType("character varying(30)");
|
||||
|
||||
b.Property<decimal?>("SuggestedStopLoss")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<decimal?>("SuggestedTakeProfit")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.Property<DateTime>("Timestamp")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<Guid>("TradeId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<decimal>("VixValue")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("Timestamp");
|
||||
|
||||
b.HasIndex("TradeId");
|
||||
|
||||
b.HasIndex("TradeId", "Timestamp");
|
||||
|
||||
b.ToTable("trade_hourly_updates");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("FinlyticTrades.Entities.TradesSettingsEntity", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<double>("AtrStopLossMultiplier")
|
||||
.HasColumnType("double precision");
|
||||
|
||||
b.Property<int>("MaxOpenPositions")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<double>("RiskPerTradePercentage")
|
||||
.HasColumnType("double precision");
|
||||
|
||||
b.Property<DateTime>("UpdatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("Settings");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("FinlyticTrades.Entities.TradeHourlyUpdateEntity", b =>
|
||||
{
|
||||
b.HasOne("FinlyticTrades.Entities.TradeEntity", "Trade")
|
||||
.WithMany("HourlyUpdates")
|
||||
.HasForeignKey("TradeId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Trade");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("FinlyticTrades.Entities.TradeEntity", b =>
|
||||
{
|
||||
b.Navigation("HourlyUpdates");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
||||
+76
@@ -0,0 +1,76 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace FinlyticTrades.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class AddAssetTypeAndDerivativeCategoriesToTrades : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "AssetType",
|
||||
table: "trades",
|
||||
type: "character varying(50)",
|
||||
maxLength: 50,
|
||||
nullable: false,
|
||||
defaultValue: "");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "DerivativeProductCategories",
|
||||
table: "trades",
|
||||
type: "text",
|
||||
nullable: false,
|
||||
defaultValue: "");
|
||||
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "HasCfd",
|
||||
table: "trades",
|
||||
type: "boolean",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "DynamicSettings",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||
Key = table.Column<string>(type: "character varying(150)", maxLength: 150, nullable: false),
|
||||
ValueJson = table.Column<string>(type: "text", nullable: false),
|
||||
ServiceIdentifier = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
|
||||
LastUpdatedUtc = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_DynamicSettings", x => x.Id);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_DynamicSettings_Key",
|
||||
table: "DynamicSettings",
|
||||
column: "Key");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "DynamicSettings");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "AssetType",
|
||||
table: "trades");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "DerivativeProductCategories",
|
||||
table: "trades");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "HasCfd",
|
||||
table: "trades");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -22,6 +22,36 @@ namespace FinlyticTrades.Migrations
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("FinlyticCore.Entities.Settings.SettingEntity", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("Key")
|
||||
.IsRequired()
|
||||
.HasMaxLength(150)
|
||||
.HasColumnType("character varying(150)");
|
||||
|
||||
b.Property<DateTime>("LastUpdatedUtc")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("ServiceIdentifier")
|
||||
.IsRequired()
|
||||
.HasMaxLength(100)
|
||||
.HasColumnType("character varying(100)");
|
||||
|
||||
b.Property<string>("ValueJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("Key");
|
||||
|
||||
b.ToTable("DynamicSettings");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("FinlyticTrades.Entities.TradeEntity", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@@ -36,6 +66,11 @@ namespace FinlyticTrades.Migrations
|
||||
.HasMaxLength(100)
|
||||
.HasColumnType("character varying(100)");
|
||||
|
||||
b.Property<string>("AssetType")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("character varying(50)");
|
||||
|
||||
b.Property<string>("CloseReason")
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("character varying(50)");
|
||||
@@ -55,6 +90,10 @@ namespace FinlyticTrades.Migrations
|
||||
.HasMaxLength(20)
|
||||
.HasColumnType("character varying(20)");
|
||||
|
||||
b.Property<string>("DerivativeProductCategories")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<decimal?>("EntryFee")
|
||||
.HasColumnType("decimal(18,4)");
|
||||
|
||||
@@ -82,6 +121,9 @@ namespace FinlyticTrades.Migrations
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<bool>("HasCfd")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<string>("InstrumentType")
|
||||
.IsRequired()
|
||||
.HasMaxLength(30)
|
||||
|
||||
@@ -101,12 +101,20 @@ public class TradeLifecycleService : ITradeLifecycleService
|
||||
var existingTrade = await _dbContext.Trades
|
||||
.FirstOrDefaultAsync(t =>
|
||||
(!string.IsNullOrWhiteSpace(proposal.TradeId) && t.TradeId == proposal.TradeId) ||
|
||||
(!string.IsNullOrWhiteSpace(proposal.AnalysisId) && t.AnalysisId == proposal.AnalysisId),
|
||||
(!string.IsNullOrWhiteSpace(proposal.AnalysisId) && t.AnalysisId == proposal.AnalysisId) ||
|
||||
(!string.IsNullOrWhiteSpace(proposal.Isin) && t.Isin == proposal.Isin && (t.Status == TradeStatus.Proposed || t.Status == TradeStatus.Active)),
|
||||
cancellationToken);
|
||||
|
||||
if (existingTrade != null)
|
||||
{
|
||||
if (existingTrade.Status != TradeStatus.Active && existingTrade.Status != TradeStatus.Closed)
|
||||
if (existingTrade.Status == TradeStatus.Active)
|
||||
{
|
||||
_logger.LogInformation("[{Channel}] An ACTIVE trade {TradeId} already exists for {Symbol} ({Isin}). Skipping duplicate proposed trade creation.",
|
||||
"TradesChannel", existingTrade.TradeId, proposal.Symbol, proposal.Isin);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (existingTrade.Status != TradeStatus.Closed)
|
||||
{
|
||||
existingTrade.Status = targetStatus;
|
||||
}
|
||||
@@ -115,7 +123,7 @@ public class TradeLifecycleService : ITradeLifecycleService
|
||||
_dbContext.Trades.Update(existingTrade);
|
||||
await _dbContext.SaveChangesAsync(cancellationToken);
|
||||
|
||||
_logger.LogInformation("[{Channel}] Successfully UPDATED trade proposal {TradeId} for Symbol {Symbol} (ISIN: {Isin}) with status {Status}",
|
||||
_logger.LogInformation("[{Channel}] Successfully UPDATED existing trade proposal {TradeId} for Symbol {Symbol} (ISIN: {Isin}) with status {Status}",
|
||||
"TradesChannel", existingTrade.TradeId, proposal.Symbol, proposal.Isin, existingTrade.Status);
|
||||
|
||||
return true;
|
||||
@@ -297,13 +305,10 @@ public class TradeLifecycleService : ITradeLifecycleService
|
||||
}
|
||||
else
|
||||
{
|
||||
trade.Status = TradeStatus.Closed;
|
||||
trade.UserExitPrice = update.CurrentPrice;
|
||||
trade.UserExitTimestamp = DateTime.UtcNow;
|
||||
trade.CloseReason = "AiRecommendationClose";
|
||||
trade.ClosedAt = DateTime.UtcNow;
|
||||
|
||||
CalculatePnL(trade);
|
||||
// NO AUTO CLOSE for active user trades!
|
||||
// Trade remains Active, alert is stored in HourlyUpdates and surfaced in UI for manual confirmation.
|
||||
_logger.LogInformation("[{Channel}] Active trade {TradeId} received Close recommendation ({Reasoning}). Trade kept Active for user action.",
|
||||
"TradesChannel", trade.TradeId, update.Reasoning);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -359,6 +364,10 @@ public class TradeLifecycleService : ITradeLifecycleService
|
||||
trade.Status = TradeStatus.Closed;
|
||||
trade.UserExitPrice = request.UserExitPrice;
|
||||
trade.UserExitTimestamp = request.UserExitTimestamp?.ToUniversalTime() ?? DateTime.UtcNow;
|
||||
if (request.ExitFee > 0m)
|
||||
{
|
||||
trade.ExitFee = request.ExitFee;
|
||||
}
|
||||
trade.CloseReason = request.CloseReason;
|
||||
trade.ClosedAt = DateTime.UtcNow;
|
||||
|
||||
@@ -406,6 +415,9 @@ public class TradeLifecycleService : ITradeLifecycleService
|
||||
entity.RiskTolerance = dto.RiskTolerance;
|
||||
entity.Timeframe = dto.Timeframe;
|
||||
entity.InstrumentType = dto.InstrumentType;
|
||||
if (!string.IsNullOrWhiteSpace(dto.AssetType)) entity.AssetType = dto.AssetType;
|
||||
entity.HasCfd = dto.HasCfd;
|
||||
if (dto.DerivativeProductCategories.Count > 0) entity.DerivativeProductCategories = dto.DerivativeProductCategories;
|
||||
if (!string.IsNullOrWhiteSpace(dto.DerivativeIsin)) entity.DerivativeIsin = dto.DerivativeIsin;
|
||||
entity.WinRate = dto.WinRate;
|
||||
entity.VixRegime = dto.VixRegime;
|
||||
|
||||
@@ -311,6 +311,10 @@ public class TradesMqttClient : ManagedMqttClient, IHostedService
|
||||
RiskTolerance = t.RiskTolerance,
|
||||
Timeframe = t.Timeframe,
|
||||
InstrumentType = t.InstrumentType,
|
||||
AssetType = t.AssetType,
|
||||
HasCfd = t.HasCfd,
|
||||
DerivativeProductCategories = t.DerivativeProductCategories ?? new List<string>(),
|
||||
DerivativeIsin = t.DerivativeIsin,
|
||||
WinRate = t.WinRate,
|
||||
VixRegime = t.VixRegime,
|
||||
VixValue = t.VixValue,
|
||||
@@ -339,7 +343,22 @@ public class TradesMqttClient : ManagedMqttClient, IHostedService
|
||||
IsRecurring = t.IsRecurring,
|
||||
PnlAbsolute = t.PnlAbsolute,
|
||||
PnlPercent = t.PnlPercent,
|
||||
CurrentPrice = t.UserExitPrice ?? t.HourlyUpdates?.LastOrDefault()?.CurrentPrice
|
||||
CurrentPrice = t.UserExitPrice ?? t.HourlyUpdates?.LastOrDefault()?.CurrentPrice,
|
||||
CloseReason = t.CloseReason,
|
||||
UserExitTimestamp = t.UserExitTimestamp,
|
||||
HasPendingExitAlert = t.Status == TradeStatus.Active && t.HourlyUpdates != null && t.HourlyUpdates.Any(u => string.Equals(u.Recommendation, "Close", StringComparison.OrdinalIgnoreCase)),
|
||||
PendingExitReason = t.Status == TradeStatus.Active ? t.HourlyUpdates?.LastOrDefault(u => string.Equals(u.Recommendation, "Close", StringComparison.OrdinalIgnoreCase))?.Reasoning : null,
|
||||
HourlyUpdates = t.HourlyUpdates?.OrderBy(u => u.Timestamp).Select(u => new TradeHourlyUpdateDto
|
||||
{
|
||||
TradeId = t.TradeId,
|
||||
Recommendation = u.Recommendation,
|
||||
CurrentPrice = u.CurrentPrice,
|
||||
SuggestedStopLoss = u.SuggestedStopLoss,
|
||||
SuggestedTakeProfit = u.SuggestedTakeProfit,
|
||||
VixValue = u.VixValue,
|
||||
Reasoning = u.Reasoning,
|
||||
Timestamp = u.Timestamp
|
||||
}).ToList()
|
||||
};
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user