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

Renames TagsRepository to TagRepository, Fixes n+1 queries on entity repository, fixes n+1 queries on tag repository, updates umbraco member types to specify an entity type for IMember and IMemberType so the entity repository can use it.

Browse Source
This commit is contained in:
Shannon
2014-09-01 18:06:24 +10:00
parent 6cacfe599f
commit 202f582661
23 changed files with 824 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web/Editors/EntityController.cs
View File

@@ -459,7 +459,7 @@ namespace Umbraco.Web.Editors
var objectType = ConvertToObjectType(entityType);
if (objectType.HasValue)
{
//TODO: Need to check for Object types that support heirarchy here, some might not.
//TODO: Need to check for Object types that support hierarchic here, some might not.
return Services.EntityService.GetChildren(id, objectType.Value).Select(Mapper.Map<EntityBasic>)
.WhereNotNull();
@@ -481,7 +481,7 @@ namespace Umbraco.Web.Editors
var objectType = ConvertToObjectType(entityType);
if (objectType.HasValue)
{
//TODO: Need to check for Object types that support heirarchy here, some might not.
//TODO: Need to check for Object types that support hierarchic here, some might not.
var ids = Services.EntityService.Get(id).Path.Split(',').Select(int.Parse);
return ids.Select(m => Mapper.Map<EntityBasic>(Services.EntityService.Get(m, objectType.Value)))
@@ -569,8 +569,11 @@ namespace Umbraco.Web.Editors
var objectType = ConvertToObjectType(entityType);
if (objectType.HasValue)
{
return keys.Select(id => Mapper.Map<EntityBasic>(Services.EntityService.GetByKey(id, objectType.Value)))
.WhereNotNull();
var result = Services.EntityService.GetAll(objectType.Value, keys.ToArray())
.WhereNotNull()
.Select(Mapper.Map<EntityBasic>);
return result;
}
//now we need to convert the unknown ones
switch (entityType)
@@ -591,8 +594,10 @@ namespace Umbraco.Web.Editors
var objectType = ConvertToObjectType(entityType);
if (objectType.HasValue)
{
var result = ids.Select(id => Mapper.Map<EntityBasic>(Services.EntityService.Get(id, objectType.Value)))
.WhereNotNull();
var result = Services.EntityService.GetAll(objectType.Value, ids.ToArray())
.WhereNotNull()
.Select(Mapper.Map<EntityBasic>);
return result;
}
//now we need to convert the unknown ones