From 64e7a29795cd62bf5253ab997250a510a84f07bc Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 8 Apr 2020 15:03:21 +1000
Subject: [PATCH] Ensures caches are refreshed after data errors are fixed

---
 .../Models/ContentDataIntegrityReport.cs            |  3 +++
 .../Services/Implement/ContentService.cs            | 13 +++++++++++--
 src/Umbraco.Core/Services/Implement/MediaService.cs | 13 +++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentDataIntegrityReport.cs b/src/Umbraco.Core/Models/ContentDataIntegrityReport.cs
index d3660679a7..9f0f147083 100644
--- a/src/Umbraco.Core/Models/ContentDataIntegrityReport.cs
+++ b/src/Umbraco.Core/Models/ContentDataIntegrityReport.cs
@@ -14,6 +14,9 @@ namespace Umbraco.Core.Models
 
         public IReadOnlyDictionary<int, ContentDataIntegrityReportEntry> DetectedIssues { get; }
 
+        public IReadOnlyDictionary<int, ContentDataIntegrityReportEntry> FixedIssues
+            => DetectedIssues.Where(x => x.Value.Fixed).ToDictionary(x => x.Key, x => x.Value);
+
         public enum IssueType
         {
             /// <summary>
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 1f384d694f..068864a558 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -2388,8 +2388,17 @@ namespace Umbraco.Core.Services.Implement
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
                 scope.WriteLock(Constants.Locks.ContentTree);
-                // TODO: We're going to have to clear all caches
-                return _documentRepository.CheckDataIntegrity(options);
+
+                var report = _documentRepository.CheckDataIntegrity(options);
+
+                if (report.FixedIssues.Count > 0)
+                {
+                    //The event args needs a content item so we'll make a fake one with enough properties to not cause a null ref
+                    var root = new Content("root", -1, new ContentType(-1)) {Id = -1, Key = Guid.Empty};
+                    scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>.EventArgs(new TreeChange<IContent>(root, TreeChangeTypes.RefreshAll)));
+                }
+
+                return report;
             }
         }
 
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index 4a2b37ca31..ecd4cccc8d 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -1155,8 +1155,17 @@ namespace Umbraco.Core.Services.Implement
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
                 scope.WriteLock(Constants.Locks.MediaTree);
-                // TODO: We're going to have to clear all caches
-                return _mediaRepository.CheckDataIntegrity(options);
+
+                var report = _mediaRepository.CheckDataIntegrity(options);
+
+                if (report.FixedIssues.Count > 0)
+                {
+                    //The event args needs a content item so we'll make a fake one with enough properties to not cause a null ref
+                    var root = new Models.Media("root", -1, new MediaType(-1)) { Id = -1, Key = Guid.Empty };
+                    scope.Events.Dispatch(TreeChanged, this, new TreeChange<IMedia>.EventArgs(new TreeChange<IMedia>(root, TreeChangeTypes.RefreshAll)));
+                }
+
+                return report;
             }
         }