From e81abc86e66855b8f33231f2d7296ce1dd06bfaf Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Thu, 2 Feb 2023 15:58:07 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/SAUB/MessageService.cs           | 31 +++----------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs
index 583eafaf..ce7606ff 100644
--- a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs
@@ -89,28 +89,13 @@ namespace AsbCloudInfrastructure.Services.SAUB
                 Count = query.Count()
             };
 
-            var hasAllSortedFieldsInDBOType = false;
-
             if (sortFields?.Any() == true)
             {
-                hasAllSortedFieldsInDBOType = hasAllFieldsInType<TelemetryMessage>(sortFields);
-                if (hasAllSortedFieldsInDBOType)
-                {
-                    query = query
-                        .SortBy(request.SortFields)
-                        .Skip(skip)
-                        .Take(take);
-                }
+                query = query.SortBy(request.SortFields);
             }
-            else
-            {
-                query = query
-                    .Skip(skip)
-                    .Take(take);
-            }
-
-            var messagesList = await query.AsNoTracking()
-                .ToListAsync(token).ConfigureAwait(false);
+            var messagesList = await query.Skip(skip)
+                    .Take(take).AsNoTracking()
+                    .ToListAsync(token).ConfigureAwait(false);
 
             if (messagesList.Count == 0)
                 return result;
@@ -150,14 +135,6 @@ namespace AsbCloudInfrastructure.Services.SAUB
                 result.Items.Add(messageDto);
             }
 
-            if (sortFields?.Any() == true && !hasAllSortedFieldsInDBOType)
-            {
-                result.Items = result.Items.AsQueryable()
-                    .SortBy(request.SortFields)
-                    .Skip(skip)
-                    .Take(take)
-                    .ToList();
-            }
             return result;
         }