From 819bc82227c179ae47536cd37c2abdc7b1babc2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Tue, 7 Dec 2021 13:43:47 +0500 Subject: [PATCH] MeasureService.GetHisoryAsync(..) uses idCategory arg --- AsbCloudApp/Services/IMeasureService.cs | 2 +- AsbCloudInfrastructure/Services/MeasureService.cs | 4 ++-- AsbCloudWebApi/Controllers/MeasureController.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AsbCloudApp/Services/IMeasureService.cs b/AsbCloudApp/Services/IMeasureService.cs index bd74c5f6..afaef573 100644 --- a/AsbCloudApp/Services/IMeasureService.cs +++ b/AsbCloudApp/Services/IMeasureService.cs @@ -9,7 +9,7 @@ namespace AsbCloudApp.Services { Task> GetCategoriesAsync(CancellationToken token); Task GetLastAsync(int idWell, int idCategory, CancellationToken token); - Task> GetHisoryAsync(int idWell, CancellationToken token); + Task> GetHisoryAsync(int idWell, int idCategory, CancellationToken token); Task InsertAsync(int idWell, MeasureDto data, CancellationToken token); Task UpdateAsync(int idWell, MeasureDto data, CancellationToken token); Task MarkAsDeleteAsync(int idWell, int idData, CancellationToken token); diff --git a/AsbCloudInfrastructure/Services/MeasureService.cs b/AsbCloudInfrastructure/Services/MeasureService.cs index e2d74479..e0fe0da4 100644 --- a/AsbCloudInfrastructure/Services/MeasureService.cs +++ b/AsbCloudInfrastructure/Services/MeasureService.cs @@ -47,10 +47,10 @@ namespace AsbCloudInfrastructure.Services return dtos; } - public async Task> GetHisoryAsync(int idWell, CancellationToken token) + public async Task> GetHisoryAsync(int idWell, int idCategory, CancellationToken token) { var query = db.Measures.Include(m => m.Category) - .Where(m => m.IdWell == idWell && !m.IsDeleted); + .Where(m => m.IdWell == idWell && !m.IsDeleted && m.IdCategory == idCategory); var entities = await query .OrderBy(m => m.Timestamp) diff --git a/AsbCloudWebApi/Controllers/MeasureController.cs b/AsbCloudWebApi/Controllers/MeasureController.cs index f5ad687f..aba583c3 100644 --- a/AsbCloudWebApi/Controllers/MeasureController.cs +++ b/AsbCloudWebApi/Controllers/MeasureController.cs @@ -50,7 +50,7 @@ namespace AsbCloudWebApi.Controllers if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false)) return Forbid(); - var result = await measureService.GetHisoryAsync(idWell, token).ConfigureAwait(false); + var result = await measureService.GetHisoryAsync(idWell, idCategory, token).ConfigureAwait(false); return Ok(result); }