Merge pull request #19 from Valeriy1991/dev

Separate commands with and without results

CQRSlight.Db/Abstract/DbCommand.cs

@@ -5,7 +5,7 @@
 
 namespace CQRSlight.Db.Abstract
 {
-    public abstract class DbCommand<TCommandContext, TResult> : ICommand<TCommandContext, TResult>
+    public abstract class DbCommand : ICommand
     {
         protected IDbExecutor DbExecutor { get; }
 
@@ -16,10 +16,10 @@ protected DbCommand(IDbExecutor dbExecutor)
             DbExecutor = dbExecutor;
         }
 
-        public abstract IOutcome<TResult> Execute(TCommandContext commandContext);
+        public abstract IOutcome Execute();
     }
 
-    public abstract class DbCommand<TCommandContext> : ICommand<TCommandContext>
+    public abstract class DbCommand<TCommandRequest> : ICommand<TCommandRequest>
     {
         protected IDbExecutor DbExecutor { get; }
 
@@ -30,6 +30,6 @@ protected DbCommand(IDbExecutor dbExecutor)
             DbExecutor = dbExecutor;
         }
 
-        public abstract IOutcome Execute(TCommandContext commandContext);
+        public abstract IOutcome Execute(TCommandRequest commandRequest);
     }
 }

CQRSlight.Db/Abstract/DbCommandAsync.cs

@@ -6,7 +6,7 @@
 
 namespace CQRSlight.Db.Abstract
 {
-    public abstract class DbCommandAsync<TCommandContext, TResult> : ICommandAsync<TCommandContext, TResult>
+    public abstract class DbCommandAsync : ICommandAsync
     {
         protected IDbExecutor DbExecutor { get; }
 
@@ -17,10 +17,10 @@ protected DbCommandAsync(IDbExecutor dbExecutor)
             DbExecutor = dbExecutor;
         }
 
-        public abstract Task<IOutcome<TResult>> ExecuteAsync(TCommandContext commandContext);
+        public abstract Task<IOutcome> ExecuteAsync();
     }
 
-    public abstract class DbCommandAsync<TCommandContext> : ICommandAsync<TCommandContext>
+    public abstract class DbCommandAsync<TCommandRequest> : ICommandAsync<TCommandRequest>
     {
         protected IDbExecutor DbExecutor { get; }
 
@@ -31,6 +31,6 @@ protected DbCommandAsync(IDbExecutor dbExecutor)
             DbExecutor = dbExecutor;
         }
 
-        public abstract Task<IOutcome> ExecuteAsync(TCommandContext commandContext);
+        public abstract Task<IOutcome> ExecuteAsync(TCommandRequest commandRequest);
     }
 }

CQRSlight.Db/Abstract/DbCommandWithResult.cs

@@ -0,0 +1,36 @@
+using System;
+using CQRSlight.Abstract;
+using DbConn.DbExecutor.Abstract;
+using Ether.Outcomes;
+
+namespace CQRSlight.Db.Abstract
+{
+    public abstract class DbCommandWithResult<TResult> : ICommandWithResult<TResult>
+    {
+        protected IDbExecutor DbExecutor { get; }
+
+        protected DbCommandWithResult(IDbExecutor dbExecutor)
+        {
+            if (dbExecutor == null)
+                throw new ArgumentNullException(nameof(dbExecutor));
+            DbExecutor = dbExecutor;
+        }
+
+        public abstract IOutcome<TResult> Execute();
+    }
+
+    public abstract class DbCommandWithResult<TCommandRequest, TResult> : 
+        ICommandWithResult<TCommandRequest, TResult>
+    {
+        protected IDbExecutor DbExecutor { get; }
+
+        protected DbCommandWithResult(IDbExecutor dbExecutor)
+        {
+            if (dbExecutor == null)
+                throw new ArgumentNullException(nameof(dbExecutor));
+            DbExecutor = dbExecutor;
+        }
+
+        public abstract IOutcome<TResult> Execute(TCommandRequest commandRequest);
+    }
+}

CQRSlight.Db/Abstract/DbCommandWithResultAsync.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Threading.Tasks;
+using CQRSlight.Abstract;
+using DbConn.DbExecutor.Abstract;
+using Ether.Outcomes;
+
+namespace CQRSlight.Db.Abstract
+{
+    public abstract class DbCommandWithResultAsync<TResult> : ICommandWithResultAsync<TResult>
+    {
+        protected IDbExecutor DbExecutor { get; }
+
+        protected DbCommandWithResultAsync(IDbExecutor dbExecutor)
+        {
+            if (dbExecutor == null)
+                throw new ArgumentNullException(nameof(dbExecutor));
+            DbExecutor = dbExecutor;
+        }
+
+        public abstract Task<IOutcome<TResult>> ExecuteAsync();
+    }
+
+    public abstract class DbCommandWithResultAsync<TCommandRequest, TResult> :
+        ICommandWithResultAsync<TCommandRequest, TResult>
+    {
+        protected IDbExecutor DbExecutor { get; }
+
+        protected DbCommandWithResultAsync(IDbExecutor dbExecutor)
+        {
+            if (dbExecutor == null)
+                throw new ArgumentNullException(nameof(dbExecutor));
+            DbExecutor = dbExecutor;
+        }
+
+        public abstract Task<IOutcome<TResult>> ExecuteAsync(TCommandRequest commandRequest);
+    }
+}

CQRSlight.Db/Abstract/DbQuery.cs

@@ -4,7 +4,7 @@
 
 namespace CQRSlight.Db.Abstract
 {
-    public abstract class DbQuery<TContext, TResult> : IQuery<TContext, TResult>
+    public abstract class DbQuery<TRequest, TResult> : IQuery<TRequest, TResult>
     {
         protected IDbExecutor DbExecutor { get; }
 
@@ -15,7 +15,7 @@ protected DbQuery(IDbExecutor dbExecutor)
             DbExecutor = dbExecutor;
         }
 
-        public abstract TResult Get(TContext context);
+        public abstract TResult Get(TRequest request);
     }
 
     public abstract class DbQuery<TResult> : IQuery<TResult>

CQRSlight.Db/Abstract/DbQueryAsync.cs

@@ -5,7 +5,7 @@
 
 namespace CQRSlight.Db.Abstract
 {
-    public abstract class DbQueryAsync<TContext, TResult> : IQueryAsync<TContext, TResult>
+    public abstract class DbQueryAsync<TRequest, TResult> : IQueryAsync<TRequest, TResult>
     {
         protected IDbExecutor DbExecutor { get; }
 
@@ -16,7 +16,7 @@ protected DbQueryAsync(IDbExecutor dbExecutor)
             DbExecutor = dbExecutor;
         }
 
-        public abstract Task<TResult> GetAsync(TContext context);
+        public abstract Task<TResult> GetAsync(TRequest request);
     }
 
     public abstract class DbQueryAsync<TResult> : IQueryAsync<TResult>

CQRSlight/Abstract/ICommand.cs

@@ -2,13 +2,14 @@
 
 namespace CQRSlight.Abstract
 {
-    public interface ICommand<in TCommandContext, TResult>
+
+    public interface ICommand
     {
-        IOutcome<TResult> Execute(TCommandContext commandContext);
+        IOutcome Execute();
     }
 
-    public interface ICommand<in TCommandContext>
+    public interface ICommand<in TCommandRequest>
     {
-        IOutcome Execute(TCommandContext commandContext);
+        IOutcome Execute(TCommandRequest commandRequest);
     }
 }

CQRSlight/Abstract/ICommandAsync.cs

@@ -3,13 +3,13 @@
 
 namespace CQRSlight.Abstract
 {
-    public interface ICommandAsync<in TCommandContext, TResult>
+    public interface ICommandAsync
     {
-        Task<IOutcome<TResult>> ExecuteAsync(TCommandContext commandContext);
+        Task<IOutcome> ExecuteAsync();
     }
 
-    public interface ICommandAsync<in TCommandContext>
+    public interface ICommandAsync<in TCommandRequest>
     {
-        Task<IOutcome> ExecuteAsync(TCommandContext commandContext);
+        Task<IOutcome> ExecuteAsync(TCommandRequest commandRequest);
     }
 }

CQRSlight/Abstract/ICommandWithResult.cs

@@ -0,0 +1,14 @@
+using Ether.Outcomes;
+
+namespace CQRSlight.Abstract
+{
+    public interface ICommandWithResult<TResult>
+    {
+        IOutcome<TResult> Execute();
+    }
+
+    public interface ICommandWithResult<in TCommandRequest, TResult>
+    {
+        IOutcome<TResult> Execute(TCommandRequest commandRequest);
+    }
+}

CQRSlight/Abstract/ICommandWithResultAsync.cs

@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using Ether.Outcomes;
+
+namespace CQRSlight.Abstract
+{
+    public interface ICommandWithResultAsync<TResult>
+    {
+        Task<IOutcome<TResult>> ExecuteAsync();
+    }
+
+    public interface ICommandWithResultAsync<in TCommandRequest, TResult>
+    {
+        Task<IOutcome<TResult>> ExecuteAsync(TCommandRequest commandRequest);
+    }
+}

CQRSlight/Abstract/IQuery.cs

@@ -1,8 +1,8 @@
 namespace CQRSlight.Abstract
 {
-    public interface IQuery<in TContext, out TResult>
+    public interface IQuery<in TRequest, out TResult>
     {
-        TResult Get(TContext context);
+        TResult Get(TRequest request);
     }
 
     public interface IQuery<out TResult>

CQRSlight/Abstract/IQueryAsync.cs

@@ -2,9 +2,9 @@
 
 namespace CQRSlight.Abstract
 {
-    public interface IQueryAsync<in TContext, TResult>
+    public interface IQueryAsync<in TRequest, TResult>
     {
-        Task<TResult> GetAsync(TContext context);
+        Task<TResult> GetAsync(TRequest request);
     }
 
     public interface IQueryAsync<TResult>

README.md

@@ -45,17 +45,19 @@ Install-Package CQRSlight.Db
 
 #### CQRSlight
 
-Contains 3 components:
+Contains multiple main components:
 
-1. IChecker
-2. ICommand
-3. IQuery
+1. `IChecker`
+2. `IQuery`
+2. `ICommand`
+2. `ICommandWithResult`
 
 and it's async versions:
 
-1. ICheckerAsync
-2. ICommandAsync
-3. IQueryAsync
+1. `ICheckerAsync`
+2. `IQueryAsync`
+2. `ICommandAsync`
+2. `ICommandWithResultAsync`
 
 ##### How to use
 
@@ -72,14 +74,14 @@ public class BlockedUserQuery : IQuery<List<User>>
 ```
 3. Create your some `Command`:
 ```csharp
-public class CreateUserCommand : ICommand<CreateUserCommandContext>
+public class CreateUserCommand : ICommand<CreateUserCommandRequest>
 {
     private readonly PasswordHasher _passwordHasher = new PasswordHasher();
 
-    public IOutcome Execute(CreateUserCommandContext commandContext)
+    public IOutcome Execute(CreateUserCommandRequest commandRequest)
     {
-        var email = commandContext.Email;
-        var password = commandContext.Password;
+        var email = commandRequest.Email;
+        var password = commandRequest.Password;
 
         var passwordHash = _passwordHasher.GetHash(password);
 
@@ -116,17 +118,19 @@ public class CreatingUserEmailChecker : IChecker<User>
 
 #### CQRSlight.Db
 
-Contains 3 components:
+Contains components:
 
-1. DbChecker
-2. DbQuery
-3. DbCommand
+1. `DbChecker`
+2. `DbQuery`
+2. `DbCommand`
+2. `DbCommandWithResult`
 
 and it's async versions:
 
-1. DbCheckerAsync
-2. DbQueryAsync
-3. DbCommandAsync
+1. `DbCheckerAsync`
+2. `DbQueryAsync`
+2. `DbCommandAsync`
+2. `DbCommandWithResultAsync`
 
 ##### How to use
 
@@ -242,4 +246,4 @@ insert into dbo.UserAccount ...
         }
     }
 }
-```
+```

appveyor.master.yml

@@ -1,7 +1,7 @@
 environment:
   version_suffix: alpha
 
-version: 1.0.2-$(version_suffix){build}
+version: 1.1.0-$(version_suffix){build}
 
 # branches to build
 branches: