Remove sequence number.

Anthony Sneed · Anthony Sneed · commit 40f924ad114b · 2022-02-26T12:51:16.000-06:00
diff --git a/reference-architecture/CustomerService/CustomerService.csproj b/reference-architecture/CustomerService/CustomerService.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="EventDriven.DDD.Abstractions" Version="1.1.0-beta2" />
+    <PackageReference Include="EventDriven.DDD.Abstractions" Version="1.1.0-beta3" />
     <PackageReference Include="EventDriven.DependencyInjection.URF.Mongo" Version="1.1.0-beta4" />
     <PackageReference Include="EventDriven.EventBus.Dapr" Version="1.2.0-beta4" />
     <PackageReference Include="EventDriven.EventBus.Dapr.EventCache.Mongo" Version="1.2.0-beta5" />
diff --git a/reference-architecture/CustomerService/Repositories/CustomerRepository.cs b/reference-architecture/CustomerService/Repositories/CustomerRepository.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using CustomerService.Domain.CustomerAggregate;
-using Microsoft.Extensions.Logging;
 using MongoDB.Driver;
-using URF.Core.Abstractions;
 using URF.Core.Mongo;
 
 namespace CustomerService.Repositories
@@ -25,7 +23,6 @@ public async Task<Customer> AddAsync(Customer entity)
         {
             var existing = await FindOneAsync(e => e.Id == entity.Id);
             if (existing != null) return null;
-            entity.SequenceNumber = 1;
             entity.ETag = Guid.NewGuid().ToString();
             return await InsertOneAsync(entity);
         }
@@ -36,7 +33,6 @@ public async Task<Customer> UpdateAsync(Customer entity)
             if (existing == null) return null;
             if (string.Compare(entity.ETag, existing.ETag, StringComparison.OrdinalIgnoreCase) != 0 )
                 throw new ConcurrencyException();
-            entity.SequenceNumber = existing.SequenceNumber + 1;
             entity.ETag = Guid.NewGuid().ToString();
             return await FindOneAndReplaceAsync(e => e.Id == entity.Id, entity);
         }
diff --git a/reference-architecture/OrderService/OrderService.csproj b/reference-architecture/OrderService/OrderService.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="EventDriven.DDD.Abstractions" Version="1.1.0-beta2" />
+    <PackageReference Include="EventDriven.DDD.Abstractions" Version="1.1.0-beta3" />
     <PackageReference Include="EventDriven.DependencyInjection.URF.Mongo" Version="1.1.0-beta4" />
     <PackageReference Include="EventDriven.EventBus.Dapr" Version="1.2.0-beta4" />
     <PackageReference Include="EventDriven.EventBus.Dapr.EventCache.Mongo" Version="1.2.0-beta5" />
diff --git a/reference-architecture/OrderService/Repositories/OrderRepository.cs b/reference-architecture/OrderService/Repositories/OrderRepository.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using MongoDB.Driver;
 using OrderService.Domain.OrderAggregate;
-using URF.Core.Abstractions;
 using URF.Core.Mongo;
 
 namespace OrderService.Repositories
@@ -27,7 +25,6 @@ public async Task<Order> AddAsync(Order entity)
         {
             var existing = await FindOneAsync(e => e.Id == entity.Id);
             if (existing != null) return null;
-            entity.SequenceNumber = 1;
             entity.ETag = Guid.NewGuid().ToString();
             return await InsertOneAsync(entity);
         }
@@ -38,7 +35,6 @@ public async Task<Order> UpdateAsync(Order entity)
             if (existing == null) return null;
             if (string.Compare(entity.ETag, existing.ETag, StringComparison.OrdinalIgnoreCase) != 0 )
                 throw new ConcurrencyException();
-            entity.SequenceNumber = existing.SequenceNumber + 1;
             entity.ETag = Guid.NewGuid().ToString();
             return await FindOneAndReplaceAsync(e => e.Id == entity.Id, entity);
         }
@@ -60,7 +56,6 @@ public async Task<Order> UpdateOrderStateAsync(Order entity, OrderState orderSta
             if (existing == null) return null;
             if (string.Compare(entity.ETag, existing.ETag, StringComparison.OrdinalIgnoreCase) != 0 )
                 throw new ConcurrencyException();
-            entity.SequenceNumber++;
             entity.ETag = Guid.NewGuid().ToString();
             entity.OrderState = orderState;
             return await FindOneAndReplaceAsync(e => e.Id == entity.Id, entity);
diff --git a/reference-architecture/OrderService/Startup.cs b/reference-architecture/OrderService/Startup.cs
@@ -1,5 +1,4 @@
 using EventDriven.DependencyInjection.URF.Mongo;
-using EventDriven.EventBus.Dapr;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
diff --git a/test/EventDriven.CQRS.Tests/EventDriven.CQRS.Tests.csproj b/test/EventDriven.CQRS.Tests/EventDriven.CQRS.Tests.csproj
@@ -2,13 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/test/EventDriven.CQRS.Tests/Fakes/FakeCustomerRepository.cs b/test/EventDriven.CQRS.Tests/Fakes/FakeCustomerRepository.cs
@@ -23,7 +23,6 @@ public Task<Customer> AddAsync(Customer entity)
         {
             if (_entities.ContainsKey(entity.Id))
                 return Task.FromResult<Customer>(null);
-            entity.SequenceNumber = 1;
             entity.ETag = Guid.NewGuid().ToString();
             _entities.Add(entity.Id, entity);
             return Task.FromResult(entity);
@@ -35,7 +34,6 @@ public Task<Customer> UpdateAsync(Customer entity)
                 return Task.FromResult<Customer>(null);
             if (string.Compare(entity.ETag, existing.ETag, StringComparison.OrdinalIgnoreCase) != 0 )
                 throw new ConcurrencyException();
-            existing.SequenceNumber++;
             existing.ETag = Guid.NewGuid().ToString();
             existing.FirstName = entity.FirstName;
             existing.LastName = entity.LastName;
diff --git a/test/EventDriven.CQRS.Tests/Fakes/FakeOrderRepository.cs b/test/EventDriven.CQRS.Tests/Fakes/FakeOrderRepository.cs
@@ -29,7 +29,6 @@ public Task<Order> AddAsync(Order entity)
         {
             if (_entities.ContainsKey(entity.Id))
                 return Task.FromResult<Order>(null);
-            entity.SequenceNumber = 1;
             entity.ETag = Guid.NewGuid().ToString();
             _entities.Add(entity.Id, entity);
             return Task.FromResult(entity);
@@ -41,7 +40,6 @@ public Task<Order> UpdateAsync(Order entity)
                 return Task.FromResult<Order>(null);
             if (string.Compare(entity.ETag, existing.ETag, StringComparison.OrdinalIgnoreCase) != 0 )
                 throw new ConcurrencyException();
-            existing.SequenceNumber++;
             existing.ETag = Guid.NewGuid().ToString();
             existing.CustomerId = entity.CustomerId;
             existing.OrderDate = entity.OrderDate;
@@ -73,7 +71,6 @@ public Task<Order> UpdateOrderStateAsync(Order entity, OrderState orderState)
                 return Task.FromResult<Order>(null);
             if (string.Compare(entity.ETag, existing.ETag, StringComparison.OrdinalIgnoreCase) != 0 )
                 throw new ConcurrencyException();
-            existing.SequenceNumber++;
             existing.ETag = Guid.NewGuid().ToString();
             existing.OrderState = orderState;
             return Task.FromResult(existing);
diff --git a/test/EventDriven.CQRS.Tests/OrderCommandControllerTests.cs b/test/EventDriven.CQRS.Tests/OrderCommandControllerTests.cs
@@ -36,7 +36,7 @@ public async Task Create_Adds_Order()
             // Assert
             var createdResult = Assert.IsType<CreatedResult>(actionResult);
             var value = (Order)createdResult.Value;
-            Assert.Equal(Customers.Customer1.Id, value.Id);
+            Assert.Equal(Customers.Customer1.Id, value!.Id);
             Assert.NotEqual(default(Guid).ToString(), value.ETag);
         }
         
@@ -48,15 +48,15 @@ public async Task Update_Updates_Order()
                 new NullLogger<OrderCommandHandler>());
             var controller = new OrderCommandController(handler, _mapper);
             var order = (await controller.Create(Orders.Order1) as CreatedResult)?.Value as Order;
-            order.ShippingAddress.City = "Los Angeles";
+            order!.ShippingAddress.City = "Los Angeles";
             
             // Act
             var actionResult = await controller.Update(order);
             
             // Assert
             var objectResult = Assert.IsType<OkObjectResult>(actionResult);
             var value = (Order)objectResult.Value;
-            Assert.Equal(order.Id, value.Id);
+            Assert.Equal(order.Id, value!.Id);
             Assert.Equal(order.ShippingAddress.City, value.ShippingAddress.City);
             Assert.NotEqual(order.ETag, value.ETag);
         }
@@ -72,7 +72,7 @@ public async Task Remove_Removes_Order()
             var order = (await controller.Create(Orders.Order1) as CreatedResult)?.Value as Order;
             
             // Act
-            var actionResult = await controller.Remove(order.Id);
+            var actionResult = await controller.Remove(order!.Id);
             
             // Assert
             Assert.IsType<NoContentResult>(actionResult);
@@ -90,12 +90,12 @@ public async Task Ship_Updates_OrderStatus_To_Shipped()
             var order = (await controller.Create(Orders.Order1) as CreatedResult)?.Value as Order;
             
             // Act
-            var actionResult = await controller.Ship(order.Id, order.ETag);
+            var actionResult = await controller.Ship(order!.Id, order.ETag);
             
             // Assert
             var objectResult = Assert.IsType<OkObjectResult>(actionResult);
             var value = (Order)objectResult.Value;
-            Assert.Equal(Orders.Order1.Id, value.Id);
+            Assert.Equal(Orders.Order1.Id, value!.Id);
             Assert.Equal(OrderState.Shipped, value.OrderState);
             Assert.NotEqual(order.ETag, value.ETag);
         }
@@ -110,12 +110,12 @@ public async Task Cancel_Updates_OrderStatus_To_Cancelled()
             var order = (await controller.Create(Orders.Order1) as CreatedResult)?.Value as Order;
             
             // Act
-            var actionResult = await controller.Cancel(order.Id, order.ETag);
+            var actionResult = await controller.Cancel(order!.Id, order.ETag);
             
             // Assert
             var objectResult = Assert.IsType<OkObjectResult>(actionResult);
             var value = (Order)objectResult.Value;
-            Assert.Equal(Orders.Order1.Id, value.Id);
+            Assert.Equal(Orders.Order1.Id, value!.Id);
             Assert.Equal(OrderState.Cancelled, value.OrderState);
             Assert.NotEqual(order.ETag, value.ETag);
         }
diff --git a/test/EventDriven.CQRS.Tests/OrderQueryControllerTests.cs b/test/EventDriven.CQRS.Tests/OrderQueryControllerTests.cs
@@ -40,7 +40,7 @@ public async Task Get_Retrieves_Orders()
             // Assert
             var okResult = Assert.IsType<OkObjectResult>(actionResult);
             var value = (IEnumerable<OrderView>)okResult.Value;
-            Assert.Collection(value,
+            Assert.Collection(value!,
                 c => Assert.Equal(OrderViews.Order1.Id, c.Id),
                 c => Assert.Equal(OrderViews.Order2.Id, c.Id));
         }
@@ -62,7 +62,7 @@ public async Task Get_Retrieves_Order_By_Id()
             // Assert
             var okResult = Assert.IsType<OkObjectResult>(actionResult);
             var value = (OrderView)okResult.Value;
-            Assert.Equal(OrderViews.Order1.Id, value.Id);
+            Assert.Equal(OrderViews.Order1.Id, value!.Id);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using EventDriven.DependencyInjection.URF.Mongo;`
`2`		`-using EventDriven.EventBus.Dapr;`
`3`	`2`	`using Microsoft.AspNetCore.Builder;`
`4`	`3`	`using Microsoft.AspNetCore.Hosting;`
`5`	`4`	`using Microsoft.Extensions.Configuration;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public async Task Get_Retrieves_Orders()`
`40`	`40`	`// Assert`
`41`	`41`	`var okResult = Assert.IsType<OkObjectResult>(actionResult);`
`42`	`42`	`var value = (IEnumerable<OrderView>)okResult.Value;`
`43`		`- Assert.Collection(value,`
	`43`	`+ Assert.Collection(value!,`
`44`	`44`	`c => Assert.Equal(OrderViews.Order1.Id, c.Id),`
`45`	`45`	`c => Assert.Equal(OrderViews.Order2.Id, c.Id));`
`46`	`46`	`}`
`@@ -62,7 +62,7 @@ public async Task Get_Retrieves_Order_By_Id()`
`62`	`62`	`// Assert`
`63`	`63`	`var okResult = Assert.IsType<OkObjectResult>(actionResult);`
`64`	`64`	`var value = (OrderView)okResult.Value;`
`65`		`- Assert.Equal(OrderViews.Order1.Id, value.Id);`
	`65`	`+ Assert.Equal(OrderViews.Order1.Id, value!.Id);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`