diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs index d75f9c384..b49b47c00 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs @@ -1,112 +1,112 @@ -using bts.api; -using bts.api.position; -using bts.utils; -using mbts; -using mbts.spark; -using mbts.ui.shell; -using System; -using System.Collections.Generic; -using System.Reactive.Linq; -using System.Reflection; -using System.Runtime.CompilerServices; - -namespace bts.shell.manual_fills { - class ManualFillRow : DisposableViewModelBase, IEquatable { - public const int _uncommitted_record_id = -1; - static readonly PropertyInfo[] _snapshot_props = - Array.ConvertAll(new[] { - nameof(security), - nameof(account), - nameof(user), - nameof(side), - nameof(size), - nameof(price) - }, typeof(ManualFillRow).GetProperty); - readonly Property _is_dirty; - readonly Property _editable_item_state; - readonly DelegateProperty _is_valid; - SecurityImmutable? _security; - AccountTuple? _account; - UserTuple? _user; - Side _side; - uint _size; - double _price; - bool _is_selected; - ManualFillData? _data; - IDisposable _committed_snapshot; - - public ManualFillRow(ManualFillData data) { - _data = data; - key = data.key; - _security = data.value.security; - _account = data.value.account; - _user = data.value.user; - _side = data.value.manual_fill.Side; - _size = data.value.manual_fill.Quantity; - _price = data.value.manual_fill.Price; - if (placeholder_key.HasValue) { - _is_dirty = backing(nameof(is_dirty), false); - _editable_item_state = backing(nameof(editable_item_state), EditableItemState.Uncommitted); - _committed_snapshot = ObjectSnapshot.create(this, _snapshot_props); - } else { - _is_dirty = backing(nameof(is_dirty), ObjectSnapshot.dirty_monitor(this, out _committed_snapshot, _snapshot_props)); - _editable_item_state = backing(nameof(editable_item_state), _is_dirty, ch => ch.newval ? EditableItemState.Modified : EditableItemState.None); - } - _is_valid = backing(nameof(is_valid), () => _validate(this)); - } - - public event Action is_selected_changed; - // key/id - public ManualFillKey key { get; } - public Guid? placeholder_key => key.unpersisted; - public int record_id => key.persisted ?? _uncommitted_record_id; - public string record_id_display_text => key.persisted?.ToString(); - // security/spec - public SecurityImmutable? security { - get => _security; - set { - if (_set(ref _security, value)) - RaisePropertyChanged(nameof(spec)); - } - } - public ContractSpecificationImmutable? spec => security.spec_or_default(); - // account/user - public AccountTuple? account { get => _account; set => _set(ref _account, value); } - public UserTuple? user { get => _user; set => _set(ref _user, value); } - // side/size/price - public Side side { get => _side; set => _set(ref _side, value); } - public uint size { get => _size; set => _set(ref _size, value); } - public double price { get => _price; set => _set(ref _price, value); } - // is selected - public bool is_selected { - get => _is_selected; - set { - if (_set(ref _is_selected, value)) - is_selected_changed?.Invoke(value); - } - } - // dirty/valid/editable-state - public bool is_dirty => _is_dirty.Value; - public bool is_valid => _is_valid.Value; - public EditableItemState editable_item_state => _editable_item_state.Value; - - public ManualFillData data => _data ?? - (_data = new ManualFillData(key, new ManualFillTuple(new ManualFillImmutable(to_man_fill()), security, account, user))).Value; - - public void revert() => - _committed_snapshot.Dispose(); - - public IObservable subscribe_is_dirty() => - _is_dirty.observe_current(true); - - public IObservable subscribe_is_selected() => - Observable.Create(o => { - o.OnNext(is_selected); - is_selected_changed += o.OnNext; - return Disposable.Create(() => is_selected_changed -= o.OnNext); - }); - - public ManualFill to_man_fill() => +using bts.api; +using bts.api.position; +using bts.utils; +using mbts; +using mbts.spark; +using mbts.ui.shell; +using System; +using System.Collections.Generic; +using System.Reactive.Linq; +using System.Reflection; +using System.Runtime.CompilerServices; + +namespace bts.shell.manual_fills { + class ManualFillRow : DisposableViewModelBase, IEquatable { + public const int _uncommitted_record_id = -1; + static readonly PropertyInfo[] _snapshot_props = + Array.ConvertAll(new[] { + nameof(security), + nameof(account), + nameof(user), + nameof(side), + nameof(size), + nameof(price) + }, typeof(ManualFillRow).GetProperty); + readonly Property _is_dirty; + readonly Property _editable_item_state; + readonly DelegateProperty _is_valid; + SecurityImmutable? _security; + AccountTuple? _account; + UserTuple? _user; + Side _side; + uint _size; + double _price; + bool _is_selected; + ManualFillData? _data; + IDisposable _committed_snapshot; + + public ManualFillRow(ManualFillData data) { + _data = data; + key = data.key; + _security = data.value.security; + _account = data.value.account; + _user = data.value.user; + _side = data.value.manual_fill.Side; + _size = data.value.manual_fill.Quantity; + _price = data.value.manual_fill.Price; + if (placeholder_key.HasValue) { + _is_dirty = backing(nameof(is_dirty), false); + _editable_item_state = backing(nameof(editable_item_state), EditableItemState.Uncommitted); + _committed_snapshot = ObjectSnapshot.create(this, _snapshot_props); + } else { + _is_dirty = backing(nameof(is_dirty), ObjectSnapshot.dirty_monitor(this, out _committed_snapshot, _snapshot_props)); + _editable_item_state = backing(nameof(editable_item_state), _is_dirty, ch => ch.newval ? EditableItemState.Modified : EditableItemState.None); + } + _is_valid = backing(nameof(is_valid), () => _validate(this)); + } + + public event Action is_selected_changed; + // key/id + public ManualFillKey key { get; } + public long? placeholder_key => key.unpersisted; + public int record_id => key.persisted ?? _uncommitted_record_id; + public string record_id_display_text => key.persisted?.ToString(); + // security/spec + public SecurityImmutable? security { + get => _security; + set { + if (_set(ref _security, value)) + RaisePropertyChanged(nameof(spec)); + } + } + public ContractSpecificationImmutable? spec => security.spec_or_default(); + // account/user + public AccountTuple? account { get => _account; set => _set(ref _account, value); } + public UserTuple? user { get => _user; set => _set(ref _user, value); } + // side/size/price + public Side side { get => _side; set => _set(ref _side, value); } + public uint size { get => _size; set => _set(ref _size, value); } + public double price { get => _price; set => _set(ref _price, value); } + // is selected + public bool is_selected { + get => _is_selected; + set { + if (_set(ref _is_selected, value)) + is_selected_changed?.Invoke(value); + } + } + // dirty/valid/editable-state + public bool is_dirty => _is_dirty.Value; + public bool is_valid => _is_valid.Value; + public EditableItemState editable_item_state => _editable_item_state.Value; + + public ManualFillData data => _data ?? + (_data = new ManualFillData(key, new ManualFillTuple(new ManualFillImmutable(to_man_fill()), security, account, user))).Value; + + public void revert() => + _committed_snapshot.Dispose(); + + public IObservable subscribe_is_dirty() => + _is_dirty.observe_current(true); + + public IObservable subscribe_is_selected() => + Observable.Create(o => { + o.OnNext(is_selected); + is_selected_changed += o.OnNext; + return Disposable.Create(() => is_selected_changed -= o.OnNext); + }); + + public ManualFill to_man_fill() => new ManualFill { RecordId = record_id, AccountId = account?.id ?? 0, @@ -115,35 +115,35 @@ namespace bts.shell.manual_fills { Price = price, Side = side, Quantity = size, - SecurityKey = security?.Id ?? 0 - }; - - public ManualFillTuple to_tuple() => - new ManualFillTuple(new ManualFillImmutable(to_man_fill()), security, account, user); - - public bool Equals(ManualFillRow other) => - data == other?.data; - - public override bool Equals(object obj) => Equals(obj as ManualFillRow); - public override int GetHashCode() => record_id; - - static bool _validate(ManualFillRow row) => - row.security.HasValue && - row.account.HasValue && - row.user.HasValue && - row.side != Side.Undefined && - !double.IsNaN(row._price); - - bool _set(ref T backing, T value, [CallerMemberName] string prop_name = "") => - _set(ref backing, value, EqualityComparer.Default, prop_name); - - bool _set(ref T backing, T value, IEqualityComparer comparer, [CallerMemberName] string prop_name = "") { - if (Set(ref backing, value, comparer, prop_name)) { - _is_valid.refresh(); - _data = null; - return true; - } - return false; - } - } + SecurityKey = security?.Id ?? 0 + }; + + public ManualFillTuple to_tuple() => + new ManualFillTuple(new ManualFillImmutable(to_man_fill()), security, account, user); + + public bool Equals(ManualFillRow other) => + data == other?.data; + + public override bool Equals(object obj) => Equals(obj as ManualFillRow); + public override int GetHashCode() => record_id; + + static bool _validate(ManualFillRow row) => + row.security.HasValue && + row.account.HasValue && + row.user.HasValue && + row.side != Side.Undefined && + !double.IsNaN(row._price); + + bool _set(ref T backing, T value, [CallerMemberName] string prop_name = "") => + _set(ref backing, value, EqualityComparer.Default, prop_name); + + bool _set(ref T backing, T value, IEqualityComparer comparer, [CallerMemberName] string prop_name = "") { + if (Set(ref backing, value, comparer, prop_name)) { + _is_valid.refresh(); + _data = null; + return true; + } + return false; + } + } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsModel.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsModel.cs index 0215bfbc3..871aaf940 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsModel.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsModel.cs @@ -11,14 +11,14 @@ using System.Threading.Tasks; namespace bts.shell.manual_fills { struct ManualFillKey : IEquatable, IComparable { public readonly int? persisted; - public readonly Guid? unpersisted; + public readonly long? unpersisted; public ManualFillKey(int persisted) { this.persisted = persisted; unpersisted = null; } - public ManualFillKey(Guid unpersisted) { + public ManualFillKey(long unpersisted) { this.unpersisted = unpersisted; persisted = null; } diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs index babfa266e..cb2ecf39b 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs @@ -38,6 +38,7 @@ namespace bts.shell.manual_fills { readonly ObservableCollection _persisted_rows = new ObservableCollection(), _placeholder_rows = new ObservableCollection(); + long _placeholder_id_counter = long.MinValue; IDisposable _import_fills_hooks; public static ManualFillsVM create(IBus bus, OrdersModel model) => @@ -121,7 +122,7 @@ namespace bts.shell.manual_fills { public ManualFillRow row_factory() => new ManualFillRow( new ManualFillData( - new ManualFillKey(Guid.NewGuid()), + new ManualFillKey(_placeholder_id_counter++), new ManualFillTuple(new ManualFillImmutable(new ManualFill { Side = Side.Buy }), null, accounts.FirstOrDefault(), users.FirstOrDefault()))); @@ -133,7 +134,7 @@ namespace bts.shell.manual_fills { async Task _commit_async(IEnumerable rows) { var updates = new List(); - var adds = new List<(ManualFill man_fill, Guid pl_key)>(); + var adds = new List<(ManualFill man_fill, long pl_key)>(); foreach (var r in rows) { if (r.is_dirty) { updates.Add(r.to_man_fill()); @@ -147,7 +148,7 @@ namespace bts.shell.manual_fills { await _model.create_fills(adds.WrapSelector(r => r.man_fill, null)); _placeholder_rows .WrapSelector(r => r.placeholder_key.Value, null) - .RemoveSorted(adds.Select(r => r.pl_key), Comparer.Default); + .RemoveSorted(adds.Select(r => r.pl_key)); } } @@ -209,7 +210,7 @@ namespace bts.shell.manual_fills { add_imported_fills(); } void add_imported_fills() => - _placeholder_rows.InsertSorted(parsed_fills.Select(pmf => new ManualFillRow(new ManualFillData(new ManualFillKey(Guid.NewGuid()), new ManualFillTuple(new ManualFillImmutable(pmf.result), + _placeholder_rows.InsertSorted(parsed_fills.Select(pmf => new ManualFillRow(new ManualFillData(new ManualFillKey(_placeholder_id_counter++), new ManualFillTuple(new ManualFillImmutable(pmf.result), pmf.result.SecurityKey != 0 && security_map.TryGetValue(pmf.result.SecurityKey, out var smd) ? smd.security : (SecurityImmutable?)null, accounts.FirstOrDefault(a => a?.id == pmf.result.AccountId), users.FirstOrDefault(a => a?.id == pmf.result.UserId))))), _row_key_comparer); diff --git a/src/client/spark_core/Collections/Extensions/ListExtensions.cs b/src/client/spark_core/Collections/Extensions/ListExtensions.cs index 72c04560a..a056e754f 100644 --- a/src/client/spark_core/Collections/Extensions/ListExtensions.cs +++ b/src/client/spark_core/Collections/Extensions/ListExtensions.cs @@ -35,6 +35,9 @@ namespace bts.collections { return true; } + public static void RemoveSorted(this IList list, IEnumerable items) where T : IComparable => + RemoveSorted(list, items, Comparer.Default); + public static void RemoveSorted(this IList list, IEnumerable items, IComparer comparer) { foreach (var item in items) { int i = CollectionHelper.binary_search(list, item, comparer);