From 2137d37cbd2f4e85fe2e0d8195dbf1429b22cddb Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 20 May 2019 12:51:24 -0500 Subject: [PATCH] adding SecurityImmutable? to on_positions and updating security_positions_demuxer for additional argument type --- src/client/spark/Orders/OrdersModel.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 76a3c7241..eb4669156 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -38,7 +38,7 @@ namespace mbts.spark { readonly OrderActivitySummarizer _activity; readonly TableUpdateDemuxer _security_orders_demuxer; readonly TableUpdateDemuxer _security_working_orders_with_piq_demuxer; - readonly TableUpdateDemuxer _security_positions_demuxer; + readonly TableUpdateDemuxer<(SecurityImmutable?, PositionUnitImmutable), int, uint> _security_positions_demuxer; IDisposable _dispose; static readonly bool _piq_enabled = Configuration.get().enabled; @@ -67,7 +67,7 @@ namespace mbts.spark { .Table() .Cache(); - on_positions = _position_service.subscribei_position_data().Naggle(interval, scheduler).PermissionFilter(admin_model.on_admin_data).Table().Cache(); + on_positions = _position_service.subscribei_position_data().Naggle(interval, scheduler).PermissionFilter(admin_model.on_admin_data).join(sstore, pos => pos.SecurityId).Table().Cache(); working_orders = on_orders.Scan( ImmutableDictionary.Empty, @@ -83,7 +83,7 @@ namespace mbts.spark { _activity = new OrderActivitySummarizer(bus, on_orders); _security_orders_demuxer = new TableUpdateDemuxer(o => o.Key, o => o.security_key()); _security_working_orders_with_piq_demuxer = new TableUpdateDemuxer(o => o.order.Key, o => o.order.security_key()); - _security_positions_demuxer = new TableUpdateDemuxer(o => o.RecordId, p => p.SecurityId); + _security_positions_demuxer = new TableUpdateDemuxer<(SecurityImmutable?, PositionUnitImmutable pos), int, uint>(o => o.pos.RecordId, p => p.pos.SecurityId); studio_algos_with_meta = algo_model.definitions.LeftJoin( algo_model.metadata_service.subscribe_metadata().Table(m => m.id), d => d.key, @@ -200,7 +200,7 @@ namespace mbts.spark { public IObservable> on_order_securities { get; } public IObservable> on_fill_tuples { get; } public IObservable> working_orders { get; } - public IObservable> on_positions { get; } + public IObservable> on_positions { get; } public IObservable> studio_algos_with_meta { get; } public IObservable> on_manual_fills_securities { get; } public IObservable> on_manual_fill_tuples { get; } @@ -214,7 +214,7 @@ namespace mbts.spark { public IObservable> on_security_orders(uint security) => _security_orders_demuxer.subscribe(security); - public IObservable> on_security_positions(uint security) => + public IObservable> on_security_positions(uint security) => _security_positions_demuxer.subscribe(security); #endregion @@ -418,10 +418,10 @@ namespace mbts.spark { public static IObservable security_total_position(this OrdersModel orders_model, uint security_key, string account) => orders_model.on_security_positions(security_key) - .Select(t => { + .Select((t,k) => { foreach (var kv in t.state) { - if (kv.Value.Account == account) - return kv.Value.total_pos(); + if (kv.Value.Item2.Account == account) + return kv.Value.Item2.total_pos(); } return double.NaN; }).DistinctUntilChanged()