claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2026-07-08 17:57:08 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Optimize admin software page query

Browse Source
This commit is contained in:
Natalia Portillo
2026-06-30 21:57:05 +01:00
parent 651d03b526
commit ffcbc9c939
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Marechai.Server/Controllers/SoftwareController.cs
View File

@@ -676,39 +676,39 @@ public class SoftwareController(MarechaiContext context, IMemoryCache cache, Use
[FromQuery] SoftwareKind? kind = null,
CancellationToken cancellationToken = default)
{
IQueryable<Database.Models.Software> baseQuery = context.Softwares;
IQueryable<Database.Models.Software> baseQuery = context.Softwares.AsNoTracking();
if(!string.IsNullOrWhiteSpace(search)) baseQuery = baseQuery.Where(s => s.Name.Contains(search));
if(kind.HasValue) baseQuery = baseQuery.Where(s => s.Kind == kind.Value);
IQueryable<SoftwareDto> projected = baseQuery.Select(s => new SoftwareDto
IQueryable<Database.Models.Software> ordered = sortBy switch
{
Id = s.Id,
Name = s.Name,
FamilyId = s.FamilyId,
Family = s.Family.Name,
Kind = s.Kind,
IsCompilation = false,
FrontCoverId = null
});
IQueryable<SoftwareDto> ordered = sortBy switch
{
"Name" => sortDescending ? projected.OrderByDescending(s => MarechaiContext.NaturalSortKey(s.Name))
: projected.OrderBy(s => MarechaiContext.NaturalSortKey(s.Name)),
"Family" => sortDescending ? projected.OrderByDescending(s => MarechaiContext.NaturalSortKey(s.Family))
: projected.OrderBy(s => MarechaiContext.NaturalSortKey(s.Family)),
"Kind" => sortDescending ? projected.OrderByDescending(s => s.Kind)
: projected.OrderBy(s => s.Kind),
_ => projected.OrderBy(s => MarechaiContext.NaturalSortKey(s.Name))
"Name" => sortDescending ? baseQuery.OrderByDescending(s => MarechaiContext.NaturalSortKey(s.Name))
: baseQuery.OrderBy(s => MarechaiContext.NaturalSortKey(s.Name)),
"Family" => sortDescending
? baseQuery.OrderByDescending(s => MarechaiContext.NaturalSortKey(s.Family != null ? s.Family.Name : null))
: baseQuery.OrderBy(s => MarechaiContext.NaturalSortKey(s.Family != null ? s.Family.Name : null)),
"Kind" => sortDescending ? baseQuery.OrderByDescending(s => s.Kind)
: baseQuery.OrderBy(s => s.Kind),
_ => baseQuery.OrderBy(s => MarechaiContext.NaturalSortKey(s.Name))
};
if(skip.HasValue) ordered = ordered.Skip(skip.Value);
if(take.HasValue) ordered = ordered.Take(take.Value);
return ordered.ToListAsync(cancellationToken);
return ordered.Select(s => new SoftwareDto
{
Id = s.Id,
Name = s.Name,
FamilyId = s.FamilyId,
Family = s.Family != null ? s.Family.Name : null,
Kind = s.Kind,
IsCompilation = false,
FrontCoverId = null
})
.ToListAsync(cancellationToken);
}
/// <summary>