update Domain Event Handlers

EstateManagement.BusinessLogic.Tests/EstateManagement.BusinessLogic.Tests.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Lamar" Version="13.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="Shared.EventStore" Version="2024.10.3" />
+    <PackageReference Include="Shared.EventStore" Version="2024.10.4" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.0.2" />

EstateManagement.BusinessLogic.Tests/EventHandling/EstateDomainEventHandlerTests.cs

@@ -1,4 +1,6 @@
-namespace EstateManagement.BusinessLogic.Tests.EventHandling;
+using SimpleResults;
+
+namespace EstateManagement.BusinessLogic.Tests.EventHandling;
 
 using System.Threading;
 using BusinessLogic.EventHandling;
@@ -28,6 +30,9 @@ public EstateDomainEventHandlerTests() {
     public void EstateDomainEventHandler_EstateCreatedEvent_EventIsHandled()
     {
         EstateCreatedEvent estateCreatedEvent = TestData.EstateCreatedEvent;
+        this.EstateReportingRepository
+            .Setup(r => r.CreateReadModel(It.IsAny<EstateCreatedEvent>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(Result.Success);
 
         Should.NotThrow(async () => { await this.DomainEventHandler.Handle(estateCreatedEvent, CancellationToken.None); });
     }

EstateManagement.BusinessLogic.Tests/EventHandling/MerchantSettlementDomainEventHandlerTests.cs

@@ -1,4 +1,6 @@
-namespace EstateManagement.BusinessLogic.Tests.EventHandling;
+using SimpleResults;
+
+namespace EstateManagement.BusinessLogic.Tests.EventHandling;
 
 using System.Threading;
 using System.Threading.Tasks;
@@ -24,12 +26,12 @@ public MerchantSettlementDomainEventHandlerTests(){
     [Fact]
     public async Task MerchantSettlementDomainEventHandler_Handle_MerchantFeeSettledEvent_EventIsHandled()
     {
-        this.Mediator.Setup(m => m.Send(It.IsAny<IRequest>(), It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
+        this.Mediator.Setup(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success);
         Should.NotThrow(async () =>
                         {
                             await this.DomainEventHandler.Handle(TestData.MerchantFeeSettledEvent, CancellationToken.None);
                         });
-        this.Mediator.Verify(m => m.Send(It.IsAny<IRequest>(), It.IsAny<CancellationToken>()), Times.Once);
+        this.Mediator.Verify(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()), Times.Once);
     }
 
     [Fact]

EstateManagement.BusinessLogic.Tests/EventHandling/MerchantStatementDomainEventHandlerTests.cs

@@ -1,4 +1,6 @@
-namespace EstateManagement.BusinessLogic.Tests.EventHandling;
+using SimpleResults;
+
+namespace EstateManagement.BusinessLogic.Tests.EventHandling;
 
 using System.Threading;
 using System.Threading.Tasks;
@@ -25,22 +27,22 @@ public MerchantStatementDomainEventHandlerTests()
     [Fact]
     public async Task MerchantStatementDomainEventHandler_Handle_StatementGeneratedEvent_EventIsHandled()
     {
-        this.Mediator.Setup(m => m.Send(It.IsAny<IRequest>(), It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
+        this.Mediator.Setup(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success());
         Should.NotThrow(async () =>
                         {
                             await this.DomainEventHandler.Handle(TestData.StatementGeneratedEvent, CancellationToken.None);
                         });
-        this.Mediator.Verify(m=> m.Send(It.IsAny<IRequest>(), It.IsAny<CancellationToken>()), Times.Once);
+        this.Mediator.Verify(m=> m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()), Times.Once);
     }
 
     [Fact]
     public async Task MerchantStatementDomainEventHandler_Handle_TransactionHasBeenCompletedEvent_EventIsHandled()
     {
-        this.Mediator.Setup(m => m.Send(It.IsAny<IRequest>(), It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
+        this.Mediator.Setup(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success());
         Should.NotThrow(async () =>
                         {
                             await this.DomainEventHandler.Handle(TestData.TransactionHasBeenCompletedEvent, CancellationToken.None);
                         });
-        this.Mediator.Verify(m => m.Send(It.IsAny<IRequest>(), It.IsAny<CancellationToken>()), Times.Once);
+        this.Mediator.Verify(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()), Times.Once);
     }
 }

EstateManagement.BusinessLogic.Tests/EventHandling/TransactionDomainEventHandlerTests.cs

@@ -7,6 +7,7 @@ namespace EstateManagement.BusinessLogic.Tests.EventHandling
     using MediatR;
     using Moq;
     using Repository;
+    using Shared.DomainDrivenDesign.EventSourcing;
     using Shared.Logger;
     using Shouldly;
     using Testing;
@@ -47,6 +48,10 @@ public void TransactionDomainEventHandler_AdditionalRequestDataRecordedEvent_Eve
 
             Logger.Initialise(NullLogger.Instance);
 
+            this.EstateReportingRepository
+                .Setup(r => r.RecordTransactionAdditionalRequestData(It.IsAny<AdditionalRequestDataRecordedEvent>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(SimpleResults.Result.Success);
+
             Should.NotThrow(async () => { await this.DomainEventHandler.Handle(additionalRequestDataRecordedEvent, CancellationToken.None); });
         }
 

EstateManagement.BusinessLogic.Tests/Mediator/DummyMerchantStatementDomainService.cs

@@ -18,15 +18,15 @@ namespace EstateManagement.BusinessLogic.Tests.Mediator;
 using Operator = Models.Operator.Operator;
 
 public class DummyMerchantStatementDomainService : IMerchantStatementDomainService{
-    public async Task<Result> AddTransactionToStatement(AddTransactionToMerchantStatementRequest command,
+    public async Task<Result> AddTransactionToStatement(MerchantStatementCommands.AddTransactionToMerchantStatementCommand command,
                                                         CancellationToken cancellationToken) => Result.Success();
 
-    public async Task<Result> AddSettledFeeToStatement(AddSettledFeeToMerchantStatementRequest command,
+    public async Task<Result> AddSettledFeeToStatement(MerchantStatementCommands.AddSettledFeeToMerchantStatementCommand command,
                                                        CancellationToken cancellationToken) => Result.Success();
 
     public async Task<Result> GenerateStatement(MerchantCommands.GenerateMerchantStatementCommand command, CancellationToken cancellationToken) => Result.Success();
 
-    public async Task<Result> EmailStatement(EmailMerchantStatementRequest command,
+    public async Task<Result> EmailStatement(MerchantStatementCommands.EmailMerchantStatementCommand command,
                                              CancellationToken cancellationToken) => Result.Success();
 }
 

EstateManagement.BusinessLogic.Tests/Services/MerchantStatementDomainServiceTests.cs

@@ -64,7 +64,7 @@ public async Task MerchantStatementDomainService_AddTransactionToStatement_Trans
             merchantStatementAggregateRepository.Setup(m => m.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
                                                 .ReturnsAsync(Result.Success(merchantStatementAggregate));
 
-            AddTransactionToMerchantStatementRequest command = AddTransactionToMerchantStatementRequest.Create(TestData.EstateId,
+            MerchantStatementCommands.AddTransactionToMerchantStatementCommand command = new(TestData.EstateId,
                 TestData.MerchantId,
                 TestData.TransactionDateTime1,
                 TestData.TransactionAmount1,
@@ -89,8 +89,8 @@ public async Task MerchantStatementDomainService_AddTransactionToStatement_Trans
 
             merchantStatementAggregateRepository.Setup(m => m.GetLatestVersionFromLastEvent(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
                                                 .ReturnsAsync(Result.Success(merchantStatementAggregate));
-            
-            AddTransactionToMerchantStatementRequest command = AddTransactionToMerchantStatementRequest.Create(TestData.EstateId,
+
+            MerchantStatementCommands.AddTransactionToMerchantStatementCommand command = new(TestData.EstateId,
                 TestData.MerchantId,
                 TestData.TransactionDateTime1,
                 TestData.TransactionAmount1,
@@ -115,8 +115,7 @@ public async Task MerchantStatementDomainService_AddTransactionToStatement_Logon
             merchantStatementAggregateRepository.Setup(m => m.GetLatestVersionFromLastEvent(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
                 .ReturnsAsync(Result.Success(merchantStatementAggregate));
 
-            AddTransactionToMerchantStatementRequest command =
-                AddTransactionToMerchantStatementRequest.Create(TestData.EstateId, TestData.MerchantId,
+            MerchantStatementCommands.AddTransactionToMerchantStatementCommand command = new(TestData.EstateId, TestData.MerchantId,
                     TestData.TransactionDateTime1, null, TestData.IsAuthorisedTrue, TestData.TransactionId1);
 
             var result = await merchantStatementDomainService.AddTransactionToStatement(command, CancellationToken.None);
@@ -137,7 +136,7 @@ public async Task MerchantStatementDomainService_AddTransactionToStatement_State
             merchantStatementAggregateRepository.Setup(m => m.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
                 .ReturnsAsync(Result.Success(merchantStatementAggregate));
 
-            AddTransactionToMerchantStatementRequest command = AddTransactionToMerchantStatementRequest.Create(TestData.EstateId,
+            MerchantStatementCommands.AddTransactionToMerchantStatementCommand command = new(TestData.EstateId,
                 TestData.MerchantId,
                 TestData.TransactionDateTime1,
                 TestData.TransactionAmount1,
@@ -163,7 +162,7 @@ public async Task MerchantStatementDomainService_AddSettledFeeToStatement_Settle
             merchantStatementAggregateRepository.Setup(m => m.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
                 .ReturnsAsync(Result.Success(merchantStatementAggregate));
 
-            AddSettledFeeToMerchantStatementRequest command = AddSettledFeeToMerchantStatementRequest.Create(TestData.EstateId,
+            MerchantStatementCommands.AddSettledFeeToMerchantStatementCommand command = new(TestData.EstateId,
                 TestData.MerchantId,
                 TestData.SettledFeeDateTime1,
                 TestData.SettledFeeAmount1,
@@ -227,7 +226,7 @@ public async Task MerchantStatementDomainService_EmailStatement_StatementGenerat
                 .Setup(m => m.SendEmail(It.IsAny<String>(), It.IsAny<SendEmailRequest>(),
                     It.IsAny<CancellationToken>())).ReturnsAsync(new SendEmailResponse { MessageId = Guid.NewGuid() });
 
-            EmailMerchantStatementRequest command = EmailMerchantStatementRequest.Create(TestData.EstateId, TestData.MerchantId,
+            MerchantStatementCommands.EmailMerchantStatementCommand command = new(TestData.EstateId, TestData.MerchantId,
                 TestData.MerchantStatementId);
 
             var result = await merchantStatementDomainService.EmailStatement(command, CancellationToken.None);

EstateManagement.BusinessLogic/EstateManagement.BusinessLogic.csproj

@@ -8,7 +8,7 @@
     <PackageReference Include="CallbackHandler.DataTransferObjects" Version="2024.4.2" />
     <PackageReference Include="MessagingService.Client" Version="2024.4.2" />
     <PackageReference Include="SecurityService.Client" Version="2024.5.1" />
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="2024.10.3" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="2024.10.4" />
     <PackageReference Include="MediatR" Version="12.2.0" />
     <PackageReference Include="Syncfusion.HtmlToPdfConverter.QtWebKit.Net.Core" Version="25.1.35" />
     <PackageReference Include="System.IO.Abstractions" Version="21.0.2" />