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

Moved logic from FolderTreeControllerBase service layer (#15976)

Browse Source 
* Moved logic from FolderTreeControllerBase into EntityService and EntityRepository

* Custom sorting for data types, not media types

* Ensure ordering is the same for SQLite and SQLServer

---------

Co-authored-by: kjac <kja@umbraco.dk>
This commit is contained in:
Bjarke Berg
2024-04-04 11:27:13 +02:00
committed by GitHub
parent 43f77eef64
commit 3cc14888a9
7 changed files with 149 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepository.cs
View File

@@ -30,13 +30,13 @@ internal class EntityRepository : RepositoryBase, IEntityRepositoryExtended
#region Repository
public int CountByQuery(IQuery<IUmbracoEntity> query, Guid objectType, IQuery<IUmbracoEntity>? filter)
public int CountByQuery(IQuery<IUmbracoEntity> query, IEnumerable<Guid> objectTypes, IQuery<IUmbracoEntity>? filter)
{
Sql<ISqlContext> sql = Sql();
sql.SelectCount();
sql
.From<NodeDto>();
sql.WhereIn<NodeDto>(x => x.NodeObjectType, new[] { objectType } );
sql.WhereIn<NodeDto>(x => x.NodeObjectType, objectTypes );
foreach (Tuple<string, object[]> queryClause in query.GetWhereClauses())
{
@@ -54,10 +54,11 @@ internal class EntityRepository : RepositoryBase, IEntityRepositoryExtended
return Database.ExecuteScalar<int>(sql);
}
public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType,
public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, ISet<Guid> objectTypes,
long pageIndex, int pageSize, out long totalRecords,
IQuery<IUmbracoEntity>? filter, Ordering? ordering) =>
GetPagedResultsByQuery(query, new[] {objectType}, pageIndex, pageSize, out totalRecords, filter, ordering);
GetPagedResultsByQuery(query, objectTypes.ToArray(), pageIndex, pageSize, out totalRecords, filter, ordering);
// get a page of entities
public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid[] objectTypes,
@@ -635,25 +636,40 @@ internal class EntityRepository : RepositoryBase, IEntityRepositoryExtended
// TODO: although the default ordering string works for name, it wont work for others without a table or an alias of some sort
// As more things are attempted to be sorted we'll prob have to add more expressions here
string orderBy;
switch (ordering.OrderBy?.ToUpperInvariant())
{
case "PATH":
orderBy = SqlSyntax.GetQuotedColumn(NodeDto.TableName, "path");
break;
default:
orderBy = ordering.OrderBy ?? string.Empty;
break;
}
Ordering? runner = ordering;
if (ordering.Direction == Direction.Ascending)
do
{
sql.OrderBy(orderBy);
}
else
{
sql.OrderByDescending(orderBy);
switch (runner.OrderBy?.ToUpperInvariant())
{
case "NODEOBJECTTYPE":
orderBy = $"UPPER({SqlSyntax.GetQuotedColumn(NodeDto.TableName, "nodeObjectType")})";
break;
case "PATH":
orderBy = SqlSyntax.GetQuotedColumn(NodeDto.TableName, "path");
break;
default:
orderBy = runner.OrderBy ?? string.Empty;
break;
}
if (runner.Direction == Direction.Ascending)
{
sql.OrderBy(orderBy);
}
else
{
sql.OrderByDescending(orderBy);
}
runner = runner.Next;
}
while (runner is not null);
}
#endregion