Skip to content

Update package versions and improve code structure #797

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 7, 2025
Merged

Update package versions and improve code structure #797

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
2 changes: 1 addition & 1 deletion TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Shared.EventStore" Version="2025.5.2" />
<PackageReference Include="Shared.EventStore" Version="2025.5.3" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions TransactionProcessor.BusinessLogic/EventHandling/MerchantStatementDomainEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using TransactionProcessor.BusinessLogic.Requests;
using TransactionProcessor.BusinessLogic.Services;
using TransactionProcessor.DomainEvents;
using Shared.EventStore.Aggregate;

namespace TransactionProcessor.BusinessLogic.EventHandling
{
Expand Down
1 change: 1 addition & 0 deletions TransactionProcessor.BusinessLogic/EventHandling/TransactionDomainEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.Diagnostics;
using Prometheus;
using Shared.EventStore.Aggregate;
using TransactionProcessor.BusinessLogic.Requests;
using TransactionProcessor.DomainEvents;
using TransactionProcessor.Models.Contract;
Expand Down
5 changes: 3 additions & 2 deletions TransactionProcessor.BusinessLogic/Services/AggregateService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using Shared.Logger;
using TransactionProcessor.Aggregates;
using TransactionProcessor.BusinessLogic.Services;

/*
namespace TransactionProcessor.BusinessLogic.Services {
public interface IAggregateRepositoryResolver {
IAggregateRepository<TAggregate, TEvent> Resolve<TAggregate, TEvent>() where TAggregate : Aggregate where TEvent : DomainEvent;
Expand Down Expand Up @@ -358,4 +358,5 @@ public Boolean TryGetValue<TAggregate>(String key,
{
return this.MemoryCache.TryGetValue(key, out aggregate);
}
}
}
*/
12 changes: 6 additions & 6 deletions TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CallbackHandler.DataTransferObjects" Version="2025.2.1" />
<PackageReference Include="ClientProxyBase" Version="2025.5.2" />
<PackageReference Include="CallbackHandler.DataTransferObjects" Version="2025.3.1" />
<PackageReference Include="ClientProxyBase" Version="2025.5.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
<PackageReference Include="MessagingService.Client" Version="2025.1.4" />
<PackageReference Include="MessagingService.Client" Version="2025.3.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Polly" Version="8.5.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="SecurityService.Client" Version="2025.1.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.5.2" />
<PackageReference Include="Shared.EventStore" Version="2025.5.2" />
<PackageReference Include="SecurityService.Client" Version="2025.3.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.5.3" />
<PackageReference Include="Shared.EventStore" Version="2025.5.3" />
<PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.12" />
<PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.Client/TransactionProcessor.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.5.2" />
<PackageReference Include="Shared.Results" Version="2025.5.2" />
<PackageReference Include="ClientProxyBase" Version="2025.5.3" />
<PackageReference Include="Shared.Results" Version="2025.5.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.Database/TransactionProcessor.Database.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
<PackageReference Include="Shared" Version="2025.5.2" />
<PackageReference Include="Shared" Version="2025.5.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.14" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.5.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.5.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj
View file
Open in desktop
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.5.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.5.3" />
</ItemGroup>
</Project>
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,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.5.2" />
<PackageReference Include="ClientProxyBase" Version="2025.5.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Reqnroll" Version="2.4.0" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.5.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.5.3" />
</ItemGroup>

<ItemGroup>
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 @@ -7,17 +7,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.5.2" />
<PackageReference Include="ClientProxyBase" Version="2025.5.3" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="EventStoreProjections" Version="2023.12.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
<PackageReference Include="SecurityService.Client" Version="2025.1.1" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.1.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.5.2" />
<PackageReference Include="SecurityService.Client" Version="2025.3.1" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.3.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.5.3" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="2.4.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
Expand All @@ -28,7 +28,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2025.1.4" />
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2025.3.1" />
<PackageReference Include="System.ServiceModel.Federation" Version="8.0.0" />
<PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="8.0.0" />
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,13 +7,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FileProcessor.File.DomainEvents" Version="2025.2.1" />
<PackageReference Include="FileProcessor.FileImportLog.DomainEvents" Version="2025.2.1" />
<PackageReference Include="FileProcessor.File.DomainEvents" Version="2025.3.1" />
<PackageReference Include="FileProcessor.FileImportLog.DomainEvents" Version="2025.3.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />

<PackageReference Include="Shared" Version="2025.5.2" />
<PackageReference Include="Shared.EventStore" Version="2025.5.2" />
<PackageReference Include="Shared" Version="2025.5.3" />
<PackageReference Include="Shared.EventStore" Version="2025.5.3" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="FileProcessor.File.DomainEvents" Version="2025.2.1" />
<PackageReference Include="FileProcessor.FileImportLog.DomainEvents" Version="2025.2.1" />
<PackageReference Include="FileProcessor.File.DomainEvents" Version="2025.3.1" />
<PackageReference Include="FileProcessor.FileImportLog.DomainEvents" Version="2025.3.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
<PackageReference Include="Shared" Version="2025.5.2" />
<PackageReference Include="Shared.EventStore" Version="2025.5.2" />
<PackageReference Include="Shared" Version="2025.5.3" />
<PackageReference Include="Shared.EventStore" Version="2025.5.3" />

</ItemGroup>

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

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.5.2" />
<PackageReference Include="ClientProxyBase" Version="2025.5.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
<PackageReference Include="SecurityService.Client" Version="2025.1.1" />
<PackageReference Include="SecurityService.Client" Version="2025.3.1" />
<PackageReference Include="System.ServiceModel.Federation" Version="8.0.0" />
<PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="8.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessor.Tests/TransactionProcessor.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.5.2" />
<PackageReference Include="ClientProxyBase" Version="2025.5.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
Expand Down
23 changes: 16 additions & 7 deletions TransactionProcessor/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
using SimpleResults;
using TransactionProcessor.Aggregates;

namespace TransactionProcessor
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using EventStore.Client;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
Expand All @@ -20,6 +15,13 @@ namespace TransactionProcessor
using Shared.EventStore.SubscriptionWorker;
using Shared.General;
using Shared.Logger;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using TransactionProcessor.BusinessLogic.OperatorInterfaces;

[ExcludeFromCodeCoverage]
Expand Down Expand Up @@ -76,6 +78,13 @@ public static void PreWarm(this IApplicationBuilder applicationBuilder) {
EventStoreClientSettings eventStoreClientSettings = EventStoreClientSettings.Create(connectionString);

applicationBuilder.ConfigureSubscriptionService(subscriptionWorkersRoot, eventStoreConnectionString, eventHandlerResolvers, Extensions.log, subscriptionRepositoryResolver).Wait(CancellationToken.None);

// Setup the aggregate service caching
IAggregateService aggregateService = Startup.ServiceProvider.GetService<IAggregateService>();
aggregateService.AddCachedAggregate(typeof(EstateAggregate),null);
aggregateService.AddCachedAggregate(typeof(ContractAggregate), null);
aggregateService.AddCachedAggregate(typeof(OperatorAggregate), null);

}

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

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.5.2" />
<PackageReference Include="ClientProxyBase" Version="2025.5.3" />
<PackageReference Include="Lamar" Version="14.0.1" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="14.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
Expand All @@ -35,10 +35,10 @@
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
<PackageReference Include="SecurityService.Client" Version="2025.3.1" />
<PackageReference Include="Shared" Version="2025.5.2" />
<PackageReference Include="Shared.EventStore" Version="2025.5.2" />
<PackageReference Include="Shared" Version="2025.5.3" />
<PackageReference Include="Shared.EventStore" Version="2025.5.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
<PackageReference Include="Shared.Results.Web" Version="2025.5.2" />
<PackageReference Include="Shared.Results.Web" Version="2025.5.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.3.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
Expand Down
Loading