refactoring

.circleci/config.yml

@@ -30,10 +30,22 @@ jobs:
     steps:
       - checkout    
       - run:
-          name: Build and test          
+          name: Build      
           command: |            
             dotnet build 
-            dotnet test --no-build 
+      - run:
+          name: Unit tests
+          command: |            
+            dotnet test --filter "Category!=E2E&Category!=Integration"
+      - run:
+          name: Integration tests
+          command: |            
+            dotnet test --filter "Category=Integration"
+
+      #- run: # skipping E2E tests for now
+      #    name: E2E tests
+      #    command: |            
+      #      dotnet test --filter "Category=E2E"           
 
   sonarscan:
     docker:
@@ -86,7 +98,7 @@ jobs:
           name: Build and test          
           command: |            
             dotnet build 
-            dotnet test --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=coverage.opencover.xml     
+            dotnet test --no-build --filter "Category!=E2E" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=coverage.opencover.xml     
 
       - run:
           name: Stop Sonarcloud 

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2021-03-26](https://github.com/mizrael/OpenSleigh/pull/32)
+### Added
+- major refactoring
+- moved E2E tests to standalone project
+### Fixed
+- addressed minor consistency issue
+- minor bugfixes
+
 ## [2021-03-23](https://github.com/mizrael/OpenSleigh/pull/31)
 ### Added
 - added Kafka transport library

OpenSleigh.sln

@@ -39,9 +39,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSleigh.Persistence.Cosm
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSleigh.Persistence.Cosmos.SQL.Tests", "tests\OpenSleigh.Persistence.Cosmos.SQL.Tests\OpenSleigh.Persistence.Cosmos.SQL.Tests.csproj", "{08E996DB-3D0C-4A63-8166-BF61732D3B21}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSleigh.Transport.Kafka", "src\OpenSleigh.Transport.Kafka\OpenSleigh.Transport.Kafka.csproj", "{887358C5-9EFF-4498-A04B-E12B199EC259}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSleigh.Transport.Kafka", "src\OpenSleigh.Transport.Kafka\OpenSleigh.Transport.Kafka.csproj", "{887358C5-9EFF-4498-A04B-E12B199EC259}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSleigh.Transport.Kafka.Tests", "tests\OpenSleigh.Transport.Kafka.Tests\OpenSleigh.Transport.Kafka.Tests.csproj", "{5B363808-664B-42F4-8C38-EEFB9F05C500}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSleigh.Transport.Kafka.Tests", "tests\OpenSleigh.Transport.Kafka.Tests\OpenSleigh.Transport.Kafka.Tests.csproj", "{5B363808-664B-42F4-8C38-EEFB9F05C500}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSleigh.E2ETests", "tests\OpenSleigh.E2ETests\OpenSleigh.E2ETests.csproj", "{A14A1452-A758-4CF3-83CC-E1C6897D83ED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -121,6 +123,10 @@ Global
 		{5B363808-664B-42F4-8C38-EEFB9F05C500}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B363808-664B-42F4-8C38-EEFB9F05C500}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B363808-664B-42F4-8C38-EEFB9F05C500}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A14A1452-A758-4CF3-83CC-E1C6897D83ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A14A1452-A758-4CF3-83CC-E1C6897D83ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A14A1452-A758-4CF3-83CC-E1C6897D83ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A14A1452-A758-4CF3-83CC-E1C6897D83ED}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

samples/Sample1/OpenSleigh.Samples.Sample1.Console/Sagas/MySaga.cs

@@ -35,15 +35,15 @@ public async Task HandleAsync(IMessageContext<StartSaga> context, CancellationTo
             _logger.LogInformation($"starting saga '{context.Message.CorrelationId}'...");
 
             var message = new ProcessMySaga(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public async Task HandleAsync(IMessageContext<ProcessMySaga> context, CancellationToken cancellationToken = default)
         {
             _logger.LogInformation($"processing saga '{context.Message.CorrelationId}'...");
 
             var message = new MySagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public Task HandleAsync(IMessageContext<MySagaCompleted> context, CancellationToken cancellationToken = default)

samples/Sample2/OpenSleigh.Samples.Sample2.Common/Sagas/ChildSaga.cs

@@ -38,7 +38,7 @@ public async Task HandleAsync(IMessageContext<StartChildSaga> context, Cancellat
             await Task.Delay(TimeSpan.FromSeconds(_random.Next(1, 5)), cancellationToken);
 
             var message = new ProcessChildSaga(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public async Task HandleAsync(IMessageContext<ProcessChildSaga> context, CancellationToken cancellationToken = default)
@@ -50,7 +50,7 @@ public async Task HandleAsync(IMessageContext<ProcessChildSaga> context, Cancell
             _logger.LogInformation($"child saga '{context.Message.CorrelationId}' completed!");
 
             var completedEvent = new ChildSagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(completedEvent, cancellationToken);
+            this.Publish(completedEvent);
         }
     }
 }

samples/Sample2/OpenSleigh.Samples.Sample2.Common/Sagas/ParentSaga.cs

@@ -38,15 +38,15 @@ public async Task HandleAsync(IMessageContext<StartParentSaga> context, Cancella
             _logger.LogInformation($"starting parent saga '{context.Message.CorrelationId}'...");
 
             var message = new ProcessParentSaga(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public async Task HandleAsync(IMessageContext<ProcessParentSaga> context, CancellationToken cancellationToken = default)
         {
             _logger.LogInformation($"starting child saga from parent saga '{context.Message.CorrelationId}'...");
 
             var message = new StartChildSaga(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public async Task HandleAsync(IMessageContext<ChildSagaCompleted> context, CancellationToken cancellationToken = default)
@@ -56,7 +56,7 @@ public async Task HandleAsync(IMessageContext<ChildSagaCompleted> context, Cance
             await Task.Delay(TimeSpan.FromSeconds(_random.Next(1, 5)), cancellationToken);
 
             var message = new ParentSagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public Task HandleAsync(IMessageContext<ParentSagaCompleted> context, CancellationToken cancellationToken = default)

samples/Sample2/OpenSleigh.Samples.Sample2.Common/Sagas/SimpleSaga.cs

@@ -35,15 +35,15 @@ public async Task HandleAsync(IMessageContext<StartSimpleSaga> context, Cancella
             _logger.LogInformation($"starting saga '{context.Message.CorrelationId}'...");
 
             var message = new ProcessSimpleSaga(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public async Task HandleAsync(IMessageContext<ProcessSimpleSaga> context, CancellationToken cancellationToken = default)
         {
             _logger.LogInformation($"processing saga '{context.Message.CorrelationId}'...");
 
             var message = new SimpleSagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public Task HandleAsync(IMessageContext<SimpleSagaCompleted> context, CancellationToken cancellationToken = default)

samples/Sample3/OpenSleigh.Samples.Sample3.Common/Sagas/ChildSaga.cs

@@ -38,19 +38,20 @@ public async Task HandleAsync(IMessageContext<StartChildSaga> context, Cancellat
             await Task.Delay(TimeSpan.FromSeconds(_random.Next(1, 5)), cancellationToken);
 
             var message = new ProcessChildSaga(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
-        public async Task HandleAsync(IMessageContext<ProcessChildSaga> context, CancellationToken cancellationToken = default)
+        public async Task HandleAsync(IMessageContext<ProcessChildSaga> context,
+            CancellationToken cancellationToken = default)
         {
             _logger.LogInformation($"processing child saga '{context.Message.CorrelationId}'...");
-            
+
             await Task.Delay(TimeSpan.FromSeconds(_random.Next(1, 5)), cancellationToken);
-            
+
             _logger.LogInformation($"child saga '{context.Message.CorrelationId}' completed!");
 
             var completedEvent = new ChildSagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(completedEvent, cancellationToken);
+            this.Publish(completedEvent);
         }
     }
 }

samples/Sample3/OpenSleigh.Samples.Sample3.Common/Sagas/ParentSaga.cs

@@ -38,15 +38,15 @@ public async Task HandleAsync(IMessageContext<StartParentSaga> context, Cancella
             _logger.LogInformation($"starting parent saga '{context.Message.CorrelationId}'...");
 
             var message = new ProcessParentSaga(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public async Task HandleAsync(IMessageContext<ProcessParentSaga> context, CancellationToken cancellationToken = default)
         {
             _logger.LogInformation($"starting child saga from parent saga '{context.Message.CorrelationId}'...");
 
             var message = new StartChildSaga(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public async Task HandleAsync(IMessageContext<ChildSagaCompleted> context, CancellationToken cancellationToken = default)
@@ -56,7 +56,7 @@ public async Task HandleAsync(IMessageContext<ChildSagaCompleted> context, Cance
             await Task.Delay(TimeSpan.FromSeconds(_random.Next(1, 5)), cancellationToken);
 
             var message = new ParentSagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public Task HandleAsync(IMessageContext<ParentSagaCompleted> context, CancellationToken cancellationToken = default)

samples/Sample3/OpenSleigh.Samples.Sample3.Common/Sagas/SimpleSaga.cs

@@ -35,15 +35,15 @@ public async Task HandleAsync(IMessageContext<StartSimpleSaga> context, Cancella
             _logger.LogInformation($"starting saga '{context.Message.CorrelationId}'...");
 
             var message = new ProcessSimpleSaga(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public async Task HandleAsync(IMessageContext<ProcessSimpleSaga> context, CancellationToken cancellationToken = default)
         {
             _logger.LogInformation($"processing saga '{context.Message.CorrelationId}'...");
 
             var message = new SimpleSagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public Task HandleAsync(IMessageContext<SimpleSagaCompleted> context, CancellationToken cancellationToken = default)

samples/Sample4/OpenSleigh.Samples.Sample4.InventoryService/Sagas/InventoryCheckSaga.cs

@@ -28,7 +28,7 @@ public async Task HandleAsync(IMessageContext<CheckInventory> context, Cancellat
             _logger.LogInformation($"checking inventory for order '{context.Message.OrderId}'...");
 
             var message = InventoryCheckCompleted.New(context.Message.OrderId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
 
             this.State.MarkAsCompleted();
         }

samples/Sample4/OpenSleigh.Samples.Sample4.Orchestrator/Sagas/OrderSaga.cs

@@ -37,10 +37,10 @@ public async Task HandleAsync(IMessageContext<SaveOrder> context, CancellationTo
             this.State.OrderId = context.Message.OrderId;
 
             var startCreditCheck = ProcessCreditCheck.New(context.Message.OrderId);
-            await this.Bus.PublishAsync(startCreditCheck, cancellationToken);
+            this.Publish(startCreditCheck);
 
             var startInventoryCheck = CheckInventory.New(context.Message.OrderId);
-            await this.Bus.PublishAsync(startInventoryCheck, cancellationToken);
+            this.Publish(startInventoryCheck);
         }
 
         public async Task HandleAsync(IMessageContext<CrediCheckCompleted> context, CancellationToken cancellationToken = default)
@@ -66,7 +66,7 @@ public async Task HandleAsync(IMessageContext<ShippingCompleted> context, Cancel
             _logger.LogInformation($"shipping for order '{context.Message.OrderId}' completed!");
 
             var message = OrderSagaCompleted.New(this.State.OrderId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
 
             this.State.MarkAsCompleted();
         }
@@ -79,7 +79,7 @@ private async Task CheckStateAsync(CancellationToken cancellationToken = default
                 return;
 
             var message = ProcessShipping.New(this.State.OrderId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
     }

samples/Sample4/OpenSleigh.Samples.Sample4.PaymentService/Sagas/CreditCheckSaga.cs

@@ -28,7 +28,7 @@ public async Task HandleAsync(IMessageContext<ProcessCreditCheck> context, Cance
             _logger.LogInformation($"processing credit check for order '{context.Message.OrderId}'...");
 
             var message = CrediCheckCompleted.New(context.Message.OrderId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
 
             this.State.MarkAsCompleted();
         }

samples/Sample4/OpenSleigh.Samples.Sample4.ShippingService/Sagas/ShippingSaga.cs

@@ -28,7 +28,7 @@ public async Task HandleAsync(IMessageContext<ProcessShipping> context, Cancella
             _logger.LogInformation($"processing shipping for order '{context.Message.OrderId}'...");
 
             var message = ShippingCompleted.New(context.Message.OrderId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
 
             this.State.MarkAsCompleted();
         }

samples/Sample5/OpenSleigh.Samples.Sample5.Console/Sagas/MySaga.cs

@@ -36,7 +36,7 @@ public async Task HandleAsync(IMessageContext<StartSaga> context, CancellationTo
                 throw new ApplicationException("whoops!");
 
             var message = new MySagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public Task HandleAsync(IMessageContext<MySagaCompleted> context, CancellationToken cancellationToken = default)

samples/Sample6/OpenSleigh.Samples.Sample6.Console/Sagas/MySaga.cs

@@ -32,7 +32,7 @@ public async Task HandleAsync(IMessageContext<StartSaga> context, CancellationTo
             _logger.LogInformation($"processing saga '{context.Message.CorrelationId}'...");
 
             var message = new MySagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public Task HandleAsync(IMessageContext<MySagaCompleted> context, CancellationToken cancellationToken = default)

samples/Sample7/OpenSleigh.Samples.Sample7.Console/Sagas/MySaga.cs

@@ -46,7 +46,7 @@ public async Task HandleAsync(IMessageContext<StartSaga> context, CancellationTo
             this.State.CurrentStep = MySagaState.Steps.Successful;
 
             var message = new MySagaCompleted(Guid.NewGuid(), context.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public async Task CompensateAsync(ICompensationContext<StartSaga> context, CancellationToken cancellationToken = default)
@@ -56,7 +56,7 @@ public async Task CompensateAsync(ICompensationContext<StartSaga> context, Cance
             this.State.CurrentStep = MySagaState.Steps.Failed;
 
             var message = new MySagaCompleted(Guid.NewGuid(), context.MessageContext.Message.CorrelationId);
-            await this.Bus.PublishAsync(message, cancellationToken);
+            this.Publish(message);
         }
 
         public Task HandleAsync(IMessageContext<MySagaCompleted> context, CancellationToken cancellationToken = default)

samples/Sample8/Server/Sagas/StepsSaga.cs

@@ -54,9 +54,7 @@ public async Task HandleAsync(IMessageContext<StartSaga> context, CancellationTo
 
             await SendNotification($"starting saga {context.Message.CorrelationId} with {State.TotalSteps} total steps...");
 
-            await this.Bus.PublishAsync(
-                new ProcessNextStep(Guid.NewGuid(), context.Message.CorrelationId),
-                cancellationToken);
+            this.Publish(new ProcessNextStep(Guid.NewGuid(), context.Message.CorrelationId));
         }
 
         public async Task HandleAsync(IMessageContext<ProcessNextStep> context,
@@ -66,19 +64,15 @@ public async Task HandleAsync(IMessageContext<StartSaga> context, CancellationTo
 
             if (State.CurrentStep > State.TotalSteps)
             {
-                await this.Bus.PublishAsync(
-                    new SagaCompleted(Guid.NewGuid(), context.Message.CorrelationId),
-                    cancellationToken);
+                this.Publish(new SagaCompleted(Guid.NewGuid(), context.Message.CorrelationId));
                 return;
             }
 
             await SendNotification($"processing step {State.CurrentStep}/{State.TotalSteps} on saga {context.Message.CorrelationId} ...");
 
             await Task.Delay(250, cancellationToken);
 
-            await this.Bus.PublishAsync(
-                new ProcessNextStep(Guid.NewGuid(), context.Message.CorrelationId),
-                cancellationToken);
+            this.Publish(new ProcessNextStep(Guid.NewGuid(), context.Message.CorrelationId));
         }
 
         public async Task HandleAsync(IMessageContext<SagaCompleted> context, CancellationToken cancellationToken = default)