Move index upgrade logic into the migration plan

Author: acoumb

src/Umbraco.Cms.Integrations.Search.Algolia/Migrations/UpdateAlgoliaIndicesPostUpgrade.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Scoping;
@@ -11,7 +12,7 @@ public class UpdateAlgoliaIndicesPostUpgrade : MigrationBase
         private readonly IScopeProvider _scopeProvider;
         private readonly IContentTypeService _contentTypeService;
 
-        public UpdateAlgoliaIndicesPostUpgrade(IMigrationContext context, IScopeProvider scopeProvider, IContentTypeService contentTypeService) 
+        public UpdateAlgoliaIndicesPostUpgrade(IMigrationContext context, IScopeProvider scopeProvider, IContentTypeService contentTypeService)
             : base(context)
         {
             _scopeProvider = scopeProvider;
@@ -24,36 +25,71 @@ protected override void Migrate()
 
             var indices = scope.Database.Fetch<AlgoliaIndex>();
 
-            foreach (var index in indices) 
+            foreach (var index in indices)
             {
-                bool requiresUpdate = false;
-
-                var indexSerializedData = JsonSerializer.Deserialize<IEnumerable<ContentTypeDto>>(index.SerializedData);
+                var indexSerializedData = JsonSerializer.Deserialize<IEnumerable<AlgoliaMigrationIndexData>>(index.SerializedData);
                 if (indexSerializedData == null) continue;
 
                 foreach (var data in indexSerializedData.Where(x => x.ContentType != null))
                 {
-                    requiresUpdate = true;
+                    var contentTypeDto = new ContentTypeDto();
 
-                    var contentType = _contentTypeService.Get(data.ContentType!.Alias);
+                    var contentType = _contentTypeService.Get(data.ContentType.Alias);
                     if (contentType != null)
                     {
-                        data.Id = contentType.Id;
+                        contentTypeDto.Id = contentType.Id;
                     }
 
-                    data.Icon = data.ContentType!.Icon;
-                    data.Alias = data.ContentType!.Alias;
-                    data.Name = data.ContentType!.Name;
-                }
+                    contentTypeDto.Icon = data.ContentType.Icon;
+                    contentTypeDto.Alias = data.ContentType.Alias;
+                    contentTypeDto.Name = data.ContentType.Name;
+                    contentTypeDto.Properties = data.Properties.Select(x => new ContentTypePropertyDto
+                    {
+                        Alias = x.Alias,
+                        Name = x.Name,
+                        Icon = x.Icon,
+                        Selected = true
+                    });
 
-                if (requiresUpdate)
-                {
-                    index.SerializedData = JsonSerializer.Serialize(indexSerializedData);
+                    index.SerializedData = JsonSerializer.Serialize(contentTypeDto);
                     scope.Database.Update(index);
                 }
             }
 
             scope.Complete();
         }
+
+        private class AlgoliaMigrationIndexData
+        {
+            [JsonPropertyName("contentType")]
+            public AlgoliaMigrationIndexContentType ContentType { get; set; }
+
+            [JsonPropertyName("properties")]
+            public IEnumerable<AlgoliaMigrationIndexProperty> Properties { get; set; }
+        }
+
+        public class AlgoliaMigrationIndexContentType
+        {
+            [JsonPropertyName("alias")]
+            public string Alias { get; set; }
+
+            [JsonPropertyName("name")]
+            public string Name { get; set; }
+
+            [JsonPropertyName("icon")]
+            public string Icon { get; set; }
+        }
+
+        public class AlgoliaMigrationIndexProperty
+        {
+            [JsonPropertyName("alias")]
+            public string Alias { get; set; }
+
+            [JsonPropertyName("name")]
+            public string Name { get; set; }
+
+            [JsonPropertyName("icon")]
+            public string Icon { get; set; }
+        }
     }
 }

src/Umbraco.Cms.Integrations.Search.Algolia/Models/ContentTypeDtos/ContentTypeDto.cs

@@ -6,21 +6,16 @@ public class ContentTypeDto
     {
         public int Id { get; set; }
 
-        [JsonPropertyName("contentType")]
-        public ContentEntity? ContentType { get; set; }
-
         public string Icon { get; set; }
 
         public string Alias { get; set; }
 
-        [JsonPropertyName("name")]
         public string Name { get; set; }
 
         public bool Selected { get; set; }
 
         public bool AllowRemove { get; set; }
 
-        [JsonPropertyName("properties")]
         public IEnumerable<ContentTypePropertyDto> Properties { get; set; }
     }
 }

src/Umbraco.Cms.Integrations.Search.Algolia/Models/ContentTypeDtos/ContentTypePropertyDto.cs

@@ -1,25 +1,17 @@
-using System.Text.Json.Serialization;
-
-namespace Umbraco.Cms.Integrations.Search.Algolia.Models.ContentTypeDtos
+namespace Umbraco.Cms.Integrations.Search.Algolia.Models.ContentTypeDtos
 {
     public class ContentTypePropertyDto
     {
-        [JsonPropertyName("id")]
         public int Id { get; set; }
 
-        [JsonPropertyName("icon")]
         public string Icon { get; set; }
 
-        [JsonPropertyName("alias")]
         public string Alias { get; set; }
 
-        [JsonPropertyName("name")]
         public string Name { get; set; }
 
-        [JsonPropertyName("group")]
         public string Group { get; set; }
 
-        [JsonPropertyName("selected")]
         public bool Selected { get; set; }
     }
 }