From 49c6fd2c76f76f09f7f14868ad827a67a1af6c3d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 8 Apr 2020 10:38:02 +1000
Subject: [PATCH] data integrity report working

---
 .../Models/ContentDataIntegrityReport.cs      |  3 ++-
 .../Implement/ContentRepositoryBase.cs        |  2 ++
 .../Checks/Data/DatabaseIntegrityCheck.cs     | 21 +++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentDataIntegrityReport.cs b/src/Umbraco.Core/Models/ContentDataIntegrityReport.cs
index 60683ee72f..d3660679a7 100644
--- a/src/Umbraco.Core/Models/ContentDataIntegrityReport.cs
+++ b/src/Umbraco.Core/Models/ContentDataIntegrityReport.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Umbraco.Core.Models
 {
@@ -9,7 +10,7 @@ namespace Umbraco.Core.Models
             DetectedIssues = detectedIssues;
         }
 
-        public bool Ok => DetectedIssues.Count == 0;
+        public bool Ok => DetectedIssues.Count == 0 || DetectedIssues.Count == DetectedIssues.Values.Count(x => x.Fixed);
 
         public IReadOnlyDictionary<int, ContentDataIntegrityReportEntry> DetectedIssues { get; }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index 9999e9f2d6..4aa9655249 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -578,6 +578,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 foreach (var node in updated)
                 {
                     Database.Update(node);
+                    if (report.TryGetValue(node.NodeId, out var entry))
+                        entry.Fixed = true;
                 }
             }
 
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Data/DatabaseIntegrityCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Data/DatabaseIntegrityCheck.cs
index 876ad9f1d7..b7d9aea3b9 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Data/DatabaseIntegrityCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Data/DatabaseIntegrityCheck.cs
@@ -68,21 +68,30 @@ namespace Umbraco.Web.HealthCheck.Checks.Data
                 });
             }
 
-            return new HealthCheckStatus(report.Ok
-                ? $"All {entityType} paths are valid"
-                : GetInvalidReport(report, entityType, detailedReport))
+            return new HealthCheckStatus(GetReport(report, entityType, detailedReport))
             {
                 ResultType = report.Ok ? StatusResultType.Success : StatusResultType.Error,
                 Actions = actions
             };
         }
 
-        private static string GetInvalidReport(ContentDataIntegrityReport report, string entityType, bool detailed)
+        private static string GetReport(ContentDataIntegrityReport report, string entityType, bool detailed)
         {
             var sb = new StringBuilder();
-            sb.AppendLine($"There are {report.DetectedIssues.Count} invalid {entityType} paths");
 
-            if (true && report.DetectedIssues.Count > 0)
+            if (report.Ok)
+            {
+                sb.AppendLine($"<p>All {entityType} paths are valid</p>");
+
+                if (!detailed)
+                    return sb.ToString();
+            }
+            else
+            {
+                sb.AppendLine($"<p>{report.DetectedIssues.Count} invalid {entityType} paths detected.</p>");
+            }
+
+            if (detailed && report.DetectedIssues.Count > 0)
             {
                 sb.AppendLine("<ul>");
                 foreach (var issueGroup in report.DetectedIssues.GroupBy(x => x.Value.IssueType))