Skip to content

V14: Fixup webhook endpoints #16143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elit0451 merged 2 commits into from
Apr 24, 2024
Merged

V14: Fixup webhook endpoints #16143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34f3458
Use presentation factory, as there is no map definition
Zeegaan Apr 24, 2024
511cc92
Refactor to actually get entities by key
Zeegaan Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Umbraco.Cms.Api.Management/Controllers/Webhook/AllWebhookController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Api.Common.ViewModels.Pagination;
using Umbraco.Cms.Api.Management.Factories;
using Umbraco.Cms.Api.Management.ViewModels.Webhook;
using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;

Expand All @@ -13,12 +13,12 @@ namespace Umbraco.Cms.Api.Management.Controllers.Webhook;
public class AllWebhookController : WebhookControllerBase
{
private readonly IWebhookService _webhookService;
private readonly IUmbracoMapper _umbracoMapper;
private readonly IWebhookPresentationFactory _webhookPresentationFactory;

public AllWebhookController(IWebhookService webhookService, IUmbracoMapper umbracoMapper)
public AllWebhookController(IWebhookService webhookService, IWebhookPresentationFactory webhookPresentationFactory)
{
_webhookService = webhookService;
_umbracoMapper = umbracoMapper;
_webhookPresentationFactory = webhookPresentationFactory;
}

[HttpGet]
Expand All @@ -34,7 +34,7 @@ public async Task<ActionResult<PagedViewModel<WebhookResponseModel>>> All(
var viewModel = new PagedViewModel<WebhookResponseModel>
{
Total = result.Total,
Items = _umbracoMapper.MapEnumerable<IWebhook, WebhookResponseModel>(webhooks)
Items = webhooks.Select(x => _webhookPresentationFactory.CreateResponseModel(x)),
};

return Ok(viewModel);
Expand Down
6 changes: 2 additions & 4 deletions src/Umbraco.Infrastructure/Persistence/Repositories/Implement/WebhookRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,9 @@ public async Task<IWebhook> CreateAsync(IWebhook webhook)
public async Task<PagedModel<IWebhook>> GetByIdsAsync(IEnumerable<Guid> keys)
{
Sql<ISqlContext>? sql = _scopeAccessor.AmbientScope?.Database.SqlContext.Sql()
.SelectAll()
.Select<WebhookDto>()
.From<WebhookDto>()
.InnerJoin<Webhook2EventsDto>()
.On<WebhookDto, Webhook2EventsDto>(left => left.Id, right => right.WebhookId)
.WhereIn<Webhook2EventsDto>(x => x.WebhookId, keys);
.WhereIn<WebhookDto>(x => x.Key, keys);

List<WebhookDto>? webhookDtos = await _scopeAccessor.AmbientScope?.Database.FetchAsync<WebhookDto>(sql)!;

Expand Down