Audit service rework

src/Umbraco.Core/Events/RelateOnCopyNotificationHandler.cs

@@ -1,31 +1,53 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Services;
 
 namespace Umbraco.Cms.Core.Events;
 
-public class RelateOnCopyNotificationHandler : INotificationHandler<ContentCopiedNotification>
+public class RelateOnCopyNotificationHandler :
+    INotificationHandler<ContentCopiedNotification>,
+    INotificationAsyncHandler<ContentCopiedNotification>
 {
     private readonly IAuditService _auditService;
+    private readonly IUserIdKeyResolver _userIdKeyResolver;
     private readonly IRelationService _relationService;
 
-    public RelateOnCopyNotificationHandler(IRelationService relationService, IAuditService auditService)
+    public RelateOnCopyNotificationHandler(
+        IRelationService relationService,
+        IAuditService auditService,
+        IUserIdKeyResolver userIdKeyResolver)
     {
         _relationService = relationService;
         _auditService = auditService;
+        _userIdKeyResolver = userIdKeyResolver;
     }
 
-    public void Handle(ContentCopiedNotification notification)
+    [Obsolete("Use the non-obsolete constructor instead. Scheduled for removal in V19.")]
+    public RelateOnCopyNotificationHandler(
+        IRelationService relationService,
+        IAuditService auditService)
+        : this(
+            relationService,
+            auditService,
+            StaticServiceProvider.Instance.GetRequiredService<IUserIdKeyResolver>())
+    {
+    }
+
+    /// <inheritdoc />
+    public async Task HandleAsync(ContentCopiedNotification notification, CancellationToken cancellationToken)
     {
         if (notification.RelateToOriginal == false)
         {
             return;
         }
 
-        IRelationType? relationType = _relationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias);
+        IRelationType? relationType =
+            _relationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias);
 
         if (relationType == null)
         {
@@ -43,11 +65,16 @@ public void Handle(ContentCopiedNotification notification)
         var relation = new Relation(notification.Original.Id, notification.Copy.Id, relationType);
         _relationService.Save(relation);
 
-        _auditService.Add(
+        Guid writerKey = await _userIdKeyResolver.GetAsync(notification.Copy.WriterId);
+        await _auditService.AddAsync(
             AuditType.Copy,
-            notification.Copy.WriterId,
+            writerKey,
             notification.Copy.Id,
             UmbracoObjectTypes.Document.GetName() ?? string.Empty,
             $"Copied content with Id: '{notification.Copy.Id}' related to original content with Id: '{notification.Original.Id}'");
     }
+
+    [Obsolete("Use the INotificationAsyncHandler.HandleAsync implementation instead. Scheduled for removal in V19.")]
+    public void Handle(ContentCopiedNotification notification) =>
+        HandleAsync(notification, CancellationToken.None).GetAwaiter().GetResult();
 }