Skip to content

reject sales when operator is disabled at either estate or merchant #607

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 1 commit into from
May 14, 2024
Merged

reject sales when operator is disabled at either estate or merchant #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion TransactionProcessor.BusinessLogic.Tests/Services/TransactionDomainServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
using Testing;
using TransactionAggregate;
using Xunit;
using MerchantResponse = EstateManagement.DataTransferObjects.Responses.MerchantResponse;

public class TransactionDomainServiceTests{
#region Fields
Expand Down
181 changes: 115 additions & 66 deletions TransactionProcessor.BusinessLogic.Tests/Services/TransactionValidationServiceTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

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>net8.0</TargetFramework>
<DebugType>Full</DebugType>
<DebugType>None</DebugType>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.BusinessLogic/OperatorInterfaces/IOperatorProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using EstateManagement.DataTransferObjects.Responses;
using EstateManagement.DataTransferObjects.Responses.Merchant;

/// <summary>
///
Expand All @@ -18,7 +18,7 @@ Task<OperatorResponse> ProcessLogonMessage(String accessToken,
Task<OperatorResponse> ProcessSaleMessage(String accessToken,
Guid transactionId,
Guid operatorId,
EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse merchant,
MerchantResponse merchant,
DateTime transactionDateTime,
String transactionReference,
Dictionary<String, String> additionalTransactionMetadata,
Expand Down
1 change: 0 additions & 1 deletion ...sactionProcessor.BusinessLogic/OperatorInterfaces/PataPawaPostPay/PataPawaPostPayProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Threading;
using System.Threading.Tasks;
using Common;
using EstateManagement.DataTransferObjects.Responses;
using global::PataPawaPostPay;
using Microsoft.Extensions.Caching.Memory;
using Shared.Logger;
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.BusinessLogic/OperatorInterfaces/PataPawaPrePay/PataPawaPrePayProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Threading;
using System.Threading.Tasks;
using Common;
using EstateManagement.DataTransferObjects.Responses;
using EstateManagement.DataTransferObjects.Responses.Merchant;
using Microsoft.Extensions.Caching.Memory;
using Newtonsoft.Json;
using Shared.Logger;
Expand Down Expand Up @@ -56,7 +56,7 @@ public async Task<OperatorResponse> ProcessLogonMessage(String accessToken, Canc
}

public async Task<OperatorResponse> ProcessSaleMessage(String accessToken, Guid transactionId, Guid operatorId,
EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse merchant, DateTime transactionDateTime, String transactionReference, Dictionary<String, String> additionalTransactionMetadata, CancellationToken cancellationToken){
MerchantResponse merchant, DateTime transactionDateTime, String transactionReference, Dictionary<String, String> additionalTransactionMetadata, CancellationToken cancellationToken){
// Get the logon response for the operator
OperatorResponse logonResponse = this.MemoryCache.Get<OperatorResponse>("PataPawaPrePayLogon");
if (logonResponse == null)
Expand Down
4 changes: 2 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 @@ -11,7 +11,7 @@
using System.Xml;
using System.Xml.Serialization;
using Common;
using EstateManagement.DataTransferObjects.Responses;
using EstateManagement.DataTransferObjects.Responses.Merchant;
using Shared.Logger;

/// <summary>
Expand Down Expand Up @@ -74,7 +74,7 @@ public async Task<OperatorResponse> ProcessLogonMessage(String accessToken,
public async Task<OperatorResponse> ProcessSaleMessage(String accessToken,
Guid transactionId,
Guid operatorId,
EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse merchant,
MerchantResponse merchant,
DateTime transactionDateTime,
String transactionReference,
Dictionary<String, String> additionalTransactionMetadata,
Expand Down
6 changes: 2 additions & 4 deletions ...ionProcessor.BusinessLogic/OperatorInterfaces/VoucherManagement/VoucherManagementProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ namespace TransactionProcessor.BusinessLogic.OperatorInterfaces.VoucherManagemen
using System.Threading;
using System.Threading.Tasks;
using Common;
using EstateManagement.DataTransferObjects.Responses;
using EstateManagement.DataTransferObjects.Responses.Merchant;
using IdentityModel.Client;
using MediatR;
//using global::VoucherManagement.Client;
//using global::VoucherManagement.DataTransferObjects;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
using Microsoft.Identity.Client;
using Models;
Expand Down Expand Up @@ -56,7 +54,7 @@ public async Task<OperatorResponse> ProcessLogonMessage(String accessToken,
public async Task<OperatorResponse> ProcessSaleMessage(String accessToken,
Guid transactionId,
Guid operatorId,
EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse merchant,
MerchantResponse merchant,
DateTime transactionDateTime,
String transactionReference,
Dictionary<String, String> additionalTransactionMetadata,
Expand Down
2 changes: 2 additions & 0 deletions TransactionProcessor.BusinessLogic/Services/TransactionResponseCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public enum TransactionResponseCode
MerchantHasNoContractsConfigured = 1014,
ContractNotValidForMerchant = 1015,
ProductNotValidForMerchant = 1016,
OperatorNotEnabledForEstate = 1017,
OperatorNotEnabledForMerchant = 1018,

// A Catch All generic Error where reason has not been identified
UnknownFailure = 9999
Expand Down
15 changes: 14 additions & 1 deletion TransactionProcessor.BusinessLogic/Services/TransactionValidationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ public TransactionValidationService(IEstateClient estateClient,
TransactionResponseCode.OperatorNotValidForEstate);
}

// Check the operator is enabled and not deleted
if (estateOperatorRecord.IsDeleted){
throw new TransactionValidationException($"Operator {operatorId} not enabled for Estate [{estate.EstateName}]",
TransactionResponseCode.OperatorNotEnabledForEstate);
}

// Device Validation
if (merchant.Devices == null || merchant.Devices.Any() == false){
throw new TransactionValidationException($"Merchant {merchant.MerchantName} has no valid Devices for this transaction.",
Expand Down Expand Up @@ -168,8 +174,15 @@ public TransactionValidationService(IEstateClient estateClient,
throw new TransactionValidationException($"Operator {operatorId} not configured for Merchant [{merchant.MerchantName}]",
TransactionResponseCode.OperatorNotValidForMerchant);
}
}

// Check the operator is enabled and not deleted
if (merchantOperatorRecord.IsDeleted)
{
throw new TransactionValidationException($"Operator {operatorId} not enabled for Merchant [{merchant.MerchantName}]",
TransactionResponseCode.OperatorNotEnabledForMerchant);
}
}

// Contract and Product Validation
if (contractId == Guid.Empty){
throw new TransactionValidationException($"Contract Id [{contractId}] must be set for a sale transaction",
Expand Down
8 changes: 4 additions & 4 deletions TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EstateManagement.Client" Version="2024.4.2-build98" />
<PackageReference Include="EstateManagement.Database" Version="2024.4.2-build98" />
<PackageReference Include="EstateManagement.Client" Version="2024.4.3-build103" />
<PackageReference Include="EstateManagement.Database" Version="2024.4.3-build103" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
<PackageReference Include="MessagingService.Client" Version="2024.4.2-build57" />
<PackageReference Include="SecurityService.Client" Version="2024.4.2-build62" />
<PackageReference Include="MessagingService.Client" Version="2024.4.2" />
<PackageReference Include="SecurityService.Client" Version="2024.4.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.4.3" />
<PackageReference Include="Shared.EventStore" Version="2024.4.3" />
<PackageReference Include="MediatR" Version="12.2.0" />
Expand Down
4 changes: 2 additions & 2 deletions ...ocessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EstateManagement.Client" Version="2024.4.2-build98" />
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.4.2-build98" />
<PackageReference Include="EstateManagement.Client" Version="2024.4.3-build103" />
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.4.3-build103" />
<PackageReference Include="Reqnroll" Version="1.0.1" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions TransactionProcessor.IntegrationTests/Common/TestingContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.Threading.Tasks;
using DataTransferObjects;
using EstateManagement.DataTransferObjects.Responses;
using EstateManagement.DataTransferObjects.Responses.Merchant;
using EstateManagement.IntegrationTesting.Helpers;
using global::Shared.IntegrationTesting;
using global::Shared.Logger;
Expand Down
10 changes: 5 additions & 5 deletions TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2024.4.3" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="EstateManagement.Client" Version="2024.4.2-build98" />
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.4.2-build98" />
<PackageReference Include="EstateManagement.Client" Version="2024.4.3-build103" />
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.4.3-build103" />
<PackageReference Include="EventStoreProjections" Version="2023.12.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="SecurityService.Client" Version="2024.4.2-build62" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.4.2-build62" />
<PackageReference Include="SecurityService.Client" Version="2024.4.2" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.4.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2024.4.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
Expand All @@ -28,7 +28,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2024.4.2-build57" />
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2024.4.2" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions TransactionProcessor.ProjectionEngine/TransactionProcessor.ProjectionEngine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EstateManagement.Estate.DomainEvents" Version="2024.4.2-build98" />
<PackageReference Include="EstateManagement.Merchant.DomainEvents" Version="2024.4.2-build98" />
<PackageReference Include="FileProcessor.File.DomainEvents" Version="2024.4.2-build55" />
<PackageReference Include="FileProcessor.FileImportLog.DomainEvents" Version="2024.4.2-build55" />
<PackageReference Include="EstateManagement.Estate.DomainEvents" Version="2024.4.3-build99" />
<PackageReference Include="EstateManagement.Merchant.DomainEvents" Version="2024.4.3-build99" />
<PackageReference Include="FileProcessor.File.DomainEvents" Version="2024.4.3-build56" />
<PackageReference Include="FileProcessor.FileImportLog.DomainEvents" Version="2024.4.3-build56" />

<PackageReference Include="Shared" Version="2024.4.3" />
<PackageReference Include="Shared.EventStore" Version="2024.4.3" />
Expand Down
Loading