Rename to TickerSymbol and CurrencyPair as appropriate

TickerSymbol now always refers to all uppercase with slash while CurrencyPair is all lowercase without slash. References #28
andreashuber69 · Oct 6, 2017 · 2ed5096 · 2ed5096
1 parent 220edb9
commit 2ed5096
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 35 deletions.
diff --git a/Bitstamp/BitstampClient.cs b/Bitstamp/BitstampClient.cs
@@ -87,36 +87,36 @@ internal async Task<IReadOnlyList<Transaction>> GetTransactionsAsync(int offset,
             return await this.ExecutePostAsync("/api/v2/user_transactions/", args, d => new TransactionCollection(d));
         }
 
-        internal Task<Ticker> GetTickerAsync(string tickerSymbol) =>
-            this.ExecuteGetAsync(Invariant($"/api/v2/ticker/{tickerSymbol}/"), d => new Ticker(d));
+        internal Task<Ticker> GetTickerAsync(string currencyPair) =>
+            this.ExecuteGetAsync(Invariant($"/api/v2/ticker/{currencyPair}/"), d => new Ticker(d));
 
         [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "Long-running operation.")]
-        internal Task<OrderBook> GetOrderBookAsync(string tickerSymbol) =>
-            this.ExecuteGetAsync(Invariant($"/api/v2/order_book/{tickerSymbol}/"), d => new OrderBook(d));
+        internal Task<OrderBook> GetOrderBookAsync(string currencyPair) =>
+            this.ExecuteGetAsync(Invariant($"/api/v2/order_book/{currencyPair}/"), d => new OrderBook(d));
 
         internal Task<PrivateOrder> CreateBuyOrderAsync(string currencyPair, decimal amount, decimal price) =>
             this.CreateBuyOrderAsync(currencyPair, amount, price, null);
 
         internal Task<PrivateOrder> CreateBuyOrderAsync(
-            string tickerSymbol, decimal amount, decimal price, decimal? limitPrice)
+            string currencyPair, decimal amount, decimal price, decimal? limitPrice)
         {
-            return this.CreateOrderAsync("buy", tickerSymbol, amount, price, limitPrice);
+            return this.CreateOrderAsync("buy", currencyPair, amount, price, limitPrice);
         }
 
-        internal Task<PrivateOrder> CreateBuyOrderAsync(string tickerSymbol, decimal amount) =>
-            this.CreateOrderAsync("buy", tickerSymbol, amount);
+        internal Task<PrivateOrder> CreateBuyOrderAsync(string currencyPair, decimal amount) =>
+            this.CreateOrderAsync("buy", currencyPair, amount);
 
         internal Task<PrivateOrder> CreateSellOrderAsync(string currencyPair, decimal amount, decimal price) =>
             this.CreateSellOrderAsync(currencyPair, amount, price, null);
 
         internal Task<PrivateOrder> CreateSellOrderAsync(
-            string tickerSymbol, decimal amount, decimal price, decimal? limitPrice)
+            string currencyPair, decimal amount, decimal price, decimal? limitPrice)
         {
-            return this.CreateOrderAsync("sell", tickerSymbol, amount, price, limitPrice);
+            return this.CreateOrderAsync("sell", currencyPair, amount, price, limitPrice);
         }
 
-        internal Task<PrivateOrder> CreateSellOrderAsync(string tickerSymbol, decimal amount) =>
-            this.CreateOrderAsync("sell", tickerSymbol, amount);
+        internal Task<PrivateOrder> CreateSellOrderAsync(string currencyPair, decimal amount) =>
+            this.CreateOrderAsync("sell", currencyPair, amount);
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

diff --git a/Bitstamp/BtcEurExchange.cs b/Bitstamp/BtcEurExchange.cs
@@ -14,7 +14,7 @@ public sealed partial class BitstampClient
         private sealed class BtcEurExchange : CurrencyExchange
         {
             internal BtcEurExchange(BitstampClient client)
-                : base(client, "btceur")
+                : base(client, "BTC/EUR")
             {
             }
 

diff --git a/Bitstamp/CurrencyExchange.cs b/Bitstamp/CurrencyExchange.cs
@@ -15,7 +15,7 @@ public sealed partial class BitstampClient
     {
         internal abstract class CurrencyExchange : ICurrencyExchange
         {
-            public string TickerSymbol => this.tickerSymbol.ToUpperInvariant();
+            public string TickerSymbol { get; }
 
             public async Task<IBalance> GetBalanceAsync() => this.CreateBalance(await this.client.GetBalanceAsync());
 
@@ -25,38 +25,41 @@ public async Task<IEnumerable<ITransaction>> GetTransactionsAsync(int offset, in
                 return transactions.Select(t => this.CreateTransaction(t)).Where(t => t != null);
             }
 
-            public Task<Ticker> GetTickerAsync() => this.client.GetTickerAsync(this.tickerSymbol);
+            public Task<Ticker> GetTickerAsync() => this.client.GetTickerAsync(this.CurrencyPair);
 
-            public Task<OrderBook> GetOrderBookAsync() => this.client.GetOrderBookAsync(this.tickerSymbol);
+            public Task<OrderBook> GetOrderBookAsync() => this.client.GetOrderBookAsync(this.CurrencyPair);
 
             public Task<PrivateOrder> CreateBuyOrderAsync(decimal amount) =>
-                this.client.CreateBuyOrderAsync(this.tickerSymbol, amount);
+                this.client.CreateBuyOrderAsync(this.CurrencyPair, amount);
 
             public Task<PrivateOrder> CreateBuyOrderAsync(decimal amount, decimal price) =>
-                this.client.CreateBuyOrderAsync(this.tickerSymbol, amount, price);
+                this.client.CreateBuyOrderAsync(this.CurrencyPair, amount, price);
 
             public Task<PrivateOrder> CreateSellOrderAsync(decimal amount) =>
-                this.client.CreateSellOrderAsync(this.tickerSymbol, amount);
+                this.client.CreateSellOrderAsync(this.CurrencyPair, amount);
 
             public Task<PrivateOrder> CreateSellOrderAsync(decimal amount, decimal price) =>
-                this.client.CreateSellOrderAsync(this.tickerSymbol, amount, price);
+                this.client.CreateSellOrderAsync(this.CurrencyPair, amount, price);
 
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-            internal CurrencyExchange(BitstampClient client, string tickerSymbol)
-            {
-                this.client = client;
-                this.tickerSymbol = tickerSymbol;
-            }
-
             internal abstract IBalance CreateBalance(Balance balance);
 
             internal abstract ITransaction CreateTransaction(Transaction transaction);
 
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+            protected CurrencyExchange(BitstampClient client, string tickerSymbol)
+            {
+                this.client = client;
+                this.TickerSymbol = tickerSymbol;
+            }
+
+            ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
             private readonly BitstampClient client;
-            private readonly string tickerSymbol;
+
+            private string CurrencyPair => this.TickerSymbol.Replace("/", string.Empty).ToLowerInvariant();
         }
     }
 }
diff --git a/SmartTrade/BtcEurTradeService.cs b/SmartTrade/BtcEurTradeService.cs
@@ -12,7 +12,7 @@ namespace SmartTrade
     internal sealed class BtcEurTradeService : TradeService
     {
         public BtcEurTradeService()
-            : base(new ExchangeClient(new Settings("BtcEur"), c => c.BtcEur))
+            : base(new ExchangeClient(new Settings("BTC/EUR"), c => c.BtcEur))
         {
         }
     }

diff --git a/SmartTrade/ISettings.cs b/SmartTrade/ISettings.cs
@@ -13,7 +13,7 @@ namespace SmartTrade
     internal interface ISettings : INotifyPropertyChanged, IDisposable
     {
         /// <summary>Gets the ticker symbol of the currency pair associated with the settings.</summary>
-        string Ticker { get; }
+        string TickerSymbol { get; }
 
         /// <summary>Gets the first currency symbol.</summary>
         string FirstCurrency { get; }

diff --git a/SmartTrade/Settings.cs b/SmartTrade/Settings.cs
@@ -31,11 +31,11 @@ internal sealed class Settings : Java.Lang.Object, ISettings, ISharedPreferences
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
-        public string Ticker => this.FirstCurrency + "/" + this.SecondCurrency;
+        public string TickerSymbol { get; }
 
-        public string FirstCurrency => this.groupName.Substring(0, 3).ToUpperInvariant();
+        public string FirstCurrency => this.TickerSymbol.Substring(0, this.TickerSymbol.IndexOf('/'));
 
-        public string SecondCurrency => this.groupName.Substring(3).ToUpperInvariant();
+        public string SecondCurrency => this.TickerSymbol.Substring(this.TickerSymbol.IndexOf('/') + 1);
 
         public int CustomerId
         {
@@ -162,9 +162,12 @@ public void OnSharedPreferenceChanged(ISharedPreferences sharedPreferences, stri
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-        internal Settings(string groupName)
+        internal Settings(string tickerSymbol)
         {
-            this.groupName = groupName;
+            this.TickerSymbol = tickerSymbol;
+            var slashPosition = tickerSymbol.IndexOf('/');
+            this.groupName = CamelCase(tickerSymbol.Substring(0, slashPosition)) +
+                CamelCase(tickerSymbol.Substring(slashPosition + 1));
             this.preferences = PreferenceManager.GetDefaultSharedPreferences(Application.Context);
             this.preferences.RegisterOnSharedPreferenceChangeListener(this);
             this.keyStore = KeyStore.GetInstance(KeyStoreName);
@@ -185,6 +188,9 @@ protected sealed override void Dispose(bool disposing)
         private const string KeyStoreName = "AndroidKeyStore";
         private const string KeyName = "BitstampApiCredentials";
 
+        private static string CamelCase(string str) =>
+            char.ToUpperInvariant(str[0]) + str.Substring(1).ToLowerInvariant();
+
         private static void GenerateKey()
         {
             var keyGenerator = KeyPairGenerator.GetInstance(KeyProperties.KeyAlgorithmRsa, KeyStoreName);

diff --git a/SmartTrade/StatusActivity.cs b/SmartTrade/StatusActivity.cs
@@ -28,7 +28,7 @@ protected sealed override void OnCreate(Bundle savedInstanceState)
             base.OnCreate(savedInstanceState);
             this.SetContentView(Resource.Layout.Status);
             this.Title = string.Format(
-                InvariantCulture, this.GetString(Resource.String.StatusTitle), this.service.Settings.Ticker);
+                InvariantCulture, this.GetString(Resource.String.StatusTitle), this.service.Settings.TickerSymbol);
 
             this.settingsButton = this.GetSettingsButton();
             this.enableDisableServiceButton = this.GetEnableDisableServiceButton();