From cda200bc6f9a088ae6b4bfd867aeefdcc4c2383c Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 07:35:20 +0000 Subject: [PATCH 1/3] refactor: use file scoped namespaces This PR modernizes the C# codebase by converting all traditional block-style namespace declarations to file-scoped namespace syntax. This change flattens the file structure, removes unnecessary indentation levels, and aligns the code with the latest C# conventions. - Use File Scoped `namespace`s instead of typical `namespace`s: Many source files originally declared block-scoped namespaces with braces, causing extra nesting and indentation. Each file has been updated to use the file-scoped namespace syntax (ending with a semicolon), and the `using` directives and class/record declarations have been moved to the top of the file. This refactor improves readability and consistency across the project. > This Autofix was generated by AI. Please review the change before merging. --- .../Mediator/MediatorTests.cs | 81 +++++++++-------- .../CallbackHandlerRequestHandlerTests.cs | 91 +++++++++---------- .../Services/CallbackDomainServiceTests.cs | 69 +++++++------- .../CallbackMessageAggregateTests.cs | 55 ++++++----- .../CallbackMessageAggregate.cs | 78 ++++++++-------- 5 files changed, 186 insertions(+), 188 deletions(-) diff --git a/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs b/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs index 55a1ae8..e5efb07 100644 --- a/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs +++ b/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs @@ -12,58 +12,59 @@ using System.Threading.Tasks; using Xunit; -namespace CallbackHandler.BusinessLogic.Tests.Mediator +namespace CallbackHandler.BusinessLogic.Tests.Mediator; + +using BusinessLogic.Services; +using Lamar; +using Microsoft.Extensions.DependencyInjection; + +public class MediatorTests { - using BusinessLogic.Services; - using Lamar; - using Microsoft.Extensions.DependencyInjection; + private readonly List Requests = new List(); - public class MediatorTests + public MediatorTests() { - private readonly List Requests = new List(); + this.Requests.Add(TestData.RecordCallbackRequest); + } - public MediatorTests() - { - this.Requests.Add(TestData.RecordCallbackRequest); - } + [Fact] + public async Task Mediator_Send_RequestHandled() + { + Mock hostingEnvironment = new(); + hostingEnvironment.Setup(he => he.EnvironmentName).Returns("Development"); + hostingEnvironment.Setup(he => he.ContentRootPath).Returns("/home"); + hostingEnvironment.Setup(he => he.ApplicationName).Returns("Test Application"); + + ServiceRegistry services = new(); + Startup s = new(hostingEnvironment.Object); + Startup.Configuration = this.SetupMemoryConfiguration(); - [Fact] - public async Task Mediator_Send_RequestHandled() + this.AddTestRegistrations(services, hostingEnvironment.Object); + s.ConfigureContainer(services); + Startup.Container.AssertConfigurationIsValid(AssertMode.Full); + + List errors = new(); + IMediator mediator = Startup.Container.GetService(); + foreach (IBaseRequest baseRequest in this.Requests) { - Mock hostingEnvironment = new(); - hostingEnvironment.Setup(he => he.EnvironmentName).Returns("Development"); - hostingEnvironment.Setup(he => he.ContentRootPath).Returns("/home"); - hostingEnvironment.Setup(he => he.ApplicationName).Returns("Test Application"); - - ServiceRegistry services = new(); - Startup s = new(hostingEnvironment.Object); - Startup.Configuration = this.SetupMemoryConfiguration(); - - this.AddTestRegistrations(services, hostingEnvironment.Object); - s.ConfigureContainer(services); - Startup.Container.AssertConfigurationIsValid(AssertMode.Full); - - List errors = new(); - IMediator mediator = Startup.Container.GetService(); - foreach (IBaseRequest baseRequest in this.Requests) + try { - try - { - await mediator.Send(baseRequest); - } - catch (Exception ex) - { - errors.Add(ex.Message); - } + await mediator.Send(baseRequest); } - - if (errors.Any()) + catch (Exception ex) { - String errorMessage = String.Join(Environment.NewLine, errors); - throw new Exception(errorMessage); + errors.Add(ex.Message); } } + if (errors.Any()) + { + String errorMessage = String.Join(Environment.NewLine, errors); + throw new Exception(errorMessage); + } + } +} + private IConfigurationRoot SetupMemoryConfiguration() { Dictionary configuration = new Dictionary(); diff --git a/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs b/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs index 3c493b6..d7f7ef4 100644 --- a/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs +++ b/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs @@ -1,56 +1,55 @@ using SimpleResults; -namespace CallbackHandler.BusinessLogic.Tests.RequestHandler -{ - using System; - using System.Threading; - using BusinessLogic.RequestHandler; - using BusinessLogic.Requests; - using BusinessLogic.Services; - using CallbackHander.Testing; - using CallbackHandlers.Models; - using CallbackMessageAggregate; - using MediatR; - using Moq; - using Services; - using Shared.DomainDrivenDesign.EventSourcing; - using Shared.EventStore.Aggregate; - using Shouldly; - using Xunit; +namespace CallbackHandler.BusinessLogic.Tests.RequestHandler; + +using System; +using System.Threading; +using BusinessLogic.RequestHandler; +using BusinessLogic.Requests; +using BusinessLogic.Services; +using CallbackHander.Testing; +using CallbackHandlers.Models; +using CallbackMessageAggregate; +using MediatR; +using Moq; +using Services; +using Shared.DomainDrivenDesign.EventSourcing; +using Shared.EventStore.Aggregate; +using Shouldly; +using Xunit; - public class CallbackHandlerRequestHandlerTests +public class CallbackHandlerRequestHandlerTests +{ + [Fact] + public void CallbackHandlerRequestHandlerTests_RecordCallbackRequest_IsHandled() { - [Fact] - public void CallbackHandlerRequestHandlerTests_RecordCallbackRequest_IsHandled() - { - Mock domainService = new(); - domainService.Setup(a => a.RecordCallback(It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny())); - Mock> aggregateRepository = new(); + Mock domainService = new(); + domainService.Setup(a => a.RecordCallback(It.IsAny(), + It.IsAny(), + It.IsAny(), + It.IsAny(), + It.IsAny(), + It.IsAny(), + It.IsAny())); + Mock> aggregateRepository = new(); - CallbackHandlerRequestHandler handler = new(domainService.Object, aggregateRepository.Object); - - CallbackCommands.RecordCallbackRequest request = TestData.RecordCallbackRequest; + CallbackHandlerRequestHandler handler = new(domainService.Object, aggregateRepository.Object); + + CallbackCommands.RecordCallbackRequest request = TestData.RecordCallbackRequest; - Should.NotThrow(async () => await handler.Handle(request, CancellationToken.None)); - } + Should.NotThrow(async () => await handler.Handle(request, CancellationToken.None)); + } - [Fact] - public void CallbackHandlerRequestHandlerTests_GetCallbackQuery_IsHandled() - { - Mock domainService = - new(); - domainService.Setup(a => a.RecordCallback(It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny(), + [Fact] + public void CallbackHandlerRequestHandlerTests_GetCallbackQuery_IsHandled() + { + Mock domainService = + new(); + domainService.Setup(a => a.RecordCallback(It.IsAny(), + It.IsAny(), + It.IsAny(), + It.IsAny(), + It.IsAny(), It.IsAny())); Mock> aggregateRepository = new(); diff --git a/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs b/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs index 92ad2e6..739305b 100644 --- a/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs +++ b/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs @@ -1,46 +1,45 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CallbackHandler.BusinessLogic.Tests.Services -{ - using System.Threading; - using BusinessLogic.Services; - using CallbackHander.Testing; - using CallbackHandlers.Models; - using CallbackMessageAggregate; - using Moq; - using Shared.DomainDrivenDesign.EventSourcing; - using Shared.EventStore.Aggregate; - using Shouldly; - using Xunit; +namespace CallbackHandler.BusinessLogic.Tests.Services; + +using System.Threading; +using BusinessLogic.Services; +using CallbackHander.Testing; +using CallbackHandlers.Models; +using CallbackMessageAggregate; +using Moq; +using Shared.DomainDrivenDesign.EventSourcing; +using Shared.EventStore.Aggregate; +using Shouldly; +using Xunit; - public class CallbackDomainServiceTests - { - private readonly ICallbackDomainService DomainService; +public class CallbackDomainServiceTests +{ + private readonly ICallbackDomainService DomainService; - private readonly Mock> AggregateRepository; - public CallbackDomainServiceTests() { - this.AggregateRepository = new Mock>(); - this.DomainService = new CallbackDomainService(this.AggregateRepository.Object); - - } + private readonly Mock> AggregateRepository; + public CallbackDomainServiceTests() { + this.AggregateRepository = new Mock>(); + this.DomainService = new CallbackDomainService(this.AggregateRepository.Object); + + } - [Fact] - public async Task CallbackDomainService_RecordCallback_CallbackRecorded() { - this.AggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny(), It.IsAny())).ReturnsAsync(TestData.EmptyCallbackMessageAggregate()); + [Fact] + public async Task CallbackDomainService_RecordCallback_CallbackRecorded() { + this.AggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny(), It.IsAny())).ReturnsAsync(TestData.EmptyCallbackMessageAggregate()); - Should.NotThrow(async () => { - await this.DomainService.RecordCallback(TestData.CallbackId, - TestData.TypeString, - (MessageFormat)TestData.MessageFormat, - TestData.CallbackMessage, - TestData.Reference, - TestData.Destinations, - CancellationToken.None); - }); - } + Should.NotThrow(async () => { + await this.DomainService.RecordCallback(TestData.CallbackId, + TestData.TypeString, + (MessageFormat)TestData.MessageFormat, + TestData.CallbackMessage, + TestData.Reference, + TestData.Destinations, + CancellationToken.None); + }); } } diff --git a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs index 67ef6e3..cfa2c88 100644 --- a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs +++ b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs @@ -1,37 +1,36 @@ using SimpleResults; -namespace CallbackHandler.CallbackMessageAggregate.Tests -{ - using CallbackHander.Testing; - using CallbackHandlers.Models; - using Shouldly; - using Xunit; +namespace CallbackHandler.CallbackMessageAggregate.Tests; - public class CallbackMessageAggregateTests - { - //[Fact] - //public void CallbackMessageAggregate_CanBeCreated_IsCreated() - //{ - // CallbackMessageAggregate aggregate = CallbackMessageAggregate.Create(TestData.CallbackId); +using CallbackHander.Testing; +using CallbackHandlers.Models; +using Shouldly; +using Xunit; - // aggregate.AggregateId.ShouldBe(TestData.CallbackId); - //} +public class CallbackMessageAggregateTests +{ + //[Fact] + //public void CallbackMessageAggregate_CanBeCreated_IsCreated() + //{ + // CallbackMessageAggregate aggregate = CallbackMessageAggregate.Create(TestData.CallbackId); - [Fact] - public void CallbackMessageAggregate_RecordCallback_CallbackIsRecorded() - { - CallbackMessageAggregate aggregate = new(); + // aggregate.AggregateId.ShouldBe(TestData.CallbackId); + //} + + [Fact] + public void CallbackMessageAggregate_RecordCallback_CallbackIsRecorded() + { + CallbackMessageAggregate aggregate = new(); - Result result = aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, MessageFormat.JSON, TestData.CallbackMessage, TestData.Reference, TestData.Destinations, - TestData.EstateReference, TestData.MerchantReference); - result.IsSuccess.ShouldBeTrue(); + Result result = aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, MessageFormat.JSON, TestData.CallbackMessage, TestData.Reference, TestData.Destinations, + TestData.EstateReference, TestData.MerchantReference); + result.IsSuccess.ShouldBeTrue(); - aggregate.ShouldSatisfyAllConditions(() => aggregate.CallbackMessage.ShouldBe(TestData.CallbackMessage), - () => aggregate.TypeString.ShouldBe(TestData.TypeString), - () => aggregate.MessageFormat.ShouldBe(MessageFormat.JSON), - () => aggregate.Reference.ShouldBe(TestData.Reference), - () => aggregate.GetDestinations().ShouldNotBeEmpty(), - () => aggregate.GetDestinations().Length.ShouldBe(TestData.Destinations.Length)); - } + aggregate.ShouldSatisfyAllConditions(() => aggregate.CallbackMessage.ShouldBe(TestData.CallbackMessage), + () => aggregate.TypeString.ShouldBe(TestData.TypeString), + () => aggregate.MessageFormat.ShouldBe(MessageFormat.JSON), + () => aggregate.Reference.ShouldBe(TestData.Reference), + () => aggregate.GetDestinations().ShouldNotBeEmpty(), + () => aggregate.GetDestinations().Length.ShouldBe(TestData.Destinations.Length)); } } \ No newline at end of file diff --git a/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs b/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs index 2ee0830..5b24ccd 100644 --- a/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs +++ b/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs @@ -1,57 +1,57 @@ using System.Runtime.CompilerServices; using SimpleResults; -namespace CallbackHandler.CallbackMessageAggregate -{ - using System; - using System.Collections.Generic; - using System.Diagnostics.CodeAnalysis; - using CallbackHandlers.Models; - using CallbackMessage.DomainEvents; - using Shared.DomainDrivenDesign.EventSourcing; - using Shared.EventStore.Aggregate; - using Shared.General; +namespace CallbackHandler.CallbackMessageAggregate; + +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using CallbackHandlers.Models; +using CallbackMessage.DomainEvents; +using Shared.DomainDrivenDesign.EventSourcing; +using Shared.EventStore.Aggregate; +using Shared.General; - public record CallbackMessageAggregate : Aggregate +public record CallbackMessageAggregate : Aggregate +{ + public CallbackMessageAggregate() { - public CallbackMessageAggregate() - { - this.Destinations = new List(); - } - - public String CallbackMessage { get; internal set; } + this.Destinations = new List(); + } - public MessageFormat MessageFormat { get; internal set; } + public String CallbackMessage { get; internal set; } - public String TypeString { get; internal set; } + public MessageFormat MessageFormat { get; internal set; } - public String Reference { get; internal set; } + public String TypeString { get; internal set; } - internal List Destinations; + public String Reference { get; internal set; } - [ExcludeFromCodeCoverage] - protected override Object GetMetadata() - { - return null; - } + internal List Destinations; - public override void PlayEvent(IDomainEvent domainEvent) => CallbackMessageAggregateExtensions.PlayEvent(this, (dynamic)domainEvent); + [ExcludeFromCodeCoverage] + protected override Object GetMetadata() + { + return null; } - public static class CallbackMessageAggregateExtensions + public override void PlayEvent(IDomainEvent domainEvent) => CallbackMessageAggregateExtensions.PlayEvent(this, (dynamic)domainEvent); +} + +public static class CallbackMessageAggregateExtensions +{ + public static void PlayEvent(this CallbackMessageAggregate aggregate, CallbackReceivedEvent domainEvent) { - public static void PlayEvent(this CallbackMessageAggregate aggregate, CallbackReceivedEvent domainEvent) - { - // Mutate the state here based on the event - aggregate.CallbackMessage = domainEvent.CallbackMessage; - aggregate.MessageFormat = (MessageFormat) domainEvent.MessageFormat; - aggregate.TypeString = domainEvent.TypeString; - aggregate.Reference = domainEvent.Reference; - aggregate.Destinations.Add(domainEvent.Destination); - } + // Mutate the state here based on the event + aggregate.CallbackMessage = domainEvent.CallbackMessage; + aggregate.MessageFormat = (MessageFormat) domainEvent.MessageFormat; + aggregate.TypeString = domainEvent.TypeString; + aggregate.Reference = domainEvent.Reference; + aggregate.Destinations.Add(domainEvent.Destination); + } - public static Result RecordCallback(this CallbackMessageAggregate aggregate, - Guid aggregateId, + public static Result RecordCallback(this CallbackMessageAggregate aggregate, + Guid aggregateId, String typeString, MessageFormat messageFormat, String callbackMessage, From 4a3a5f19ddb54e039e847785a44f2b17b781d659 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 19 Sep 2025 08:39:04 +0100 Subject: [PATCH 2/3] :| --- .../Mediator/MediatorTests.cs | 2 - .../CallbackHandlerRequestHandlerTests.cs | 2 +- .../Services/CallbackDomainServiceTests.cs | 2 +- .../CallbackMessageAggregate.cs | 93 ++++++++----------- 4 files changed, 43 insertions(+), 56 deletions(-) diff --git a/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs b/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs index e5efb07..cec79ca 100644 --- a/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs +++ b/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs @@ -63,7 +63,6 @@ public async Task Mediator_Send_RequestHandled() throw new Exception(errorMessage); } } -} private IConfigurationRoot SetupMemoryConfiguration() { @@ -101,4 +100,3 @@ private void AddTestRegistrations(ServiceRegistry services, services.OverrideServices(s => { s.AddSingleton(); }); } } -} diff --git a/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs b/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs index d7f7ef4..7dece2c 100644 --- a/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs +++ b/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs @@ -50,6 +50,7 @@ public void CallbackHandlerRequestHandlerTests_GetCallbackQuery_IsHandled() It.IsAny(), It.IsAny(), It.IsAny(), + It.IsAny(), It.IsAny())); Mock> aggregateRepository = new(); @@ -69,4 +70,3 @@ public void CallbackHandlerRequestHandlerTests_GetCallbackQuery_IsHandled() }); } } -} diff --git a/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs b/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs index 739305b..9f8d314 100644 --- a/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs +++ b/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs b/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs index 5b24ccd..ebd09e5 100644 --- a/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs +++ b/CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs @@ -38,69 +38,58 @@ protected override Object GetMetadata() public override void PlayEvent(IDomainEvent domainEvent) => CallbackMessageAggregateExtensions.PlayEvent(this, (dynamic)domainEvent); } -public static class CallbackMessageAggregateExtensions -{ - public static void PlayEvent(this CallbackMessageAggregate aggregate, CallbackReceivedEvent domainEvent) - { +public static class CallbackMessageAggregateExtensions { + public static void PlayEvent(this CallbackMessageAggregate aggregate, + CallbackReceivedEvent domainEvent) { // Mutate the state here based on the event aggregate.CallbackMessage = domainEvent.CallbackMessage; - aggregate.MessageFormat = (MessageFormat) domainEvent.MessageFormat; + aggregate.MessageFormat = (MessageFormat)domainEvent.MessageFormat; aggregate.TypeString = domainEvent.TypeString; aggregate.Reference = domainEvent.Reference; aggregate.Destinations.Add(domainEvent.Destination); } public static Result RecordCallback(this CallbackMessageAggregate aggregate, - Guid aggregateId, - String typeString, - MessageFormat messageFormat, - String callbackMessage, - String reference, - String[] destinations, - Guid estateId,Guid merchantId) - { - foreach (String destination in destinations) - { - DomainEvent callbackReceivedEvent = CreateCallbackReceivedEvent(aggregate,aggregateId, typeString, - messageFormat, callbackMessage, reference, destination, - estateId, merchantId); - - aggregate.ApplyAndAppend(callbackReceivedEvent); - } - - return Result.Success(); + Guid aggregateId, + String typeString, + MessageFormat messageFormat, + String callbackMessage, + String reference, + String[] destinations, + Guid estateId, + Guid merchantId) { + foreach (String destination in destinations) { + DomainEvent callbackReceivedEvent = CreateCallbackReceivedEvent(aggregate, aggregateId, typeString, messageFormat, callbackMessage, reference, destination, estateId, merchantId); + + aggregate.ApplyAndAppend(callbackReceivedEvent); } - internal static DomainEvent CreateCallbackReceivedEvent(this CallbackMessageAggregate aggregate, - Guid aggregateId, - String typeString, - MessageFormat messageFormat, - String callbackMessage, - String reference, - String destination, - Guid estateId, Guid merchantId) - { - return new CallbackReceivedEvent(aggregateId, typeString, (Int32) messageFormat, - callbackMessage, - reference, - destination, estateId, merchantId); - } + return Result.Success(); + } - public static String[] GetDestinations(this CallbackMessageAggregate aggregate) - { - return aggregate.Destinations.ToArray(); - } + internal static DomainEvent CreateCallbackReceivedEvent(this CallbackMessageAggregate aggregate, + Guid aggregateId, + String typeString, + MessageFormat messageFormat, + String callbackMessage, + String reference, + String destination, + Guid estateId, + Guid merchantId) { + return new CallbackReceivedEvent(aggregateId, typeString, (Int32)messageFormat, callbackMessage, reference, destination, estateId, merchantId); + } - public static CallbackMessage GetCallbackMessage(this CallbackMessageAggregate aggregate) - { - return new CallbackMessage - { - Reference = aggregate.Reference, - Destinations = aggregate.Destinations, - Message = aggregate.CallbackMessage, - MessageFormat = aggregate.MessageFormat, - TypeString = aggregate.TypeString - }; - } + public static String[] GetDestinations(this CallbackMessageAggregate aggregate) { + return aggregate.Destinations.ToArray(); + } + + public static CallbackMessage GetCallbackMessage(this CallbackMessageAggregate aggregate) { + return new CallbackMessage { + Reference = aggregate.Reference, + Destinations = aggregate.Destinations, + Message = aggregate.CallbackMessage, + MessageFormat = aggregate.MessageFormat, + TypeString = aggregate.TypeString + }; } } \ No newline at end of file From 5d6a8240e5bdc72d42ed8a181e133480eb98d05e Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 08:33:00 +0000 Subject: [PATCH 3/3] refactor: simplify lambda when its body has a single statement This PR refactors lambda expressions that contain only a single statement to use more concise, expression-bodied forms and improves readability across chained calls. - Consider simplifying lambda when its body has a single statement: The original code used a block lambda for an async call and a tightly coupled Setup expression. In the first patch, the `Setup(a => a.GetLatestVersion(...))` call is reformatted across multiple lines for clarity while retaining its expression-bodied form. In the second patch, the multi-line block inside `Should.NotThrow(async () => { await ... })` is converted into an inline, expression-bodied async lambda, removing unnecessary braces and making the code more succinct. > This Autofix was generated by AI. Please review the change before merging. --- .../Services/CallbackDomainServiceTests.cs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs b/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs index 9f8d314..3b2100b 100644 --- a/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs +++ b/CallbackHandler.BusinessLogic.Tests/Services/CallbackDomainServiceTests.cs @@ -30,16 +30,15 @@ public CallbackDomainServiceTests() { [Fact] public async Task CallbackDomainService_RecordCallback_CallbackRecorded() { - this.AggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny(), It.IsAny())).ReturnsAsync(TestData.EmptyCallbackMessageAggregate()); + this.AggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny(), It.IsAny())) + .ReturnsAsync(TestData.EmptyCallbackMessageAggregate()); - Should.NotThrow(async () => { - await this.DomainService.RecordCallback(TestData.CallbackId, - TestData.TypeString, - (MessageFormat)TestData.MessageFormat, - TestData.CallbackMessage, - TestData.Reference, - TestData.Destinations, - CancellationToken.None); - }); + Should.NotThrow(async () => await this.DomainService.RecordCallback(TestData.CallbackId, + TestData.TypeString, + (MessageFormat)TestData.MessageFormat, + TestData.CallbackMessage, + TestData.Reference, + TestData.Destinations, + CancellationToken.None)); } }