Skip to content

Commit

Permalink
refactor: [breaking] remove sync methods from ConversionClient
Browse files Browse the repository at this point in the history
  • Loading branch information
Tr00d committed Mar 14, 2024
1 parent e8f90f6 commit 7b5732a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 99 deletions.
54 changes: 0 additions & 54 deletions Vonage.Test/ConversionTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,6 @@ namespace Vonage.Test;
[Trait("Category", "Legacy")]
public class ConversionTest : TestBase
{
[Theory]
[InlineData(false)]
[InlineData(true)]
public void SmsConversion(bool passCreds)
{
var expectedUri = $"{this.ApiUrl}/conversions/sms";
var expectedContent =
"message-id=00A0B0C0&delivered=true&timestamp=2020-01-01+12%3A00%3A00&api_key=testkey&api_secret=testSecret&";
var expectedResponse = "";
this.Setup(expectedUri, expectedResponse, expectedContent);
var request = new ConversionRequest
{Delivered = true, MessageId = "00A0B0C0", TimeStamp = "2020-01-01 12:00:00"};
var credentials = Credentials.FromApiKeyAndSecret(this.ApiKey, this.ApiSecret);
var client = this.BuildVonageClient(credentials);
bool response;
if (passCreds)
{
response = client.ConversionClient.SmsConversion(request, credentials);
}
else
{
response = client.ConversionClient.SmsConversion(request);
}

Assert.True(response);
}

[Theory]
[InlineData(false)]
[InlineData(true)]
Expand Down Expand Up @@ -62,33 +35,6 @@ public async Task SmsConversionAsync(bool passCreds)
Assert.True(response);
}

[Theory]
[InlineData(false)]
[InlineData(true)]
public void VoiceConversion(bool passCreds)
{
var expectedUri = $"{this.ApiUrl}/conversions/voice";
var expectedContent =
"message-id=00A0B0C0&delivered=true&timestamp=2020-01-01+12%3A00%3A00&api_key=testkey&api_secret=testSecret&";
var expectedResponse = "";
this.Setup(expectedUri, expectedResponse, expectedContent);
var request = new ConversionRequest
{Delivered = true, MessageId = "00A0B0C0", TimeStamp = "2020-01-01 12:00:00"};
var creds = Credentials.FromApiKeyAndSecret(this.ApiKey, this.ApiSecret);
var client = this.BuildVonageClient(creds);
bool response;
if (passCreds)
{
response = client.ConversionClient.VoiceConversion(request, creds);
}
else
{
response = client.ConversionClient.VoiceConversion(request);
}

Assert.True(response);
}

[Theory]
[InlineData(false)]
[InlineData(true)]
Expand Down
29 changes: 1 addition & 28 deletions Vonage/Conversions/ConversionClient.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Vonage.Common;
using Vonage.Request;

Expand All @@ -25,19 +24,6 @@ internal ConversionClient(Credentials credentials, Configuration configuration,

public Credentials Credentials { get; set; }

/// <inheritdoc/>
[Obsolete("Favor asynchronous version instead.")]
public bool SmsConversion(ConversionRequest request, Credentials creds = null)
{
ApiRequest.Build(this.GetCredentials(creds), this.configuration, this.timeProvider)
.DoPostRequestUrlContentFromObject<object>
(
ApiRequest.GetBaseUri(ApiRequest.UriType.Api, this.configuration, "/conversions/sms"),
request
);
return true;
}

/// <inheritdoc/>
public async Task<bool> SmsConversionAsync(ConversionRequest request, Credentials creds = null)
{
Expand All @@ -50,19 +36,6 @@ await ApiRequest.Build(this.GetCredentials(creds), this.configuration, this.time
return true;
}

/// <inheritdoc/>
[Obsolete("Favor asynchronous version instead.")]
public bool VoiceConversion(ConversionRequest request, Credentials creds = null)
{
ApiRequest.Build(this.GetCredentials(creds), this.configuration, this.timeProvider)
.DoPostRequestUrlContentFromObject<object>
(
ApiRequest.GetBaseUri(ApiRequest.UriType.Api, this.configuration, "/conversions/voice"),
request
);
return true;
}

/// <inheritdoc/>
public async Task<bool> VoiceConversionAsync(ConversionRequest request, Credentials creds = null)
{
Expand Down
18 changes: 1 addition & 17 deletions Vonage/Conversions/IConversionClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,13 @@ public interface IConversionClient
/// <param name="creds"></param>
/// <returns></returns>
Task<bool> SmsConversionAsync(ConversionRequest request, Credentials creds = null);
/// <summary>
/// Send a Conversion API request with information about the Call or Text-To-Speech identified by message-id.
/// Vonage uses your conversion data and internal information about message-id to help improve our routing of messages in the future.
/// </summary>
/// <param name="request"></param>
/// <param name="creds"></param>
/// <returns></returns>
Task<bool> VoiceConversionAsync(ConversionRequest request, Credentials creds = null);

/// <summary>
/// Send a Conversion API request with information about the SMS message identified by message-id.
/// Vonage uses your conversion data and internal information about message-id to help improve our routing of messages in the future.
/// </summary>
/// <param name="request"></param>
/// <param name="creds"></param>
/// <returns></returns>
bool SmsConversion(ConversionRequest request, Credentials creds = null);
/// <summary>
/// Send a Conversion API request with information about the Call or Text-To-Speech identified by message-id.
/// Vonage uses your conversion data and internal information about message-id to help improve our routing of messages in the future.
/// </summary>
/// <param name="request"></param>
/// <param name="creds"></param>
/// <returns></returns>
bool VoiceConversion(ConversionRequest request, Credentials creds = null);
Task<bool> VoiceConversionAsync(ConversionRequest request, Credentials creds = null);
}

0 comments on commit 7b5732a

Please sign in to comment.