Upgrade DDD commands, simplify DI registrations.

Anthony Sneed · Anthony Sneed · commit 1591a69f188c · 2022-01-24T08:38:22.000-06:00
diff --git a/EventDriven.CQRS.sln b/EventDriven.CQRS.sln
@@ -11,6 +11,10 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{269CD137-4093-4100-B33E-808586D335F6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "reference-architecture", "reference-architecture", "{C4FD0AF1-927A-4860-A634-7CE342807692}"
+	ProjectSection(SolutionItems) = preProject
+		reference-architecture\dapr\components\pubsub.yaml = reference-architecture\dapr\components\pubsub.yaml
+		reference-architecture\dapr\components\snssqs-pubsub.yaml = reference-architecture\dapr\components\snssqs-pubsub.yaml
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventDriven.CQRS.Tests", "test\EventDriven.CQRS.Tests\EventDriven.CQRS.Tests.csproj", "{9809006C-2F6B-44A1-8AE2-BC449368D209}"
 EndProject
@@ -66,8 +70,8 @@ Global
 		{16A5B2CB-8C46-4F3E-B7A1-97C47D9F66E7} = {C4FD0AF1-927A-4860-A634-7CE342807692}
 		{B11B21E0-7B89-4285-990A-D98793310B02} = {C4FD0AF1-927A-4860-A634-7CE342807692}
 		{FC04D111-903D-49FF-84A6-8806C71E2168} = {C4FD0AF1-927A-4860-A634-7CE342807692}
-		{F0E48E00-7D72-4614-9C13-90A7B015B06F} = {AFFCBFA4-9D64-43AA-AC59-D4CC54BD9C72}
 		{00BA9501-787E-465C-97D0-F51295D97802} = {F0E48E00-7D72-4614-9C13-90A7B015B06F}
+		{F0E48E00-7D72-4614-9C13-90A7B015B06F} = {C4FD0AF1-927A-4860-A634-7CE342807692}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {427A0D03-63CA-48AE-AA95-D21800101398}
diff --git a/reference-architecture/CustomerService/Configuration/CustomerDatabaseSettings.cs b/reference-architecture/CustomerService/Configuration/CustomerDatabaseSettings.cs
@@ -1,9 +1,11 @@
+using EventDriven.DependencyInjection.URF.Mongo;
+
 namespace CustomerService.Configuration
 {
-    public class CustomerDatabaseSettings
+    public class CustomerDatabaseSettings : IMongoDbSettings
     {
-        public string CustomersCollectionName { get; set; }
         public string ConnectionString { get; set; }
         public string DatabaseName { get; set; }
+        public string CollectionName { get; set; }
     }
 }
diff --git a/reference-architecture/CustomerService/CustomerService.csproj b/reference-architecture/CustomerService/CustomerService.csproj
@@ -6,8 +6,9 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="EventDriven.DDD.Abstractions" Version="1.1.0-beta1" />
-    <PackageReference Include="EventDriven.EventBus.Dapr" Version="1.1.0" />
+    <PackageReference Include="EventDriven.DDD.Abstractions" Version="1.1.0-beta2" />
+    <PackageReference Include="EventDriven.DependencyInjection.URF.Mongo" Version="1.1.0-beta3" />
+    <PackageReference Include="EventDriven.EventBus.Dapr" Version="1.2.0-beta1" />
     <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     <PackageReference Include="URF.Core.Mongo" Version="3.1.3" />
diff --git a/reference-architecture/CustomerService/Domain/CustomerAggregate/CommandHandlers/CustomerCommandHandler.cs b/reference-architecture/CustomerService/Domain/CustomerAggregate/CommandHandlers/CustomerCommandHandler.cs
@@ -38,15 +38,15 @@ public async Task<CommandResult<Customer>> Handle(CreateCustomer command)
         {
             // Process command
             _logger.LogInformation("Handling command: {CommandName}", nameof(CreateCustomer));
-            var events = command.Customer.Process(command);
+            var events = command.Entity.Process(command);
             
             // Apply events
             var domainEvent = events.OfType<CustomerCreated>().SingleOrDefault();
             if (domainEvent == null) return new CommandResult<Customer>(CommandOutcome.NotHandled);
-            command.Customer.Apply(domainEvent);
+            command.Entity.Apply(domainEvent);
             
             // Persist entity
-            var entity = await _repository.Add(command.Customer);
+            var entity = await _repository.Add(command.Entity);
             if (entity == null) return new CommandResult<Customer>(CommandOutcome.InvalidCommand);
             return new CommandResult<Customer>(CommandOutcome.Accepted, entity);
         }
@@ -56,12 +56,12 @@ public async Task<CommandResult<Customer>> Handle(UpdateCustomer command)
             // Compare shipping addresses
             _logger.LogInformation("Handling command: {CommandName}", nameof(UpdateCustomer));
             var existing = await _repository.Get(command.EntityId);
-            var addressChanged = command.Customer.ShippingAddress != existing.ShippingAddress;
+            var addressChanged = command.Entity.ShippingAddress != existing.ShippingAddress;
             
             try
             {
                 // Persist entity
-                var entity = await _repository.Update(command.Customer);
+                var entity = await _repository.Update(command.Entity);
                 if (entity == null) return new CommandResult<Customer>(CommandOutcome.NotFound);
                 
                 // Publish events
diff --git a/reference-architecture/CustomerService/Domain/CustomerAggregate/Commands/CreateCustomer.cs b/reference-architecture/CustomerService/Domain/CustomerAggregate/Commands/CreateCustomer.cs
@@ -2,5 +2,5 @@
 
 namespace CustomerService.Domain.CustomerAggregate.Commands
 {
-    public record CreateCustomer(Customer Customer) : Command(Customer.Id);
+    public record CreateCustomer(Customer Entity) : Command<Customer>(Entity);
 }
diff --git a/reference-architecture/CustomerService/Domain/CustomerAggregate/Commands/UpdateCustomer.cs b/reference-architecture/CustomerService/Domain/CustomerAggregate/Commands/UpdateCustomer.cs
@@ -2,5 +2,5 @@
 
 namespace CustomerService.Domain.CustomerAggregate.Commands
 {
-    public record UpdateCustomer(Customer Customer) : Command(Customer.Id);
+    public record UpdateCustomer(Customer Entity) : Command<Customer>(Entity);
 }
diff --git a/reference-architecture/CustomerService/Domain/CustomerAggregate/Customer.cs b/reference-architecture/CustomerService/Domain/CustomerAggregate/Customer.cs
@@ -21,7 +21,7 @@ public IEnumerable<IDomainEvent> Process(CreateCustomer command)
             // To process command, return one or more domain events
             => new List<IDomainEvent>
             {
-                new CustomerCreated(command.Customer)
+                new CustomerCreated(command.Entity)
             };
 
         public void Apply(CustomerCreated domainEvent) =>
diff --git a/reference-architecture/CustomerService/Startup.cs b/reference-architecture/CustomerService/Startup.cs
@@ -2,17 +2,13 @@
 using CustomerService.Domain.CustomerAggregate;
 using CustomerService.Domain.CustomerAggregate.CommandHandlers;
 using CustomerService.Repositories;
-using EventDriven.EventBus.Dapr;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
-using MongoDB.Driver;
-using URF.Core.Abstractions;
-using URF.Core.Mongo;
+using EventDriven.DependencyInjection.URF.Mongo;
 
 namespace CustomerService
 {
@@ -34,40 +30,14 @@ public void ConfigureServices(IServiceCollection services)
                 c.SwaggerDoc("v1", new OpenApiInfo { Title = "CustomerService", Version = "v1" });
             });
 
-            // Configuration
-            services.Configure<CustomerDatabaseSettings>(
-                Configuration.GetSection(nameof(CustomerDatabaseSettings)));
-            services.AddSingleton(sp =>
-                sp.GetRequiredService<IOptions<CustomerDatabaseSettings>>().Value);
-
             // Registrations
             services.AddAutoMapper(typeof(Startup));
             services.AddSingleton<CustomerCommandHandler>();
-            services.AddSingleton(sp =>
-            {
-                var settings = sp.GetRequiredService<CustomerDatabaseSettings>();
-                var client = new MongoClient(settings.ConnectionString);
-                var database = client.GetDatabase(settings.DatabaseName);
-                return database.GetCollection<Customer>(settings.CustomersCollectionName);
-            });
-            services.AddSingleton<IDocumentRepository<Customer>, DocumentRepository<Customer>>();
             services.AddSingleton<ICustomerRepository, CustomerRepository>();
-
-            // Configuration
-            var eventBusOptions = new DaprEventBusOptions();
-            Configuration.GetSection(nameof(DaprEventBusOptions)).Bind(eventBusOptions);
-            var eventBusSchemaOptions = new DaprEventBusSchemaOptions();
-            Configuration.GetSection(nameof(DaprEventBusSchemaOptions)).Bind(eventBusSchemaOptions);
+            services.AddMongoDbSettings<CustomerDatabaseSettings, Customer>(Configuration);
 
             // Add Dapr event bus
-            services.AddDaprEventBus(eventBusOptions.PubSubName, options =>
-            {
-                options.UseSchemaRegistry = eventBusSchemaOptions.UseSchemaRegistry;
-                options.SchemaRegistryType = eventBusSchemaOptions.SchemaRegistryType;
-                options.MongoStateStoreOptions = eventBusSchemaOptions.MongoStateStoreOptions;
-                options.SchemaValidatorType = eventBusSchemaOptions.SchemaValidatorType;
-                options.AddSchemaOnPublish = eventBusSchemaOptions.AddSchemaOnPublish;
-            });
+            services.AddDaprEventBus(Configuration, true);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/reference-architecture/CustomerService/appsettings.json b/reference-architecture/CustomerService/appsettings.json
@@ -10,7 +10,7 @@
   "CustomerDatabaseSettings": {
     "ConnectionString": "mongodb://localhost:27017",
     "DatabaseName": "CustomersDb",
-    "CustomersCollectionName": "Customers"
+    "CollectionName": "Customers"
   },
   "DaprEventBusOptions": {
     "PubSubName": "pubsub"
diff --git a/reference-architecture/OrderService/Configuration/OrderDatabaseSettings.cs b/reference-architecture/OrderService/Configuration/OrderDatabaseSettings.cs
@@ -1,9 +1,11 @@
+using EventDriven.DependencyInjection.URF.Mongo;
+
 namespace OrderService.Configuration
 {
-    public class OrderDatabaseSettings
+    public class OrderDatabaseSettings : IMongoDbSettings
     {
-        public string OrdersCollectionName { get; set; }
         public string ConnectionString { get; set; }
         public string DatabaseName { get; set; }
+        public string CollectionName { get; set; }
     }
 }
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/CommandHandlers/OrderCommandHandler.cs b/reference-architecture/OrderService/Domain/OrderAggregate/CommandHandlers/OrderCommandHandler.cs
@@ -30,15 +30,15 @@ public async Task<CommandResult<Order>> Handle(CreateOrder command)
         {
             // Process command
             _logger.LogInformation("Handling command: {CommandName}", nameof(CreateOrder));
-            var events = command.Order.Process(command);
+            var events = command.Entity.Process(command);
             
             // Apply events
             var domainEvent = events.OfType<OrderCreated>().SingleOrDefault();
             if (domainEvent == null) return new CommandResult<Order>(CommandOutcome.NotHandled);
-            command.Order.Apply(domainEvent);
+            command.Entity.Apply(domainEvent);
             
             // Persist entity
-            var entity = await _repository.AddOrder(command.Order);
+            var entity = await _repository.AddOrder(command.Entity);
             if (entity == null) return new CommandResult<Order>(CommandOutcome.InvalidCommand);
             return new CommandResult<Order>(CommandOutcome.Accepted, entity);
         }
@@ -50,7 +50,7 @@ public async Task<CommandResult<Order>> Handle(UpdateOrder command)
             try
             {
                 // Persist entity
-                var entity = await _repository.UpdateOrder(command.Order);
+                var entity = await _repository.UpdateOrder(command.Entity);
                 if (entity == null) return new CommandResult<Order>(CommandOutcome.NotFound);
                 return new CommandResult<Order>(CommandOutcome.Accepted, entity);
             }
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/Commands/CreateOrder.cs b/reference-architecture/OrderService/Domain/OrderAggregate/Commands/CreateOrder.cs
@@ -2,5 +2,5 @@
 
 namespace OrderService.Domain.OrderAggregate.Commands
 {
-    public record CreateOrder(Order Order) : Command(Order.Id);
+    public record CreateOrder(Order Entity) : Command<Order>(Entity);
 }
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/Commands/UpdateOrder.cs b/reference-architecture/OrderService/Domain/OrderAggregate/Commands/UpdateOrder.cs
@@ -2,5 +2,5 @@
 
 namespace OrderService.Domain.OrderAggregate.Commands
 {
-    public record UpdateOrder(Order Order) : Command(Order.Id);
+    public record UpdateOrder(Order Entity) : Command<Order>(Entity);
 }
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/Order.cs b/reference-architecture/OrderService/Domain/OrderAggregate/Order.cs
@@ -27,7 +27,7 @@ public IEnumerable<IDomainEvent> Process(CreateOrder command)
             // To process command, return one or more domain events
             => new List<IDomainEvent>
             {
-                new OrderCreated(command.Order)
+                new OrderCreated(command.Entity)
             };
 
         public void Apply(OrderCreated domainEvent) =>
diff --git a/reference-architecture/OrderService/OrderService.csproj b/reference-architecture/OrderService/OrderService.csproj
@@ -6,8 +6,9 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="EventDriven.DDD.Abstractions" Version="1.1.0-beta1" />
-    <PackageReference Include="EventDriven.EventBus.Dapr" Version="1.1.0" />
+    <PackageReference Include="EventDriven.DDD.Abstractions" Version="1.1.0-beta2" />
+    <PackageReference Include="EventDriven.DependencyInjection.URF.Mongo" Version="1.1.0-beta3" />
+    <PackageReference Include="EventDriven.EventBus.Dapr" Version="1.2.0-beta1" />
     <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     <PackageReference Include="URF.Core.Mongo" Version="3.1.3" />
diff --git a/reference-architecture/OrderService/Startup.cs b/reference-architecture/OrderService/Startup.cs
@@ -1,19 +1,16 @@
+using EventDriven.DependencyInjection.URF.Mongo;
 using EventDriven.EventBus.Dapr;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
-using MongoDB.Driver;
 using OrderService.Configuration;
 using OrderService.Domain.OrderAggregate;
 using OrderService.Domain.OrderAggregate.CommandHandlers;
 using OrderService.Integration.EventHandlers;
 using OrderService.Repositories;
-using URF.Core.Abstractions;
-using URF.Core.Mongo;
 
 namespace OrderService
 {
@@ -35,41 +32,15 @@ public void ConfigureServices(IServiceCollection services)
                 c.SwaggerDoc("v1", new OpenApiInfo { Title = "OrderService", Version = "v1" });
             });
 
-            // Configuration
-            services.Configure<OrderDatabaseSettings>(
-                Configuration.GetSection(nameof(OrderDatabaseSettings)));
-            services.AddSingleton(sp =>
-                sp.GetRequiredService<IOptions<OrderDatabaseSettings>>().Value);
-
             // Registrations
             services.AddAutoMapper(typeof(Startup));
             services.AddSingleton<OrderCommandHandler>();
-            services.AddSingleton(sp =>
-            {
-                var settings = sp.GetRequiredService<OrderDatabaseSettings>();
-                var client = new MongoClient(settings.ConnectionString);
-                var database = client.GetDatabase(settings.DatabaseName);
-                return database.GetCollection<Order>(settings.OrdersCollectionName);
-            });
-            services.AddSingleton<IDocumentRepository<Order>, DocumentRepository<Order>>();
             services.AddSingleton<IOrderRepository, OrderRepository>();
+            services.AddMongoDbSettings<OrderDatabaseSettings, Order>(Configuration);
             services.AddSingleton<CustomerAddressUpdatedEventHandler>();
 
-            // Configuration
-            var eventBusOptions = new DaprEventBusOptions();
-            Configuration.GetSection(nameof(DaprEventBusOptions)).Bind(eventBusOptions);
-            var eventBusSchemaOptions = new DaprEventBusSchemaOptions();
-            Configuration.GetSection(nameof(DaprEventBusSchemaOptions)).Bind(eventBusSchemaOptions);
-
             // Add Dapr event bus
-            services.AddDaprEventBus(eventBusOptions.PubSubName, options =>
-            {
-                options.UseSchemaRegistry = eventBusSchemaOptions.UseSchemaRegistry;
-                options.SchemaRegistryType = eventBusSchemaOptions.SchemaRegistryType;
-                options.MongoStateStoreOptions = eventBusSchemaOptions.MongoStateStoreOptions;
-                options.SchemaValidatorType = eventBusSchemaOptions.SchemaValidatorType;
-                options.AddSchemaOnPublish = eventBusSchemaOptions.AddSchemaOnPublish;
-            });
+            services.AddDaprEventBus(Configuration, true);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/reference-architecture/OrderService/appsettings.json b/reference-architecture/OrderService/appsettings.json
@@ -10,7 +10,7 @@
   "OrderDatabaseSettings": {
     "ConnectionString": "mongodb://localhost:27017",
     "DatabaseName": "OrdersDb",
-    "OrdersCollectionName": "Orders"
+    "CollectionName": "Orders"
   },
   "DaprEventBusOptions": {
     "PubSubName": "pubsub"
diff --git a/reference-architecture/json/customers.json b/reference-architecture/json/customers.json
@@ -8,7 +8,7 @@
       "street": "123 This Street",
       "city": "Freemont",
       "state": "CA",
-      "country": "USA",
+      "country": "USA[\n  {\n    \"id\": \"22eea083-6f0d-48f2-8c82-65ac850e5aad\",\n    \"eTag\": \"\",\n    \"firstName\": \"Elon\",\n    \"lastName\": \"Musk\",\n    \"shippingAddress\": {\n      \"street\": \"123 This Street\",\n      \"city\": \"Freemont\",\n      \"state\": \"CA\",\n      \"country\": \"USA\",\n      \"postalCode\": \"90045\"\n    }\n  },\n  {\n    \"id\": \"848f5790-3981-4862-bb7e-a8566aa07026\",\n    \"eTag\": \"\",\n    \"firstName\": \"Jeff\",\n    \"lastName\": \"Bezos\",\n    \"shippingAddress\": {\n      \"street\": \"123 That Street\",\n      \"city\": \"Seattle\",\n      \"state\": \"WA\",\n      \"country\": \"USA\",\n      \"postalCode\": \"54321\"\n    }\n  },\n  {\n    \"id\": \"1c44eea7-400a-4f6f-ab99-5e8c853ea363\",\n    \"eTag\": \"\",\n    \"firstName\": \"Mark\",\n    \"lastName\": \"Zuckerberg\",\n    \"shippingAddress\": {\n      \"street\": \"123 Other Street\",\n      \"city\": \"Palo Alto\",\n      \"state\": \"CA\",\n      \"country\": \"USA\",\n      \"postalCode\": \"98765\"\n    }\n  }\n]",
       "postalCode": "90045"
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
	`1`	`+using EventDriven.DependencyInjection.URF.Mongo;`
	`2`	`+`
`1`	`3`	`namespace CustomerService.Configuration`
`2`	`4`	`{`
`3`		`- public class CustomerDatabaseSettings`
	`5`	`+ public class CustomerDatabaseSettings : IMongoDbSettings`
`4`	`6`	`{`
`5`		`- public string CustomersCollectionName { get; set; }`
`6`	`7`	`public string ConnectionString { get; set; }`
`7`	`8`	`public string DatabaseName { get; set; }`
	`9`	`+ public string CollectionName { get; set; }`
`8`	`10`	`}`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`namespace CustomerService.Domain.CustomerAggregate.Commands`
`4`	`4`	`{`
`5`		`- public record CreateCustomer(Customer Customer) : Command(Customer.Id);`
	`5`	`+ public record CreateCustomer(Customer Entity) : Command<Customer>(Entity);`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`namespace CustomerService.Domain.CustomerAggregate.Commands`
`4`	`4`	`{`
`5`		`- public record UpdateCustomer(Customer Customer) : Command(Customer.Id);`
	`5`	`+ public record UpdateCustomer(Customer Entity) : Command<Customer>(Entity);`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public IEnumerable<IDomainEvent> Process(CreateCustomer command)`
`21`	`21`	`// To process command, return one or more domain events`
`22`	`22`	`=> new List<IDomainEvent>`
`23`	`23`	`{`
`24`		`- new CustomerCreated(command.Customer)`
	`24`	`+ new CustomerCreated(command.Entity)`
`25`	`25`	`};`
`26`	`26`
`27`	`27`	`public void Apply(CustomerCreated domainEvent) =>`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
	`1`	`+using EventDriven.DependencyInjection.URF.Mongo;`
	`2`	`+`
`1`	`3`	`namespace OrderService.Configuration`
`2`	`4`	`{`
`3`		`- public class OrderDatabaseSettings`
	`5`	`+ public class OrderDatabaseSettings : IMongoDbSettings`
`4`	`6`	`{`
`5`		`- public string OrdersCollectionName { get; set; }`
`6`	`7`	`public string ConnectionString { get; set; }`
`7`	`8`	`public string DatabaseName { get; set; }`
	`9`	`+ public string CollectionName { get; set; }`
`8`	`10`	`}`
`9`	`11`	`}`