From e6cca214d454c75bcba549d845971b93781984d2 Mon Sep 17 00:00:00 2001
From: Mikhail Trubnikov <ivc_trubnikovme@dvgd.rzd>
Date: Tue, 18 Jun 2024 10:37:57 +1000
Subject: [PATCH] =?UTF-8?q?feat(api):=20=D1=81=D0=BE=D1=80=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8=20getAll=20?=
 =?UTF-8?q?ApplicationInWorks.=20=D0=9A=D0=BE=D0=BB-=D0=B2=D0=BE=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D1=81=20api=20=D1=83=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=B4=D0=BE=204.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.API/Controllers/V1/ApplicationInWorkController.cs | 6 +++---
 docker-compose.yml                                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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<PaginationFilter>(paginationQuery);
 
-            IQueryable<ApplicationsInWork> query = applicationsInWorkService.Get();
+            IQueryable<ApplicationsInWork> 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: