Skip to content

Need same case insentive checks on operator #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 13, 2021
Merged

Need same case insentive checks on operator #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afd0657
Need same case insentive checks on operator
StuartFerguson May 13, 2021
c7860a5
Merge branch 'master' into bug/#144_caseinsentitivemetadata
StuartFerguson May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions TransactionProcessor.BusinessLogic.Tests/OperatorInterfaces/SafaricomPinlessProxyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,71 @@ public async Task SafaricomPinlessProxy_ProcessSaleMessage_TopupSuccessful_SaleM
operatorResponse.ResponseMessage.ShouldBe("Topup Successful");
}

[Theory]
[InlineData("amount")]
[InlineData("Amount")]
[InlineData("AMOUNT")]
public async Task SafaricomPinlessProxy_ProcessSaleMessage_MetadataCasingTests_Amount_TopupSuccessful_SaleMessageIsProcessed(String amountFieldName)
{
HttpResponseMessage responseMessage = new HttpResponseMessage
{
StatusCode = HttpStatusCode.OK,
Content = new StringContent(TestData.SuccessfulSafaricomTopup)
};

SafaricomConfiguration safaricomConfiguration = TestData.SafaricomConfiguration;
HttpClient httpClient = SetupMockHttpClient(responseMessage);

IOperatorProxy safaricomPinlessproxy = new SafaricomPinlessProxy(safaricomConfiguration, httpClient);

OperatorResponse operatorResponse = await safaricomPinlessproxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
TestData.TransactionId,
TestData.OperatorIdentifier1,
TestData.Merchant,
TestData.TransactionDateTime,
TestData.TransactionReference,
TestData.AdditionalTransactionMetaData(amountName: amountFieldName),
CancellationToken.None);

operatorResponse.ShouldNotBeNull();
operatorResponse.IsSuccessful.ShouldBeTrue();
operatorResponse.ResponseCode.ShouldBe("200");
operatorResponse.ResponseMessage.ShouldBe("Topup Successful");
}

[Theory]
[InlineData("customeraccountnumber")]
[InlineData("customerAccountNumber")]
[InlineData("CustomerAccountNumber")]
[InlineData("CUSTOMERACCOUNTNUMBER")]
public async Task SafaricomPinlessProxy_ProcessSaleMessage_MetadataCasingTests_CustomerAccountNumber_TopupSuccessful_SaleMessageIsProcessed(String customerAccountNumberFieldName)
{
HttpResponseMessage responseMessage = new HttpResponseMessage
{
StatusCode = HttpStatusCode.OK,
Content = new StringContent(TestData.SuccessfulSafaricomTopup)
};

SafaricomConfiguration safaricomConfiguration = TestData.SafaricomConfiguration;
HttpClient httpClient = SetupMockHttpClient(responseMessage);

IOperatorProxy safaricomPinlessproxy = new SafaricomPinlessProxy(safaricomConfiguration, httpClient);

OperatorResponse operatorResponse = await safaricomPinlessproxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
TestData.TransactionId,
TestData.OperatorIdentifier1,
TestData.Merchant,
TestData.TransactionDateTime,
TestData.TransactionReference,
TestData.AdditionalTransactionMetaData(customerAccountNumberName: customerAccountNumberFieldName),
CancellationToken.None);

operatorResponse.ShouldNotBeNull();
operatorResponse.IsSuccessful.ShouldBeTrue();
operatorResponse.ResponseCode.ShouldBe("200");
operatorResponse.ResponseMessage.ShouldBe("Topup Successful");
}

[Fact]
public async Task SafaricomPinlessProxy_ProcessSaleMessage_TopupFailed_SaleMessageIsProcessed()
{
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessor.BusinessLogic.Tests/TransactionProcessor.BusinessLogic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<DebugType>None</DebugType>
<DebugType>Full</DebugType>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
27 changes: 25 additions & 2 deletions ...ctionProcessor.BusinessLogic/OperatorInterfaces/SafaricomPinless/SafaricomPinlessProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Net.Http;
using System.Text;
Expand Down Expand Up @@ -73,8 +74,8 @@ public async Task<OperatorResponse> ProcessSaleMessage(String accessToken,
CancellationToken cancellationToken)
{
// Extract the required fields
String transactionAmount = additionalTransactionMetadata.GetValueOrDefault("Amount");
String customerMsisdn = additionalTransactionMetadata.GetValueOrDefault("CustomerAccountNumber");
String transactionAmount = this.ExtractFieldFromMetadata("Amount", additionalTransactionMetadata);
String customerMsisdn = this.ExtractFieldFromMetadata("CustomerAccountNumber", additionalTransactionMetadata);

if (String.IsNullOrEmpty(transactionAmount))
{
Expand Down Expand Up @@ -115,6 +116,28 @@ public async Task<OperatorResponse> ProcessSaleMessage(String accessToken,
return this.CreateFrom(responseContent);
}

[ExcludeFromCodeCoverage]
private String ExtractFieldFromMetadata(String fieldName,
Dictionary<String, String> additionalTransactionMetadata)
{
// Create a case insensitive version of the dictionary
Dictionary<String, String> caseInsensitiveDictionary = new Dictionary<String, String>(StringComparer.InvariantCultureIgnoreCase);
foreach (KeyValuePair<String, String> keyValuePair in additionalTransactionMetadata)
{
caseInsensitiveDictionary.Add(keyValuePair.Key, keyValuePair.Value);
}

if (caseInsensitiveDictionary.ContainsKey(fieldName))
{
return caseInsensitiveDictionary[fieldName];
}
else
{
return String.Empty;
}

}

/// <summary>
/// Builds the request.
/// </summary>
Expand Down