From 6c459c51178ddc8efb02e1b2da9be2b3cfd2b53b Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 18 Oct 2018 15:51:22 +0100
Subject: [PATCH] OK I think we are finally done with C# for Audit Wraps with a
 scope so Audit can be fired & the Rollback events can be emitted

---
 .../Services/Implement/ContentService.cs      | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index a2cb393900..ea2a2e5685 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -2496,9 +2496,7 @@ namespace Umbraco.Core.Services.Implement
         public OperationResult Rollback(int id, int versionId, string culture = "*", int userId = 0)
         {
             var evtMsgs = EventMessagesFactory.Get();
-
-            //TODO: Ensure 'RollingBack' & 'RolledBack' events are wired up
-
+            
             //Get the current copy of the node
             var content = GetById(id);
 
@@ -2511,25 +2509,39 @@ namespace Umbraco.Core.Services.Implement
                 return new OperationResult(OperationResultType.FailedCannot, evtMsgs);
             }
 
-            //Copy the changes from the version
-            content.CopyFrom(version, culture);
+            //Store the result of doing the save of content for the rollback
+            OperationResult rollbackSaveResult;
 
-            //Save the content for the rollback
-            var rollbackSaveResult = Save(content, userId);
-
-            //Depending on the save result - is what we log & audit along with what we return
-            if(rollbackSaveResult.Success == false)
+            using (var scope = ScopeProvider.CreateScope())
             {
-                //Log the error/warning
-                Logger.Error<ContentService>("User '{UserId}' was unable to rollback content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
-            }
-            else
-            {
-                //Logging & Audit message
-                Logger.Info<ContentService>("User '{UserId}' rolled back content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
+                var rollbackEventArgs = new RollbackEventArgs<IContent>(content);
 
-                //TODO: Audit throws me a 'Cannot run a repository without an ambient scope.'
-                //Audit(AuditType.RollBack, $"Content '{content.Name}' was rolled back to version '{versionId}'", userId, id);
+                //Emit RollingBack event aka before
+                scope.Events.Dispatch(RollingBack, this, rollbackEventArgs);
+
+                //Copy the changes from the version
+                content.CopyFrom(version, culture);
+
+                //Save the content for the rollback
+                rollbackSaveResult = Save(content, userId);
+
+                //Depending on the save result - is what we log & audit along with what we return
+                if (rollbackSaveResult.Success == false)
+                {
+                    //Log the error/warning
+                    Logger.Error<ContentService>("User '{UserId}' was unable to rollback content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
+                }
+                else
+                {
+                    //Emit RolledBack event aka after
+                    scope.Events.Dispatch(RolledBack, this, rollbackEventArgs);
+
+                    //Logging & Audit message
+                    Logger.Info<ContentService>("User '{UserId}' rolled back content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
+                    Audit(AuditType.RollBack, $"Content '{content.Name}' was rolled back to version '{versionId}'", userId, id);
+                }
+                
+                scope.Complete();
             }
 
             return rollbackSaveResult;