Use EventDriven.CQRS.Abstractions v2.

Author: Anthony Sneed

ReadMe.md

@@ -3,7 +3,7 @@
 Reference architecture for using **EventDriven** abstractions and libraries for Domain Driven Design (**DDD**), Command-Query Responsibility Segregation (**CQRS**) and Event Driven Architecture (**EDA**).
 
 ## Prerequisites
-- [.NET Core SDK](https://dotnet.microsoft.com/download) (5.0 or greater)
+- [.NET Core SDK](https://dotnet.microsoft.com/download) (6.0 or greater)
 - [Docker Desktop](https://www.docker.com/products/docker-desktop)
 - MongoDB Docker: `docker run --name mongo -d -p 27017:27017 -v /tmp/mongo/data:/data/db mongo`
 - [MongoDB Client](https://robomongo.org/download):

reference-architecture/CustomerService/Controllers/CustomerCommandController.cs

@@ -2,7 +2,7 @@
 using CustomerService.Domain.CustomerAggregate;
 using CustomerService.Domain.CustomerAggregate.Commands;
 using CustomerService.Helpers;
-using EventDriven.DDD.Abstractions.Commands;
+using EventDriven.CQRS.Abstractions.Commands;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CustomerService.Controllers

reference-architecture/CustomerService/Controllers/CustomerQueryController.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
+using CustomerService.Domain.CustomerAggregate.Queries;
 using CustomerService.DTO.Read;
-using CustomerService.Repositories;
+using EventDriven.CQRS.Abstractions.Queries;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CustomerService.Controllers
@@ -9,30 +10,32 @@ namespace CustomerService.Controllers
     [ApiController]
     public class CustomerQueryController : ControllerBase
     {
-        private readonly ICustomerRepository _repository;
+        private readonly IQueryBroker _queryBroker;
         private readonly IMapper _mapper;
 
-        public CustomerQueryController(ICustomerRepository repository, IMapper mapper)
+        public CustomerQueryController(
+            IQueryBroker queryBroker,
+            IMapper mapper)
         {
-            _repository = repository;
+            _queryBroker = queryBroker;
             _mapper = mapper;
         }
 
         // GET api/customer
         [HttpGet]
         public async Task<IActionResult> GetCustomers()
         {
-            var customers = await _repository.GetAsync();
+            var customers = await _queryBroker.SendAsync(new GetCustomers());
             var result = _mapper.Map<IEnumerable<CustomerView>>(customers);
             return Ok(result);
         }
 
         // GET api/customer/id
         [HttpGet]
-        [Route("{id}")]
+        [Route("{id:guid}")]
         public async Task<IActionResult> GetCustomer([FromRoute] Guid id)
         {
-            var customer = await _repository.GetAsync(id);
+            var customer = await _queryBroker.SendAsync(new GetCustomer(id));
             if (customer == null) return NotFound();
             var result = _mapper.Map<CustomerView>(customer);
             return Ok(result);

reference-architecture/CustomerService/CustomerService.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="EventDriven.DDD.Abstractions" Version="2.0.0-beta1" />
+    <PackageReference Include="EventDriven.CQRS.Abstractions" Version="2.0.0-beta3" />
     <PackageReference Include="EventDriven.DependencyInjection.URF.Mongo" Version="1.1.0" />
     <PackageReference Include="EventDriven.EventBus.Dapr" Version="1.2.0" />
     <PackageReference Include="EventDriven.EventBus.Dapr.EventCache.Mongo" Version="1.2.0" />

reference-architecture/CustomerService/DTO/Read/CustomerView.cs

@@ -10,6 +10,6 @@ public class CustomerView
         public string State { get; set; } = null!;
         public string Country { get; set; } = null!;
         public string PostalCode { get; set; } = null!;
-        public string ETag { get; set; } = null!;
+        public string? ETag { get; set; }
     }
 }

reference-architecture/CustomerService/Domain/CustomerAggregate/Handlers/CreateCustomerHandler.cs renamed to reference-architecture/CustomerService/Domain/CustomerAggregate/CommandHandlers/CreateCustomerHandler.cs

@@ -1,8 +1,8 @@
 using CustomerService.Domain.CustomerAggregate.Commands;
 using CustomerService.Repositories;
-using EventDriven.DDD.Abstractions.Commands;
+using EventDriven.CQRS.Abstractions.Commands;
 
-namespace CustomerService.Domain.CustomerAggregate.Handlers;
+namespace CustomerService.Domain.CustomerAggregate.CommandHandlers;
 
 public class CreateCustomerHandler : ICommandHandler<Customer, CreateCustomer>
 {
@@ -21,11 +21,12 @@ public async Task<CommandResult<Customer>> Handle(CreateCustomer command, Cancel
     {
         // Process command
         _logger.LogInformation("Handling command: {CommandName}", nameof(CreateCustomer));
+        if (command.Entity == null) return new CommandResult<Customer>(CommandOutcome.InvalidCommand);
         var domainEvent = command.Entity.Process(command);
 
         // Apply events
         command.Entity.Apply(domainEvent);
-            
+
         // Persist entity
         var entity = await _repository.AddAsync(command.Entity);
         if (entity == null) return new CommandResult<Customer>(CommandOutcome.InvalidCommand);

reference-architecture/CustomerService/Domain/CustomerAggregate/Handlers/RemoveCustomerHandler.cs renamed to reference-architecture/CustomerService/Domain/CustomerAggregate/CommandHandlers/RemoveCustomerHandler.cs

@@ -1,8 +1,8 @@
 using CustomerService.Domain.CustomerAggregate.Commands;
 using CustomerService.Repositories;
-using EventDriven.DDD.Abstractions.Commands;
+using EventDriven.CQRS.Abstractions.Commands;
 
-namespace CustomerService.Domain.CustomerAggregate.Handlers;
+namespace CustomerService.Domain.CustomerAggregate.CommandHandlers;
 
 public class RemoveCustomerHandler : ICommandHandler<RemoveCustomer>
 {

reference-architecture/CustomerService/Domain/CustomerAggregate/Handlers/UpdateCustomerHandler.cs renamed to reference-architecture/CustomerService/Domain/CustomerAggregate/CommandHandlers/UpdateCustomerHandler.cs

@@ -2,12 +2,12 @@
 using Common.Integration.Events;
 using CustomerService.Domain.CustomerAggregate.Commands;
 using CustomerService.Repositories;
-using EventDriven.DDD.Abstractions.Commands;
+using EventDriven.CQRS.Abstractions.Commands;
 using EventDriven.DDD.Abstractions.Repositories;
 using EventDriven.EventBus.Abstractions;
 using Integration = Common.Integration;
 
-namespace CustomerService.Domain.CustomerAggregate.Handlers;
+namespace CustomerService.Domain.CustomerAggregate.CommandHandlers;
 
 public class UpdateCustomerHandler : ICommandHandler<Customer, UpdateCustomer>
 {
@@ -32,6 +32,7 @@ public async Task<CommandResult<Customer>> Handle(UpdateCustomer command, Cancel
     {
         // Process command
         _logger.LogInformation("Handling command: {CommandName}", nameof(UpdateCustomer));
+        if (command.Entity == null) return new CommandResult<Customer>(CommandOutcome.InvalidCommand);
         var domainEvent = command.Entity.Process(command);
 
         // Apply events

reference-architecture/CustomerService/Domain/CustomerAggregate/Commands/CreateCustomer.cs

@@ -1,6 +1,6 @@
-using EventDriven.DDD.Abstractions.Commands;
+using EventDriven.CQRS.Abstractions.Commands;
 
 namespace CustomerService.Domain.CustomerAggregate.Commands
 {
-    public record CreateCustomer(Customer Entity) : Command<Customer>(Entity);
+    public record CreateCustomer(Customer? Entity) : Command<Customer>(Entity);
 }

reference-architecture/CustomerService/Domain/CustomerAggregate/Commands/RemoveCustomer.cs

@@ -1,4 +1,4 @@
-using EventDriven.DDD.Abstractions.Commands;
+using EventDriven.CQRS.Abstractions.Commands;
 
 namespace CustomerService.Domain.CustomerAggregate.Commands
 {