From a4ff666b97fa383ba9e0ad52f0e8148bd03dd0ce Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Thu, 2 Feb 2023 11:08:25 +0500 Subject: [PATCH 1/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=B2=20MessageController?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Requests/MessageRequest.cs | 63 ++++++++++++++++ AsbCloudApp/Services/IMessageService.cs | 15 +--- .../Services/SAUB/MessageService.cs | 74 ++++++++++++++----- .../Controllers/SAUB/MessageController.cs | 42 +++++++---- 4 files changed, 149 insertions(+), 45 deletions(-) create mode 100644 AsbCloudApp/Requests/MessageRequest.cs diff --git a/AsbCloudApp/Requests/MessageRequest.cs b/AsbCloudApp/Requests/MessageRequest.cs new file mode 100644 index 00000000..83906bfc --- /dev/null +++ b/AsbCloudApp/Requests/MessageRequest.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AsbCloudApp.Requests +{ +#nullable enable + /// + /// параметры для запроса списка сообщений + /// + public class MessageRequestBase: RequestBase + { + /// + /// + /// + public IEnumerable? Categoryids { get; set; } + + + /// + /// + /// + public DateTime? Begin { get; set; } + + /// + /// + /// + public DateTime? End { get; set; } + + /// + /// + /// + public string? SearchString { get; set; } + + } + + /// + /// параметры для запроса списка сообщений (с id скважины) + /// + public class MessageRequest: MessageRequestBase { + + /// + /// id скважины + /// + public int IdWell { get; set; } + + /// + /// параметры для запроса списка сообщений (с id скважины) + /// + /// + /// + public MessageRequest(MessageRequestBase request, int idWell) + { + this.IdWell = idWell; + + this.Skip = request.Skip; + this.Take = request.Take; + this.SortFields = request.SortFields; + } + + } +} diff --git a/AsbCloudApp/Services/IMessageService.cs b/AsbCloudApp/Services/IMessageService.cs index 0b2261a4..b3abd842 100644 --- a/AsbCloudApp/Services/IMessageService.cs +++ b/AsbCloudApp/Services/IMessageService.cs @@ -1,5 +1,6 @@ using AsbCloudApp.Data; using AsbCloudApp.Data.SAUB; +using AsbCloudApp.Requests; using System; using System.Collections.Generic; using System.Threading; @@ -15,20 +16,10 @@ namespace AsbCloudApp.Services /// /// Получить сообщения по параметрам /// - /// - /// - /// - /// - /// - /// - /// + /// /// /// - Task> GetMessagesAsync(int idWell, - IEnumerable categoryids = default, DateTime begin = default, - DateTime end = default, string searchString = default, - int skip = 0, int take = 32, - CancellationToken token = default); + Task> GetMessagesAsync(MessageRequest request, CancellationToken token); /// /// Метод для сохранения сообщения от панели diff --git a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs index 1911029a..583eafaf 100644 --- a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs @@ -1,6 +1,8 @@ using AsbCloudApp.Data; using AsbCloudApp.Data.SAUB; +using AsbCloudApp.Requests; using AsbCloudApp.Services; +using AsbCloudDb; using AsbCloudDb.Model; using AsbCloudInfrastructure.EfCache; using Mapster; @@ -24,16 +26,17 @@ namespace AsbCloudInfrastructure.Services.SAUB this.telemetryService = telemetryService; } - public async Task> GetMessagesAsync( - int idWell, - IEnumerable categoryids = default, - DateTime begin = default, - DateTime end = default, - string searchString = default, - int skip = 0, - int take = 32, - CancellationToken token = default) + public async Task> GetMessagesAsync(MessageRequest request, CancellationToken token) { + var idWell = request.IdWell; + var categoryids = request.Categoryids; + var searchString = request.SearchString; + var begin = request.Begin; + var end = request.End; + var skip = request.Skip ?? 0; + var take = request.Take ?? 32; + var sortFields = request.SortFields; + var idTelemetry = telemetryService.GetOrDefaultIdTelemetryByIdWell(idWell); if (idTelemetry is null) return null; @@ -69,13 +72,13 @@ namespace AsbCloudInfrastructure.Services.SAUB if (begin != default) { - var beginUtc = begin.ToUtcDateTimeOffset(timezone.Hours); + var beginUtc = begin.Value.ToUtcDateTimeOffset(timezone.Hours); query = query.Where(m => m.DateTime >= beginUtc); } if (end != default) { - var endUtc = end.ToUtcDateTimeOffset(timezone.Hours); + var endUtc = end.Value.ToUtcDateTimeOffset(timezone.Hours); query = query.Where(m => m.DateTime <= endUtc); } @@ -86,10 +89,27 @@ namespace AsbCloudInfrastructure.Services.SAUB Count = query.Count() }; - if (skip > 0) - query = query.Skip(skip); + var hasAllSortedFieldsInDBOType = false; - var messagesList = await query.Take(take).AsNoTracking() + if (sortFields?.Any() == true) + { + hasAllSortedFieldsInDBOType = hasAllFieldsInType(sortFields); + if (hasAllSortedFieldsInDBOType) + { + query = query + .SortBy(request.SortFields) + .Skip(skip) + .Take(take); + } + } + else + { + query = query + .Skip(skip) + .Take(take); + } + + var messagesList = await query.AsNoTracking() .ToListAsync(token).ConfigureAwait(false); if (messagesList.Count == 0) @@ -98,6 +118,9 @@ namespace AsbCloudInfrastructure.Services.SAUB var allUsers = await db.TelemetryUsers.FromCacheAsync(token); var users = allUsers.Where(u => u.IdTelemetry == idTelemetry); + var eventsDict = events.GroupBy(x => x.IdEvent).ToDictionary(x => x.Key, x => x.FirstOrDefault()); + var usersDict = users.GroupBy(x => x.IdUser).ToDictionary(x => x.Key, x => x.FirstOrDefault()); + foreach (var message in messagesList) { var messageDto = new MessageDto @@ -110,17 +133,15 @@ namespace AsbCloudInfrastructure.Services.SAUB if (message.IdTelemetryUser is not null) { - if (users.Any()) + if (usersDict.TryGetValue((int)message.IdTelemetryUser, out TelemetryUser user)) { - var user = users.FirstOrDefault(u => u.IdUser == message.IdTelemetryUser); messageDto.User = user.MakeDisplayName(); } else messageDto.User = message.IdTelemetryUser.ToString(); } - var e = events.FirstOrDefault(e => e.IdEvent == message.IdEvent); - if (e != null) + if (eventsDict.TryGetValue(message.IdEvent, out TelemetryEvent e)) { messageDto.CategoryId = e.IdCategory; messageDto.Message = e.MakeMessageText(message); @@ -129,6 +150,14 @@ 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; } @@ -152,5 +181,14 @@ namespace AsbCloudInfrastructure.Services.SAUB return db.SaveChangesAsync(token); } + + private bool hasAllFieldsInType(IEnumerable sortFields) + { + var type = typeof(T); + var properyNames = type.GetProperties().Select(x => x.Name.ToLower()); + sortFields = sortFields.Select(x => x.ToLower().Split(' ')[0]); + var result = sortFields.All(field => properyNames.Contains(field)); + return result; + } } } diff --git a/AsbCloudWebApi/Controllers/SAUB/MessageController.cs b/AsbCloudWebApi/Controllers/SAUB/MessageController.cs index 00f6fd6e..89c40692 100644 --- a/AsbCloudWebApi/Controllers/SAUB/MessageController.cs +++ b/AsbCloudWebApi/Controllers/SAUB/MessageController.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Requests; using AsbCloudApp.Services; using Microsoft.AspNetCore.Mvc; using System; @@ -28,29 +29,30 @@ namespace AsbCloudWebApi.Controllers.SAUB /// Выдает список сообщений по скважине /// /// id скважины - /// список категорий - /// дата начала - /// окончание - /// для пагинации кол-во записей пропустить - /// для пагинации кол-во записей - /// Строка поиска + /// Параметры запроса /// Токен для отмены задачи /// список сообщений по скважине [HttpGet] [Permission] [ProducesResponseType(typeof(PaginationContainer), (int)System.Net.HttpStatusCode.OK)] - public async Task GetMessagesAsync(int idWell, int skip = 0, int take = 32, - [FromQuery] IEnumerable categoryids = default, - DateTime begin = default, DateTime end = default, - string searchString = default, - CancellationToken token = default) + public async Task GetMessagesAsync( + [FromRoute] int idWell, + [FromQuery] MessageRequestBase request, + CancellationToken token = default) { - if (take > 1024) + + if (!await UserHasAccesToWellAsync(idWell, token)) + return Forbid(); + + if (request.Take > 1024) return BadRequest("limit mast be less then 1024"); - var result = await messageService.GetMessagesAsync(idWell, - categoryids, begin, end, searchString, - skip, take, token).ConfigureAwait(false); + var requestToService = new MessageRequest(request, idWell); + + var result = await messageService.GetMessagesAsync( + requestToService, + token) + .ConfigureAwait(false); if (result is null || result.Count == 0) return NoContent(); @@ -85,5 +87,15 @@ namespace AsbCloudWebApi.Controllers.SAUB return Ok(wellMessagesDatesRange); } + + protected async Task UserHasAccesToWellAsync(int idWell, CancellationToken token) + { + var idCompany = User.GetCompanyId(); + if (idCompany is not null && + await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token) + .ConfigureAwait(false)) + return true; + return false; + } } } From e81abc86e66855b8f33231f2d7296ce1dd06bfaf Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Thu, 2 Feb 2023 15:58:07 +0500 Subject: [PATCH 2/8] =?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(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; } From 2746c9472933d90fb38e7280b616d4211d849b50 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Thu, 2 Feb 2023 16:07:41 +0500 Subject: [PATCH 3/8] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20GetMessagesAsyn?= =?UTF-8?q?c=20=D0=B2=20MessageService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/SAUB/MessageService.cs | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs index ce7606ff..d7540576 100644 --- a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs @@ -28,16 +28,8 @@ namespace AsbCloudInfrastructure.Services.SAUB public async Task> GetMessagesAsync(MessageRequest request, CancellationToken token) { - var idWell = request.IdWell; - var categoryids = request.Categoryids; - var searchString = request.SearchString; - var begin = request.Begin; - var end = request.End; - var skip = request.Skip ?? 0; - var take = request.Take ?? 32; - var sortFields = request.SortFields; - var idTelemetry = telemetryService.GetOrDefaultIdTelemetryByIdWell(idWell); + var idTelemetry = telemetryService.GetOrDefaultIdTelemetryByIdWell(request.IdWell); if (idTelemetry is null) return null; @@ -50,13 +42,13 @@ namespace AsbCloudInfrastructure.Services.SAUB var query = db.TelemetryMessages.Where(m => m.IdTelemetry == idTelemetry) .OrderBy(m => m.DateTime).AsNoTracking(); - if (categoryids?.Any() == true || !string.IsNullOrEmpty(searchString)) + if (request.Categoryids?.Any() == true || !string.IsNullOrEmpty(request.SearchString)) { - if (!string.IsNullOrEmpty(searchString)) - events = events.Where(e => e.MessageTemplate.Contains(searchString, StringComparison.OrdinalIgnoreCase)); + if (!string.IsNullOrEmpty(request.SearchString)) + events = events.Where(e => e.MessageTemplate.Contains(request.SearchString, StringComparison.OrdinalIgnoreCase)); - if (categoryids?.Any() == true) - events = events.Where(e => categoryids.ToList().Contains(e.IdCategory)); + if (request.Categoryids?.Any() == true) + events = events.Where(e => request.Categoryids.ToList().Contains(e.IdCategory)); var eventIds = events.Select(e => e.IdEvent); @@ -70,31 +62,31 @@ namespace AsbCloudInfrastructure.Services.SAUB var timezone = telemetryService.GetTimezone(idTelemetry ?? default); - if (begin != default) + if (request.Begin != default) { - var beginUtc = begin.Value.ToUtcDateTimeOffset(timezone.Hours); + var beginUtc = request.Begin.Value.ToUtcDateTimeOffset(timezone.Hours); query = query.Where(m => m.DateTime >= beginUtc); } - if (end != default) + if (request.End != default) { - var endUtc = end.Value.ToUtcDateTimeOffset(timezone.Hours); + var endUtc = request.End.Value.ToUtcDateTimeOffset(timezone.Hours); query = query.Where(m => m.DateTime <= endUtc); } var result = new PaginationContainer { - Skip = skip, - Take = take, + Skip = request.Skip ?? 0, + Take = request.Take ?? 32, Count = query.Count() }; - if (sortFields?.Any() == true) + if (request.SortFields?.Any() == true) { query = query.SortBy(request.SortFields); } - var messagesList = await query.Skip(skip) - .Take(take).AsNoTracking() + var messagesList = await query.Skip(request.Skip ?? 0) + .Take(request.Take ?? 32).AsNoTracking() .ToListAsync(token).ConfigureAwait(false); if (messagesList.Count == 0) From c62d3adb18bd857d5d490ffb38db7a8df574644e Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Thu, 2 Feb 2023 17:51:27 +0500 Subject: [PATCH 4/8] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudInfrastructure/Services/SAUB/MessageService.cs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs index d7540576..fe195fea 100644 --- a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs @@ -150,14 +150,5 @@ namespace AsbCloudInfrastructure.Services.SAUB return db.SaveChangesAsync(token); } - - private bool hasAllFieldsInType(IEnumerable sortFields) - { - var type = typeof(T); - var properyNames = type.GetProperties().Select(x => x.Name.ToLower()); - sortFields = sortFields.Select(x => x.ToLower().Split(' ')[0]); - var result = sortFields.All(field => properyNames.Contains(field)); - return result; - } } } From 0b7f53997a5b00707a13af4d32204cfc3844d7de Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 3 Feb 2023 09:08:25 +0500 Subject: [PATCH 5/8] =?UTF-8?q?=D0=94=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D1=83=D1=8E=D1=89=D0=B8=D0=B5=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B8=20=D0=B2?= =?UTF-8?q?=20MessageRequestBase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Requests/MessageRequest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AsbCloudApp/Requests/MessageRequest.cs b/AsbCloudApp/Requests/MessageRequest.cs index 83906bfc..9751f29e 100644 --- a/AsbCloudApp/Requests/MessageRequest.cs +++ b/AsbCloudApp/Requests/MessageRequest.cs @@ -13,23 +13,23 @@ namespace AsbCloudApp.Requests public class MessageRequestBase: RequestBase { /// - /// + /// Категория /// public IEnumerable? Categoryids { get; set; } /// - /// + /// Начальная дата /// public DateTime? Begin { get; set; } /// - /// + /// Конечная дата /// public DateTime? End { get; set; } /// - /// + /// Строка поиска /// public string? SearchString { get; set; } From 479cf72f0cdb85329d72ac77d602d3b52d4db720 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 3 Feb 2023 09:09:55 +0500 Subject: [PATCH 6/8] =?UTF-8?q?=D0=94=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D1=83=D1=8E=D1=89=D0=B8=D0=B5=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B8=20=D0=B2?= =?UTF-8?q?=20MessageRequestBase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Requests/MessageRequest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AsbCloudApp/Requests/MessageRequest.cs b/AsbCloudApp/Requests/MessageRequest.cs index 9751f29e..cdfc83f1 100644 --- a/AsbCloudApp/Requests/MessageRequest.cs +++ b/AsbCloudApp/Requests/MessageRequest.cs @@ -13,23 +13,23 @@ namespace AsbCloudApp.Requests public class MessageRequestBase: RequestBase { /// - /// Категория + /// категория /// public IEnumerable? Categoryids { get; set; } /// - /// Начальная дата + /// начальная дата /// public DateTime? Begin { get; set; } /// - /// Конечная дата + /// конечная дата /// public DateTime? End { get; set; } /// - /// Строка поиска + /// строка поиска /// public string? SearchString { get; set; } From d9684f6985b55c1f6fcded3d5ddeafbcacb1eff2 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 3 Feb 2023 09:38:56 +0500 Subject: [PATCH 7/8] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=D0=BE=D0=B1=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D0=BC=D1=8B=D1=85=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=20MessageRequest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Requests/MessageRequest.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AsbCloudApp/Requests/MessageRequest.cs b/AsbCloudApp/Requests/MessageRequest.cs index cdfc83f1..d352f4f7 100644 --- a/AsbCloudApp/Requests/MessageRequest.cs +++ b/AsbCloudApp/Requests/MessageRequest.cs @@ -54,6 +54,11 @@ namespace AsbCloudApp.Requests { this.IdWell = idWell; + this.Categoryids = request.Categoryids; + this.Begin = request.Begin; + this.End = request.End; + this.SearchString = request.SearchString; + this.Skip = request.Skip; this.Take = request.Take; this.SortFields = request.SortFields; From 2ba6a57975f65a6bfac4b15ec5df5119cb7e681c Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 3 Feb 2023 11:15:14 +0500 Subject: [PATCH 8/8] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20+=20=D1=83=D1=8C=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20using?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Requests/MessageRequest.cs | 10 ++--- .../Services/SAUB/MessageService.cs | 38 ++++++++++--------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/AsbCloudApp/Requests/MessageRequest.cs b/AsbCloudApp/Requests/MessageRequest.cs index d352f4f7..8f7f06f6 100644 --- a/AsbCloudApp/Requests/MessageRequest.cs +++ b/AsbCloudApp/Requests/MessageRequest.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AsbCloudApp.Requests { @@ -10,7 +7,7 @@ namespace AsbCloudApp.Requests /// /// параметры для запроса списка сообщений /// - public class MessageRequestBase: RequestBase + public class MessageRequestBase : RequestBase { /// /// категория @@ -26,7 +23,7 @@ namespace AsbCloudApp.Requests /// /// конечная дата /// - public DateTime? End { get; set; } + public DateTime? End { get; set; } /// /// строка поиска @@ -38,7 +35,8 @@ namespace AsbCloudApp.Requests /// /// параметры для запроса списка сообщений (с id скважины) /// - public class MessageRequest: MessageRequestBase { + public class MessageRequest : MessageRequestBase + { /// /// id скважины diff --git a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs index fe195fea..cd4a1749 100644 --- a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs @@ -13,6 +13,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +#nullable enable namespace AsbCloudInfrastructure.Services.SAUB { public class MessageService : IMessageService @@ -28,16 +29,21 @@ namespace AsbCloudInfrastructure.Services.SAUB public async Task> GetMessagesAsync(MessageRequest request, CancellationToken token) { + var result = new PaginationContainer + { + Skip = request.Skip ?? 0, + Take = request.Take ?? 32, + }; var idTelemetry = telemetryService.GetOrDefaultIdTelemetryByIdWell(request.IdWell); if (idTelemetry is null) - return null; + return result; var allEvents = await db.TelemetryEvents.FromCacheAsync(token); var events = allEvents.Where(e => e.IdTelemetry == idTelemetry); if (!events.Any()) - return null; + return result; var query = db.TelemetryMessages.Where(m => m.IdTelemetry == idTelemetry) .OrderBy(m => m.DateTime).AsNoTracking(); @@ -53,7 +59,7 @@ namespace AsbCloudInfrastructure.Services.SAUB var eventIds = events.Select(e => e.IdEvent); if (!eventIds.Any()) - return null; + return result; query = query.Where(m => eventIds.Contains(m.IdEvent)); } @@ -62,31 +68,26 @@ namespace AsbCloudInfrastructure.Services.SAUB var timezone = telemetryService.GetTimezone(idTelemetry ?? default); - if (request.Begin != default) + if (request.Begin is not null) { var beginUtc = request.Begin.Value.ToUtcDateTimeOffset(timezone.Hours); query = query.Where(m => m.DateTime >= beginUtc); } - if (request.End != default) + if (request.End is not null) { var endUtc = request.End.Value.ToUtcDateTimeOffset(timezone.Hours); query = query.Where(m => m.DateTime <= endUtc); } - var result = new PaginationContainer - { - Skip = request.Skip ?? 0, - Take = request.Take ?? 32, - Count = query.Count() - }; + result.Count = query.Count(); if (request.SortFields?.Any() == true) { query = query.SortBy(request.SortFields); } - var messagesList = await query.Skip(request.Skip ?? 0) - .Take(request.Take ?? 32).AsNoTracking() + var messagesList = await query.Skip(result.Skip) + .Take(result.Take).AsNoTracking() .ToListAsync(token).ConfigureAwait(false); if (messagesList.Count == 0) @@ -95,8 +96,8 @@ namespace AsbCloudInfrastructure.Services.SAUB var allUsers = await db.TelemetryUsers.FromCacheAsync(token); var users = allUsers.Where(u => u.IdTelemetry == idTelemetry); - var eventsDict = events.GroupBy(x => x.IdEvent).ToDictionary(x => x.Key, x => x.FirstOrDefault()); - var usersDict = users.GroupBy(x => x.IdUser).ToDictionary(x => x.Key, x => x.FirstOrDefault()); + var eventsDict = events.ToDictionary(x=>x.IdEvent, x => x); + var usersDict = users.ToDictionary(x => x.IdUser, x => x); foreach (var message in messagesList) { @@ -110,7 +111,7 @@ namespace AsbCloudInfrastructure.Services.SAUB if (message.IdTelemetryUser is not null) { - if (usersDict.TryGetValue((int)message.IdTelemetryUser, out TelemetryUser user)) + if (usersDict.TryGetValue((int)message.IdTelemetryUser, out TelemetryUser? user)) { messageDto.User = user.MakeDisplayName(); } @@ -118,7 +119,7 @@ namespace AsbCloudInfrastructure.Services.SAUB messageDto.User = message.IdTelemetryUser.ToString(); } - if (eventsDict.TryGetValue(message.IdEvent, out TelemetryEvent e)) + if (eventsDict.TryGetValue(message.IdEvent, out TelemetryEvent? e)) { messageDto.CategoryId = e.IdCategory; messageDto.Message = e.MakeMessageText(message); @@ -134,7 +135,7 @@ namespace AsbCloudInfrastructure.Services.SAUB CancellationToken token = default) { if (!dtos.Any()) - return null; + return Task.CompletedTask; var telemetryId = telemetryService.GetOrCreateTelemetryIdByUid(uid); var timezone = telemetryService.GetTimezone(telemetryId); @@ -152,3 +153,4 @@ namespace AsbCloudInfrastructure.Services.SAUB } } } +#nullable disable