Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/dev

# Conflicts: # src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs # src/Umbraco.Core/Composing/CompositionExtensions/Services.cs # src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs # src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs # src/Umbraco.Core/ContentEditing/HistoryCleanup.cs # src/Umbraco.Core/Models/ContentEditing/DocumentTypeDisplay.cs # src/Umbraco.Core/Models/ContentType.cs # src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs # src/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository.cs # src/Umbraco.Core/Scheduling/ContentVersionCleanup.cs # src/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy.cs # src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs # src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs # src/Umbraco.Infrastructure/Services/Implement/ContentService.cs # src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config # src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs # src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs # src/Umbraco.Tests/Umbraco.Tests.csproj # src/Umbraco.Web.UI.Client/package-lock.json # src/Umbraco.Web.UI/config/umbracoSettings.Release.config # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml # src/Umbraco.Web/Scheduling/SchedulerComponent.cs # src/Umbraco.Web/Umbraco.Web.csproj # tests/Umbraco.Tests.Common/Extensions/AutoMoqDataAttribute.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanup_Tests_UnitTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_Integration.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_UnitTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
2021-10-29 15:00:27 +02:00
parent 14fc4b6e25 698e6b1533
commit 53631ee48b
44 changed files with 3354 additions and 1063 deletions
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentVersionRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentVersionRepository.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Infrastructure.Persistence.Dtos;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
+{
+    internal class DocumentVersionRepository : IDocumentVersionRepository
+    {
+        private readonly IScopeAccessor _scopeAccessor;
+
+        public DocumentVersionRepository(IScopeAccessor scopeAccessor)
+        {
+            _scopeAccessor = scopeAccessor ?? throw new ArgumentNullException(nameof(scopeAccessor));
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// Never includes current draft version. <br/>
+        /// Never includes current published version.<br/>
+        /// Never includes versions marked as "preventCleanup".<br/>
+        /// </remarks>
+        public IReadOnlyCollection<HistoricContentVersionMeta> GetDocumentVersionsEligibleForCleanup()
+        {
+            var query = _scopeAccessor.AmbientScope.SqlContext.Sql();
+
+            query.Select(@"umbracoDocument.nodeId as contentId,
+                           umbracoContent.contentTypeId as contentTypeId,
+                           umbracoContentVersion.id as versionId,
+                           umbracoContentVersion.versionDate as versionDate")
+                .From<DocumentDto>()
+                .InnerJoin<ContentDto>()
+                    .On<DocumentDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentVersionDto>()
+                    .On<ContentDto, ContentVersionDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<DocumentVersionDto>()
+                    .On<ContentVersionDto, DocumentVersionDto>(left => left.Id, right => right.Id)
+                .Where<ContentVersionDto>(x => !x.Current) // Never delete current draft version
+                .Where<ContentVersionDto>(x => !x.PreventCleanup) // Never delete "pinned" versions
+                .Where<DocumentVersionDto>(x => !x.Published); // Never delete published version
+
+            return _scopeAccessor.AmbientScope.Database.Fetch<HistoricContentVersionMeta>(query);
+        }
+
+        /// <inheritdoc />
+        public IReadOnlyCollection<ContentVersionCleanupPolicySettings> GetCleanupPolicies()
+        {
+            var query = _scopeAccessor.AmbientScope.SqlContext.Sql();
+
+            query.Select<ContentVersionCleanupPolicyDto>()
+                .From<ContentVersionCleanupPolicyDto>();
+
+            return _scopeAccessor.AmbientScope.Database.Fetch<ContentVersionCleanupPolicySettings>(query);
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// Deletes in batches of <see cref="Constants.Sql.MaxParameterCount"/>
+        /// </remarks>
+        public void DeleteVersions(IEnumerable<int> versionIds)
+        {
+            foreach (var group in versionIds.InGroupsOf(Constants.Sql.MaxParameterCount))
+            {
+                var groupedVersionIds = group.ToList();
+
+                // Note: We had discussed doing this in a single SQL Command.
+                // If you can work out how to make that work with SQL CE, let me know!
+                // Can use test PerformContentVersionCleanup_WithNoKeepPeriods_DeletesEverythingExceptActive to try things out.
+
+                var query = _scopeAccessor.AmbientScope.SqlContext.Sql()
+                    .Delete<PropertyDataDto>()
+                    .WhereIn<PropertyDataDto>(x => x.VersionId, groupedVersionIds);
+                _scopeAccessor.AmbientScope.Database.Execute(query);
+
+                query = _scopeAccessor.AmbientScope.SqlContext.Sql()
+                    .Delete<ContentVersionCultureVariationDto>()
+                    .WhereIn<ContentVersionCultureVariationDto>(x => x.VersionId, groupedVersionIds);
+                _scopeAccessor.AmbientScope.Database.Execute(query);
+
+                query = _scopeAccessor.AmbientScope.SqlContext.Sql()
+                    .Delete<DocumentVersionDto>()
+                    .WhereIn<DocumentVersionDto>(x => x.Id, groupedVersionIds);
+                _scopeAccessor.AmbientScope.Database.Execute(query);
+
+                query = _scopeAccessor.AmbientScope.SqlContext.Sql()
+                    .Delete<ContentVersionDto>()
+                    .WhereIn<ContentVersionDto>(x => x.Id, groupedVersionIds);
+                _scopeAccessor.AmbientScope.Database.Execute(query);
+            }
+        }
+    }
+}