yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DataType refactoring preparation - Entity refactoring

Browse Source
This commit is contained in:
Stephan
2018-01-15 11:32:30 +01:00
parent 988aa661ea
commit d23933a5b1
213 changed files with 2149 additions and 2478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs
View File

@@ -7,6 +7,7 @@ using Examine.LuceneEngine.Providers;
using Examine.LuceneEngine;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Entities;
using Umbraco.Core.Models.Membership;
using Umbraco.Web.Models.ContentEditing;
using Umbraco.Examine;
@@ -15,14 +16,17 @@ namespace Umbraco.Web.Models.Mapping
{
internal class EntityMapperProfile : Profile
{
private static string GetContentTypeIcon(EntitySlim entity)
=> entity is ContentEntitySlim contentEntity ? contentEntity.ContentTypeIcon : null;
public EntityMapperProfile()
{
// create, capture, cache
var contentTypeUdiResolver = new ContentTypeUdiResolver();
CreateMap<UmbracoEntity, EntityBasic>()
.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(src.NodeObjectType), src.Key)))
.ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentTypeIcon))
CreateMap<EntitySlim, EntityBasic>()
.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(ObjectTypes.GetUdiType(src.NodeObjectType), src.Key)))
.ForMember(dest => dest.Icon, opt => opt.MapFrom(src => GetContentTypeIcon(src)))
.ForMember(dest => dest.Trashed, opt => opt.Ignore())
.ForMember(dest => dest.Alias, opt => opt.Ignore())
.AfterMap((src, dest) =>
@@ -79,9 +83,9 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(dest => dest.Trashed, opt => opt.Ignore())
.ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
CreateMap<UmbracoEntity, SearchResultItem>()
.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(src.NodeObjectType), src.Key)))
.ForMember(dest => dest.Icon, opt => opt.MapFrom(src=> src.ContentTypeIcon))
CreateMap<EntitySlim, SearchResultItem>()
.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(ObjectTypes.GetUdiType(src.NodeObjectType), src.Key)))
.ForMember(dest => dest.Icon, opt => opt.MapFrom(src=> GetContentTypeIcon(src)))
.ForMember(dest => dest.Trashed, opt => opt.Ignore())
.ForMember(dest => dest.Alias, opt => opt.Ignore())
.ForMember(dest => dest.Score, opt => opt.Ignore())

2
src/Umbraco.Web/Models/Mapping/EntityProfileExtensions.cs
View File

@@ -1,5 +1,5 @@
using AutoMapper;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Models.Entities;
namespace Umbraco.Web.Models.Mapping
{

13
src/Umbraco.Web/Models/Mapping/UserMapperProfile.cs
View File

@@ -7,7 +7,7 @@ using Umbraco.Core.Cache;
using Umbraco.Core.Models.Membership;
using Umbraco.Web.Models.ContentEditing;
using Umbraco.Core.Models;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Models.Entities;
using Umbraco.Core.Security;
using Umbraco.Core.Services;
using Umbraco.Web._Legacy.Actions;
@@ -16,6 +16,9 @@ namespace Umbraco.Web.Models.Mapping
{
internal class UserMapperProfile : Profile
{
private static string GetContentTypeIcon(EntitySlim entity)
=> entity is ContentEntitySlim contentEntity ? contentEntity.ContentTypeIcon : null;
public UserMapperProfile(ILocalizedTextService textService, IUserService userService, IEntityService entityService, ISectionService sectionService,
IRuntimeCacheProvider runtimeCache,
ActionCollection actions)
@@ -156,9 +159,9 @@ namespace Umbraco.Web.Models.Mapping
}
});
CreateMap<UmbracoEntity, AssignedContentPermissions>()
.ForMember(x => x.Udi, opt => opt.MapFrom(x => Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(x.NodeObjectType), x.Key)))
.ForMember(basic => basic.Icon, opt => opt.MapFrom(entity => entity.ContentTypeIcon))
CreateMap<EntitySlim, AssignedContentPermissions>()
.ForMember(x => x.Udi, opt => opt.MapFrom(x => Udi.Create(ObjectTypes.GetUdiType(x.NodeObjectType), x.Key)))
.ForMember(basic => basic.Icon, opt => opt.MapFrom(entity => GetContentTypeIcon(entity)))
.ForMember(dto => dto.Trashed, opt => opt.Ignore())
.ForMember(x => x.Alias, opt => opt.Ignore())
.ForMember(x => x.AssignedPermissions, opt => opt.Ignore())
@@ -198,7 +201,7 @@ namespace Umbraco.Web.Models.Mapping
.ToDictionary(x => x.EntityId, x => x);
var contentEntities = allContentPermissions.Keys.Count == 0
? new IUmbracoEntity[0]
? Array.Empty<IEntitySlim>()
: entityService.GetAll(UmbracoObjectTypes.Document, allContentPermissions.Keys.ToArray());
var allAssignedPermissions = new List<AssignedContentPermissions>();