From f776caeb616caa63c468fd8c7a68bf8494075785 Mon Sep 17 00:00:00 2001
From: Anitonchik <anitonchikantonova@yandex.ru>
Date: Fri, 13 Dec 2024 13:29:39 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=20=D0=BF=D0=B0=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectCompanyFurniture/Reports/ChartReport.cs            | 4 ++--
 .../Repositories/Implementations/InvoiceRepository.cs         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ProjectCompanyFurniture/ProjectCompanyFurniture/Reports/ChartReport.cs b/ProjectCompanyFurniture/ProjectCompanyFurniture/Reports/ChartReport.cs
index 822d047..13485d3 100644
--- a/ProjectCompanyFurniture/ProjectCompanyFurniture/Reports/ChartReport.cs
+++ b/ProjectCompanyFurniture/ProjectCompanyFurniture/Reports/ChartReport.cs
@@ -40,8 +40,8 @@ public class ChartReport
         return _invoiceRepository
             .ReadInvoices(dateForm: dateTime.Date, dateTo: dateTime.Date.AddDays(1))
             .Where(x => x.DateInvoice.Date == dateTime.Date)
-            .GroupBy(x => x.ClientID, (key, group) => new { ID = key, Count = group.Sum(y => y.SellingPrice)})
-            .Select(x => (x.ID.ToString(), (double)x.Count))
+            .GroupBy(x => x.ClientName, (key, group) => new { ClientName = key, Count = group.Sum(y => y.SellingPrice)})
+            .Select(x => (x.ClientName, (double)x.Count))
             .ToList();
     }
 }
diff --git a/ProjectCompanyFurniture/ProjectCompanyFurniture/Repositories/Implementations/InvoiceRepository.cs b/ProjectCompanyFurniture/ProjectCompanyFurniture/Repositories/Implementations/InvoiceRepository.cs
index bdee6c1..917754c 100644
--- a/ProjectCompanyFurniture/ProjectCompanyFurniture/Repositories/Implementations/InvoiceRepository.cs
+++ b/ProjectCompanyFurniture/ProjectCompanyFurniture/Repositories/Implementations/InvoiceRepository.cs
@@ -98,7 +98,7 @@ public class InvoiceRepository : IInvoiceRepository
             using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
             var querySelect = @$"SELECT inv.*, cl.Name as ClientName, ipr.ProductID, ipr.Count, pr.Name as ProductName
                                 FROM Invoices inv
-                                INNER JOIN InvoiceProducts ipr ON ipr.InvoiceID = inv.ID AND ipr.ProductID = @productID
+                                INNER JOIN InvoiceProducts ipr ON ipr.InvoiceID = inv.ID{((productID is null) ? "" : " AND ipr.ProductID = @productID")}
                                 INNER JOIN Clients cl ON inv.ClientID = cl.ID 
                                 INNER JOIN Products pr ON pr.ID = ipr.ProductID
                                 {builder.Build()}";