Added deliveries workspace view to the webhook details workspace

src/Umbraco.Cms.Api.Management/Controllers/Webhook/AllWebhookController.cs

@@ -34,7 +34,7 @@ public async Task<ActionResult<PagedViewModel<WebhookResponseModel>>> All(
         var viewModel = new PagedViewModel<WebhookResponseModel>
         {
             Total = result.Total,
-            Items = webhooks.Select(x => _webhookPresentationFactory.CreateResponseModel(x)),
+            Items = webhooks.Select(_webhookPresentationFactory.CreateResponseModel),
         };
 
         return Ok(viewModel);

src/Umbraco.Cms.Api.Management/Controllers/Webhook/Logs/AllWebhookLogController.cs

@@ -1,8 +1,8 @@
-using Asp.Versioning;
+using Asp.Versioning;
 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.Api.Management.ViewModels.Webhook.Logs;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
@@ -23,12 +23,11 @@ public AllWebhookLogController(IWebhookLogService webhookLogService, IWebhookPre
 
     [HttpGet("logs")]
     [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(WebhookResponseModel), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    [ProducesResponseType(typeof(PagedViewModel<WebhookLogResponseModel>), StatusCodes.Status200OK)]
     public async Task<IActionResult> Logs(CancellationToken cancellationToken, int skip = 0, int take = 100)
     {
         PagedModel<WebhookLog> logs = await _webhookLogService.Get(skip, take);
-        IEnumerable<WebhookLogResponseModel> logResponseModels = logs.Items.Select(x => _webhookPresentationFactory.CreateResponseModel(x));
-        return Ok(logResponseModels);
+        PagedViewModel<WebhookLogResponseModel> viewModel = CreatePagedWebhookLogResponseModel(logs, _webhookPresentationFactory);
+        return Ok(viewModel);
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/Webhook/Logs/WebhookLogController.cs

@@ -0,0 +1,33 @@
+using Asp.Versioning;
+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.Logs;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+
+namespace Umbraco.Cms.Api.Management.Controllers.Webhook.Logs;
+
+[ApiVersion("1.0")]
+public class WebhookLogController : WebhookLogControllerBase
+{
+    private readonly IWebhookLogService _webhookLogService;
+    private readonly IWebhookPresentationFactory _webhookPresentationFactory;
+
+    public WebhookLogController(IWebhookLogService webhookLogService, IWebhookPresentationFactory webhookPresentationFactory)
+    {
+        _webhookLogService = webhookLogService;
+        _webhookPresentationFactory = webhookPresentationFactory;
+    }
+
+    [HttpGet("{id:guid}/logs")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<WebhookLogResponseModel>), StatusCodes.Status200OK)]
+    public async Task<IActionResult> Logs(CancellationToken cancellationToken, Guid id, int skip = 0, int take = 100)
+    {
+        PagedModel<WebhookLog> logs = await _webhookLogService.Get(id, skip, take);
+        PagedViewModel<WebhookLogResponseModel> viewModel = CreatePagedWebhookLogResponseModel(logs, _webhookPresentationFactory);
+        return Ok(viewModel);
+    }
+}

src/Umbraco.Cms.Api.Management/Controllers/Webhook/Logs/WebhookLogControllerBase.cs

@@ -1,9 +1,26 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Api.Common.ViewModels.Pagination;
+using Umbraco.Cms.Api.Management.Factories;
 using Umbraco.Cms.Api.Management.Routing;
+using Umbraco.Cms.Api.Management.ViewModels.Webhook.Logs;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Webhook.Logs;
 
 [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Webhook}")]
 [ApiExplorerSettings(GroupName = "Webhook")]
-public class WebhookLogControllerBase : ManagementApiControllerBase;
+public class WebhookLogControllerBase : ManagementApiControllerBase
+{
+    protected PagedViewModel<WebhookLogResponseModel> CreatePagedWebhookLogResponseModel(PagedModel<WebhookLog> logs, IWebhookPresentationFactory webhookPresentationFactory)
+    {
+        WebhookLogResponseModel[] logResponseModels = logs.Items.Select(webhookPresentationFactory.CreateResponseModel).ToArray();
+
+        return new PagedViewModel<WebhookLogResponseModel>
+        {
+            Total = logs.Total,
+            Items = logResponseModels,
+        };
+    }
+
+}

src/Umbraco.Cms.Api.Management/OpenApi.json

@@ -33846,13 +33846,22 @@
         ]
       }
     },
-    "/umbraco/management/api/v1/webhook/events": {
+    "/umbraco/management/api/v1/webhook/{id}/logs": {
       "get": {
         "tags": [
           "Webhook"
         ],
-        "operationId": "GetWebhookEvents",
+        "operationId": "GetWebhookByIdLogs",
         "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
           {
             "name": "skip",
             "in": "query",
@@ -33880,7 +33889,7 @@
                 "schema": {
                   "oneOf": [
                     {
-                      "$ref": "#/components/schemas/PagedWebhookEventModel"
+                      "$ref": "#/components/schemas/PagedWebhookLogResponseModel"
                     }
                   ]
                 }
@@ -33889,9 +33898,6 @@
           },
           "401": {
             "description": "The resource is protected and requires an authentication token"
-          },
-          "403": {
-            "description": "The authenticated user do not have access to this resource"
           }
         },
         "security": [
@@ -33901,12 +33907,12 @@
         ]
       }
     },
-    "/umbraco/management/api/v1/webhook/logs": {
+    "/umbraco/management/api/v1/webhook/events": {
       "get": {
         "tags": [
           "Webhook"
         ],
-        "operationId": "GetWebhookLogs",
+        "operationId": "GetWebhookEvents",
         "parameters": [
           {
             "name": "skip",
@@ -33935,21 +33941,62 @@
                 "schema": {
                   "oneOf": [
                     {
-                      "$ref": "#/components/schemas/WebhookResponseModel"
+                      "$ref": "#/components/schemas/PagedWebhookEventModel"
                     }
                   ]
                 }
               }
             }
           },
-          "404": {
-            "description": "Not Found",
+          "401": {
+            "description": "The resource is protected and requires an authentication token"
+          },
+          "403": {
+            "description": "The authenticated user do not have access to this resource"
+          }
+        },
+        "security": [
+          {
+            "Backoffice User": [ ]
+          }
+        ]
+      }
+    },
+    "/umbraco/management/api/v1/webhook/logs": {
+      "get": {
+        "tags": [
+          "Webhook"
+        ],
+        "operationId": "GetWebhookLogs",
+        "parameters": [
+          {
+            "name": "skip",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "default": 0
+            }
+          },
+          {
+            "name": "take",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "default": 100
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
                   "oneOf": [
                     {
-                      "$ref": "#/components/schemas/ProblemDetails"
+                      "$ref": "#/components/schemas/PagedWebhookLogResponseModel"
                     }
                   ]
                 }
@@ -42320,6 +42367,30 @@
         },
         "additionalProperties": false
       },
+      "PagedWebhookLogResponseModel": {
+        "required": [
+          "items",
+          "total"
+        ],
+        "type": "object",
+        "properties": {
+          "total": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "items": {
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/WebhookLogResponseModel"
+                }
+              ]
+            }
+          }
+        },
+        "additionalProperties": false
+      },
       "PagedWebhookResponseModel": {
         "required": [
           "items",
@@ -46190,6 +46261,70 @@
         },
         "additionalProperties": false
       },
+      "WebhookLogResponseModel": {
+        "required": [
+          "date",
+          "eventAlias",
+          "exceptionOccured",
+          "isSuccessStatusCode",
+          "key",
+          "requestBody",
+          "requestHeaders",
+          "responseBody",
+          "responseHeaders",
+          "retryCount",
+          "statusCode",
+          "url",
+          "webhookKey"
+        ],
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "webhookKey": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "statusCode": {
+            "type": "string"
+          },
+          "isSuccessStatusCode": {
+            "type": "boolean"
+          },
+          "date": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "eventAlias": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "retryCount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "requestHeaders": {
+            "type": "string"
+          },
+          "requestBody": {
+            "type": "string"
+          },
+          "responseHeaders": {
+            "type": "string"
+          },
+          "responseBody": {
+            "type": "string"
+          },
+          "exceptionOccured": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
       "WebhookResponseModel": {
         "required": [
           "contentTypeKeys",

src/Umbraco.Core/Persistence/Repositories/IWebhookLogRepository.cs

@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models;
 
 namespace Umbraco.Cms.Core.Persistence.Repositories;
 
@@ -8,6 +8,17 @@ public interface IWebhookLogRepository
 
     Task<PagedModel<WebhookLog>> GetPagedAsync(int skip, int take);
 
+    // TODO (V16): Remove the default implementation on this method.
+    async Task<PagedModel<WebhookLog>> GetPagedAsync(Guid webhookKey, int skip, int take)
+    {
+        // This is very inefficient as the filter/skip/take is in-memory, but it will return the correct data.
+        // As it's only here to avoid a breaking change on the interface that is unlikely to have a custom
+        // implementation, this seems reasonable.
+        PagedModel<WebhookLog> allLogs = await GetPagedAsync(0, int.MaxValue);
+        var logsForId = allLogs.Items.Where(x => x.WebhookKey == webhookKey).ToList();
+        return new PagedModel<WebhookLog>(logsForId.Count, logsForId.Skip(skip).Take(take));
+    }
+
     Task<IEnumerable<WebhookLog>> GetOlderThanDate(DateTime date);
 
     Task DeleteByIds(int[] ids);

src/Umbraco.Core/Services/IWebhookLogService.cs

@@ -1,5 +1,4 @@
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Webhooks;
+using Umbraco.Cms.Core.Models;
 
 namespace Umbraco.Cms.Core.Services;
 
@@ -8,4 +7,15 @@ public interface IWebhookLogService
     Task<WebhookLog> CreateAsync(WebhookLog webhookLog);
 
     Task<PagedModel<WebhookLog>> Get(int skip = 0, int take = int.MaxValue);
+
+    // TODO (V16): Remove the default implementation on this method.
+    async Task<PagedModel<WebhookLog>> Get(Guid webhookKey, int skip = 0, int take = int.MaxValue)
+    {
+        // This is very inefficient as the filter/skip/take is in-memory, but it will return the correct data.
+        // As it's only here to avoid a breaking change on the interface that is unlikely to have a custom
+        // implementation, this seems reasonable.
+        PagedModel<WebhookLog> allLogs = await Get(0, int.MaxValue);
+        var logsForId = allLogs.Items.Where(x => x.WebhookKey == webhookKey).ToList();
+        return new PagedModel<WebhookLog>(logsForId.Count, logsForId.Skip(skip).Take(take));
+    }
 }

src/Umbraco.Core/Services/WebhookLogService.cs

@@ -1,7 +1,6 @@
-using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Core.Webhooks;
 
 namespace Umbraco.Cms.Core.Services;
 
@@ -30,4 +29,10 @@ public async Task<PagedModel<WebhookLog>> Get(int skip = 0, int take = int.MaxVa
         using ICoreScope scope = _coreScopeProvider.CreateCoreScope(autoComplete: true);
         return await _webhookLogRepository.GetPagedAsync(skip, take);
     }
+
+    public async Task<PagedModel<WebhookLog>> Get(Guid webhookKey, int skip = 0, int take = int.MaxValue)
+    {
+        using ICoreScope scope = _coreScopeProvider.CreateCoreScope(autoComplete: true);
+        return await _webhookLogRepository.GetPagedAsync(webhookKey, skip, take);
+    }
 }