Browse Source

Fix async dbset

pull/6996/head
Ahmet 6 years ago
parent
commit
dd2585b402
  1. 12
      modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs
  2. 12
      modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs

12
modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs

@ -17,23 +17,23 @@ namespace Volo.CmsKit.Pages
{
}
public virtual Task<int> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
public virtual async Task<int> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
{
return (await GetDbSetAsync()).WhereIf(
return await (await GetDbSetAsync()).WhereIf(
!filter.IsNullOrWhiteSpace(),
x =>
x.Title.Contains(filter)
).CountAsync(GetCancellationToken(cancellationToken));
}
public virtual Task<List<Page>> GetListAsync(
public virtual async Task<List<Page>> GetListAsync(
string filter = null,
int maxResultCount = int.MaxValue,
int skipCount = 0,
string sorting = null,
CancellationToken cancellationToken = default)
{
return (await GetDbSetAsync()).WhereIf(
return await (await GetDbSetAsync()).WhereIf(
!filter.IsNullOrWhiteSpace(),
x =>
x.Title.Contains(filter))
@ -52,9 +52,9 @@ namespace Volo.CmsKit.Pages
return FindAsync(x => x.Url == url, cancellationToken: GetCancellationToken(cancellationToken));
}
public virtual Task<bool> ExistsAsync(string url, CancellationToken cancellationToken = default)
public virtual async Task<bool> ExistsAsync(string url, CancellationToken cancellationToken = default)
{
return (await GetDbSetAsync()).AnyAsync(x => x.Url == url, GetCancellationToken(cancellationToken));
return await (await GetDbSetAsync()).AnyAsync(x => x.Url == url, GetCancellationToken(cancellationToken));
}
}
}

12
modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs

@ -18,9 +18,9 @@ namespace Volo.CmsKit.MongoDB.Pages
{
}
public virtual Task<int> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
public virtual async Task<int> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
{
return (await GetMongoQueryableAsync())
return await (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken)))
.WhereIf<Page, IMongoQueryable<Page>>(
!filter.IsNullOrWhiteSpace(),
u =>
@ -28,14 +28,14 @@ namespace Volo.CmsKit.MongoDB.Pages
).CountAsync(GetCancellationToken(cancellationToken));
}
public virtual Task<List<Page>> GetListAsync(
public virtual async Task<List<Page>> GetListAsync(
string filter = null,
int maxResultCount = int.MaxValue,
int skipCount = 0,
string sorting = null,
CancellationToken cancellationToken = default)
{
return (await GetMongoQueryableAsync())
return await (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken)))
.WhereIf<Page, IMongoQueryable<Page>>(
!filter.IsNullOrWhiteSpace(),
u =>
@ -57,9 +57,9 @@ namespace Volo.CmsKit.MongoDB.Pages
return FindAsync(x => x.Url == url, cancellationToken: GetCancellationToken(cancellationToken));
}
public virtual Task<bool> ExistsAsync(string url, CancellationToken cancellationToken = default)
public virtual async Task<bool> ExistsAsync(string url, CancellationToken cancellationToken = default)
{
return (await GetMongoQueryableAsync()).AnyAsync(x => x.Url == url, GetCancellationToken(cancellationToken));
return await (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken))).AnyAsync(x => x.Url == url, GetCancellationToken(cancellationToken));
}
}
}

Loading…
Cancel
Save