Iatsuta/62 add async query (#74)

#68

src/Framework.DomainDriven.WebApiNetCore/Middleware/TryProcessDbSessionMiddleware.cs

@@ -15,7 +15,7 @@ public TryProcessDbSessionMiddleware(RequestDelegate next)
         this.next = next;
     }
 
-    public Task Invoke(HttpContext context, IWebApiDBSessionModeResolver sessionModeResolver)
+    public async Task Invoke(HttpContext context, IWebApiDBSessionModeResolver sessionModeResolver)
     {
         try
         {
@@ -38,7 +38,7 @@ public Task Invoke(HttpContext context, IWebApiDBSessionModeResolver sessionMode
                 }
             }
 
-            return this.next(context);
+            await this.next(context);
         }
         catch
         {
@@ -47,7 +47,7 @@ public Task Invoke(HttpContext context, IWebApiDBSessionModeResolver sessionMode
         }
         finally
         {
-            context.RequestServices.TryCloseDbSession();
+            await context.RequestServices.TryCloseDbSessionAsync(context.RequestAborted);
         }
     }
 }

src/Framework.DomainDriven.WebApiNetCore/Middleware/WebApiExceptionExpanderMiddleware.cs

@@ -14,11 +14,11 @@ public WebApiExceptionExpanderMiddleware(RequestDelegate next)
         this.next = next;
     }
 
-    public Task Invoke(HttpContext context, IWebApiExceptionExpander exceptionExpander)
+    public async Task Invoke(HttpContext context, IWebApiExceptionExpander exceptionExpander)
     {
         try
         {
-            return this.next(context);
+            await this.next(context);
         }
         catch (Exception ex)
         {

src/IAD.Framework.sln

@@ -390,8 +390,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GeneratedTools", "Generated
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Framework.Authorization.ApproveWorkflow", "_Authorization\Framework.Authorization.ApproveWorkflow\Framework.Authorization.ApproveWorkflow.csproj", "{24F41E7D-4D0F-4B52-8A35-18C4F6FBD31F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Framework.Core.VisistedQueryable", "Framework.Core.VisistedQueryable\Framework.Core.VisistedQueryable.csproj", "{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -3522,26 +3520,6 @@ Global
 		{24F41E7D-4D0F-4B52-8A35-18C4F6FBD31F}.Release|x64.Build.0 = Release|Any CPU
 		{24F41E7D-4D0F-4B52-8A35-18C4F6FBD31F}.Release|x86.ActiveCfg = Release|Any CPU
 		{24F41E7D-4D0F-4B52-8A35-18C4F6FBD31F}.Release|x86.Build.0 = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|ARM.Build.0 = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|x64.Build.0 = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Debug|x86.Build.0 = Debug|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|ARM.ActiveCfg = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|ARM.Build.0 = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|x64.ActiveCfg = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|x64.Build.0 = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|x86.ActiveCfg = Release|Any CPU
-		{FC4C1FC4-BCDA-40E6-BC57-F9F804B0028E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/_Authorization/Framework.Authorization.BLL/BusinessRoleBLL.cs

@@ -7,7 +7,6 @@
 using Framework.DomainDriven;
 using Framework.DomainDriven.BLL;
 using Framework.Exceptions;
-using Framework.HierarchicalExpand;
 using Framework.Persistent;
 
 namespace Framework.Authorization.BLL

src/_DomainDriven/Framework.DomainDriven.Core/BLL/BLLBase.cs

@@ -3,6 +3,8 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
 
 using Framework.Core;
 using Framework.DomainDriven.DAL.Revisions;
@@ -265,7 +267,7 @@ public OData.SelectOperationResult<TDomainObject> GetObjectsByOData(OData.Select
         /// <returns></returns>
         public IQueryable<TDomainObject> GetUnsecureQueryable(IFetchContainer<TDomainObject> fetchContainer, LockRole lockRole = LockRole.None)
         {
-            return this._dal.GetQueryable(lockRole, fetchContainer).Visit(this.GetQueryableExpressionVisitor());
+            return this._dal.GetQueryable(lockRole, fetchContainer, this.GetQueryableExpressionVisitor());
         }
 
         public IQueryable<TDomainObject> GetUnsecureQueryable(
@@ -444,7 +446,7 @@ public TDomainObject GetObjectBy(Expression<Func<TDomainObject, bool>> filter, b
             return this.GetObjectBy(filter, throwOnNotFound, fetchs.ToFetchContainer());
         }
 
-        public virtual List<TDomainObject> GetFullList(IFetchContainer<TDomainObject> fetchContainer = null)
+        public List<TDomainObject> GetFullList(IFetchContainer<TDomainObject> fetchContainer = null)
         {
             return this.GetSecureQueryable(fetchContainer).ToList();
         }

src/_DomainDriven/Framework.DomainDriven.Core/BLL/IBLLBase.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
 
 using Framework.Core;
 using Framework.Exceptions;

src/_DomainDriven/Framework.DomainDriven.Core/BLL/IOperationBLLBase.cs

@@ -11,6 +11,7 @@ public interface IOperationBLLBase<in TDomainObject>
     {
         void Save([NotNull] TDomainObject domainObject);
 
+
         void Remove([NotNull] TDomainObject domainObject);
     }
 

src/_DomainDriven/Framework.DomainDriven.Core/DAL/IDAL.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Linq.Expressions;
 
 using Framework.DomainDriven.DAL.Revisions;
 
@@ -10,7 +11,7 @@ public interface IDAL<TDomainObject, TIdent> : IAuditDAL<TDomainObject, TIdent>
         /// Предоставляет Queryable в контексте Read
         /// </summary>
         /// <returns></returns>
-        IQueryable<TDomainObject> GetQueryable(LockRole lockRole, IFetchContainer<TDomainObject> fetchContainer = null);
+        IQueryable<TDomainObject> GetQueryable(LockRole lockRole, IFetchContainer<TDomainObject> fetchContainer = null, ExpressionVisitor visitor = null);
 
         TDomainObject GetById(TIdent id, LockRole lockRole);
 

src/_DomainDriven/Framework.DomainDriven.Core/Framework.DomainDriven.Core.csproj

@@ -7,7 +7,6 @@
     <Compile Include="..\..\__SolutionItems\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Framework.Core.VisistedQueryable\Framework.Core.VisistedQueryable.csproj" />
     <ProjectReference Include="..\..\Framework.HierarchicalExpand\Framework.HierarchicalExpand.csproj" />
     <ProjectReference Include="..\..\Framework.OData\Framework.OData.csproj" />
     <ProjectReference Include="..\..\Framework.Persistent.Mapping\Framework.Persistent.Mapping.csproj" />

src/_DomainDriven/Framework.DomainDriven.Core/Session/IDBSession.cs

@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 
 using Framework.DomainDriven.BLL.Tracking;
 using Framework.Persistent;
 
 namespace Framework.DomainDriven
 {
-    public interface IDBSession : ICurrentRevisionService, IDisposable
+    public interface IDBSession : ICurrentRevisionService, IAsyncDisposable, IDisposable
     {
         DBSessionMode SessionMode { get; }
 
@@ -18,7 +20,12 @@ IDALFactory<TPersistentDomainObjectBase, TIdent> GetDALFactory<TPersistentDomain
         /// <summary>
         /// Мануальный флаш сессии, при его вызове срабатывают только Flushed-евенты, TransactionCompleted-евенты вызываются только при закрытие сессии
         /// </summary>
-        void Flush();
+        void Flush()
+        {
+            this.FlushAsync().GetAwaiter().GetResult();
+        }
+
+        Task FlushAsync(CancellationToken cancellationToken = default);
 
         IEnumerable<ObjectModification> GetModifiedObjectsFromLogic();
 
@@ -45,6 +52,16 @@ IDALFactory<TPersistentDomainObjectBase, TIdent> GetDALFactory<TPersistentDomain
         /// </summary>
         void AsWritable();
 
-        void Close();
+        public void Close()
+        {
+            this.CloseAsync().GetAwaiter().GetResult();
+        }
+
+        Task CloseAsync(CancellationToken cancellationToken = default);
+
+        void IDisposable.Dispose()
+        {
+            this.DisposeAsync().GetAwaiter().GetResult();
+        }
     }
 }

src/_DomainDriven/Framework.DomainDriven.Core/Session/ServiceProviderExtensions.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 
 using JetBrains.Annotations;
 
@@ -13,15 +15,15 @@ public static class ServiceProviderExtensions
     /// </summary>
     /// <param name="serviceProvider"></param>
     /// <exception cref="ArgumentNullException"></exception>
-    public static void TryCloseDbSession([NotNull] this IServiceProvider serviceProvider)
+    public static async Task TryCloseDbSessionAsync([NotNull] this IServiceProvider serviceProvider, CancellationToken cancellationToken = default)
     {
         if (serviceProvider == null) throw new ArgumentNullException(nameof(serviceProvider));
 
         var lazyDbSession = serviceProvider.GetRequiredService<Lazy<IDBSession>>();
 
         if (lazyDbSession.IsValueCreated)
         {
-            lazyDbSession.Value.Close();
+            await lazyDbSession.Value.CloseAsync(cancellationToken);
         }
     }
 

src/_DomainDriven/Framework.DomainDriven.NHibernate/NHibDal.cs

@@ -69,14 +69,16 @@ public virtual void Remove(TDomainObject domainObject)
             this.session.RegisterModified(domainObject, ModificationType.Remove);
 
             this.InnerSession.Delete(domainObject);
-
-            // this.InnerSession.Delete(this.InnerSession.Get<TDomainObject>(domainObject.Id));
         }
 
-        public IQueryable<TDomainObject> GetQueryable(LockRole lockRole, IFetchContainer<TDomainObject> fetchContainer)
+        public IQueryable<TDomainObject> GetQueryable(LockRole lockRole, IFetchContainer<TDomainObject> fetchContainer, ExpressionVisitor visitor = null)
         {
             var queryable = this.InnerSession.Query<TDomainObject>();
 
+            (queryable.Provider as VisitedQueryProvider)
+                    .FromMaybe("Register VisitedQueryProvider in Nhib configuration")
+                    .Visitor = visitor;
+
             var fetchsResult = queryable.WithFetchs(fetchContainer);
 
             if (lockRole == LockRole.None)