Minor fix for cross order id (#8213)

QuantConnect · Jul 19, 2024 · ab601cb · ab601cb
1 parent 72a1bd4
commit ab601cb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Brokerages/Brokerage.cs b/Brokerages/Brokerage.cs
@@ -660,7 +660,11 @@ protected virtual CrossZeroOrderResponse PlaceCrossZeroOrder(CrossZeroFirstOrder
                     response = PlaceCrossZeroOrder(firstOrderPartRequest);
                     if (response.IsOrderPlacedSuccessfully)
                     {
-                        order.BrokerId.Add(response.BrokerageOrderId.ToStringInvariant());
+                        var orderId = response.BrokerageOrderId;
+                        if (!order.BrokerId.Contains(orderId))
+                        {
+                            order.BrokerId.Add(orderId);
+                        }
                     }
                 }
 
@@ -796,8 +800,15 @@ protected bool TryHandleRemainingCrossZeroOrder(Order leanOrder, OrderEvent orde
                             if (response.IsOrderPlacedSuccessfully)
                             {
                                 // add the new brokerage id for retrieval later
-                                leanOrder.BrokerId.Add(response.BrokerageOrderId);
-                                LeanOrderByZeroCrossBrokerageOrderId.AddOrUpdate(response.BrokerageOrderId, leanOrder);
+                                var orderId = response.BrokerageOrderId;
+                                if (!leanOrder.BrokerId.Contains(orderId))
+                                {
+                                    leanOrder.BrokerId.Add(orderId);
+                                }
+
+                                // leanOrder is a clone, here we can add the new brokerage order Id for the second part of the cross zero
+                                OnOrderIdChangedEvent(new BrokerageOrderIdChangedEvent { OrderId = leanOrder.Id, BrokerId = leanOrder.BrokerId });
+                                LeanOrderByZeroCrossBrokerageOrderId.AddOrUpdate(orderId, leanOrder);
                             }
                         }
 

diff --git a/Common/Orders/BrokerageOrderIdChangedEvent.cs b/Common/Orders/BrokerageOrderIdChangedEvent.cs
@@ -23,7 +23,7 @@ namespace QuantConnect.Orders
     public class BrokerageOrderIdChangedEvent
     {
         /// <summary>
-        /// The order ID.
+        /// The lean order ID.
         /// </summary>
         public int OrderId { get; set; }