diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 2d782efa7..784dbf53b 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -78,7 +78,7 @@ namespace mbts.spark { _animation.AnimationsChanged += on_animations_changed; void on_animations_changed() => RaisePropertyChanged(nameof(animations)); _dispose = Disposable.Create( - _orders_model.on_security_orders(security.Id).OnDispatcher().Subscribe(_on_orders), + _orders_model.on_security_root_orders(security.Id).OnDispatcher().Subscribe(_on_orders), _position.OnDispatcher().Subscribe(v => _animation.animate_position(v.newval > v.oldval)), _inside_bids.OnDispatcher().Subscribe(v => _animation.animate_working_bids_inside(v.newval)), _inside_asks.OnDispatcher().Subscribe(v => _animation.animate_working_asks_inside(v.newval)), @@ -250,9 +250,6 @@ namespace mbts.spark { public int position => _position; public void add_order(OrderRecordImmutable o) { - // This is a market data form - not an orders form - so just show data for root/non-child orders. - if (o.has_parent()) - return; switch (o.side()) { case Side.Buy: _position += (int)o.filled(); @@ -274,9 +271,6 @@ namespace mbts.spark { } public void remove_order(OrderRecordImmutable o) { - // This is a market data form - not an orders form - so just show data for root/non-child orders. - if (o.has_parent()) - return; switch (o.side()) { case Side.Buy: _position -= (int)o.filled(); diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index e3f8020bd..3532eddc0 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -2,6 +2,7 @@ using bts.api.core; using bts.api.orderman; using bts.spark; +using mbts.collections; using mbts.spark.utilities; using mbts.utils; using System; @@ -173,6 +174,69 @@ namespace mbts.spark { .Select(t => t.state.Any(kv => kv.Value.is_active())) .StartWith(false); + public static IObservable> on_security_root_orders(this OrdersModel orders_model, uint security_key) => + orders_model.on_security_orders(security_key).Scan(new RootOrderData(), (rod, table) => { + // ** using HashSet/List pairs, rather than a Dictionary, because TableUpdateTransform calls for IReadOnlyLists, while Dictionary.Values only implements IReadOnlyCollection. + // (this way, we avoid copying both added/removed Dictionary.Values to new Lists at the end, see comment at bottom of method if this is unclear) ** + var added_root_keys = new HashSet(); + var added_roots = new List(); + var removed_root_keys = new HashSet(); + var removed_roots = new List(); + foreach (var o in table.removed) { + if (rod.last_update.state.ContainsKey(o.Key)) { + // order was a root, needs to be removed + removed_roots.Add(o); + if (table.state.TryGetValue(o.Key, out OrderRecordImmutable newval)) { + // order was changed, if its an actual root, or its parent isn't present, the newval needs to be added + if (!o.has_parent() || !table.state.ContainsKey(o.ParentKey)) { + added_roots.Add(newval); + added_root_keys.Add(o.Key); + } + } else { + // order was indeed removed, not just changed - if it has a parent, remove its corresponding child-entry + if (o.has_parent()) { + rod.parent_to_children.remove(o.ParentKey, o.Key); + } + if (rod.parent_to_children.try_lookup(o.Key, out ISet children)) { + // order has left some orphans behind, any children that haven't been removed (i.e. still exist in table.state) are now roots + foreach (uint ck in children) { + if (table.state.TryGetValue(ck, out OrderRecordImmutable child)) { + added_roots.Add(child); + added_root_keys.Add(ck); + } + } + } + } + } else if (!table.state.ContainsKey(o.Key)) { + // order was indeed removed, not just changed - if it has a parent, remove its corresponding child-entry + rod.parent_to_children.remove(o.ParentKey, o.Key); + } + } + foreach (var o in table.added) { + if (added_root_keys.Contains(o.Key)) + continue; + if (rod.parent_to_children.try_lookup(o.Key, out ISet children)) { + // children were previously functioning as roots, need to remove them + foreach (uint ck in children) { + if (rod.last_update.state.TryGetValue(ck, out OrderRecordImmutable child)) + removed_roots.Add(child); + } + } + if (o.has_parent()) { + rod.parent_to_children.add(o.ParentKey, o.Key); + if (table.state.ContainsKey(o.ParentKey)) { + // not a root order + continue; + } + } + added_roots.Add(o); + } + // ** [continue comment at top of method] this call would otherwise be: + // rod.last_update = rod.last_update.update(removed_dict.Values.ToList(), added_dict.Values.ToList(), o => o.Key) ** + rod.last_update = rod.last_update.update(removed_roots, added_roots, o => o.Key); + return rod; + }).Select(r => r.last_update); + public static async Task order_from_key(this OrdersModel orders_model, uint order_key) { (var tu, var success) = await orders_model.on_orders.FirstAsyncTask(t => t.state.ContainsKey(order_key), TimeSpan.FromSeconds(3)); if (success && tu.state.TryGetValue(order_key, out OrderRecordImmutable rec)) { @@ -213,5 +277,10 @@ namespace mbts.spark { } return false; } + + class RootOrderData { + public readonly SetMap parent_to_children = new SetMap(); + public TableUpdateTransform last_update { get; set; } = new TableUpdateTransform(); + } } } \ No newline at end of file