Merge pull request #46 from TransactionProcessing/task/#43_reduceeventsize

Updates to useage of worker service

Author: StuartFerguson

MessagingService.Client/MessagingService.Client.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="1.0.3.3" />
+    <PackageReference Include="ClientProxyBase" Version="1.0.3.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 

MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Shared.EventStore" Version="1.0.3.3" />
+    <PackageReference Include="Shared.EventStore" Version="1.0.3.6" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Shared" Version="1.0.3.3" />
-	<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3.3" />
+	<PackageReference Include="Shared" Version="1.0.3.6" />
+	<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3.6" />
   </ItemGroup>
 
 </Project>

MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Shared" Version="1.0.3.3" />
-	  <PackageReference Include="Shared.EventStore" Version="1.0.3.3" />
+	  <PackageReference Include="Shared" Version="1.0.3.6" />
+	  <PackageReference Include="Shared.EventStore" Version="1.0.3.6" />
   </ItemGroup>
 
   <ItemGroup>

MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj

@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="1.0.3.3" />
+    <PackageReference Include="ClientProxyBase" Version="1.0.3.6" />
     <PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="SecurityService.Client" Version="1.0.5" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="1.0.3.3" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="1.0.3.6" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.14" />
     <PackageReference Include="SpecFlow.xUnit" Version="3.5.14" />

MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3.3" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3.6" />
   </ItemGroup>
 
 </Project>

MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.EventStore" Version="1.0.3.3" />
+    <PackageReference Include="Shared.EventStore" Version="1.0.3.6" />
   </ItemGroup>
 
   <ItemGroup>

MessagingService/MessagingService.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
-    <PackageReference Include="Shared" Version="1.0.3.3" />
+    <PackageReference Include="Shared" Version="1.0.3.6" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />

MessagingService/Program.cs

@@ -11,11 +11,14 @@
 namespace MessagingService
 {
     using System.Diagnostics.CodeAnalysis;
+    using System.Net.Http;
     using EmailMessage.DomainEvents;
     using EventStore.Client;
     using Microsoft.Extensions.DependencyInjection;
     using Shared.EventStore.Aggregate;
+    using Shared.EventStore.EventHandling;
     using Shared.EventStore.Subscriptions;
+    using Shared.Logger;
     using SMSMessage.DomainEvents;
 
     [ExcludeFromCodeCoverage]
@@ -56,10 +59,48 @@ public static IHostBuilder CreateHostBuilder(string[] args)
 
                                                                   TypeProvider.LoadDomainEventsTypeDynamically();
 
-                                                                  services.AddHostedService<SubscriptionWorker>();
+                                                                  services.AddHostedService<SubscriptionWorker>(provider =>
+                                                                                                                {
+                                                                                                                    IDomainEventHandlerResolver r =
+                                                                                                                        provider.GetRequiredService<IDomainEventHandlerResolver>();
+                                                                                                                    EventStorePersistentSubscriptionsClient p = provider.GetRequiredService<EventStorePersistentSubscriptionsClient>();
+                                                                                                                    HttpClient h = provider.GetRequiredService<HttpClient>();
+                                                                                                                    SubscriptionWorker worker = new SubscriptionWorker(r, p, h);
+                                                                                                                    worker.TraceGenerated += Worker_TraceGenerated;
+                                                                                                                    return worker;
+                                                                                                                });
                                                               });
             return hostBuilder;
         }
 
+        /// <summary>
+        /// Workers the trace generated.
+        /// </summary>
+        /// <param name="trace">The trace.</param>
+        /// <param name="logLevel">The log level.</param>
+        private static void Worker_TraceGenerated(string trace, LogLevel logLevel)
+        {
+            switch (logLevel)
+            {
+                case LogLevel.Trace:
+                    Logger.LogTrace(trace);
+                    break;
+                case LogLevel.Debug:
+                    Logger.LogDebug(trace);
+                    break;
+                case LogLevel.Information:
+                    Logger.LogInformation(trace);
+                    break;
+                case LogLevel.Warning:
+                    Logger.LogWarning(trace);
+                    break;
+                case LogLevel.Error:
+                    Logger.LogError(new Exception(trace));
+                    break;
+                case LogLevel.Critical:
+                    Logger.LogCritical(new Exception(trace));
+                    break;
+            }
+        }
     }
 }