Netcore: Migration of Model classes from Umbraco.Infrastructure to Core (#9404)

* Migrating more model, mapping and tree classes * Migrating files from Mapping dir without Newtonsoft dependency * Migrating files from PublishedContent and Editors dirs without Newtonsoft dependency + some more of the same kind * Migrating DataType class without the usage of Newtonsoft.Json and making the corresponding changes to all classes affected * Combining 3 ContentExtensions files into 1 * Refactoring from migrating ContentExtensions * Migrating more classes * Migrating ContentRepositoryExtensions - combining it with existing file in Umbraco.Core * removing Newtonsoft json dependency & migrating file. Adding partial migration of ConfigurationEditor, so PropertyTagsExtensions can be migrated * Migrating ContentTagsExtensions, and refactoring from changes in PropertyTagsExtensions * Changes that should be reverted once ConfigurationEditor class is fully migrated * VS couldn't find Composing, so build was failing. Removing the using solves the problem * Handling a single case for deserializing a subset of an input * Small changes and added tests to JsonNetSerializer Signed-off-by: Bjarke Berg <mail@bergmania.dk> * Migrated ConfigurationEditor Signed-off-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2020-11-17 20:27:10 +01:00
parent d498c1a2cd
commit dd5f400cf3
116 changed files with 1098 additions and 897 deletions
--- a/src/Umbraco.Core/Models/Mapping/CommonMapper.cs
+++ b/src/Umbraco.Core/Models/Mapping/CommonMapper.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Mapping;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.ContentEditing;
+using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Services;
+using Umbraco.Web.ContentApps;
+using Umbraco.Web.Models.ContentEditing;
+using UserProfile = Umbraco.Web.Models.ContentEditing.UserProfile;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    public class CommonMapper
+    {
+        private readonly IUserService _userService;
+        private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
+        private readonly ContentAppFactoryCollection _contentAppDefinitions;
+        private readonly ILocalizedTextService _localizedTextService;
+
+        public CommonMapper(IUserService userService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
+            ContentAppFactoryCollection contentAppDefinitions, ILocalizedTextService localizedTextService)
+        {
+            _userService = userService;
+            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+            _contentAppDefinitions = contentAppDefinitions;
+            _localizedTextService = localizedTextService;
+        }
+
+        public UserProfile GetOwner(IContentBase source, MapperContext context)
+        {
+            var profile = source.GetCreatorProfile(_userService);
+            return profile == null ? null : context.Map<IProfile, UserProfile>(profile);
+        }
+
+        public UserProfile GetCreator(IContent source, MapperContext context)
+        {
+            var profile = source.GetWriterProfile(_userService);
+            return profile == null ? null : context.Map<IProfile, UserProfile>(profile);
+        }
+
+        public ContentTypeBasic GetContentType(IContentBase source, MapperContext context)
+        {
+            var contentType = _contentTypeBaseServiceProvider.GetContentTypeOf(source);
+            var contentTypeBasic = context.Map<IContentTypeComposition, ContentTypeBasic>(contentType);
+            return contentTypeBasic;
+        }
+
+        public IEnumerable<ContentApp> GetContentApps(IUmbracoEntity source)
+        {
+            var apps = _contentAppDefinitions.GetContentAppsFor(source).ToArray();
+
+            // localize content app names
+            foreach (var app in apps)
+            {
+                var localizedAppName = _localizedTextService.Localize($"apps/{app.Alias}");
+                if (localizedAppName.Equals($"[{app.Alias}]", StringComparison.OrdinalIgnoreCase) == false)
+                {
+                    app.Name = localizedAppName;
+                }
+            }
+
+            return apps;
+        }
+    }
+}