mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(api): сортировка при getAll ApplicationInWorks. Кол-во контейнеров с api увеличено до 4.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-06-18 10:37:57 +10:00
parent cc71a8774b
commit e6cca214d4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PARR.API/Controllers/V1/ApplicationInWorkController.cs
View File

@@ -52,17 +52,17 @@ namespace PARR.API.Controllers.V1
{ {
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery); var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
IQueryable<ApplicationsInWork> query = applicationsInWorkService.Get(); IQueryable<ApplicationsInWork> query = applicationsInWorkService.Get().Include(t => t.Application).ThenInclude(t => t!.ApplicationType);
if (filter.IsLight != true) if (filter.IsLight != true)
{ {
query = query.Include(t => t.Application).ThenInclude(t => t!.ApplicationType) query = query
.Include(t => t.Work) .Include(t => t.Work)
.Include(t => t.Templates) .Include(t => t.Templates)
.Include(t => t.WorkGroups).ThenInclude(t => t.WorkGroup); .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)) if (!string.IsNullOrEmpty(filter.ShortDescription))
query = query.Where(t => t.ShortDescription.ToLower().Contains(filter.ShortDescription.ToLower())); query = query.Where(t => t.ShortDescription.ToLower().Contains(filter.ShortDescription.ToLower()));

2
docker-compose.yml
View File

@@ -23,7 +23,7 @@ services:
fluentd-max-retries: '30' fluentd-max-retries: '30'
tag: parr.api.serilog tag: parr.api.serilog
deploy: deploy:
replicas: 2 replicas: 4
networks: networks:
parr-network: parr-network: