IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix query

Browse Source
This commit is contained in:
pavelbannov 2023-06-29 11:32:05 +03:00
parent 0e91c423cf
commit dff3333862
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/ASC.Webhooks.Core/DbWorker.cs
View File

@ -67,7 +67,7 @@ public class DbWorker
{ {
await using var webhooksDbContext = _dbContextFactory.CreateDbContext(); await using var webhooksDbContext = _dbContextFactory.CreateDbContext();
var objForCreate = await Queries.WebhooksConfigByUriAsync(webhooksDbContext, Tenant, uri); var objForCreate = await Queries.WebhooksConfigByUriAsync(webhooksDbContext, Tenant, uri, name);
if (objForCreate != null) if (objForCreate != null)
{ {
@ -233,11 +233,11 @@ public class DbWorker
{ {
await using var webhooksDbContext = _dbContextFactory.CreateDbContext(); await using var webhooksDbContext = _dbContextFactory.CreateDbContext();
var dbWebhooks = Queries.DbWebhooksAsync(webhooksDbContext); var dbWebhooks = await Queries.DbWebhooksAsync(webhooksDbContext).ToListAsync();
foreach (var webhook in webhooks) foreach (var webhook in webhooks)
{ {
if (!await dbWebhooks.AnyAsync(r => r.Route == webhook.Route && r.Method == webhook.Method)) if (!dbWebhooks.Any(r => r.Route == webhook.Route && r.Method == webhook.Method))
{ {
try try
{ {
@ -363,11 +363,11 @@ public enum WebhookGroupStatus
static file class Queries static file class Queries
{ {
public static readonly Func<WebhooksDbContext, int, string, Task<WebhooksConfig>> WebhooksConfigByUriAsync = public static readonly Func<WebhooksDbContext, int, string, string, Task<WebhooksConfig>> WebhooksConfigByUriAsync =
Microsoft.EntityFrameworkCore.EF.CompileAsyncQuery( Microsoft.EntityFrameworkCore.EF.CompileAsyncQuery(
(WebhooksDbContext ctx, int tenantId, string uri) => (WebhooksDbContext ctx, int tenantId, string uri, string name) =>
ctx.WebhooksConfigs ctx.WebhooksConfigs
.FirstOrDefault(r => r.TenantId == tenantId && r.Uri == uri)); .FirstOrDefault(r => r.TenantId == tenantId && r.Uri == uri && r.Name == name));
public static readonly Func<WebhooksDbContext, int, IAsyncEnumerable<WebhooksConfigWithStatus>> WebhooksConfigWithStatusAsync = public static readonly Func<WebhooksDbContext, int, IAsyncEnumerable<WebhooksConfigWithStatus>> WebhooksConfigWithStatusAsync =
Microsoft.EntityFrameworkCore.EF.CompileAsyncQuery( Microsoft.EntityFrameworkCore.EF.CompileAsyncQuery(