Updated to MT v8

matei-tm · Apr 19, 2022 · 07127a4 · 07127a4
1 parent d01be29
commit 07127a4
Show file tree

Hide file tree

Showing 22 changed files with 64 additions and 186 deletions.
diff --git a/src/SampleBatch.Api/SampleBatch.Api.csproj b/src/SampleBatch.Api/SampleBatch.Api.csproj
@@ -13,11 +13,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MassTransit.Analyzers" Version="7.0.0" />
-    <PackageReference Include="MassTransit.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="MassTransit.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="MassTransit.RabbitMQ" Version="7.0.0" />
-    <PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="7.0.0" />
+    <PackageReference Include="MassTransit.Analyzers" Version="8.0.1" />
+    <PackageReference Include="MassTransit.RabbitMQ" Version="8.0.1" />
+    <PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.5" />
     <PackageReference Include="NSwag.AspNetCore" Version="13.6.2" />
   </ItemGroup>

diff --git a/src/SampleBatch.Common/JsonHelper.cs b/src/SampleBatch.Common/JsonHelper.cs
diff --git a/src/SampleBatch.Common/JsonValueComparer.cs b/src/SampleBatch.Common/JsonValueComparer.cs
diff --git a/src/SampleBatch.Common/JsonValueConverter.cs b/src/SampleBatch.Common/JsonValueConverter.cs
diff --git a/src/SampleBatch.Common/SampleBatch.Common.csproj b/src/SampleBatch.Common/SampleBatch.Common.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MassTransit" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.5" />
+    <PackageReference Include="MassTransit" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.18" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SampleBatch.Components/Activities/CancelOrder/CancelOrderActivity.cs b/src/SampleBatch.Components/Activities/CancelOrder/CancelOrderActivity.cs
@@ -2,15 +2,14 @@
 {
     using System;
     using System.Threading.Tasks;
-    using MassTransit.Courier;
-    using MassTransit.Courier.Exceptions;
+    using MassTransit;
     using Microsoft.Extensions.Logging;
 
 
     public class CancelOrderActivity :
         IExecuteActivity<CancelOrderArguments>
     {
-        private readonly SampleBatchDbContext _dbContext;
+        readonly SampleBatchDbContext _dbContext;
         readonly ILogger _logger;
 
         public CancelOrderActivity(SampleBatchDbContext dbContext, ILoggerFactory loggerFactory)

diff --git a/src/SampleBatch.Components/Activities/SuspendOrder/SuspendOrderActivity.cs b/src/SampleBatch.Components/Activities/SuspendOrder/SuspendOrderActivity.cs
@@ -2,8 +2,7 @@
 {
     using System;
     using System.Threading.Tasks;
-    using MassTransit.Courier;
-    using MassTransit.Courier.Exceptions;
+    using MassTransit;
     using Microsoft.Extensions.Logging;
 
 

diff --git a/src/SampleBatch.Components/Consumers/SubmitBatchConsumer.cs b/src/SampleBatch.Components/Consumers/SubmitBatchConsumer.cs
@@ -3,7 +3,6 @@
     using System.Threading.Tasks;
     using Contracts;
     using MassTransit;
-    using MassTransit.Definition;
     using Microsoft.Extensions.Logging;
 
 
@@ -66,14 +65,6 @@ public class SubmitBatchConsumerDefinition :
         public SubmitBatchConsumerDefinition()
         {
             ConcurrentMessageLimit = 10;
-
-            Request<SubmitBatch>(x =>
-            {
-                x.Responds<BatchRejected>();
-                x.Responds<BatchSubmitted>();
-
-                x.Publishes<BatchReceived>();
-            });
         }
     }
 }
diff --git a/src/SampleBatch.Components/SampleBatch.Components.csproj b/src/SampleBatch.Components/SampleBatch.Components.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MassTransit.Analyzers" Version="7.0.0" />
-    <PackageReference Include="MassTransit.EntityFrameworkCore" Version="7.0.0" />
+    <PackageReference Include="MassTransit.Analyzers" Version="8.0.1" />
+    <PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SampleBatch.Components/SampleBatchDbContext.cs b/src/SampleBatch.Components/SampleBatchDbContext.cs
@@ -20,6 +20,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         }
 
         public DbSet<BatchState> BatchStates { get; set; }
-        public DbSet<JobState> JobStates { get; set; }
+        public DbSet<BatchJobState> JobStates { get; set; }
     }
 }
diff --git a/...atch.Components/StateMachines/JobState.cs → ...Components/StateMachines/BatchJobState.cs b/...atch.Components/StateMachines/JobState.cs → ...Components/StateMachines/BatchJobState.cs
@@ -1,11 +1,11 @@
 namespace SampleBatch.Components.StateMachines
 {
     using System;
-    using Automatonymous;
     using Contracts.Enums;
+    using MassTransit;
 
 
-    public class JobState :
+    public class BatchJobState :
         SagaStateMachineInstance
     {
         public Guid BatchId { get; set; }

diff --git a/...mponents/StateMachines/JobStateMachine.cs → ...nts/StateMachines/BatchJobStateMachine.cs b/...mponents/StateMachines/JobStateMachine.cs → ...nts/StateMachines/BatchJobStateMachine.cs
@@ -1,18 +1,14 @@
 namespace SampleBatch.Components.StateMachines
 {
     using System;
-    using System.Threading.Tasks;
-    using Automatonymous;
     using Contracts;
-    using GreenPipes;
     using MassTransit;
-    using MassTransit.Definition;
 
 
-    public class JobStateMachine :
-        MassTransitStateMachine<JobState>
+    public class BatchJobStateMachine :
+        MassTransitStateMachine<BatchJobState>
     {
-        public JobStateMachine()
+        public BatchJobStateMachine()
         {
             InstanceState(x => x.CurrentState);
 
@@ -25,7 +21,14 @@ public JobStateMachine()
                     .Then(context => Touch(context.Instance, context.Data.Timestamp))
                     .Then(context => SetReceiveTimestamp(context.Instance, context.Data.Timestamp))
                     .Then(Initialize)
-                    .ThenAsync(InitiateProcessing)
+                    .Send(context => context.Init<ProcessBatchJob>(new
+                    {
+                        BatchJobId = context.Instance.CorrelationId,
+                        Timestamp = DateTime.UtcNow,
+                        context.Instance.BatchId,
+                        context.Instance.OrderId,
+                        context.Instance.Action
+                    }))
                     .TransitionTo(Received));
 
             During(Received,
@@ -58,55 +61,43 @@ public JobStateMachine()
         public Event<BatchJobFailed> BatchJobFailed { get; private set; }
         public Event<BatchJobCompleted> BatchJobCompleted { get; private set; }
 
-        static void Touch(JobState state, DateTime timestamp)
+        static void Touch(BatchJobState state, DateTime timestamp)
         {
             state.CreateTimestamp ??= timestamp;
 
             if (!state.UpdateTimestamp.HasValue || state.UpdateTimestamp.Value < timestamp)
                 state.UpdateTimestamp = timestamp;
         }
 
-        static void SetReceiveTimestamp(JobState state, DateTime timestamp)
+        static void SetReceiveTimestamp(BatchJobState state, DateTime timestamp)
         {
             if (!state.ReceiveTimestamp.HasValue || state.ReceiveTimestamp.Value > timestamp)
                 state.ReceiveTimestamp = timestamp;
         }
 
-        static void Initialize(BehaviorContext<JobState, BatchJobReceived> context)
+        static void Initialize(BehaviorContext<BatchJobState, BatchJobReceived> context)
         {
             InitializeInstance(context.Instance, context.Data);
         }
 
-        static void InitializeInstance(JobState instance, BatchJobReceived data)
+        static void InitializeInstance(BatchJobState instance, BatchJobReceived data)
         {
             instance.Action = data.Action;
             instance.OrderId = data.OrderId;
             instance.BatchId = data.BatchId;
         }
-
-        static async Task InitiateProcessing(BehaviorContext<JobState, BatchJobReceived> context)
-        {
-            await context.Send<JobState, BatchJobReceived, ProcessBatchJob>(new
-            {
-                BatchJobId = context.Instance.CorrelationId,
-                Timestamp = DateTime.UtcNow,
-                context.Instance.BatchId,
-                context.Instance.OrderId,
-                context.Instance.Action
-            });
-        }
     }
 
 
     public class JobStateMachineDefinition :
-        SagaDefinition<JobState>
+        SagaDefinition<BatchJobState>
     {
         public JobStateMachineDefinition()
         {
             ConcurrentMessageLimit = 8;
         }
 
-        protected override void ConfigureSaga(IReceiveEndpointConfigurator endpointConfigurator, ISagaConfigurator<JobState> sagaConfigurator)
+        protected override void ConfigureSaga(IReceiveEndpointConfigurator endpointConfigurator, ISagaConfigurator<BatchJobState> sagaConfigurator)
         {
             sagaConfigurator.UseMessageRetry(r => r.Immediate(5));
             sagaConfigurator.UseInMemoryOutbox();

diff --git a/src/SampleBatch.Components/StateMachines/BatchState.cs b/src/SampleBatch.Components/StateMachines/BatchState.cs
@@ -2,15 +2,13 @@
 {
     using System;
     using System.Collections.Generic;
-    using Automatonymous;
     using Contracts.Enums;
+    using MassTransit;
 
 
     public class BatchState :
         SagaStateMachineInstance
     {
-        public Guid CorrelationId { get; set; }
-
         public string CurrentState { get; set; }
 
         public DateTime? ReceiveTimestamp { get; set; }
@@ -35,6 +33,7 @@ public class BatchState :
         public Dictionary<Guid, Guid> ProcessingOrderIds { get; set; } = new Dictionary<Guid, Guid>(); // CorrelationId, OrderId
 
         // Navigation Properties
-        public List<JobState> Jobs { get; set; } = new List<JobState>();
+        public List<BatchJobState> Jobs { get; set; } = new List<BatchJobState>();
+        public Guid CorrelationId { get; set; }
     }
 }
diff --git a/src/SampleBatch.Components/StateMachines/BatchStateEntityConfiguration.cs b/src/SampleBatch.Components/StateMachines/BatchStateEntityConfiguration.cs
@@ -2,8 +2,8 @@
 {
     using System;
     using System.Collections.Generic;
-    using Common;
     using Contracts.Enums;
+    using MassTransit.EntityFrameworkCoreIntegration;
     using Microsoft.EntityFrameworkCore;
     using Microsoft.EntityFrameworkCore.Metadata.Builders;
     using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

diff --git a/src/SampleBatch.Components/StateMachines/BatchStateMachine.cs b/src/SampleBatch.Components/StateMachines/BatchStateMachine.cs
@@ -4,11 +4,8 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using Automatonymous;
     using Contracts;
-    using GreenPipes;
     using MassTransit;
-    using MassTransit.Definition;
 
 
     public class BatchStateMachine :
@@ -93,7 +90,7 @@ public BatchStateMachine()
                         InVar.Timestamp,
                         ProcessingJobCount = x.Instance.ProcessingOrderIds.Count,
                         UnprocessedJobCount = x.Instance.UnprocessedOrderIds.Count,
-                        State = (await this.GetState(x.Instance)).Name
+                        State = (await this.GetState(x)).Name
                     })),
                 When(BatchReceived)
                     .Then(context => Touch(context.Instance, context.Data.Timestamp))

diff --git a/src/SampleBatch.Components/StateMachines/JobStateEntityConfiguration.cs b/src/SampleBatch.Components/StateMachines/JobStateEntityConfiguration.cs
@@ -7,9 +7,9 @@
 
 
     class JobStateEntityConfiguration :
-        IEntityTypeConfiguration<JobState>
+        IEntityTypeConfiguration<BatchJobState>
     {
-        public void Configure(EntityTypeBuilder<JobState> builder)
+        public void Configure(EntityTypeBuilder<BatchJobState> builder)
         {
             builder.HasKey(c => c.CorrelationId);
 

diff --git a/src/SampleBatch.Contracts/SampleBatch.Contracts.csproj b/src/SampleBatch.Contracts/SampleBatch.Contracts.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MassTransit" Version="7.0.0" />
+    <PackageReference Include="MassTransit" Version="8.0.1" />
   </ItemGroup>
 
 </Project>