From e97902084fd67e9dcd11968f4b2f9ec3682d5814 Mon Sep 17 00:00:00 2001 From: mfnefd Date: Wed, 11 Dec 2024 04:02:26 +0400 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B7=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B8=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/Contracts/Services/IReportPeriodService.cs | 2 +- back/Controllers/Controllers/ReportController.cs | 6 +++--- back/Services/Reports/ReportPeriodService.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/back/Contracts/Services/IReportPeriodService.cs b/back/Contracts/Services/IReportPeriodService.cs index 46719a4..1b3f6d9 100644 --- a/back/Contracts/Services/IReportPeriodService.cs +++ b/back/Contracts/Services/IReportPeriodService.cs @@ -4,5 +4,5 @@ namespace Contracts.Services; public interface IReportPeriodService { - Task> GetReportData(DateTime from, DateTime to); + Task> GetReportData(DateTime from, DateTime to, Guid userId); } \ No newline at end of file diff --git a/back/Controllers/Controllers/ReportController.cs b/back/Controllers/Controllers/ReportController.cs index 3e3402e..c844aa9 100644 --- a/back/Controllers/Controllers/ReportController.cs +++ b/back/Controllers/Controllers/ReportController.cs @@ -19,13 +19,13 @@ public class ReportController : ControllerBase _reportOffsetFromPlanService = reportOffsetFromPlanService; } - [HttpGet("period")] + [HttpGet("period/{id}")] public async Task>> GetReportData( - [FromQuery] DateTime from, [FromQuery] DateTime to) + [FromQuery] DateTime from, [FromQuery] DateTime to, Guid id) { try { - var periodData = await _reportPeriodService.GetReportData(from, to); + var periodData = await _reportPeriodService.GetReportData(from, to, id); return Ok(periodData); } catch (ReportDataNotFoundException ex) diff --git a/back/Services/Reports/ReportPeriodService.cs b/back/Services/Reports/ReportPeriodService.cs index 96539fa..ea2d246 100644 --- a/back/Services/Reports/ReportPeriodService.cs +++ b/back/Services/Reports/ReportPeriodService.cs @@ -16,9 +16,9 @@ public class ReportPeriodService : IReportPeriodService _changeRecordRepo = changeRecordRepo; } - public async Task> GetReportData(DateTime from, DateTime to) + public async Task> GetReportData(DateTime from, DateTime to, Guid userId) { - var records = await _changeRecordRepo.GetList(new ChangeRecordSearch() { From = from, To = to }); + var records = await _changeRecordRepo.GetList(new ChangeRecordSearch() { From = from, To = to, UserId = userId }); if (!records.Any()) {