diff --git a/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj b/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj index 375ddeb..92864c3 100644 --- a/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj +++ b/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj b/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj index a0563e0..928b172 100644 --- a/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj +++ b/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs b/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs index b351e63..cb4ca93 100644 --- a/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs +++ b/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs @@ -46,7 +46,6 @@ public async Task RecordCallback(CallbackCommands.RecordCallbackCommand Result<(Guid estateId, Guid merchantId)> validateResult = await ValidateReference(command.Reference, cancellationToken); if (validateResult.IsFailed) return ResultHelpers.CreateFailure(validateResult); - Result getResult = await this.AggregateRepository.GetLatestVersion(command.CallbackId, cancellationToken); Result callbackMessageAggregateResult = DomainServiceHelper.HandleGetAggregateResult(getResult, command.CallbackId, false); @@ -56,6 +55,7 @@ public async Task RecordCallback(CallbackCommands.RecordCallbackCommand (command.Reference,validateResult.Data.estateId, validateResult.Data.merchantId)); if (stateResult.IsFailed) return stateResult; + return await this.AggregateRepository.SaveChanges(aggregate, cancellationToken); } diff --git a/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj b/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj index ec15f59..c888f4c 100644 --- a/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj +++ b/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj @@ -5,7 +5,7 @@ None - - + + \ No newline at end of file diff --git a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj index 0565ac9..d22d225 100644 --- a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj +++ b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj b/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj index 7b19bd3..30d2c65 100644 --- a/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj +++ b/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj @@ -10,8 +10,8 @@ - - - + + + \ No newline at end of file diff --git a/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj b/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj index 10cd74d..341f87b 100644 --- a/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj +++ b/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj @@ -16,12 +16,12 @@ - - - - - - + + + + + + diff --git a/CallbackHandler.IntegrationTests/Shared/SharedSteps.cs b/CallbackHandler.IntegrationTests/Shared/SharedSteps.cs index 1288db7..840c2e6 100644 --- a/CallbackHandler.IntegrationTests/Shared/SharedSteps.cs +++ b/CallbackHandler.IntegrationTests/Shared/SharedSteps.cs @@ -72,8 +72,10 @@ public async Task WhenISendTheRequestsToTheCallbackHandlerForDeposits() 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(); + response.StatusCode.ShouldBe(HttpStatusCode.OK, content); + CallbackResponse responseData = StringSerialiser.Deserialise(content); diff --git a/CallbackHandler/CallbackHandler.csproj b/CallbackHandler/CallbackHandler.csproj index e9bfa17..e181638 100644 --- a/CallbackHandler/CallbackHandler.csproj +++ b/CallbackHandler/CallbackHandler.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/CallbackHandler/Common/JsonSerializerConfiguration.cs b/CallbackHandler/Common/JsonSerializerConfiguration.cs index 6309bd0..55ec382 100644 --- a/CallbackHandler/Common/JsonSerializerConfiguration.cs +++ b/CallbackHandler/Common/JsonSerializerConfiguration.cs @@ -13,46 +13,6 @@ public static void ConfigureMinimalApi(JsonSerializerOptions serializerOptions) serializerOptions.DictionaryKeyPolicy = defaultOptions.DictionaryKeyPolicy; serializerOptions.ReferenceHandler = defaultOptions.ReferenceHandler; serializerOptions.WriteIndented = defaultOptions.WriteIndented; - serializerOptions.Converters.Add(new UtcDateTimeJsonConverter()); - serializerOptions.Converters.Add(new NullableUtcDateTimeJsonConverter()); - } - - private sealed class UtcDateTimeJsonConverter : System.Text.Json.Serialization.JsonConverter - { - public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - var value = reader.GetDateTime(); - return value.Kind == DateTimeKind.Utc ? value : value.ToUniversalTime(); - } - - public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options) - { - writer.WriteStringValue(value.Kind == DateTimeKind.Utc ? value : value.ToUniversalTime()); - } - } - - private sealed class NullableUtcDateTimeJsonConverter : System.Text.Json.Serialization.JsonConverter - { - public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType == JsonTokenType.Null) - { - return null; - } - - var value = reader.GetDateTime(); - return value.Kind == DateTimeKind.Utc ? value : value.ToUniversalTime(); - } - - public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options) - { - if (value.HasValue == false) - { - writer.WriteNullValue(); - return; - } - - writer.WriteStringValue(value.Value.Kind == DateTimeKind.Utc ? value.Value : value.Value.ToUniversalTime()); - } + serializerOptions.Converters.Add(new DateTimeSpaceConverter()); } } \ No newline at end of file diff --git a/CallbackHandler/Handlers/CallbackHandlers.cs b/CallbackHandler/Handlers/CallbackHandlers.cs index 97b5c6d..0ce9cd7 100644 --- a/CallbackHandler/Handlers/CallbackHandlers.cs +++ b/CallbackHandler/Handlers/CallbackHandlers.cs @@ -8,6 +8,7 @@ using System; using System.Threading; using System.Threading.Tasks; +using Shared.Logger; using Shared.Serialisation; namespace CallbackHandler.Handlers;