Merge pull request #11495 from umbraco/v8/feature/version-history-cleanup

Version history cleanup

Author: bergmania

src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs

@@ -49,6 +49,7 @@ public static Composition ComposeRepositories(this Composition composition)
             composition.RegisterUnique<IContentTypeCommonRepository, ContentTypeCommonRepository>();
             composition.RegisterUnique<IInstallationRepository, InstallationRepository>();
             composition.RegisterUnique<IUpgradeCheckRepository, UpgradeCheckRepository>();
+            composition.RegisterUnique<IDocumentVersionRepository, DocumentVersionRepository>();
 
             return composition;
         }

src/Umbraco.Core/Composing/CompositionExtensions/Services.cs

@@ -31,7 +31,12 @@ public static Composition ComposeServices(this Composition composition)
             composition.RegisterUnique<IDomainService, DomainService>();
             composition.RegisterUnique<IAuditService, AuditService>();
             composition.RegisterUnique<ITagService, TagService>();
-            composition.RegisterUnique<IContentService, ContentService>();
+
+            composition.RegisterUnique<ContentService>();
+            composition.RegisterUnique<IContentService>(factory => factory.GetInstance<ContentService>());
+            composition.RegisterUnique<IContentVersionService>(factory => factory.GetInstance<ContentService>());
+            composition.RegisterUnique<IContentVersionCleanupPolicy, DefaultContentVersionCleanupPolicy>();
+
             composition.RegisterUnique<IUserService, UserService>();
             composition.RegisterUnique<IMemberService, MemberService>();
             composition.RegisterUnique<IMediaService, MediaService>();

src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs

@@ -22,6 +22,9 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
         [ConfigurationProperty("notifications", IsRequired = true)]
         internal NotificationsElement Notifications => (NotificationsElement) base["notifications"];
 
+        [ConfigurationProperty("contentVersionCleanupPolicyGlobalSettings", IsRequired = false)]
+        internal ContentVersionCleanupPolicyGlobalSettingsElement ContentVersionCleanupPolicyGlobalSettingsElement => (ContentVersionCleanupPolicyGlobalSettingsElement) this["contentVersionCleanupPolicyGlobalSettings"];
+
         [ConfigurationProperty("PreviewBadge")]
         internal InnerTextConfigurationElement<string> PreviewBadge => GetOptionalTextElement("PreviewBadge", DefaultPreviewBadge);
 
@@ -61,6 +64,8 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         IEnumerable<string> IContentSection.AllowedUploadFiles => AllowedUploadFiles;
 
+        IContentVersionCleanupPolicyGlobalSettings IContentSection.ContentVersionCleanupPolicyGlobalSettings => ContentVersionCleanupPolicyGlobalSettingsElement;
+
         bool IContentSection.ShowDeprecatedPropertyEditors => ShowDeprecatedPropertyEditors;
 
         string IContentSection.LoginBackgroundImage => LoginBackgroundImage;

src/Umbraco.Core/Configuration/UmbracoSettings/ContentVersionCleanupPolicyGlobalSettingsElement.cs

@@ -0,0 +1,16 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentVersionCleanupPolicyGlobalSettingsElement : UmbracoConfigurationElement, IContentVersionCleanupPolicyGlobalSettings
+    {
+        [ConfigurationProperty("enable", DefaultValue = false)]
+        public bool EnableCleanup => (bool)this["enable"];
+
+        [ConfigurationProperty("keepAllVersionsNewerThanDays", DefaultValue = 2)]
+        public int KeepAllVersionsNewerThanDays => (int)this["keepAllVersionsNewerThanDays"];
+
+        [ConfigurationProperty("keepLatestVersionPerDayForDays", DefaultValue = 30)]
+        public int KeepLatestVersionPerDayForDays => (int)this["keepLatestVersionPerDayForDays"];
+    }
+}

src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs

@@ -25,6 +25,8 @@ public interface IContentSection : IUmbracoConfigurationSection
 
         IEnumerable<string> AllowedUploadFiles { get; }
 
+        IContentVersionCleanupPolicyGlobalSettings ContentVersionCleanupPolicyGlobalSettings { get; }
+
         /// <summary>
         /// Gets a value indicating whether to show deprecated property editors in
         /// a datatype list of available editors.

src/Umbraco.Core/Configuration/UmbracoSettings/IContentVersionCleanupPolicyGlobalSettings.cs

@@ -0,0 +1,9 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IContentVersionCleanupPolicyGlobalSettings
+    {
+        bool EnableCleanup { get; }
+        int KeepAllVersionsNewerThanDays { get; }
+        int KeepLatestVersionPerDayForDays { get; }
+    }
+}

src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs

@@ -85,7 +85,8 @@ public DatabaseSchemaCreator(IUmbracoDatabase database, ILogger logger)
             typeof (AuditEntryDto),
             typeof (ContentVersionCultureVariationDto),
             typeof (DocumentCultureVariationDto),
-            typeof (ContentScheduleDto)
+            typeof (ContentScheduleDto),
+            typeof (ContentVersionCleanupPolicyDto)
         };
 
         /// <summary>

src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs

@@ -11,6 +11,7 @@
 using Umbraco.Core.Migrations.Upgrade.V_8_10_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_15_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_17_0;
+using Umbraco.Core.Migrations.Upgrade.V_8_18_0;
 
 namespace Umbraco.Core.Migrations.Upgrade
 {
@@ -211,6 +212,7 @@ protected void DefinePlan()
             To<AddPropertyTypeGroupColumns>("{153865E9-7332-4C2A-9F9D-F20AEE078EC7}");
 
             //FINAL
+            To<AddContentVersionCleanupFeature>("{8BAF5E6C-DCB7-41AE-824F-4215AE4F1F98}");
         }
     }
 }

src/Umbraco.Core/Migrations/Upgrade/V_8_18_0/AddContentVersionCleanupFeature.cs

@@ -0,0 +1,26 @@
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_18_0
+{
+    class AddContentVersionCleanupFeature : MigrationBase
+    {
+        public AddContentVersionCleanupFeature(IMigrationContext context)
+            : base(context) { }
+
+        /// <remarks>
+        /// The conditionals are useful to enable the same migration to be used in multiple
+        /// migration paths x.x -> 8.18 and x.x -> 9.x
+        /// </remarks>
+        public override void Migrate()
+        {
+            var tables = SqlSyntax.GetTablesInSchema(Context.Database);
+            if (!tables.InvariantContains(ContentVersionCleanupPolicyDto.TableName))
+            {
+                Create.Table<ContentVersionCleanupPolicyDto>().Do();
+            }
+
+            var columns = SqlSyntax.GetColumnsInSchema(Context.Database);
+            AddColumnIfNotExists<ContentVersionDto>(columns, "preventCleanup");
+        }
+    }
+}

src/Umbraco.Core/Models/ContentEditing/HistoryCleanup.cs

@@ -0,0 +1,18 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Models.ContentEditing
+{
+    [DataContract(Name = "historyCleanup", Namespace = "")]
+    public class HistoryCleanup
+    {
+        [DataMember(Name = "preventCleanup")]
+        public bool PreventCleanup { get; set; }
+
+        [DataMember(Name = "keepAllVersionsNewerThanDays")]
+        public int? KeepAllVersionsNewerThanDays { get;set; }
+
+        [DataMember(Name = "keepLatestVersionPerDayForDays")]
+        public int? KeepLatestVersionPerDayForDays { get;set; }
+    }
+}
+