Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="System.ServiceModel.Federation" Version="8.1.2" />
<PackageReference Include="System.ServiceModel.Http" Version="8.1.2" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="8.1.2" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/ContractAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ public ContractAggregate(){
}

private ContractAggregate(Guid aggregateId){
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.Products = new List<Product>();
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/EstateAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ public EstateAggregate(){
}

private EstateAggregate(Guid aggregateId){
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.Operators = new Dictionary<Guid, TransactionProcessor.Models.Estate.Operator>();
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/FloatActivityAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ public FloatActivityAggregate()

private FloatActivityAggregate(Guid aggregateId)
{
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.Credits = new List<Guid>();
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/FloatAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public FloatAggregate()

private FloatAggregate(Guid aggregateId)
{
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.Credits = new List<(DateTime creditPurchasedDate, Decimal amount, Decimal costPrice)>();
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/MerchantAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,8 @@ public MerchantAggregate()
/// <param name="aggregateId">The aggregate identifier.</param>
private MerchantAggregate(Guid aggregateId)
{
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.Addresses = new Dictionary<Guid, Address>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ public MerchantDepositListAggregate(){
}

private MerchantDepositListAggregate(Guid aggregateId){
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.Deposits = new List<Models.Deposit>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ public MerchantStatementAggregate()

private MerchantStatementAggregate(Guid aggregateId)
{
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.ActivityDates = new();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ public MerchantStatementForDateAggregate()

private MerchantStatementForDateAggregate(Guid aggregateId)
{
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.Transactions = new List<Transaction>();
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/OperatorAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ public OperatorAggregate()

private OperatorAggregate(Guid aggregateId)
{
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
}
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/ReconciliationAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ public ReconciliationAggregate()

private ReconciliationAggregate(Guid aggregateId)
{
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
}
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/SettlementAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,8 @@ public SettlementAggregate()
/// <param name="aggregateId">The aggregate identifier.</param>
private SettlementAggregate(Guid aggregateId)
{
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.CalculatedFeesPendingSettlement = new List<(Guid transactionId, Guid merchantId, CalculatedFee calculatedFee)>();
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/TransactionAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,8 @@ public TransactionAggregate() {
}

private TransactionAggregate(Guid aggregateId) {
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
this.CalculatedFees = new List<CalculatedFee>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Shared.EventStore" Version="2025.7.13" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Shared.EventStore" Version="2025.10.2" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/VoucherAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ public VoucherAggregate()
/// <param name="aggregateId">The aggregate identifier.</param>
private VoucherAggregate(Guid aggregateId)
{
Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid");
if (aggregateId == Guid.Empty)
throw new ArgumentNullException(nameof(aggregateId));

this.AggregateId = aggregateId;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Lamar" Version="15.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Lamar" Version="15.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="22.0.16" />
<PackageReference Include="System.ServiceModel.Federation" Version="8.1.2" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
<PackageReference Include="System.ServiceModel.Http" Version="8.1.2" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="8.1.2" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CallbackHandler.DataTransferObjects" Version="2025.7.2" />
<PackageReference Include="ClientProxyBase" Version="2025.7.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
<PackageReference Include="MessagingService.Client" Version="2025.7.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Polly" Version="8.5.2" />
<PackageReference Include="CallbackHandler.DataTransferObjects" Version="2025.8.1" />
<PackageReference Include="ClientProxyBase" Version="2025.10.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageReference Include="MessagingService.Client" Version="2025.8.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Polly" Version="8.6.4" />
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="SecurityService.Client" Version="2025.7.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.13" />
<PackageReference Include="Shared.EventStore" Version="2025.7.13" />
<PackageReference Include="MediatR" Version="12.5.0" />
<PackageReference Include="Syncfusion.HtmlToPdfConverter.Net.Windows" Version="29.2.9" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.14" />
<PackageReference Include="SecurityService.Client" Version="2025.8.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.10.2" />
<PackageReference Include="Shared.EventStore" Version="2025.10.2" />
<PackageReference Include="MediatR" Version="13.1.0" />
<PackageReference Include="Syncfusion.HtmlToPdfConverter.Net.Windows" Version="31.2.3" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.16" />
<PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0" />
<PackageReference Include="System.ServiceModel.Federation" Version="8.1.2" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
<PackageReference Include="System.ServiceModel.Http" Version="8.1.2" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="8.1.2" />
<PackageReference Include="System.ServiceModel.Security" Version="6.0.0" />
<PackageReference Include="NetBarcode" Version="1.8.2" />
<PackageReference Include="NetBarcode" Version="1.8.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.7.13" />
<PackageReference Include="Shared.Results" Version="2025.7.13" />
<PackageReference Include="ClientProxyBase" Version="2025.10.2" />
<PackageReference Include="Shared.Results" Version="2025.10.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.6" />
</ItemGroup>

<ItemGroup>
Expand Down
20 changes: 10 additions & 10 deletions TransactionProcessor.Database/TransactionProcessor.Database.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
<ItemGroup>
<PackageReference Include="EntityFrameworkCore.Exceptions.Common" Version="8.1.3" />
<PackageReference Include="EntityFrameworkCore.Exceptions.SqlServer" Version="8.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Shared" Version="2025.7.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.13" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Shared" Version="2025.10.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.10.2" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,20 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.7.13" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.13" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.10.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.7.13" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Reqnroll" Version="2.4.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.7.13" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
<PackageReference Include="ClientProxyBase" Version="2025.10.2" />
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Reqnroll" Version="3.2.0" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 4 additions & 1 deletion TransactionProcessor.IntegrationTests/Common/DockerHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,12 @@ public override ContainerBuilder SetupSecurityServiceContainer()
environmentVariables.AddRange(additionalEnvironmentVariables);
}

var imageDetails = this.GetImageDetails(ContainerType.SecurityService);
if (imageDetails.IsFailed)
throw new Exception(imageDetails.Message);
ContainerBuilder securityServiceContainer = new Builder().UseContainer().WithName(this.SecurityServiceContainerName)
.WithEnvironment(environmentVariables.ToArray())
.UseImageDetails(this.GetImageDetails(ContainerType.SecurityService))
.UseImageDetails(imageDetails.Data)
.MountHostFolder(this.DockerPlatform, this.HostTraceFolder)
.SetDockerCredentials(this.DockerCredentials);

Expand Down
Loading
Loading