From 1325663d7e6407c5a0567371b93de2f6372d70e7 Mon Sep 17 00:00:00 2001 From: KharchenkoVV Date: Mon, 26 Jul 2021 17:26:07 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=BF=D1=83=D1=82=D1=8C=20=D0=B4=D0=BE=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=BB=D0=BB=D0=B5=D1=80=D0=B0=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BE=D0=BA?= =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudInfrastructure/Services/FileService.cs | 14 +++++++------- AsbCloudWebApi/Controllers/FileController.cs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AsbCloudInfrastructure/Services/FileService.cs b/AsbCloudInfrastructure/Services/FileService.cs index f9c8cd73..f34be6cf 100644 --- a/AsbCloudInfrastructure/Services/FileService.cs +++ b/AsbCloudInfrastructure/Services/FileService.cs @@ -53,27 +53,27 @@ namespace AsbCloudInfrastructure.Services if (telemetry is null) return null; - var filesInfoFromDb = db.Files.Include(f => f.User) + var filesInfoQuery = db.Files.Include(f => f.User) .Where(f => f.IdWell == wellId && f.IdCategory == idCategory); - if (!filesInfoFromDb.Any()) + if (!filesInfoQuery.Any()) return null; var result = new PaginationContainer() { Skip = skip, Take = take }; if (begin != default) - filesInfoFromDb = filesInfoFromDb.Where(m => m.Date >= begin); + filesInfoQuery = filesInfoQuery.Where(m => m.Date >= begin); if (end != default) - filesInfoFromDb = filesInfoFromDb.Where(m => m.Date <= end); + filesInfoQuery = filesInfoQuery.Where(m => m.Date <= end); - result.Count = filesInfoFromDb.Count(); + result.Count = filesInfoQuery.Count(); if (skip > 0) - filesInfoFromDb = filesInfoFromDb.Skip(skip); + filesInfoQuery = filesInfoQuery.Skip(skip); - var filesInfoList = filesInfoFromDb.Take(take).ToList(); + var filesInfoList = filesInfoQuery.Take(take).ToList(); if (filesInfoList.Count == 0) return result; diff --git a/AsbCloudWebApi/Controllers/FileController.cs b/AsbCloudWebApi/Controllers/FileController.cs index 13c2e913..e4573beb 100644 --- a/AsbCloudWebApi/Controllers/FileController.cs +++ b/AsbCloudWebApi/Controllers/FileController.cs @@ -79,7 +79,7 @@ namespace AsbCloudWebApi.Controllers /// для пагинации кол-во записей взять /// Список информации о файлах в этой категории [HttpGet] - [Route("{wellId}/filesInfo")] + [Route("{wellId}")] [ProducesResponseType(typeof(PaginationContainer), (int)System.Net.HttpStatusCode.OK)] public IActionResult GetFilesInfo([FromRoute] int wellId, int skip = 0, int take = 32, int idCategory = default,