Add support for EventDriven.EventBus.Dapr.EventCache.Mongo.

Anthony Sneed · Anthony Sneed · commit 9af2f90d4667 · 2022-02-05T20:23:04.000-06:00
diff --git a/EventDriven.CQRS.sln b/EventDriven.CQRS.sln
@@ -11,10 +11,6 @@ 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
@@ -35,7 +31,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components", "{00BA9501-787E-465C-97D0-F51295D97802}"
 	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
+		reference-architecture\dapr\components\pubsub-snssqs.yaml = reference-architecture\dapr\components\pubsub-snssqs.yaml
+		reference-architecture\dapr\components\statestore-mongodb.yaml = reference-architecture\dapr\components\statestore-mongodb.yaml
+		reference-architecture\dapr\components\statestore.yaml = reference-architecture\dapr\components\statestore.yaml
 	EndProjectSection
 EndProject
 Global
diff --git a/ReadMe.md b/ReadMe.md
@@ -46,14 +46,15 @@ The **Reference Architecture** projects demonstrate how to apply these concepts
     dapr run --app-id order-service --app-port 5150 --components-path ../dapr/components -- dotnet run
     ```
 4. Create some customers.
-   - Open http://localhost:5000/swagger
+   - Open http://localhost:5656/swagger
    - Execute posts using contents of **customers.json**.
    - Copy post response, modify fields, then execute puts.
      - Make sure to copy `etag` value from last response, or you will get a concurrency error.
    - Copy `id` and `etag` values to execute deletes.
    - Execute gets to retrieve customers.
    - View customers database collections using Robo 3T.
 5. Create some orders.
+   - Open http://localhost:5757/swagger
    - Execute posts using contents of **orders.json**.
    - Copy post response, modify fields, then execute puts.
      - Make sure to copy `etag` value from last response, or you will get a concurrency error.
@@ -63,15 +64,12 @@ The **Reference Architecture** projects demonstrate how to apply these concepts
 6. Update the address of a customer who has order.
    - Note the address is also updated for the customer's orders.
    - Observe log messages in terminal when integration events are published and handled.
-7. To **debug** services, you will need to use **Visual Studio Code** with the *Dapr extension*.
-   - Open instances of VS Code at both CustomerService and OrderService.
-   - If .vscode folder not present:
-     - First create build and debug artifacts.
-     - Then from the task palette run `Dapr: Scaffold Dapr Tasks`.
-       - Enter values for launch, app id (customer-service) and port (5000).
-       - Enter values for launch, app id (order-service) and port (5050).
-   - Switch to the Debug tab and select "with Dapr" configuration.
-   - Set breakpoints as needed and press F5 to start debugging.
+7. To **debug** services, you can use [tye](https://github.com/dotnet/tye) with the *Dapr extension*.
+   - Open a terminal at the reference-architecture folder.
+   - Run `tye run --debug *`
+   - Set breakpoints in each project.
+   - Attach the debugger to each process.
+   - Open http://localhost:8000 to view the Tye Dashboard.
 
 ### Development Guide
 
diff --git a/reference-architecture/Common/Common.csproj b/reference-architecture/Common/Common.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="EventDriven.EventBus.Abstractions" Version="1.1.0" />
+        <PackageReference Include="EventDriven.EventBus.Abstractions" Version="1.2.0-beta2" />
     </ItemGroup>
 
 </Project>
diff --git a/reference-architecture/CustomerService/CustomerService.csproj b/reference-architecture/CustomerService/CustomerService.csproj
@@ -5,10 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.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="EventDriven.EventBus.Dapr" Version="1.2.0-beta2" />
+    <PackageReference Include="EventDriven.EventBus.Dapr.EventCache.Mongo" Version="1.2.0-beta2" />
     <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
@@ -52,6 +52,7 @@ 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);
+            if (existing == null) return new CommandResult<Customer>(CommandOutcome.NotHandled);
             var addressChanged = command.Entity.ShippingAddress != existing.ShippingAddress;
             
             try
diff --git a/reference-architecture/CustomerService/Domain/CustomerAggregate/Customer.cs b/reference-architecture/CustomerService/Domain/CustomerAggregate/Customer.cs
@@ -22,6 +22,6 @@ public CustomerCreated Process(CreateCustomer command)
 
         public void Apply(CustomerCreated domainEvent) =>
             // Set Id
-            Id = domainEvent.EntityId != default(Guid) ? domainEvent.EntityId : Guid.NewGuid();
+            Id = domainEvent.EntityId != default ? domainEvent.EntityId : Guid.NewGuid();
     }
 }
diff --git a/reference-architecture/CustomerService/Properties/launchSettings.json b/reference-architecture/CustomerService/Properties/launchSettings.json
@@ -6,7 +6,7 @@
       "dotnetRunMessages": "true",
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:5656",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/reference-architecture/CustomerService/Startup.cs b/reference-architecture/CustomerService/Startup.cs
@@ -38,6 +38,9 @@ public void ConfigureServices(IServiceCollection services)
 
             // Add Dapr event bus
             services.AddDaprEventBus(Configuration, true);
+            
+            // Add Dapr Mongo event cache
+            services.AddDaprMongoEventCache(Configuration);
         }
 
         // 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
@@ -15,6 +15,16 @@
   "DaprEventBusOptions": {
     "PubSubName": "pubsub"
   },
+  "DaprEventCacheOptions": {
+    "DaprStateStoreOptions": {
+      "StateStoreName": "statestore-mongodb"
+    }
+  },
+  "DaprStoreDatabaseSettings": {
+    "ConnectionString": "mongodb://localhost:27017",
+    "DatabaseName": "daprStore",
+    "CollectionName": "daprCollection"
+  },
   "DaprEventBusSchemaOptions": {
     "UseSchemaRegistry": true,
     "SchemaValidatorType": "Json",
diff --git a/reference-architecture/OrderService/OrderService.csproj b/reference-architecture/OrderService/OrderService.csproj
@@ -5,10 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.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="EventDriven.EventBus.Dapr" Version="1.2.0-beta2" />
+    <PackageReference Include="EventDriven.EventBus.Dapr.EventCache.Mongo" Version="1.2.0-beta2" />
     <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/Properties/launchSettings.json b/reference-architecture/OrderService/Properties/launchSettings.json
@@ -6,7 +6,7 @@
       "dotnetRunMessages": "true",
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5150",
+      "applicationUrl": "http://localhost:5757",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/reference-architecture/OrderService/Startup.cs b/reference-architecture/OrderService/Startup.cs
@@ -41,6 +41,9 @@ public void ConfigureServices(IServiceCollection services)
 
             // Add Dapr event bus
             services.AddDaprEventBus(Configuration, true);
+            
+            // Add Dapr Mongo event cache
+            services.AddDaprMongoEventCache(Configuration);
         }
 
         // 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
@@ -15,6 +15,16 @@
   "DaprEventBusOptions": {
     "PubSubName": "pubsub"
   },
+  "DaprEventCacheOptions": {
+    "DaprStateStoreOptions": {
+      "StateStoreName": "statestore-mongodb"
+    }
+  },
+  "DaprStoreDatabaseSettings": {
+    "ConnectionString": "mongodb://localhost:27017",
+    "DatabaseName": "daprStore",
+    "CollectionName": "daprCollection"
+  },
   "DaprEventBusSchemaOptions": {
     "UseSchemaRegistry": true,
     "SchemaValidatorType": "Json",
diff --git a/reference-architecture/dapr/components/pubsub-snssqs.yaml b/reference-architecture/dapr/components/pubsub-snssqs.yaml
@@ -1,7 +1,7 @@
 apiVersion: dapr.io/v1alpha1
 kind: Component
 metadata:
-  name: snssqs-pubsub
+  name: pubsub-snssqs
 spec:
   type: pubsub.snssqs
   version: v1
diff --git a/reference-architecture/dapr/components/statestore-mongodb.yaml b/reference-architecture/dapr/components/statestore-mongodb.yaml
@@ -0,0 +1,9 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: statestore-mongodb
+spec:
+  type: state.mongodb
+  metadata:
+    - name: host
+      value: localhost:27017
diff --git a/reference-architecture/dapr/components/statestore.yaml b/reference-architecture/dapr/components/statestore.yaml
@@ -0,0 +1,13 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: statestore
+spec:
+  type: state.redis
+  metadata:
+    - name: redisHost
+      value: localhost:6379
+    - name: redisPassword
+      value: ""
+    - name: actorStateStore
+      value: "true"
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[\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]",
+      "country": "USA",
       "postalCode": "90045"
     }
   },
diff --git a/reference-architecture/tye.yaml b/reference-architecture/tye.yaml
@@ -11,7 +11,9 @@ name: cqrs-ref-arch
 
 # dapr extension
 extensions:
-- name: dapr
+  - name: dapr
+    log-level: debug
+    components-path: "dapr/components"
 
 # define multiple services here
 # project: app.csproj # msbuild project path (relative to this file)
@@ -24,11 +26,11 @@ extensions:
 # bindings: # optional array of bindings (ports, connection strings)
 # - port: 8080 # number port of the binding
 services:
-# - name: customer-service
-#   project: CustomerService/CustomerService.csproj
-#   bindings:
-#   - port: 5000
-- name: order-service
-  project: OrderService/OrderService.csproj
-  bindings:
-  - port: 5050
+  - name: customer-service
+    project: CustomerService/CustomerService.csproj
+    bindings:
+      - port: 5656
+  - name: order-service
+    project: OrderService/OrderService.csproj
+    bindings:
+      - port: 5757
diff --git a/test/EventDriven.CQRS.Tests/CustomerCommandControllerTests.cs b/test/EventDriven.CQRS.Tests/CustomerCommandControllerTests.cs
@@ -6,7 +6,6 @@
 using CustomerService.DTO.Write;
 using CustomerService.Mapping;
 using EventDriven.CQRS.Tests.Fakes;
-using EventDriven.EventBus.Abstractions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
@@ -28,7 +27,7 @@ public async Task Create_Adds_Customer()
         {
             // Arrange
             var handler = new CustomerCommandHandler(
-                new FakeCustomerRepository(), new FakeEventBus(new EventBusOptions()),
+                new FakeCustomerRepository(), new FakeEventBus(),
                 _mapper, new NullLogger<CustomerCommandHandler>());
             var controller = new CustomerCommandController(handler, _mapper);
             
@@ -47,7 +46,7 @@ public async Task Update_Updates_Customer()
         {
             // Arrange
             var handler = new CustomerCommandHandler(
-                new FakeCustomerRepository(), new FakeEventBus(new EventBusOptions()), 
+                new FakeCustomerRepository(), new FakeEventBus(), 
                 _mapper, new NullLogger<CustomerCommandHandler>());
             var controller = new CustomerCommandController(handler, _mapper);
             var customer = (await controller.Create(Customers.Customer1) as CreatedResult)?.Value as Customer;
@@ -69,7 +68,7 @@ public async Task Remove_Removes_Customer()
             // Arrange
             var repository = new FakeCustomerRepository();
             var handler = new CustomerCommandHandler(
-                repository, new FakeEventBus(new EventBusOptions()),
+                repository, new FakeEventBus(),
                 _mapper, new NullLogger<CustomerCommandHandler>());
             var controller = new CustomerCommandController(handler, _mapper);
             var customer = (await controller.Create(Customers.Customer1) as CreatedResult)?.Value as Customer;
diff --git a/test/EventDriven.CQRS.Tests/CustomerQueryControllerTests.cs b/test/EventDriven.CQRS.Tests/CustomerQueryControllerTests.cs
@@ -6,7 +6,6 @@
 using CustomerService.DTO.Read;
 using CustomerService.Mapping;
 using EventDriven.CQRS.Tests.Fakes;
-using EventDriven.EventBus.Abstractions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
@@ -28,7 +27,7 @@ public async Task Get_Retrieves_Customers()
         {
             // Arrange
             var repository = new FakeCustomerRepository();
-            var handler = new CustomerCommandHandler(repository, new FakeEventBus(new EventBusOptions()),
+            var handler = new CustomerCommandHandler(repository, new FakeEventBus(),
                 _mapper, new NullLogger<CustomerCommandHandler>());
             var commandController = new CustomerCommandController(handler, _mapper);
             await commandController.Create(Customers.Customer1);
@@ -42,7 +41,7 @@ public async Task Get_Retrieves_Customers()
             // Assert
             var okResult = Assert.IsType<OkObjectResult>(actionResult);
             var value = (IEnumerable<CustomerView>)okResult.Value;
-            Assert.Collection(value,
+            Assert.Collection(value!,
                 c => Assert.Equal(CustomerViews.Customer1.Id, c.Id),
                 c => Assert.Equal(CustomerViews.Customer2.Id, c.Id),
                 c => Assert.Equal(CustomerViews.Customer3.Id, c.Id));
@@ -53,7 +52,7 @@ public async Task Get_Retrieves_Customer_By_Id()
         {
             // Arrange
             var repository = new FakeCustomerRepository();
-            var handler = new CustomerCommandHandler(repository, new FakeEventBus(new EventBusOptions()),
+            var handler = new CustomerCommandHandler(repository, new FakeEventBus(),
                 _mapper, new NullLogger<CustomerCommandHandler>());
             var commandController = new CustomerCommandController(handler, _mapper);
             await commandController.Create(Customers.Customer1);
@@ -65,7 +64,7 @@ public async Task Get_Retrieves_Customer_By_Id()
             // Assert
             var okResult = Assert.IsType<OkObjectResult>(actionResult);
             var value = (CustomerView)okResult.Value;
-            Assert.Equal(CustomerViews.Customer1.Id, value.Id);
+            Assert.Equal(CustomerViews.Customer1.Id, value!.Id);
         }
     }
 }
diff --git a/test/EventDriven.CQRS.Tests/EventDriven.CQRS.Tests.csproj b/test/EventDriven.CQRS.Tests/EventDriven.CQRS.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
diff --git a/test/EventDriven.CQRS.Tests/Fakes/FakeEventBus.cs b/test/EventDriven.CQRS.Tests/Fakes/FakeEventBus.cs
@@ -1,14 +1,9 @@
 using System.Threading.Tasks;
-using EventDriven.EventBus.Abstractions;
 
 namespace EventDriven.CQRS.Tests.Fakes
 {
     public class FakeEventBus : EventBus.Abstractions.EventBus
     {
-        public FakeEventBus(EventBusOptions eventBusOptions) : base(eventBusOptions)
-        {
-        }
-
         public override Task PublishAsync<TIntegrationEvent>(
             TIntegrationEvent @event,
             string topic = null,

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ public CustomerCreated Process(CreateCustomer command)`
`22`	`22`
`23`	`23`	`public void Apply(CustomerCreated domainEvent) =>`
`24`	`24`	`// Set Id`
`25`		`- Id = domainEvent.EntityId != default(Guid) ? domainEvent.EntityId : Guid.NewGuid();`
	`25`	`+ Id = domainEvent.EntityId != default ? domainEvent.EntityId : Guid.NewGuid();`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"dotnetRunMessages": "true",`
`7`	`7`	`"launchBrowser": true,`
`8`	`8`	`"launchUrl": "swagger",`
`9`		`- "applicationUrl": "http://localhost:5000",`
	`9`	`+ "applicationUrl": "http://localhost:5656",`
`10`	`10`	`"environmentVariables": {`
`11`	`11`	`"ASPNETCORE_ENVIRONMENT": "Development"`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ public void ConfigureServices(IServiceCollection services)`
`38`	`38`
`39`	`39`	`// Add Dapr event bus`
`40`	`40`	`services.AddDaprEventBus(Configuration, true);`
	`41`	`+`
	`42`	`+ // Add Dapr Mongo event cache`
	`43`	`+ services.AddDaprMongoEventCache(Configuration);`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`