added UsageAware

softawaregmbh · Sep 24, 2018 · c73fe34 · c73fe34
1 parent 03fd04a
commit c73fe34
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/src/softaware.Cqs.Decorators.UsageAware/UsageAwareCommandLogger.cs b/src/softaware.Cqs.Decorators.UsageAware/UsageAwareCommandLogger.cs
@@ -1,16 +1,16 @@
-using System;
+using softaware.UsageAware;
+using System;
 using System.Threading.Tasks;
 
 namespace softaware.Cqs.Decorators.UsageAware
 {
     public class UsageAwareCommandLogger<TCommand> : UsageAwareLogger<TCommand>
         where TCommand : ICommand
     {
-        //// TODO
-        ////public UsageAwareCommandLogger(IUsageAwareLogger logger)
-        ////    : base(logger)
-        ////{
-        ////}
+        public UsageAwareCommandLogger(IUsageAwareLogger logger)
+            : base(logger)
+        {
+        }
 
         public Task TimeAndLogCommandAsync(Func<Task> command)
         {

diff --git a/src/softaware.Cqs.Decorators.UsageAware/UsageAwareLogger.cs b/src/softaware.Cqs.Decorators.UsageAware/UsageAwareLogger.cs
@@ -1,4 +1,5 @@
-using System;
+using softaware.UsageAware;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
@@ -17,7 +18,7 @@ protected enum LogType
         private static readonly string Area;
         private static readonly string Action;
 
-        //// TODO private readonly IUsageAwareLogger logger;
+        private readonly IUsageAwareLogger logger;
 
         static UsageAwareLogger()
         {
@@ -26,11 +27,10 @@ static UsageAwareLogger()
             Action = type.Name;
         }
 
-        //// TODO
-        ////public UsageAwareLogger(IUsageAwareLogger logger)
-        ////{
-        ////    this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        ////}
+        public UsageAwareLogger(IUsageAwareLogger logger)
+        {
+            this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
 
         protected async Task<Task> TimeAndLogAsync(Func<Task> commandOrQuery, LogType type)
         {
@@ -45,7 +45,7 @@ protected async Task<Task> TimeAndLogAsync(Func<Task> commandOrQuery, LogType ty
                 { "type", type.ToString() }
             };
 
-            //// TODO await this.logger.TrackActionAsync(Area, Action, additionalProperties);
+            await this.logger.TrackActionAsync(Area, Action, additionalProperties);
 
             return task;
         }

diff --git a/src/softaware.Cqs.Decorators.UsageAware/UsageAwareQueryLogger.cs b/src/softaware.Cqs.Decorators.UsageAware/UsageAwareQueryLogger.cs
@@ -1,4 +1,5 @@
-using System;
+using softaware.UsageAware;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
@@ -8,11 +9,10 @@ namespace softaware.Cqs.Decorators.UsageAware
     public class UsageAwareQueryLogger<TQuery, TResult> : UsageAwareLogger<TQuery>
         where TQuery : IQuery<TResult>
     {
-        //// TODO
-        ////public UsageAwareQueryLogger(IUsageAwareLogger logger)
-        ////    : base(logger)
-        ////{
-        ////}
+        public UsageAwareQueryLogger(IUsageAwareLogger logger)
+            : base(logger)
+        {
+        }
 
         public async Task<TResult> TimeAndLogQueryAsync(Func<Task<TResult>> query)
         {

diff --git a/src/softaware.Cqs.Decorators.UsageAware/softaware.Cqs.Decorators.UsageAware.csproj b/src/softaware.Cqs.Decorators.UsageAware/softaware.Cqs.Decorators.UsageAware.csproj
@@ -16,6 +16,10 @@
     <Version>1.0.1</Version>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="softaware.UsageAware" Version="1.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\softaware.Cqs\softaware.Cqs.csproj" />
   </ItemGroup>