Remaning number insight methods to remove confusion

Vonage · May 25, 2022 · 018153e · 018153e
1 parent c7c3299
commit 018153e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 38 deletions.
diff --git a/Vonage.Test.Unit/NumberInsightsTests.cs b/Vonage.Test.Unit/NumberInsightsTests.cs
@@ -694,14 +694,14 @@ public void TestAdvancedAsync(bool passCreds, bool kitchenSink)
             //ACT
             var creds = Request.Credentials.FromApiKeyAndSecret(ApiKey, ApiSecret);
             var client = new VonageClient(creds);
-            AdvancedInsightsAsyncResponse response;
+            AdvancedInsightsAsynchronousResponse response;
             if (passCreds)
             {
-                response = client.NumberInsightClient.GetNumberInsightAsync(request, creds);
+                response = client.NumberInsightClient.GetNumberInsightAsynchronous(request, creds);
             }
             else
             {
-                response = client.NumberInsightClient.GetNumberInsightAsync(request);
+                response = client.NumberInsightClient.GetNumberInsightAsynchronous(request);
             }
 
             //ASSERT
@@ -739,14 +739,14 @@ public async void TestAdvancedAsyncAsync(bool passCreds, bool kitchenSink)
             //ACT
             var creds = Request.Credentials.FromApiKeyAndSecret(ApiKey, ApiSecret);
             var client = new VonageClient(creds);
-            AdvancedInsightsAsyncResponse response;
+            AdvancedInsightsAsynchronousResponse response;
             if (passCreds)
             {
-                response = await client.NumberInsightClient.GetNumberInsightAsyncAsync(request, creds);
+                response = await client.NumberInsightClient.GetNumberInsightAsynchronousAsync(request, creds);
             }
             else
             {
-                response = await client.NumberInsightClient.GetNumberInsightAsyncAsync(request);
+                response = await client.NumberInsightClient.GetNumberInsightAsynchronousAsync(request);
             }
 
             //ASSERT
@@ -770,7 +770,7 @@ public void TestFailedAsyncRequest()
             var client = new VonageClient(creds);
             try
             {
-                client.NumberInsightClient.GetNumberInsightAsync(request);
+                client.NumberInsightClient.GetNumberInsightAsynchronous(request);
                 //ASSERT
                 Assert.True(false, "Auto fail because request returned without throwing exception");
             }

diff --git a/...Insights/AdvancedInsightsAsyncResponse.cs → ...s/AdvancedInsightsAsynchronousResponse.cs b/...Insights/AdvancedInsightsAsyncResponse.cs → ...s/AdvancedInsightsAsynchronousResponse.cs
@@ -2,7 +2,7 @@
 
 namespace Vonage.NumberInsights
 {
-    public class AdvancedInsightsAsyncResponse : NumberInsightResponseBase
+    public class AdvancedInsightsAsynchronousResponse : NumberInsightResponseBase
     {
         /// <summary>
         /// The number in your request

diff --git a/Vonage/NumberInsights/INumberInsightClient.cs b/Vonage/NumberInsights/INumberInsightClient.cs
@@ -19,8 +19,7 @@ public interface INumberInsightClient
         /// <param name="request"></param>
         /// <param name="creds"></param>
         /// <returns></returns>
-        Task<StandardInsightResponse>
-            GetNumberInsightStandardAsync(StandardNumberInsightRequest request, Credentials creds = null);
+        Task<StandardInsightResponse> GetNumberInsightStandardAsync(StandardNumberInsightRequest request, Credentials creds = null);
 
         /// <summary>
         /// Provides advanced number insight information about a number synchronously, in the same way that the basic and standard endpoints do.
@@ -39,7 +38,7 @@ Task<AdvancedInsightsResponse> GetNumberInsightAdvancedAsync(AdvancedNumberInsig
         /// <param name="request"></param>
         /// <param name="creds"></param>
         /// <returns></returns>
-        Task<AdvancedInsightsAsyncResponse> GetNumberInsightAsyncAsync(AdvancedNumberInsightAsynchronousRequest request,
+        Task<AdvancedInsightsAsynchronousResponse> GetNumberInsightAsynchronousAsync(AdvancedNumberInsightAsynchronousRequest request,
             Credentials creds = null);
 
         /// <summary>
@@ -56,8 +55,7 @@ Task<AdvancedInsightsAsyncResponse> GetNumberInsightAsyncAsync(AdvancedNumberIns
         /// <param name="request"></param>
         /// <param name="creds"></param>
         /// <returns></returns>
-        StandardInsightResponse
-            GetNumberInsightStandard(StandardNumberInsightRequest request, Credentials creds = null);
+        StandardInsightResponse GetNumberInsightStandard(StandardNumberInsightRequest request, Credentials creds = null);
 
         /// <summary>
         /// Provides advanced number insight information about a number synchronously, in the same way that the basic and standard endpoints do.
@@ -66,8 +64,7 @@ Task<AdvancedInsightsAsyncResponse> GetNumberInsightAsyncAsync(AdvancedNumberIns
         /// <param name="request"></param>
         /// <param name="creds"></param>
         /// <returns></returns>
-        AdvancedInsightsResponse GetNumberInsightAdvanced(AdvancedNumberInsightRequest request,
-            Credentials creds = null);
+        AdvancedInsightsResponse GetNumberInsightAdvanced(AdvancedNumberInsightRequest request, Credentials creds = null);
 
         /// <summary>
         /// Provides advanced number insight number information asynchronously using the URL specified in the callback parameter. 
@@ -76,7 +73,6 @@ AdvancedInsightsResponse GetNumberInsightAdvanced(AdvancedNumberInsightRequest r
         /// <param name="request"></param>
         /// <param name="creds"></param>
         /// <returns></returns>
-        AdvancedInsightsAsyncResponse GetNumberInsightAsync(AdvancedNumberInsightAsynchronousRequest request,
-            Credentials creds = null);
+        AdvancedInsightsAsynchronousResponse GetNumberInsightAsynchronous(AdvancedNumberInsightAsynchronousRequest request, Credentials creds = null);
     }
 }
diff --git a/Vonage/NumberInsights/NumberInsightClient.cs b/Vonage/NumberInsights/NumberInsightClient.cs
@@ -35,8 +35,7 @@ public async Task<StandardInsightResponse> GetNumberInsightStandardAsync(Standar
             return response;
         }
 
-        public async Task<AdvancedInsightsResponse> GetNumberInsightAdvancedAsync(AdvancedNumberInsightRequest request,
-            Credentials creds = null)
+        public async Task<AdvancedInsightsResponse> GetNumberInsightAdvancedAsync(AdvancedNumberInsightRequest request, Credentials creds = null)
         {
             var response = await ApiRequest.DoGetRequestWithQueryParametersAsync<AdvancedInsightsResponse>(
                 ApiRequest.GetBaseUri(ApiRequest.UriType.Api, "/ni/advanced/json"),
@@ -48,9 +47,9 @@ public async Task<AdvancedInsightsResponse> GetNumberInsightAdvancedAsync(Advanc
             return response;
         }
 
-        public async Task<AdvancedInsightsAsyncResponse> GetNumberInsightAsyncAsync(AdvancedNumberInsightAsynchronousRequest request, Credentials creds = null)
+        public async Task<AdvancedInsightsAsynchronousResponse> GetNumberInsightAsynchronousAsync(AdvancedNumberInsightAsynchronousRequest request, Credentials creds = null)
         {
-            var response = await ApiRequest.DoGetRequestWithQueryParametersAsync<AdvancedInsightsAsyncResponse>(
+            var response = await ApiRequest.DoGetRequestWithQueryParametersAsync<AdvancedInsightsAsynchronousResponse>(
                 ApiRequest.GetBaseUri(ApiRequest.UriType.Api, "/ni/advanced/async/json"),
                 ApiRequest.AuthType.Query,
                 request,
@@ -60,21 +59,6 @@ public async Task<AdvancedInsightsAsyncResponse> GetNumberInsightAsyncAsync(Adva
             return response;
         }
 
-        public void ValidateNumberInsightResponse(NumberInsightResponseBase response)
-        {
-            if (response.Status != 0)
-            {
-                if(response is AdvancedInsightsAsyncResponse asyncResponse)
-                {
-                    throw new VonageNumberInsightResponseException($"Advanced Insights Async response failed with status: {asyncResponse.Status}") { Response = response};
-                }
-                else if(response is BasicInsightResponse basicInsightResponse)
-                {                    
-                    throw new VonageNumberInsightResponseException($"Number insight request failed with status: {basicInsightResponse.Status} and error message: {basicInsightResponse.StatusMessage}") { Response=response};
-                }
-            }
-        }
-
         public BasicInsightResponse GetNumberInsightBasic(BasicNumberInsightRequest request, Credentials creds = null)
         {
             var response = ApiRequest.DoGetRequestWithQueryParameters<BasicInsightResponse>(
@@ -111,9 +95,9 @@ public AdvancedInsightsResponse GetNumberInsightAdvanced(AdvancedNumberInsightRe
             return response;
         }
 
-        public AdvancedInsightsAsyncResponse GetNumberInsightAsync(AdvancedNumberInsightAsynchronousRequest request, Credentials creds = null)
+        public AdvancedInsightsAsynchronousResponse GetNumberInsightAsynchronous(AdvancedNumberInsightAsynchronousRequest request, Credentials creds = null)
         {
-            var response = ApiRequest.DoGetRequestWithQueryParameters<AdvancedInsightsAsyncResponse>(
+            var response = ApiRequest.DoGetRequestWithQueryParameters<AdvancedInsightsAsynchronousResponse>(
                 ApiRequest.GetBaseUri(ApiRequest.UriType.Api, "/ni/advanced/async/json"),
                 ApiRequest.AuthType.Query,
                 request,
@@ -122,5 +106,19 @@ public AdvancedInsightsAsyncResponse GetNumberInsightAsync(AdvancedNumberInsight
             ValidateNumberInsightResponse(response);
             return response;
         }
+
+        public void ValidateNumberInsightResponse(NumberInsightResponseBase response)
+        {
+            if (response.Status != 0)
+            {
+                switch (response)
+                {
+                    case AdvancedInsightsAsynchronousResponse asyncResponse:
+                        throw new VonageNumberInsightResponseException($"Advanced Insights Async response failed with status: {asyncResponse.Status}") { Response = response};
+                    case BasicInsightResponse basicInsightResponse:
+                        throw new VonageNumberInsightResponseException($"Number insight request failed with status: {basicInsightResponse.Status} and error message: {basicInsightResponse.StatusMessage}") { Response=response};
+                }
+            }
+        }
     }
 }