diff --git a/PARR.API/Controllers/V1/ApplicationInWorkController.cs b/PARR.API/Controllers/V1/ApplicationInWorkController.cs index bfb03fcd..8f514fa8 100644 --- a/PARR.API/Controllers/V1/ApplicationInWorkController.cs +++ b/PARR.API/Controllers/V1/ApplicationInWorkController.cs @@ -52,17 +52,17 @@ namespace PARR.API.Controllers.V1 { var paginationFilter = mapper.Map(paginationQuery); - IQueryable query = applicationsInWorkService.Get(); + IQueryable query = applicationsInWorkService.Get().Include(t => t.Application).ThenInclude(t => t!.ApplicationType); if (filter.IsLight != true) { - query = query.Include(t => t.Application).ThenInclude(t => t!.ApplicationType) + query = query .Include(t => t.Work) .Include(t => t.Templates) .Include(t => t.WorkGroups).ThenInclude(t => t.WorkGroup); } - query = query.OrderBy(t => t.ShortDescription); + query = query.OrderBy(t => t.ShortDescription).ThenBy(t => t.Application!.Name); if (!string.IsNullOrEmpty(filter.ShortDescription)) query = query.Where(t => t.ShortDescription.ToLower().Contains(filter.ShortDescription.ToLower())); diff --git a/docker-compose.yml b/docker-compose.yml index dc4665fd..e04113d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: fluentd-max-retries: '30' tag: parr.api.serilog deploy: - replicas: 2 + replicas: 4 networks: parr-network: