Merge pull request 'fix: Release build breakage + Dapper mapping bugs in VS-03/VS-04/Phase3-K' (#30) from fix/dapper-underscore-mapping-and-build into main

Reviewed-on: #30

src/KArtSell.Host/KArtSell.Host.csproj

@@ -4,16 +4,18 @@
   </PropertyGroup>
 
   <!-- Frontend Build Target: Automatically build Vite and copy to wwwroot (dev only) -->
+  <!-- FrontendFiles must be globbed *after* pnpm build, inside the target: Vite emits
+       content-hashed filenames each build, and a top-level ItemGroup is evaluated once
+       at project load (before pnpm build runs), so it would copy stale/missing filenames. -->
   <Target Name="BuildFrontend" BeforeTargets="Build" Condition="'$(CI)' != 'true' AND Exists('$(ProjectDir)../../frontend/package.json')">
     <Exec Command="pnpm install --frozen-lockfile" WorkingDirectory="$(ProjectDir)../../frontend" ContinueOnError="false" />
     <Exec Command="pnpm build" WorkingDirectory="$(ProjectDir)../../frontend" ContinueOnError="false" />
+    <ItemGroup>
+      <FrontendFiles Include="../../frontend/dist/**/*" />
+    </ItemGroup>
     <Copy SourceFiles="@(FrontendFiles)" DestinationFolder="$(ProjectDir)wwwroot/%(RecursiveDir)" />
   </Target>
 
-  <ItemGroup>
-    <FrontendFiles Include="../../frontend/dist/**/*" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="../KArtSell.BuildingBlocks/KArtSell.BuildingBlocks.csproj" />
     <ProjectReference Include="../KArtSell.Modules.SignalEngine/KArtSell.Modules.SignalEngine.csproj" />

src/KArtSell.Modules.ModelOperations/ApprovalWorkflow/ApprovalSql.cs

@@ -69,7 +69,7 @@ public class ApprovalSql
         const string sql = """
             INSERT INTO model_operations.approval_proposals
             (id, model_id, status, created_by, created_at, justification, effective_at, published_at, revision, correlation_id)
-            VALUES (@id, @modelId, @status, @createdBy, @createdAt, @justification, @effectiveAt, @publishedAt, 1, @correlationId)
+            VALUES (@id, @modelId, @status, @createdBy, @createdAt, @justification, @effectiveAt::date, @publishedAt, 1, @correlationId)
             """;
 
         await conn.ExecuteAsync(sql, new
@@ -80,7 +80,7 @@ public class ApprovalSql
             createdBy,
             createdAt = _clock.UtcNow,
             justification,
-            effectiveAt,
+            effectiveAt = effectiveAt.ToString("yyyy-MM-dd"), // Dapper: DateOnly cannot be used as a parameter value directly
             publishedAt,
             correlationId
         });

src/KArtSell.Modules.ModelOperations/Compliance/AuditSql.cs

@@ -135,7 +135,7 @@ public class AuditSql
         // Get paginated results
         var sql = $"""
             SELECT id, event_type, entity_type, entity_id, actor_email, actor_role, event_at,
-                   result, error_message, details, evidence_links, ip_address, user_agent,
+                   result, error_message, details, evidence_links, ip_address::text as ip_address, user_agent,
                    published_at, correlation_id, revision
             FROM compliance.audit_events
             WHERE {whereClause}
@@ -162,7 +162,7 @@ public class AuditSql
     {
         const string sql = """
             SELECT id, event_type, entity_type, entity_id, actor_email, actor_role, event_at,
-                   result, error_message, details, evidence_links, ip_address, user_agent,
+                   result, error_message, details, evidence_links, ip_address::text as ip_address, user_agent,
                    published_at, correlation_id, revision
             FROM compliance.audit_events
             WHERE id = @EventId

src/KArtSell.Modules.ModelOperations/Compliance/GdprRetention.cs

@@ -10,7 +10,7 @@ public class GdprRetention
     public Guid EventId { get; set; }
     public Guid? CustomerId { get; set; }
     public string[]? DataCategories { get; set; } // PII, EMAIL, TRADING_HISTORY, PORTFOLIO_DATA, etc.
-    public DateTime RetentionEndsAt { get; set; }
+    public DateOnly RetentionEndsAt { get; set; }
     public required string PurgeStatus { get; set; } // PENDING, PURGED, EXCEPTION
     public DateTime? PurgedAt { get; set; }
     public string? ExceptionReason { get; set; }

src/KArtSell.Modules.ModelOperations/DapperMappingBootstrap.cs

@@ -0,0 +1,25 @@
+using System.Runtime.CompilerServices;
+
+namespace KArtSell.Modules.ModelOperations;
+
+/// <summary>
+/// KArtSell.BuildingBlocks.Data.DapperBootstrap sets Dapper's snake_case-to-PascalCase column
+/// mapping via its own [ModuleInitializer], but that only fires once that assembly is actually
+/// loaded into the process. Several Sql classes in this module (e.g. AuditSql, TradeSql) only
+/// have a `using` for a BuildingBlocks namespace without ever touching a type from it at
+/// runtime, so under test isolation - or any host that queries this module before touching
+/// BuildingBlocks - the load (and the mapping) can be skipped, silently nulling out every
+/// snake_case column. Every Sql class in this assembly is defined here, so a module initializer
+/// in this assembly is guaranteed to run before any of them are used, regardless of what else
+/// has loaded.
+/// </summary>
+internal static class DapperMappingBootstrap
+{
+#pragma warning disable CA2255
+    [ModuleInitializer]
+#pragma warning restore CA2255
+    public static void Initialize()
+    {
+        Dapper.DefaultTypeMap.MatchNamesWithUnderscores = true;
+    }
+}

src/KArtSell.Modules.ModelOperations/TradeExecution/Trade.cs

@@ -26,7 +26,7 @@ public class Trade
     public decimal? Commission { get; set; }
     public decimal? NetProceeds { get; set; }
     public string? ErrorMessage { get; set; }
-    public JsonElement? KisResponse { get; set; }
+    public string? KisResponse { get; set; }
     public DateTime? ExecutionTimestamp { get; set; }
     public DateTime? SettlementTimestamp { get; set; }
     public DateTime PublishedAt { get; set; }
@@ -55,14 +55,14 @@ public class Trade
     {
         Status = TradeStatus.Submitted;
         KisOrderId = kisOrderId;
-        KisResponse = response;
+        KisResponse = response.ToString();
         Revision++;
     }
 
     public void MarkAccepted(JsonElement response)
     {
         Status = TradeStatus.Accepted;
-        KisResponse = response;
+        KisResponse = response.ToString();
         Revision++;
     }
 
@@ -73,7 +73,7 @@ public class Trade
         TotalAmount = executedQty * unitPrice;
         Status = executedQty >= Quantity ? TradeStatus.FullyFilled : TradeStatus.PartiallyFilled;
         ExecutionTimestamp = now;
-        KisResponse = response;
+        KisResponse = response.ToString();
         Revision++;
     }
 
@@ -98,7 +98,7 @@ public class Trade
     public void MarkErrored(KisTradeExecutionException exception)
     {
         ErrorMessage = exception.Message;
-        KisResponse = exception.KisResponse;
+        KisResponse = exception.KisResponse?.ToString();
         Revision++;
     }
 }

src/KArtSell.Modules.ModelOperations/TradeExecution/TradeHandlers.cs

@@ -57,14 +57,7 @@ public class SubmitTradeHandler
             );
 
             trade.MarkSubmitted(orderId, response);
-            await _sql.UpdateTradeStatusAsync(
-                trade.Id,
-                TradeStatus.Submitted,
-                response,
-                null,
-                command.CorrelationId,
-                ct
-            );
+            await _sql.UpdateTradeStatusAsync(trade, response, null, ct);
 
             await PublishEventAsync(
                 "TradeSubmitted",
@@ -84,14 +77,7 @@ public class SubmitTradeHandler
         catch (KisTradeExecutionException ex)
         {
             trade.MarkErrored(ex);
-            await _sql.UpdateTradeStatusAsync(
-                trade.Id,
-                trade.Status,
-                ex.KisResponse,
-                ex.Message,
-                command.CorrelationId,
-                ct
-            );
+            await _sql.UpdateTradeStatusAsync(trade, ex.KisResponse, ex.Message, ct);
 
             _logger.LogError(
                 "Trade submission failed: {TradeId} {Classification}",
@@ -163,14 +149,7 @@ public class PollTradeStatusHandler
                     trade.MarkFilled(executedQty, unitPrice, response, _clock.UtcNow.UtcDateTime);
                 }
 
-                await _sql.UpdateTradeStatusAsync(
-                    trade.Id,
-                    trade.Status,
-                    response,
-                    null,
-                    command.CorrelationId,
-                    ct
-                );
+                await _sql.UpdateTradeStatusAsync(trade, response, null, ct);
 
                 if (trade.Status is TradeStatus.FullyFilled)
                 {
@@ -195,14 +174,7 @@ public class PollTradeStatusHandler
         }
         catch (KisTradeExecutionException ex)
         {
-            await _sql.UpdateTradeStatusAsync(
-                trade.Id,
-                trade.Status,
-                ex.KisResponse,
-                ex.Message,
-                command.CorrelationId,
-                ct
-            );
+            await _sql.UpdateTradeStatusAsync(trade, ex.KisResponse, ex.Message, ct);
 
             _logger.LogError("Failed to poll trade status: {TradeId}", trade.Id);
         }
@@ -262,14 +234,7 @@ public class ConfirmSettlementHandler
             if (success)
             {
                 trade.MarkConfirmed(_clock.UtcNow.UtcDateTime, command.Commission);
-                await _sql.UpdateTradeStatusAsync(
-                    trade.Id,
-                    TradeStatus.Confirmed,
-                    response,
-                    null,
-                    command.CorrelationId,
-                    ct
-                );
+                await _sql.UpdateTradeStatusAsync(trade, response, null, ct);
 
                 await TradeOutboxPublisher.PublishAsync(
                     _connectionFactory,
@@ -290,14 +255,7 @@ public class ConfirmSettlementHandler
         }
         catch (KisTradeExecutionException ex)
         {
-            await _sql.UpdateTradeStatusAsync(
-                trade.Id,
-                trade.Status,
-                ex.KisResponse,
-                ex.Message,
-                command.CorrelationId,
-                ct
-            );
+            await _sql.UpdateTradeStatusAsync(trade, ex.KisResponse, ex.Message, ct);
 
             _logger.LogError("Failed to confirm settlement: {TradeId}", trade.Id);
         }

src/KArtSell.Modules.ModelOperations/TradeExecution/TradeSql.cs

@@ -12,7 +12,7 @@ public interface ITradeSql
     Task<IEnumerable<Trade>> GetTradesByStatusAsync(TradeStatus status, Guid correlationId, CancellationToken ct = default);
     Task<IEnumerable<Trade>> GetTradesByDecisionIdAsync(Guid sellDecisionId, Guid correlationId, CancellationToken ct = default);
     Task InsertTradeAsync(Trade trade, CancellationToken ct = default);
-    Task UpdateTradeStatusAsync(Guid tradeId, TradeStatus newStatus, JsonElement? kisResponse, string? errorMessage, Guid correlationId, CancellationToken ct = default);
+    Task UpdateTradeStatusAsync(Trade trade, JsonElement? kisResponse, string? errorMessage, CancellationToken ct = default);
     Task<int> CountTradesByStatusAsync(TradeStatus status, CancellationToken ct = default);
 }
 
@@ -33,7 +33,7 @@ public class TradeSql : ITradeSql
 
         const string sql = """
             SELECT id, sell_decision_id, kis_order_id, status, quantity, executed_quantity,
-                   unit_price, total_amount, commission, net_proceeds, error_message, kis_response,
+                   unit_price, total_amount, commission, net_proceeds, error_message, kis_response::text as kis_response,
                    execution_timestamp, settlement_timestamp, published_at, correlation_id, revision
             FROM model_operations.trades
             WHERE id = @tradeId
@@ -61,7 +61,7 @@ public class TradeSql : ITradeSql
 
         const string sql = """
             SELECT id, sell_decision_id, kis_order_id, status, quantity, executed_quantity,
-                   unit_price, total_amount, commission, net_proceeds, error_message, kis_response,
+                   unit_price, total_amount, commission, net_proceeds, error_message, kis_response::text as kis_response,
                    execution_timestamp, settlement_timestamp, published_at, correlation_id, revision
             FROM model_operations.trades
             WHERE kis_order_id = @kisOrderId
@@ -82,7 +82,7 @@ public class TradeSql : ITradeSql
 
         const string sql = """
             SELECT id, sell_decision_id, kis_order_id, status, quantity, executed_quantity,
-                   unit_price, total_amount, commission, net_proceeds, error_message, kis_response,
+                   unit_price, total_amount, commission, net_proceeds, error_message, kis_response::text as kis_response,
                    execution_timestamp, settlement_timestamp, published_at, correlation_id, revision
             FROM model_operations.trades
             WHERE status = @status
@@ -102,7 +102,7 @@ public class TradeSql : ITradeSql
 
         const string sql = """
             SELECT id, sell_decision_id, kis_order_id, status, quantity, executed_quantity,
-                   unit_price, total_amount, commission, net_proceeds, error_message, kis_response,
+                   unit_price, total_amount, commission, net_proceeds, error_message, kis_response::text as kis_response,
                    execution_timestamp, settlement_timestamp, published_at, correlation_id, revision
             FROM model_operations.trades
             WHERE sell_decision_id = @sellDecisionId
@@ -143,7 +143,7 @@ public class TradeSql : ITradeSql
             trade.Commission,
             trade.NetProceeds,
             trade.ErrorMessage,
-            kisResponse = trade.KisResponse?.ToString(),
+            trade.KisResponse,
             trade.ExecutionTimestamp,
             trade.SettlementTimestamp,
             trade.PublishedAt,
@@ -155,11 +155,9 @@ public class TradeSql : ITradeSql
     }
 
     public async Task UpdateTradeStatusAsync(
-        Guid tradeId,
-        TradeStatus newStatus,
+        Trade trade,
         JsonElement? kisResponse,
         string? errorMessage,
-        Guid correlationId,
         CancellationToken ct = default)
     {
         using var connection = await _dataSource.OpenConnectionAsync(ct);
@@ -173,6 +171,14 @@ public class TradeSql : ITradeSql
 
             UPDATE model_operations.trades
             SET status = @newStatus,
+                kis_order_id = COALESCE(@kisOrderId, kis_order_id),
+                executed_quantity = COALESCE(@executedQuantity, executed_quantity),
+                unit_price = COALESCE(@unitPrice, unit_price),
+                total_amount = COALESCE(@totalAmount, total_amount),
+                commission = COALESCE(@commission, commission),
+                net_proceeds = COALESCE(@netProceeds, net_proceeds),
+                execution_timestamp = COALESCE(@executionTimestamp, execution_timestamp),
+                settlement_timestamp = COALESCE(@settlementTimestamp, settlement_timestamp),
                 kis_response = COALESCE(@kisResponse::jsonb, kis_response),
                 error_message = COALESCE(@errorMessage, error_message),
                 revision = revision + 1
@@ -182,14 +188,22 @@ public class TradeSql : ITradeSql
         await connection.ExecuteAsync(sql, new
         {
             id = Guid.NewGuid(),
-            tradeId,
-            newStatus = newStatus.ToString(),
+            tradeId = trade.Id,
+            newStatus = trade.Status.ToString(),
+            kisOrderId = trade.KisOrderId,
+            executedQuantity = trade.ExecutedQuantity,
+            unitPrice = trade.UnitPrice,
+            totalAmount = trade.TotalAmount,
+            commission = trade.Commission,
+            netProceeds = trade.NetProceeds,
+            executionTimestamp = trade.ExecutionTimestamp,
+            settlementTimestamp = trade.SettlementTimestamp,
             kisResponse = kisResponse?.ToString(),
             errorMessage,
-            correlationId
+            correlationId = trade.CorrelationId
         });
 
-        _logger.LogInformation("Updated trade {TradeId} status to {Status}", tradeId, newStatus);
+        _logger.LogInformation("Updated trade {TradeId} status to {Status}", trade.Id, trade.Status);
     }
 
     public async Task<int> CountTradesByStatusAsync(TradeStatus status, CancellationToken ct = default)

src/KArtSell.Modules.SignalEngine/DapperMappingBootstrap.cs

@@ -0,0 +1,21 @@
+using System.Runtime.CompilerServices;
+
+namespace KArtSell.Modules.SignalEngine;
+
+/// <summary>
+/// See KArtSell.Modules.ModelOperations.DapperMappingBootstrap for the full rationale: Dapper's
+/// snake_case-to-PascalCase column mapping is a process-wide static flag set via
+/// KArtSell.BuildingBlocks.Data.DapperBootstrap's [ModuleInitializer], which only fires once
+/// that assembly is loaded. This mirrors it locally so every Sql/reader class defined in this
+/// assembly is guaranteed the mapping is on before its first query, regardless of load order.
+/// </summary>
+internal static class DapperMappingBootstrap
+{
+#pragma warning disable CA2255
+    [ModuleInitializer]
+#pragma warning restore CA2255
+    public static void Initialize()
+    {
+        Dapper.DefaultTypeMap.MatchNamesWithUnderscores = true;
+    }
+}

tests/KArtSell.Integration.Tests/ApprovalWorkflow/ApprovalWorkflowTests.cs

@@ -3,6 +3,7 @@ namespace KArtSell.Integration.Tests.ApprovalWorkflow;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Dapper;
 using Xunit;
 using KArtSell.BuildingBlocks.Time;
 using KArtSell.Modules.ModelOperations.ApprovalWorkflow;
@@ -165,6 +166,7 @@ public class ApprovalWorkflowTests : IAsyncLifetime
         var id = Guid.NewGuid();
         var modelId = Guid.NewGuid();
         var correlationId = Guid.NewGuid();
+        await SeedModelAsync(modelId);
 
         // Act
         await _sql.InsertProposalAsync(
@@ -185,6 +187,15 @@ public class ApprovalWorkflowTests : IAsyncLifetime
         Assert.Equal(modelId, retrieved.ModelId);
         Assert.Equal(correlationId, retrieved.CorrelationId);
     }
+
+    private async Task SeedModelAsync(Guid modelId)
+    {
+        await using var conn = new Npgsql.NpgsqlConnection(_connectionString);
+        await conn.OpenAsync();
+        await conn.ExecuteAsync(
+            "INSERT INTO model_operations.models (id, ticker, correlation_id) VALUES (@Id, @Ticker, @CorrelationId)",
+            new { Id = modelId, Ticker = "TEST", CorrelationId = Guid.NewGuid() });
+    }
 }
 
 public class InMemoryOutbox : IOutbox

tests/KArtSell.Integration.Tests/Compliance/AuditTrailTests.cs

@@ -106,6 +106,11 @@ public class AuditTrailTests : IAsyncLifetime
         var customerId = Guid.NewGuid();
         var retentionId = Guid.NewGuid();
 
+        await _sql.InsertAuditEventAsync(
+            _db, eventId, AuditEventTypes.ModelActivated, AuditEntityTypes.Model,
+            Guid.NewGuid(), "customer@company.com", null, DateTime.UtcNow, "SUCCESS", null,
+            null, null, null, null, Guid.NewGuid(), CancellationToken.None);
+
         // Act
         await _sql.InsertGdprRetentionAsync(
             _db, retentionId, eventId, customerId,
@@ -175,7 +180,8 @@ public class AuditTrailTests : IAsyncLifetime
         // Assert
         var @event = await _sql.GetAuditEventByIdAsync(_db, eventId, CancellationToken.None);
         Assert.NotNull(@event);
-        Assert.Contains("<redacted>", @event.Details?.ToString() ?? "");
+        Assert.Equal("<redacted>", @event.Details?["actor_email"].ToString());
+        Assert.Equal("<purged>", @event.Details?["customer_id"].ToString());
     }
 
     private const string TestConnectionString =

tests/KArtSell.Integration.Tests/SellDecision/SellDecisionTests.cs

@@ -118,8 +118,8 @@ public class SellPriorityRankerTests
     [Fact]
     public void CalculateScore_HardImpairment_ReturnsLowestScore()
     {
-        var score = _ranker.CalculateScore(SellPriority.HardImpairment, fundAgeDays: 200, liquidityPercent: 0.5m);
-        Assert.Equal(950m, score); // 1000 - 50 (age boost)
+        var score = _ranker.CalculateScore(SellPriority.HardImpairment, fundAgeDays: 400, liquidityPercent: 0.5m);
+        Assert.Equal(950m, score); // 1000 - 50 (age boost, fundAgeDays > 365 per VS-10-SLICE_SPEC.md)
     }
 
     [Fact]

tests/KArtSell.Integration.Tests/TradeExecution/TradeExecutionTests.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using Dapper;
 using KArtSell.Modules.ModelOperations.TradeExecution;
 using Microsoft.Extensions.Logging;
 using Npgsql;
@@ -31,11 +32,31 @@ public class TradeExecutionTests : IAsyncLifetime
         await _dataSource.DisposeAsync();
     }
 
+    private async Task<Guid> SeedSellDecisionAsync()
+    {
+        await using var connection = await _dataSource.OpenConnectionAsync();
+        var modelId = Guid.NewGuid();
+        await connection.ExecuteAsync(
+            "INSERT INTO model_operations.models (id, ticker, correlation_id) VALUES (@Id, @Ticker, @CorrelationId)",
+            new { Id = modelId, Ticker = "TEST", CorrelationId = Guid.NewGuid() });
+
+        var sellDecisionId = Guid.NewGuid();
+        await connection.ExecuteAsync(
+            """
+            INSERT INTO model_operations.sell_decisions
+            (id, model_id, status, created_by, published_at, correlation_id)
+            VALUES (@Id, @ModelId, 'PENDING', 'test@company.com', NOW(), @CorrelationId)
+            """,
+            new { Id = sellDecisionId, ModelId = modelId, CorrelationId = Guid.NewGuid() });
+
+        return sellDecisionId;
+    }
+
     [Fact]
     public async Task CreateTrade_WithValidData_ShouldInsertSuccessfully()
     {
         var sql = new TradeSql(_dataSource, _logger);
-        var sellDecisionId = Guid.NewGuid();
+        var sellDecisionId = await SeedSellDecisionAsync();
         var correlationId = Guid.NewGuid();
 
         var trade = Trade.Create(sellDecisionId, 1000, correlationId, DateTime.UtcNow);
@@ -55,14 +76,14 @@ public class TradeExecutionTests : IAsyncLifetime
     {
         var sql = new TradeSql(_dataSource, _logger);
         var correlationId = Guid.NewGuid();
-        var trade = Trade.Create(Guid.NewGuid(), 1000, correlationId, DateTime.UtcNow);
+        var trade = Trade.Create(await SeedSellDecisionAsync(), 1000, correlationId, DateTime.UtcNow);
 
         await sql.InsertTradeAsync(trade);
 
         var response = JsonDocument.Parse("{}").RootElement;
         trade.MarkSubmitted("KIS-ORDER-123", response);
 
-        await sql.UpdateTradeStatusAsync(trade.Id, TradeStatus.Submitted, response, null, correlationId);
+        await sql.UpdateTradeStatusAsync(trade, response, null);
 
         var retrieved = await sql.GetTradeByIdAsync(trade.Id, correlationId);
 
@@ -76,14 +97,14 @@ public class TradeExecutionTests : IAsyncLifetime
     {
         var sql = new TradeSql(_dataSource, _logger);
         var correlationId = Guid.NewGuid();
-        var trade = Trade.Create(Guid.NewGuid(), 1000, correlationId, DateTime.UtcNow);
+        var trade = Trade.Create(await SeedSellDecisionAsync(), 1000, correlationId, DateTime.UtcNow);
 
         await sql.InsertTradeAsync(trade);
 
         var response = JsonDocument.Parse("{}").RootElement;
         trade.MarkFilled(1000, 49.95m, response, DateTime.UtcNow);
 
-        await sql.UpdateTradeStatusAsync(trade.Id, TradeStatus.FullyFilled, response, null, correlationId);
+        await sql.UpdateTradeStatusAsync(trade, response, null);
 
         var retrieved = await sql.GetTradeByIdAsync(trade.Id, correlationId);
 
@@ -100,8 +121,8 @@ public class TradeExecutionTests : IAsyncLifetime
         var sql = new TradeSql(_dataSource, _logger);
         var correlationId = Guid.NewGuid();
 
-        var trade1 = Trade.Create(Guid.NewGuid(), 1000, correlationId, DateTime.UtcNow);
-        var trade2 = Trade.Create(Guid.NewGuid(), 2000, correlationId, DateTime.UtcNow);
+        var trade1 = Trade.Create(await SeedSellDecisionAsync(), 1000, correlationId, DateTime.UtcNow);
+        var trade2 = Trade.Create(await SeedSellDecisionAsync(), 2000, correlationId, DateTime.UtcNow);
 
         await sql.InsertTradeAsync(trade1);
         await sql.InsertTradeAsync(trade2);
@@ -118,14 +139,14 @@ public class TradeExecutionTests : IAsyncLifetime
     {
         var sql = new TradeSql(_dataSource, _logger);
         var correlationId = Guid.NewGuid();
-        var trade = Trade.Create(Guid.NewGuid(), 1000, correlationId, DateTime.UtcNow);
+        var trade = Trade.Create(await SeedSellDecisionAsync(), 1000, correlationId, DateTime.UtcNow);
 
         await sql.InsertTradeAsync(trade);
 
         trade.TotalAmount = 49950m;
         trade.MarkConfirmed(DateTime.UtcNow, 50m);
 
-        await sql.UpdateTradeStatusAsync(trade.Id, TradeStatus.Confirmed, null, null, correlationId);
+        await sql.UpdateTradeStatusAsync(trade, null, null);
 
         var retrieved = await sql.GetTradeByIdAsync(trade.Id, correlationId);
 
@@ -140,11 +161,16 @@ public class TradeExecutionTests : IAsyncLifetime
     {
         var sql = new TradeSql(_dataSource, _logger);
         var correlationId = Guid.NewGuid();
-        var trade = Trade.Create(Guid.NewGuid(), 1000, correlationId, DateTime.UtcNow);
+        var trade = Trade.Create(await SeedSellDecisionAsync(), 1000, correlationId, DateTime.UtcNow);
 
         await sql.InsertTradeAsync(trade);
-        await sql.UpdateTradeStatusAsync(trade.Id, TradeStatus.Submitted, null, null, correlationId);
-        await sql.UpdateTradeStatusAsync(trade.Id, TradeStatus.Accepted, null, null, correlationId);
+
+        var response = JsonDocument.Parse("{}").RootElement;
+        trade.MarkSubmitted("KIS-1", response);
+        await sql.UpdateTradeStatusAsync(trade, response, null);
+
+        trade.MarkAccepted(response);
+        await sql.UpdateTradeStatusAsync(trade, response, null);
 
         var retrieved = await sql.GetTradeByIdAsync(trade.Id, correlationId);
 
@@ -158,8 +184,8 @@ public class TradeExecutionTests : IAsyncLifetime
         var sql = new TradeSql(_dataSource, _logger);
         var correlationId = Guid.NewGuid();
 
-        var trade1 = Trade.Create(Guid.NewGuid(), 1000, correlationId, DateTime.UtcNow);
-        var trade2 = Trade.Create(Guid.NewGuid(), 2000, correlationId, DateTime.UtcNow);
+        var trade1 = Trade.Create(await SeedSellDecisionAsync(), 1000, correlationId, DateTime.UtcNow);
+        var trade2 = Trade.Create(await SeedSellDecisionAsync(), 2000, correlationId, DateTime.UtcNow);
 
         await sql.InsertTradeAsync(trade1);
         await sql.InsertTradeAsync(trade2);