From 9a361f715a17231c1e64fb64cbc4dc6d817e57da Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Sun, 26 May 2024 23:02:21 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D1=87=D0=B5=D1=82=D1=8B=20=D0=B3?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implements/PetStorage.cs                  | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/VeterinaryView/VeterinaryDatabaseImplement/Implements/PetStorage.cs b/VeterinaryView/VeterinaryDatabaseImplement/Implements/PetStorage.cs
index 96c8144..cff141d 100644
--- a/VeterinaryView/VeterinaryDatabaseImplement/Implements/PetStorage.cs
+++ b/VeterinaryView/VeterinaryDatabaseImplement/Implements/PetStorage.cs
@@ -62,28 +62,22 @@ namespace VeterinaryDatabaseImplement.Implements
 			using var context = new VeterinaryDatabase();
 
 			return context.Pets
-				.Select(pet => new ReportVisitsDrugsViewModel()
-				{
-					PetName = pet.PetName,
-					Visits = context.Visits
-						.Where(visit => visit.DateVisit <= model.DateTo &&
-							visit.DateVisit >= model.DateFrom && visit.Pets
-								.Select(x => x.PetId)
-								.ToList()
-								.Contains(pet.Id))
-						.Select(visit => visit.GetViewModel)
-						.ToList(),
-					Drugs = context.Purchases
-						.Include(purchase => purchase.Drug)
-						.Where(purchase => purchase.DateCreate <= model.DateTo &&
-							purchase.DateCreate >= model.DateFrom && purchase.Pets
-								.Select(x => x.PetId)
-								.ToList()
-								.Contains(pet.Id))
-						.Select(purchase => purchase.Drug.GetViewModel)
-						.ToList(),
-				})
-				.ToList();
+			  .Select(pet => new ReportVisitsDrugsViewModel()
+			  {
+				  PetName = pet.PetName,
+				  Visits = context.Visits
+				  .Where(visit => visit.DateVisit <= model.DateTo &&
+					visit.DateVisit >= model.DateFrom && visit.Pets.Any(p => p.PetId == pet.Id))
+				  .Select(visit => visit.GetViewModel)
+				  .ToList(),
+				  Drugs = context.Purchases
+				  .Include(purchase => purchase.Drug)
+				  .Where(purchase => purchase.DateCreate <= model.DateTo &&
+					purchase.DateCreate >= model.DateFrom && purchase.Pets.Any(p => p.PetId == pet.Id))
+				  .Select(purchase => purchase.Drug.GetViewModel)
+				  .ToList(),
+			  })
+			  .ToList();
 		}
 		public PetViewModel? Insert(PetBindingModel model)
 		{