on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Рефактор

Browse Source
This commit is contained in:
Olga Nemt 2023-02-02 15:58:07 +05:00
parent a4ff666b97
commit e81abc86e6
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
AsbCloudInfrastructure/Services/SAUB/MessageService.cs
View File

@ -89,27 +89,12 @@ namespace AsbCloudInfrastructure.Services.SAUB
Count = query.Count() Count = query.Count()
}; };
var hasAllSortedFieldsInDBOType = false;
if (sortFields?.Any() == true) if (sortFields?.Any() == true)
{ {
hasAllSortedFieldsInDBOType = hasAllFieldsInType<TelemetryMessage>(sortFields); query = query.SortBy(request.SortFields);
if (hasAllSortedFieldsInDBOType)
{
query = query
.SortBy(request.SortFields)
.Skip(skip)
.Take(take);
} }
} var messagesList = await query.Skip(skip)
else .Take(take).AsNoTracking()
{
query = query
.Skip(skip)
.Take(take);
}
var messagesList = await query.AsNoTracking()
.ToListAsync(token).ConfigureAwait(false); .ToListAsync(token).ConfigureAwait(false);
if (messagesList.Count == 0) if (messagesList.Count == 0)
@ -150,14 +135,6 @@ namespace AsbCloudInfrastructure.Services.SAUB
result.Items.Add(messageDto); result.Items.Add(messageDto);
} }
if (sortFields?.Any() == true && !hasAllSortedFieldsInDBOType)
{
result.Items = result.Items.AsQueryable()
.SortBy(request.SortFields)
.Skip(skip)
.Take(take)
.ToList();
}
return result; return result;
} }