fix IRepositoryQueryAsyncAdvice

Cyprincess · Apr 25, 2024 · 1416c58 · 1416c58
1 parent ec5b42f
commit 1416c58
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -26,13 +26,13 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) ">
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) ">
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.28" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.29" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="6.0.29" />
   </ItemGroup>

diff --git a/src/Schemata.Entity.EntityFrameworkCore/EntityFrameworkCoreRepository.cs b/src/Schemata.Entity.EntityFrameworkCore/EntityFrameworkCoreRepository.cs
@@ -57,7 +57,7 @@ public class EntityFrameworkCoreRepository<TContext, TEntity> : RepositoryBase<T
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, TResult>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, TResult>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }
@@ -72,7 +72,7 @@ public class EntityFrameworkCoreRepository<TContext, TEntity> : RepositoryBase<T
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, TResult>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, TResult>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }
@@ -86,7 +86,7 @@ public class EntityFrameworkCoreRepository<TContext, TEntity> : RepositoryBase<T
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, bool>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, bool>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }
@@ -100,7 +100,7 @@ public class EntityFrameworkCoreRepository<TContext, TEntity> : RepositoryBase<T
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, int>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, int>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }
@@ -114,7 +114,7 @@ public class EntityFrameworkCoreRepository<TContext, TEntity> : RepositoryBase<T
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, long>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, long>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }

diff --git a/src/Schemata.Entity.LinqToDB/LinQ2DbRepository.cs b/src/Schemata.Entity.LinqToDB/LinQ2DbRepository.cs
@@ -73,7 +73,7 @@ public class LinQ2DbRepository<TContext, TEntity> : RepositoryBase<TEntity>
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, TResult>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, TResult>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }
@@ -88,7 +88,7 @@ public class LinQ2DbRepository<TContext, TEntity> : RepositoryBase<TEntity>
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, TResult>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, TResult>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }
@@ -102,7 +102,7 @@ public class LinQ2DbRepository<TContext, TEntity> : RepositoryBase<TEntity>
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, bool>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, bool>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }
@@ -116,7 +116,7 @@ public class LinQ2DbRepository<TContext, TEntity> : RepositoryBase<TEntity>
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, int>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, int>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }
@@ -130,7 +130,7 @@ public class LinQ2DbRepository<TContext, TEntity> : RepositoryBase<TEntity>
         var query = await BuildQueryAsync(predicate, ct);
 
         var context = new QueryContext<TEntity, TResult, long>(this, query);
-        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, IAsyncEnumerable<TResult>>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
+        var next = await Advices<IRepositoryQueryAsyncAdvice<TEntity, TResult, long>>.AdviseAsync(ServiceProvider, AdviceContext, context, ct);
         if (!next) {
             return context.Result;
         }

diff --git a/src/Schemata.Resource.Foundation/Advices/AdviceDeleteFreshness.cs b/src/Schemata.Resource.Foundation/Advices/AdviceDeleteFreshness.cs
@@ -5,7 +5,6 @@
 using Schemata.Abstractions.Advices;
 using Schemata.Abstractions.Entities;
 using Schemata.Abstractions.Exceptions;
-using Schemata.Abstractions.Resource;
 
 namespace Schemata.Resource.Foundation.Advices;
 

diff --git a/src/Schemata.Resource.Foundation/Advices/AdviceEditFreshness.cs b/src/Schemata.Resource.Foundation/Advices/AdviceEditFreshness.cs
@@ -5,7 +5,6 @@
 using Schemata.Abstractions.Advices;
 using Schemata.Abstractions.Entities;
 using Schemata.Abstractions.Exceptions;
-using Schemata.Abstractions.Resource;
 
 namespace Schemata.Resource.Foundation.Advices;