From 15750383652b6c960fe0edbab2ed0604755084b3 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 13 Feb 2019 08:27:28 -0500 Subject: [PATCH] Fix equality on OrderSecurity type --- src/client/spark/Orders/OrderSecurity.cs | 2 +- src/client/spark/Orders/OrdersModel.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/spark/Orders/OrderSecurity.cs b/src/client/spark/Orders/OrderSecurity.cs index dd9936162..a703e4c2b 100644 --- a/src/client/spark/Orders/OrderSecurity.cs +++ b/src/client/spark/Orders/OrderSecurity.cs @@ -15,7 +15,7 @@ namespace bts.api.orderman { public OrderRecordImmutable order { get; } public override bool Equals(object obj) => (obj is OrderSecurity os) && Equals(os); - public bool Equals(OrderSecurity other) => order.Key == other.order.Key && security == other.security; + public bool Equals(OrderSecurity other) => order.Equals(other.order) && security == other.security; public override int GetHashCode() => (security, order).GetHashCode(); public static bool operator == (OrderSecurity left, OrderSecurity right) => left.Equals(right); diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 0503e569e..b41edc81f 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -175,12 +175,12 @@ namespace mbts.spark { clone.Remove(o.order.Key); } } - foreach (var o in table.changed) { - if (o.order.is_active()) { - clone[o.order.Key] = o; + foreach (var o in table.changes) { + if (o.Old.order.is_active()) { + clone.Remove(o.Old.order.Key); } - else { - clone.Remove(o.order.Key); + if (o.New.order.is_active()) { + clone.Add(o.New.order.Key, o.New); } } foreach (var o in table.added) {