diff --git a/src/client/spark/Analytics/Core/Settings/SecurityExpiration.cs b/src/client/spark/Analytics/Core/Settings/SecurityExpiration.cs index 703c01df2..27de294da 100644 --- a/src/client/spark/Analytics/Core/Settings/SecurityExpiration.cs +++ b/src/client/spark/Analytics/Core/Settings/SecurityExpiration.cs @@ -189,6 +189,6 @@ namespace mbts { exchange ?? sec_exp.exchange, security_type ?? sec_exp.security_type, symbol ?? sec_exp.symbol, expiration ?? sec_exp.expiration, - id.has_value ? id.value : sec_exp.id); + id.has_value ? id : sec_exp.id); } } diff --git a/src/client/spark/Trades/TradeInfo.cs b/src/client/spark/Trades/TradeInfo.cs index f4cf4b7e8..329e9832a 100644 --- a/src/client/spark/Trades/TradeInfo.cs +++ b/src/client/spark/Trades/TradeInfo.cs @@ -33,7 +33,7 @@ namespace mbts.spark { new( security ?? trade_info.security, trade ?? trade_info.trade, - greeks_tuple.has_value ? greeks_tuple.value : trade_info.greeks_tuple, + greeks_tuple.value_or(trade_info.greeks_tuple), volume ?? trade_info.volume); } } diff --git a/src/client/spark_api/utils/Optional.cs b/src/client/spark_api/utils/Optional.cs index b815b5fc6..e70a4b874 100644 --- a/src/client/spark_api/utils/Optional.cs +++ b/src/client/spark_api/utils/Optional.cs @@ -37,6 +37,9 @@ namespace bts.utils { public static implicit operator Optional(T value) => new(value); + public static implicit operator T(Optional optional) => + optional.value; + public static bool operator ==(Optional left, Optional right) => left.Equals(right); public static bool operator !=(Optional left, Optional right) => !(left == right); }