Removed module from handlers (#74)

* Removed module from handlers

* Updated ConcurrencyConflictValidator

* Changed QueryExecutor

* Changed command executor

Author: adimiko

samples/EasyWay.Samples/Commands/ErrorCommand.cs

@@ -1,6 +1,6 @@
 namespace EasyWay.Samples.Commands
 {
-    public class ErrorCommand : Command<SampleModule>
+    public class ErrorCommand : Command
     {
 
     }

samples/EasyWay.Samples/Commands/ErrorCommandHandler.cs

@@ -2,7 +2,7 @@
 
 namespace EasyWay.Samples.Commands
 {
-    public class ErrorCommandHandler : ICommandHandler<SampleModule, ErrorCommand>
+    public class ErrorCommandHandler : ICommandHandler<ErrorCommand>
     {
         public Task<CommandResult> Handle(ErrorCommand command)
         {

samples/EasyWay.Samples/Commands/SampleCommand.cs

@@ -1,6 +1,6 @@
 namespace EasyWay.Samples.Commands
 {
-    public class SampleCommand : Command<SampleModule>, IWithConcurrencyToken
+    public class SampleCommand : Command, IWithConcurrencyToken
     {
         public Guid Id { get; init; }
 

samples/EasyWay.Samples/Commands/SampleCommandHandler.cs

@@ -3,7 +3,7 @@
 
 namespace EasyWay.Samples.Commands
 {
-    internal sealed class SampleCommandHandler : ICommandHandler<SampleModule, SampleCommand>
+    internal sealed class SampleCommandHandler : ICommandHandler<SampleCommand>
     {
         private readonly ICancellationContext _cancellationContext;
 

samples/EasyWay.Samples/Commands/WithResult/SampleCommandWithResult.cs

@@ -1,7 +1,9 @@
 namespace EasyWay.Samples.Commands.WithResult
 {
-    public class SampleCommandWithResult : Command<SampleModule, SampleCommandResult>
+    public class SampleCommandWithResult : Command<SampleCommandResult>, IWithConcurrencyToken
     {
         public string Name { get; init; }
+
+        public short ConcurrencyToken { get; init; }
     }
 }

samples/EasyWay.Samples/Commands/WithResult/SampleCommandWithResultHandler.cs

@@ -1,7 +1,7 @@
 
 namespace EasyWay.Samples.Commands.WithResult
 {
-    public sealed class SampleCommandWithResultHandler : ICommandHandler<SampleModule, SampleCommandWithResult, SampleCommandResult>
+    public sealed class SampleCommandWithResultHandler : ICommandHandler<SampleCommandWithResult, SampleCommandResult>
     {
         public Task<CommandResult<SampleCommandResult>> Handle(SampleCommandWithResult command)
         {

samples/EasyWay.Samples/Program.cs

@@ -1,4 +1,6 @@
 using EasyWay.Samples;
+using EasyWay.Samples.Commands;
+using EasyWay.Samples.Commands.WithResult;
 using EasyWay.Samples.Queries;
 using Microsoft.AspNetCore.Mvc;
 
@@ -14,6 +16,7 @@ await kernel
 
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
+builder.Services.AddEasyWayWebApi();
 
 var app = builder.Build();
 
@@ -25,12 +28,27 @@ await kernel
 
 app.UseHttpsRedirection();
 
+//app.UseEasyWay();
 
-app.MapPost("/query", async ([FromBody] SampleQuery query, IModuleExecutor<SampleModule> executor) =>
+
+app.MapPost("/query", async ([FromBody] SampleQuery query, IModuleExecutor<SampleModule> executor, IWebApiResultMapper mapper) =>
+{
+    var x = await executor.Query<SampleQuery, SampleQueryResult>(query);
+
+    return mapper.Map(x);
+});
+
+app.MapPost("/command", async ([FromBody] SampleCommand command, IModuleExecutor<SampleModule> executor, IWebApiResultMapper mapper) =>
 {
-    return await executor.Execute(query);
+    return  await executor.Command(command);
 });
 
+app.MapPost("/commandwithresult", async ([FromBody] SampleCommandWithResult command, IModuleExecutor<SampleModule> executor, IWebApiResultMapper mapper) =>
+{
+    var x = await executor.Command<SampleCommandWithResult, SampleCommandResult>(command);
+
+    return mapper.Map(x);
+});
 
 app.Run();
 

samples/EasyWay.Samples/Queries/SampleQuery.cs

@@ -1,6 +1,6 @@
 namespace EasyWay.Samples.Queries
 {
-    public class SampleQuery : Query<SampleModule, SampleQueryResult>
+    public class SampleQuery : Query<SampleQueryResult>
     {
         public required string Name { get; init; }
 

samples/EasyWay.Samples/Queries/SampleQueryHandler.cs

@@ -1,6 +1,6 @@
 namespace EasyWay.Samples.Queries
 {
-    public class SampleQueryHandler : IQueryHandler<SampleModule, SampleQuery, SampleQueryResult>
+    public class SampleQueryHandler : IQueryHandler<SampleQuery, SampleQueryResult>
     {
         public Task<QueryResult<SampleQueryResult>> Handle(SampleQuery query)
         {

samples/EasyWay.Samples/SampleModule.cs

@@ -1,4 +1,5 @@
-using EasyWay.Samples.Databases;
+using EasyWay.Samples.Commands;
+using EasyWay.Samples.Databases;
 using Microsoft.EntityFrameworkCore;
 using System.Reflection;
 
@@ -8,7 +9,8 @@ public sealed class SampleModule : EasyWayModule
     {
         protected override IEnumerable<Assembly> Assemblies => new List<Assembly>
         {
-            typeof(SampleModule).Assembly
+            typeof(SampleModule).Assembly,
+            typeof(SampleCommand).Assembly
         };
 
         protected override void ConfigureDependencies(IServiceCollection services, IConfiguration configuration)