diff --git a/AsbCloudApp/Data/WellCaseDto.cs b/AsbCloudApp/Data/WellCaseDto.cs new file mode 100644 index 00000000..7117d6b6 --- /dev/null +++ b/AsbCloudApp/Data/WellCaseDto.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AsbCloudApp.Data +{ +#nullable enable + /// + /// Дела скважины + /// + public class WellCaseDto + { + /// + /// Скважина + /// + public int IdWell { get; set; } + + /// + /// Документ дела скважины + /// + public IEnumerable WellFinalDocuments { get; set; } = Enumerable.Empty(); + } +#nullable disable +} diff --git a/AsbCloudApp/Data/WellFinalDocumentDto.cs b/AsbCloudApp/Data/WellFinalDocumentDto.cs index 1bc46ab1..8c92b736 100644 --- a/AsbCloudApp/Data/WellFinalDocumentDto.cs +++ b/AsbCloudApp/Data/WellFinalDocumentDto.cs @@ -9,11 +9,6 @@ namespace AsbCloudApp.Data /// public class WellFinalDocumentDto { - /// - /// Скважина - /// - public int IdWell { get; set; } - /// /// Наименование категории файла /// diff --git a/AsbCloudApp/Services/IWellFinalDocumentsService.cs b/AsbCloudApp/Services/IWellFinalDocumentsService.cs index 555ddcbb..99fcec37 100644 --- a/AsbCloudApp/Services/IWellFinalDocumentsService.cs +++ b/AsbCloudApp/Services/IWellFinalDocumentsService.cs @@ -27,7 +27,7 @@ namespace AsbCloudApp.Services /// /// /// - Task> GetByWellId(int idWell, CancellationToken token); + Task GetByWellId(int idWell, CancellationToken token); /// /// Получение списка ответственных diff --git a/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs b/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs index ba1f9533..32232a7a 100644 --- a/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs +++ b/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs @@ -77,9 +77,9 @@ namespace AsbCloudInfrastructure.Services throw new ArgumentInvalidException("Данные по категориям отсутствуют."); } - public async Task> GetByWellId(int idWell, CancellationToken token) + public async Task GetByWellId(int idWell, CancellationToken token) { - var result = new List(); + var wellFinalDocuments = new List(); var wells = await context.WellFinalDocuments.Where(x => x.IdWell == idWell) .ToListAsync(token) @@ -121,8 +121,8 @@ namespace AsbCloudInfrastructure.Services .FirstOrDefault(); } - result.Add(new WellFinalDocumentDto { - IdWell = idWell, + wellFinalDocuments.Add(new WellFinalDocumentDto { + NameCategory = item.NameCategory, Publishers = allUsers.Where(x => userIds.Contains(x.Id)), FilesCount = allFiles.Count(), @@ -131,7 +131,10 @@ namespace AsbCloudInfrastructure.Services }); } - return result; + return new WellCaseDto { + IdWell = idWell, + WellFinalDocuments = wellFinalDocuments + }; } public async Task> GetAvailableUsersAsync(int idWell, CancellationToken token)