Skip to content

upgrade to new serializer class #258

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
StuartFerguson merged 1 commit into from
May 6, 2026
Merged

upgrade to new serializer class #258

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
4 changes: 2 additions & 2 deletions CallbackHander.Testing/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using CallbackHandlers.Models;
using System;
using System.Collections.Generic;
using SecurityService.DataTransferObjects;
using Xunit;

namespace CallbackHander.Testing;

using CallbackHandler.BusinessLogic.Requests;
using CallbackHandler.CallbackMessageAggregate;
using SecurityService.DataTransferObjects.Responses;

public class TestData
{
Expand All @@ -26,7 +26,7 @@ public class TestData
public static Guid MerchantReference = Guid.Parse("9D20A396-1CF6-45ED-AA7B-DD436318BA29");
public static TokenResponse TokenResponse()
{
return SecurityService.DataTransferObjects.Responses.TokenResponse.Create("AccessToken", string.Empty, 100);
return SecurityService.DataTransferObjects.TokenResponse.Create("AccessToken", string.Empty, 100);
}

public static IReadOnlyDictionary<String, String> DefaultAppSettings =>
Expand Down
2 changes: 1 addition & 1 deletion CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Shared.EventStore" Version="2026.3.1" />
<PackageReference Include="Shared.EventStore" Version="2026.5.5" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
Expand Down
1 change: 0 additions & 1 deletion CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using SecurityService.Client;
using SecurityService.DataTransferObjects.Responses;
using Shared.General;
using SimpleResults;
using System;
Expand Down
10 changes: 5 additions & 5 deletions CallbackHandler.BusinessLogic/CallbackHandler.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="MediatR" Version="14.1.0" />
<PackageReference Include="SecurityService.Client" Version="2026.2.3" />
<PackageReference Include="Shared" Version="2026.3.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.3.1" />
<PackageReference Include="Shared.EventStore" Version="2026.3.1" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.3.2" />
<PackageReference Include="SecurityService.Client" Version="2026.4.3-build156" />
<PackageReference Include="Shared" Version="2026.5.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.5.5" />
<PackageReference Include="Shared.EventStore" Version="2026.5.5" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.4.3-build352" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CallbackHandler.CallbackMessageAggregate\CallbackHandler.CallbackMessageAggregate.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using SecurityService.Client;
using SecurityService.DataTransferObjects;
using Shared.EventStore.Helpers;
using Shared.Logger;
using SimpleResults;
Expand All @@ -9,7 +10,6 @@ namespace CallbackHandler.BusinessLogic.Services;

using CallbackMessageAggregate;
using Requests;
using SecurityService.DataTransferObjects.Responses;
using Shared.DomainDrivenDesign.EventSourcing;
using Shared.EventStore.Aggregate;
using Shared.General;
Expand Down
4 changes: 2 additions & 2 deletions ...kHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<DebugType>None</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Shared" Version="2026.3.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.3.1" />
<PackageReference Include="Shared" Version="2026.5.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.5.5" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...dler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.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.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Shared.EventStore" Version="2026.3.1" />
<PackageReference Include="Shared.EventStore" Version="2026.5.5" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.extensibility.core" Version="2.9.3" />
Expand Down
6 changes: 3 additions & 3 deletions CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.76.0" />
<PackageReference Include="Shared" Version="2026.3.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.3.1" />
<PackageReference Include="Shared.EventStore" Version="2026.3.1" />
<PackageReference Include="Shared" Version="2026.5.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.5.5" />
<PackageReference Include="Shared.EventStore" Version="2026.5.5" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion CallbackHandler.DataTransferObjects/CallbackHandler.DataTransferObjects.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />

</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions CallbackHandler.DataTransferObjects/CallbackMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using Newtonsoft.Json;

namespace CallbackHandler.DataTransferObjects
{
Expand All @@ -19,7 +19,6 @@ public class CallbackMessage
}

public class CallbackResponse {
[JsonProperty("callback_id")]
public Guid CallbackId { get; set; }
}

Expand Down
14 changes: 1 addition & 13 deletions CallbackHandler.DataTransferObjects/Deposit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,22 @@
{
using System;
using System.Diagnostics.CodeAnalysis;
using Newtonsoft.Json;


[ExcludeFromCodeCoverage]
public class Deposit
{
#region Properties

[JsonProperty("account_number")]
public String AccountNumber { get; set; }

[JsonProperty("amount")]
public Decimal Amount { get; set; }

[JsonProperty("date_time")]
public DateTime DateTime { get; set; }

[JsonProperty("deposit_id")]
public Guid DepositId { get; set; }

[JsonProperty("host_identifier")]
public Guid HostIdentifier { get; set; }

[JsonProperty("reference")]
public String Reference { get; set; }

[JsonProperty("sort_code")]
public String SortCode { get; set; }

#endregion
}
}
12 changes: 6 additions & 6 deletions CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="SecurityService.Client" Version="2026.2.3" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2026.2.3" />
<PackageReference Include="Shared" Version="2026.3.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.3.1" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.3.2" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2026.3.2" />
<PackageReference Include="SecurityService.Client" Version="2026.4.3-build156" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2026.4.3-build156" />
<PackageReference Include="Shared" Version="2026.5.5" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.5.5" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.4.3-build352" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2026.4.3-build352" />
</ItemGroup>

<ItemGroup>
Expand Down
26 changes: 17 additions & 9 deletions CallbackHandler.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
using EventStore.Client;
using Newtonsoft.Json.Bson;
using SecurityService.Client;
using Shared.IntegrationTesting;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
using Shared.Serialisation;
using TransactionProcessor.Client;

namespace CallbackHandler.IntegrationTests.Common;

public class DockerHelper : global::Shared.IntegrationTesting.TestContainers.DockerHelper
{
public DockerHelper() {
StringSerialiser.Initialise(new SystemTextJsonSerializer(SystemTextJsonSerializer.GetDefaultJsonSerializerOptions()));
}

public ISecurityServiceClient SecurityServiceClient;
public ITransactionProcessorClient TransactionProcessorClient;
public EventStoreProjectionManagementClient ProjectionManagementClient;
Expand Down Expand Up @@ -67,10 +65,20 @@ public override async Task StartContainersForScenarioRun(String scenarioName,
}
};
HttpClient httpClient = new HttpClient(clientHandler);
this.SecurityServiceClient = new SecurityServiceClient(SecurityServiceBaseAddressResolver, httpClient);
this.TransactionProcessorClient = new TransactionProcessorClient(TransactionProcessorBaseAddressResolver, httpClient);
this.SecurityServiceClient = new SecurityServiceClient(SecurityServiceBaseAddressResolver, httpClient, Serialise, Deserialise);
this.TransactionProcessorClient = new TransactionProcessorClient(TransactionProcessorBaseAddressResolver, httpClient, Serialise, Deserialise);
this.ProjectionManagementClient = new EventStoreProjectionManagementClient(ConfigureEventStoreSettings());
this.TestHostHttpClient = new HttpClient(clientHandler);
this.TestHostHttpClient.BaseAddress = new Uri($"http://127.0.0.1:{this.TestHostServicePort}");
}

String Serialise(Object arg)
{
return StringSerialiser.Serialise<Object>(arg, new SerialiserOptions(SerialiserPropertyFormat.SnakeCase));
}

Object Deserialise(String arg, Type type)
{
return StringSerialiser.DeserializeObject<Object>(arg, type, new SerialiserOptions(SerialiserPropertyFormat.SnakeCase));
}
}
9 changes: 5 additions & 4 deletions CallbackHandler.IntegrationTests/Common/TestingContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using CallbackHandler.DataTransferObjects;
using System.Text.Json;
using CallbackHandler.DataTransferObjects;
using Reqnroll;
using SecurityService.DataTransferObjects.Responses;
using Shared.Logger;
using Shared.Serialisation;
using Shouldly;
using TransactionProcessor.DataTransferObjects.Responses.Merchant;
using TransactionProcessor.IntegrationTesting.Helpers;
Expand All @@ -10,7 +11,6 @@ namespace CallbackHandler.IntegrationTests.Common;

public class TestingContext
{

public DockerHelper DockerHelper { get; set; }
public NlogLogger Logger { get; set; }

Expand Down Expand Up @@ -174,4 +174,5 @@ public static ClientDetails Create(String clientId,
}

#endregion
}
}

2 changes: 2 additions & 0 deletions CallbackHandler.IntegrationTests/Features/BankDepositCallback.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 7 additions & 14 deletions CallbackHandler.IntegrationTests/Shared/SharedSteps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
using CallbackHandler.IntegrationTests.Common;
using Reqnroll;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http.Headers;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
using CallbackHandler.DataTransferObjects;
using Newtonsoft.Json;
using SecurityService.DataTransferObjects.Requests;
using SecurityService.DataTransferObjects.Responses;
using SecurityService.DataTransferObjects;
using SecurityService.IntegrationTesting.Helpers;
using Shared.Serialisation;
using Shouldly;
using TransactionProcessor.DataTransferObjects.Requests.Estate;
using TransactionProcessor.DataTransferObjects.Requests.Merchant;
Expand Down Expand Up @@ -73,15 +67,15 @@ public async Task WhenISendTheRequestsToTheCallbackHandlerForDeposits()
String requestUri =
$"http://localhost:{this.TestingContext.DockerHelper.GetCallbackHandlerPort()}/api/callbacks";
HttpRequestMessage msg = new(HttpMethod.Post, requestUri);
var payload = JsonConvert.SerializeObject(testingContextDeposit);
var payload = StringSerialiser.Serialise(testingContextDeposit);

msg.Content = new StringContent(payload, Encoding.UTF8,
MediaTypeHeaderValue.Parse("application/json"));
var response = await client.SendAsync(msg);
response.StatusCode.ShouldBe(HttpStatusCode.OK);
var content = await response.Content.ReadAsStringAsync();
CallbackResponse responseData =
JsonConvert.DeserializeObject<CallbackResponse>(content);
StringSerialiser.Deserialise<CallbackResponse>(content);

this.TestingContext.SentCallbacks.Add(responseData.CallbackId, payload);
}
Expand All @@ -99,15 +93,14 @@ public async Task ThenTheDepositRecordsAreRecorded()
var response = await client.SendAsync(msg);
response.StatusCode.ShouldBe(HttpStatusCode.OK);

var originalDeposit = JsonConvert.DeserializeObject<Deposit>(sentCallback.Value);
var originalDeposit = StringSerialiser.Deserialise<Deposit>(sentCallback.Value);

var content = await response.Content.ReadAsStringAsync();
CallbackMessage responseData =
JsonConvert.DeserializeObject<CallbackMessage>(content);

StringSerialiser.Deserialise<CallbackMessage>(content);

responseData.Reference.ShouldBe(originalDeposit.Reference);
var callbackDeposit = JsonConvert.DeserializeObject<Deposit>(responseData.Message);
var callbackDeposit = StringSerialiser.Deserialise<Deposit>(responseData.Message);
callbackDeposit.AccountNumber.ShouldBe(originalDeposit.AccountNumber);
}
}
Expand Down
22 changes: 21 additions & 1 deletion CallbackHandler/Bootstrapper/ClientRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@
using Lamar;
using Microsoft.Extensions.DependencyInjection;
using SecurityService.Client;
using Shared.General;
using Shared.Serialisation;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Shared.General;
using System.Linq;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;
using NLog;
using Shared.DomainDrivenDesign.EventSourcing;
using TransactionProcessor.Client;

namespace CallbackHandler.Bootstrapper;
Expand All @@ -20,4 +28,16 @@ public ClientRegistry() {
Func<String, String> resolver(IServiceProvider container) => serviceName => ConfigurationReader.GetBaseServerUri(serviceName).OriginalString;
this.AddSingleton<Func<String, String>>(resolver);
}
}

[ExcludeFromCodeCoverage]
public class SerialiserRegistry : ServiceRegistry
{
public SerialiserRegistry()
{
this.AddSingleton<IStringSerialiser, SystemTextJsonSerializer>();
this.AddSingleton<Func<Object, String>>(_ => obj => StringSerialiser.Serialise(obj));
this.AddSingleton<Func<String, Type, Object>>(_ => (str,type) => StringSerialiser.DeserializeObject<Object>(str, type));
this.AddSingleton(SystemTextJsonSerializer.GetDefaultJsonSerializerOptions());
}
}
Loading
Loading