Merge pull request #174 from WestDiscGolf/issue-167

Update DeleteSubscriptionAsync parameters order for consistency - fix 167
aarondcoleman · Jun 20, 2016 · 7c88b7d · 7c88b7d
2 parents 23bc852 + e4f277e
commit 7c88b7d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 28 deletions.
diff --git a/Fitbit.Portable.Tests/RemoveSubscriptionTests.cs b/Fitbit.Portable.Tests/RemoveSubscriptionTests.cs
@@ -27,7 +27,7 @@ public void DeleteSubscription_Correctly()
 
             //Any unexpected behavior will throw exception or fail on request checks (in handler)
             //Pass APICollectionType.user to delete subscriptions for all data sets
-            sut.DeleteSubscriptionAsync(subId, APICollectionType.user).Wait();
+            sut.DeleteSubscriptionAsync(APICollectionType.user, subId).Wait();
         }
 
         [Test]
@@ -42,7 +42,7 @@ public void DeleteSubscriptonFromSpecificCollection()
             var sut = this.SetupFitbitClient(null, expectedUrl, HttpMethod.Delete);
 
             //Any unexpected behavior will throw exception or fail on request checks (in handler)
-            sut.DeleteSubscriptionAsync(subId, collection).Wait();
+            sut.DeleteSubscriptionAsync(collection, subId).Wait();
 
         }
 

diff --git a/Fitbit.Portable/FitbitClient.cs b/Fitbit.Portable/FitbitClient.cs
@@ -716,6 +716,33 @@ public async Task<ApiSubscription> AddSubscriptionAsync(APICollectionType apiCol
             return serializer.Deserialize<ApiSubscription>(responseBody);
         }
 
+
+        public async Task DeleteSubscriptionAsync(APICollectionType collection, string uniqueSubscriptionId, string subscriberId = null)
+        {
+            var collectionString = string.Empty;
+
+            if (collection == APICollectionType.user)
+                collectionString = string.Empty;
+            else
+                collectionString = collection.ToString() + @"/";
+
+            string url = "/1/user/-/{2}apiSubscriptions/{1}.json";
+            string apiCall = FitbitClientHelperExtensions.ToFullUrl(url, args: new object[] { uniqueSubscriptionId, collectionString });
+
+            if (subscriberId != null)
+            {
+                HttpClient.DefaultRequestHeaders.Add(Constants.Headers.XFitbitSubscriberId, subscriberId);
+            }
+
+            var response = await HttpClient.DeleteAsync(apiCall);
+
+            if (response.StatusCode != HttpStatusCode.NoContent)
+            {
+                var errors = new JsonDotNetSerializer().ParseErrors(await response.Content.ReadAsStringAsync());
+                throw new FitbitException("Unexpected response message", errors);
+            }
+        }
+
         private string FormatKey(APICollectionType apiCollectionType, string format)
         {
             string strValue = apiCollectionType == APICollectionType.user ? string.Empty : apiCollectionType.ToString();
@@ -776,31 +803,5 @@ private async Task HandleResponse(HttpResponseMessage response)
                 throw new FitbitException($"An error has occured. Please see error list for details - {response.StatusCode}", errors);
             }
         }
-
-        public async Task DeleteSubscriptionAsync(string uniqueSubscriptionId, APICollectionType collection, string subscriberId = null)
-        {
-            var collectionString = string.Empty;
-
-            if (collection == APICollectionType.user)
-                collectionString = string.Empty;
-            else
-                collectionString = collection.ToString() + @"/";
-
-            string url = "/1/user/-/{2}apiSubscriptions/{1}.json";
-            string apiCall = FitbitClientHelperExtensions.ToFullUrl(url, args: new object[] {  uniqueSubscriptionId, collectionString });
-
-            if (subscriberId != null)
-            {
-                HttpClient.DefaultRequestHeaders.Add(Constants.Headers.XFitbitSubscriberId, subscriberId);
-            }
-
-            var response = await HttpClient.DeleteAsync(apiCall);
-
-            if (response.StatusCode != HttpStatusCode.NoContent)
-            {
-                var errors = new JsonDotNetSerializer().ParseErrors(await response.Content.ReadAsStringAsync());
-                throw new FitbitException("Unexpected response message", errors);
-            }
-        }
     }
 }
diff --git a/Fitbit.Portable/IFitbitClient.cs b/Fitbit.Portable/IFitbitClient.cs
@@ -33,5 +33,6 @@ public interface IFitbitClient
 
         Task<List<ApiSubscription>> GetSubscriptionsAsync();
         Task<ApiSubscription> AddSubscriptionAsync(APICollectionType apiCollectionType, string uniqueSubscriptionId, string subscriberId = default(string));
+        Task DeleteSubscriptionAsync(APICollectionType collection, string uniqueSubscriptionId, string subscriberId = null);
     }
 }