feature: support multiple ReadingTime property types per content type

Author: jcdcdev

src/jcdcdev.Umbraco.ReadingTime/Core/IReadingTimeService.cs

@@ -7,6 +7,7 @@ public interface IReadingTimeService
 {
     Task ScanTree(int homeId);
     Task Process(IContent item);
-    Task<ContentReadingTimeModel?> GetAsync(Guid key);
     Task<int> DeleteAsync(Guid key);
+    Task<ReadingTimeDto?> GetAsync(Guid key, Guid dataTypeKey);
+    Task<ReadingTimeDto?> GetAsync(Guid key, int dataTypeId);
 }

src/jcdcdev.Umbraco.ReadingTime/Core/Models/ContentReadingTimeModel.cs

@@ -0,0 +1,14 @@
+using Umbraco.Extensions;
+
+namespace jcdcdev.Umbraco.ReadingTime.Core.Models;
+
+public class ReadingTimeDto
+{
+    public List<ReadingTimeVariantDto?> Data { get; init; } = new();
+    public int Id { get; init; }
+    public Guid Key { get; init; }
+    public int DataTypeId { get; init; }
+    public Guid DataTypeKey { get; set; }
+
+    public ReadingTimeVariantDto? Value(string? culture = null) => Data.FirstOrDefault(x => x?.Culture.InvariantEquals(culture) ?? false);
+}

src/jcdcdev.Umbraco.ReadingTime/Core/Models/ReadingTimeDto.cs

@@ -0,0 +1,11 @@
+using System.Runtime.Serialization;
+
+namespace jcdcdev.Umbraco.ReadingTime.Core.Models;
+
+public class ReadingTimeVariantDto
+{
+    [DataMember(Name = "culture")]
+    public string? Culture { get; set; }
+    [DataMember(Name = "readingTime")]
+    public TimeSpan? ReadingTime { get; set; }
+}

src/jcdcdev.Umbraco.ReadingTime/Core/Models/ReadingTimeVariantDto.cs

@@ -33,7 +33,7 @@ public ReadingTimePropertyValueConverter(
             return null;
         }
 
-        var model = _readingTimeService.GetAsync(key).GetAwaiter().GetResult();
+        var model = _readingTimeService.GetAsync(key, propertyType.DataType.Id).GetAwaiter().GetResult();
         var culture = _variationContextAccessor.VariationContext?.Culture;
         var config = propertyType.DataType.ConfigurationAs<ReadingTimeConfiguration>();
         if (config is null)

src/jcdcdev.Umbraco.ReadingTime/Core/Models/ReadingTimeVariantModel.cs

@@ -2,6 +2,7 @@
 using jcdcdev.Umbraco.ReadingTime.Core.Extensions;
 using jcdcdev.Umbraco.ReadingTime.Core.PropertyEditors;
 using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Services;
@@ -46,6 +47,12 @@ public async Task HandleAsync(SendingContentNotification notification, Cancellat
             return;
         }
 
+        var contentType = notification.Content.DocumentType;
+        if (contentType == null)
+        {
+            return;
+        }
+
         var properties = new List<ContentPropertyDisplay>();
         foreach (var variant in notification.Content.Variants)
         {
@@ -79,10 +86,11 @@ public async Task HandleAsync(SendingContentNotification notification, Cancellat
             return;
         }
 
-        var model = await _readingTimeService.GetAsync(notification.Content.Key.Value);
 
         foreach (var property in properties)
         {
+
+            var model = await _readingTimeService.GetAsync(notification.Content.Key.Value, property.DataTypeKey);
             if (model == null)
             {
                 property.Value = _localizedTextService.Localize(Constants.LocalisationKeys.Area, Constants.LocalisationKeys.SaveAndPublishToGenerateReadingTime);

src/jcdcdev.Umbraco.ReadingTime/Core/PropertyEditors/ReadingTimePropertyValueConverter.cs

@@ -0,0 +1,34 @@
+using jcdcdev.Umbraco.ReadingTime.Core;
+using Umbraco.Cms.Infrastructure.Migrations;
+
+namespace jcdcdev.Umbraco.ReadingTime.Infrastructure.Migrations;
+
+public class MultiplePropertyEditorSupport : MigrationBase
+{
+    public MultiplePropertyEditorSupport(IMigrationContext context) : base(context)
+    {
+    }
+
+    protected override void Migrate()
+    {
+        if (!ColumnExists(Constants.TableName, "dataTypeId"))
+        {
+            Alter.Table(Constants.TableName)
+                .AddColumn("dataTypeId")
+                .AsInt32()
+                .ForeignKey(global::Umbraco.Cms.Core.Constants.DatabaseSchema.Tables.Node, "id")
+                .NotNullable()
+                .Do();
+        }
+
+        if (!ColumnExists(Constants.TableName, "dataTypeKey"))
+        {
+            Alter.Table(Constants.TableName)
+                .AddColumn("dataTypeKey")
+                .AsInt32()
+                .ForeignKey(global::Umbraco.Cms.Core.Constants.DatabaseSchema.Tables.Node, "uniqueId")
+                .NotNullable()
+                .Do();
+        }
+    }
+}

src/jcdcdev.Umbraco.ReadingTime/Core/ReadingTimeNotificationHandler.cs

@@ -17,6 +17,6 @@ protected override void Migrate()
             Delete.Table(Constants.TableName).Do();
         }
 
-        Create.Table<ContentReadingTimePoco>().Do();
+        Create.Table<ReadingTimePoco>().Do();
     }
 }

src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/0.2.0/MultiplePropertyEditorSupport.cs

@@ -13,5 +13,6 @@ protected override void DefinePlan()
     {
         From(string.Empty);
         To<InitialMigration>(nameof(InitialMigration));
+        To<MultiplePropertyEditorSupport>(nameof(MultiplePropertyEditorSupport));
     }
 }