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

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

<ItemGroup>
<PackageReference Include="CallbackHandler.DataTransferObjects" Version="2025.3.2-build71" />
<PackageReference Include="ClientProxyBase" Version="2025.6.2" />
<PackageReference Include="ClientProxyBase" Version="2025.7.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
<PackageReference Include="MessagingService.Client" Version="2025.3.2-build77" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Polly" Version="8.5.2" />
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="SecurityService.Client" Version="2025.5.2-build82" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
<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" />
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.6.2" />
<PackageReference Include="Shared.Results" Version="2025.6.2" />
<PackageReference Include="ClientProxyBase" Version="2025.7.9" />
<PackageReference Include="Shared.Results" Version="2025.7.9" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
<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" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
</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.5" />
<PackageReference Include="Shared" Version="2025.6.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Shared" Version="2025.7.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
</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.6.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.6.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
<PackageReference Include="ClientProxyBase" Version="2025.7.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Reqnroll" Version="2.4.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.6.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.7.9" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.6.2" />
<PackageReference Include="ClientProxyBase" Version="2025.7.9" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="EventStoreProjections" Version="2023.12.3" />
<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.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="SecurityService.Client" Version="2025.5.2-build82" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.5.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.6.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.7.9" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="2.4.1" />
<PackageReference Include="NUnit" Version="4.3.2" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<ItemGroup>
<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="9.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />
<PackageReference Include="Shared" Version="2025.6.2" />
<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
<PackageReference Include="Shared" Version="2025.7.9" />
<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
<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.5" />
<PackageReference Include="Shared" Version="2025.6.2" />
<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Shared" Version="2025.7.9" />
<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.0" />

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.6.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
<PackageReference Include="ClientProxyBase" Version="2025.7.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="SecurityService.Client" Version="2025.5.2-build82" />
<PackageReference Include="System.ServiceModel.Federation" Version="8.1.2" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.Tests/TransactionProcessor.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.6.2" />
<PackageReference Include="ClientProxyBase" Version="2025.7.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
Expand Down
29 changes: 8 additions & 21 deletions TransactionProcessor/Bootstrapper/ClientRegistry.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
namespace TransactionProcessor.Bootstrapper
{
using System;
using System.Diagnostics.CodeAnalysis;
using System.Net.Http;
using ClientProxyBase;
using Lamar;
using MessagingService.Client;
using Microsoft.Extensions.DependencyInjection;
using SecurityService.Client;
using Shared.General;
using System;
using System.Diagnostics.CodeAnalysis;
using System.Net.Http;

/// <summary>
///
Expand All @@ -23,26 +24,12 @@
/// </summary>
public ClientRegistry()
{
this.AddSingleton<ISecurityServiceClient, SecurityServiceClient>();
this.AddSingleton<IMessagingServiceClient, MessagingServiceClient>();

Func<String, String> resolver(IServiceProvider container) => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; };
Func<String, String> resolver1() => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; };
this.AddHttpContextAccessor();
this.RegisterHttpClient<ISecurityServiceClient, SecurityServiceClient>();
this.RegisterHttpClient<IMessagingServiceClient, MessagingServiceClient>();

Func<String, String> resolver(IServiceProvider container) => serviceName => ConfigurationReader.GetBaseServerUri(serviceName).OriginalString;

Check warning on line 31 in TransactionProcessor/Bootstrapper/ClientRegistry.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

TransactionProcessor/Bootstrapper/ClientRegistry.cs#L31

Remove this unused method parameter 'container'.
this.AddSingleton<Func<String, String>>(resolver);

var httpMessageHandler = new SocketsHttpHandler
{
SslOptions =
{
RemoteCertificateValidationCallback = (sender,
certificate,
chain,
errors) => true,
}
};
HttpClient httpClient = new HttpClient(httpMessageHandler);
this.AddSingleton(httpClient);
}

#endregion
Expand Down
28 changes: 26 additions & 2 deletions TransactionProcessor/Program.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
using System;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
using Shared.Logger;
using Shared.Middleware;

namespace TransactionProcessor
{
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Lamar.Microsoft.DependencyInjection;
using Microsoft.Extensions.DependencyInjection;
using NLog;
using System.Diagnostics.CodeAnalysis;
using System.IO;

[ExcludeFromCodeCoverage]
public class Program
Expand All @@ -27,6 +33,20 @@ public static IHostBuilder CreateHostBuilder(string[] args)
.AddJsonFile("hosting.development.json", optional: true)
.AddEnvironmentVariables().Build();

String contentRoot = Directory.GetCurrentDirectory();
String nlogConfigPath = Path.Combine(contentRoot, "nlog.config");

LogManager.Setup(b =>
{
b.SetupLogFactory(setup =>
{
setup.AddCallSiteHiddenAssembly(typeof(NlogLogger).Assembly);
setup.AddCallSiteHiddenAssembly(typeof(Shared.Logger.Logger).Assembly);
setup.AddCallSiteHiddenAssembly(typeof(TenantMiddleware).Assembly);
});
b.LoadConfigurationFromFile(nlogConfigPath);
});

IHostBuilder hostBuilder = Host.CreateDefaultBuilder(args);
hostBuilder.UseWindowsService();
hostBuilder.UseLamar();
Expand All @@ -36,7 +56,11 @@ public static IHostBuilder CreateHostBuilder(string[] args)
webBuilder.UseConfiguration(config);
webBuilder.UseKestrel();
});
hostBuilder.ConfigureLogging(logging => {
logging.AddConsole();
logging.AddNLog();

});
hostBuilder.ConfigureServices(services =>
{
services.AddHostedService<AutoLogonWorkerService>(provider =>
Expand Down
33 changes: 9 additions & 24 deletions TransactionProcessor/Startup.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
using Prometheus;
using System.Linq;
using System.Threading;
using Prometheus;
using TransactionProcessor.BusinessLogic.Services;

namespace TransactionProcessor
{
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Reflection;
using Bootstrapper;
using HealthChecks.UI.Client;
using Lamar;
Expand All @@ -25,6 +20,12 @@ namespace TransactionProcessor
using Shared.EventStore.Aggregate;
using Shared.Extensions;
using Shared.General;
using Shared.Middleware;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Reflection;
using ILogger = Microsoft.Extensions.Logging.ILogger;
using Logger = Shared.Logger.Logger;

Expand Down Expand Up @@ -99,27 +100,11 @@ public void Configure(IApplicationBuilder app,
IWebHostEnvironment env,
ILoggerFactory loggerFactory) {
ConfigurationReader.Initialise(Startup.Configuration);

String nlogConfigFilename = "nlog.config";


if (env.IsDevelopment()) {
app.UseDeveloperExceptionPage();
string directoryPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
LogManager.AddHiddenAssembly(Assembly.LoadFrom(Path.Combine(directoryPath, "Shared.dll")));

var developmentNlogConfigFilename = "nlog.development.config";
if (File.Exists(Path.Combine(env.ContentRootPath, developmentNlogConfigFilename)))
{
nlogConfigFilename = developmentNlogConfigFilename;
}
}
else{
LogManager.AddHiddenAssembly(Assembly.LoadFrom(Path.Combine(env.ContentRootPath, "Shared.dll")));
}

loggerFactory.ConfigureNLog(Path.Combine(env.ContentRootPath, nlogConfigFilename));
loggerFactory.AddNLog();

ILogger logger = loggerFactory.CreateLogger("TransactionProcessor");

Logger.Initialise(logger);
Expand All @@ -129,7 +114,7 @@ public void Configure(IApplicationBuilder app,
foreach (KeyValuePair<Type, String> type in TypeMap.Map) {
Logger.LogInformation($"Type name {type.Value} mapped to {type.Key.Name}");
}

app.UseMiddleware<TenantMiddleware>();
app.AddRequestLogging();
app.AddResponseLogging();
app.AddExceptionHandler();
Expand Down
10 changes: 5 additions & 5 deletions TransactionProcessor/TransactionProcessor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.6.2" />
<PackageReference Include="ClientProxyBase" Version="2025.7.9" />
<PackageReference Include="Lamar" Version="15.0.0" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
Expand All @@ -25,7 +25,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
Expand All @@ -34,10 +34,10 @@
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
<PackageReference Include="SecurityService.Client" Version="2025.5.2-build82" />
<PackageReference Include="Shared" Version="2025.6.2" />
<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
<PackageReference Include="Shared" Version="2025.7.9" />
<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
<PackageReference Include="Shared.Results.Web" Version="2025.6.2" />
<PackageReference Include="Shared.Results.Web" Version="2025.7.9" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.4" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.3" />
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessor/nlog.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<target name="asyncFile" xsi:type="AsyncWrapper">
<target name="logfile" xsi:type="File"
fileName="/home/txnproc/trace/transactionprocessor.log"
layout="${date:format=dd/MM/yyyy HH\:mm\:ss.ffff} | ${level} | ${callsite:className=true} | ${message} | ${exception:format=type,method:maxInnerExceptionLevel=5:innerFormat=shortType,message,method:InnerExceptionSeparator= | }"
layout="${date:format=dd/MM/yyyy HH\:mm\:ss.ffff} | ${level} |${mdlc:CorrelationId:fallback=NO-ID}| ${callsite:className=true} | ${message} | ${exception:format=type,method:maxInnerExceptionLevel=5:innerFormat=shortType,message,method:InnerExceptionSeparator= | }"
archiveFileName="/home/txnproc/trace/transactionprocessor.{#####}.log"
archiveAboveSize="104857600"
archiveNumbering="Sequence"
Expand Down
Loading