From f203356284983a7bfd5c0cd8211df6d90c7fc320 Mon Sep 17 00:00:00 2001
From: bekodeg <andermag102@yandex.ru>
Date: Tue, 21 May 2024 21:07:18 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implements/OrderStorage.cs                | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs b/SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs
index 18f9f47..f02ef9e 100644
--- a/SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs
+++ b/SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs
@@ -16,7 +16,7 @@ namespace SushiBarFileImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             return source.Orders
-                .Select(x => AccessClientStorage(AccessSushiStorage(x.GetViewModel))!)
+                .Select(x => AccessStorage(x.GetViewModel))!
                 .ToList();
         }
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@@ -27,7 +27,7 @@ namespace SushiBarFileImplement.Implements
                     (!model.DateFrom.HasValue || o.DateCreate >= model.DateFrom) &&
                     (!model.DateTo.HasValue || o.DateCreate <= model.DateTo) &&
                     (!model.ClientId.HasValue || o.ClientId == model.ClientId))
-                .Select(o => AccessClientStorage(AccessSushiStorage(o.GetViewModel))!)
+                .Select(o => AccessStorage(o.GetViewModel)!)
                 .ToList();
         }
         public OrderViewModel? GetElement(OrderSearchModel model)
@@ -36,9 +36,8 @@ namespace SushiBarFileImplement.Implements
             {
                 return null;
             }
-            return AccessClientStorage(AccessSushiStorage(
-                source.Orders
-                .FirstOrDefault(x => (x.Id == model.Id))?.GetViewModel));
+            return AccessStorage(source.Orders
+                .FirstOrDefault(x => x.Id == model.Id)?.GetViewModel!);
         }
         public OrderViewModel? Insert(OrderBindingModel model)
         {
@@ -50,7 +49,7 @@ namespace SushiBarFileImplement.Implements
             }
             source.Orders.Add(newOrder);
             source.SaveOrders();
-            return AccessClientStorage(AccessSushiStorage(newOrder.GetViewModel));
+            return AccessStorage(newOrder.GetViewModel);
         }
         public OrderViewModel? Update(OrderBindingModel model)
         {
@@ -61,7 +60,7 @@ namespace SushiBarFileImplement.Implements
             }
             element.Update(model);
             source.SaveOrders();
-            return AccessClientStorage(AccessSushiStorage(element.GetViewModel));
+            return AccessStorage(element.GetViewModel);
         }
         public OrderViewModel? Delete(OrderBindingModel model)
         {
@@ -70,32 +69,23 @@ namespace SushiBarFileImplement.Implements
             {
                 source.Orders.Remove(element);
                 source.SaveOrders();
-                return AccessClientStorage(AccessSushiStorage(element.GetViewModel));
+                return AccessStorage(element.GetViewModel);
             }
             return null;
         }
-        public OrderViewModel? AccessSushiStorage(OrderViewModel? model)
-        {
-            if (model == null)
-                return null;
-            foreach (var iceCream in source.Sushis)
-            {
-                if (iceCream.Id == model.SushiId)
-                {
-                    model.SushiName = iceCream.SushiName;
-                    break;
-                }
-            }
-            return model;
-        }
-
-        public OrderViewModel? AccessClientStorage(OrderViewModel? model)
+        public OrderViewModel AccessStorage(OrderViewModel model)
         {
             if (model == null)
                 return null;
+            var sushi = source.Sushis.FirstOrDefault(x => x.Id == model.Id);
             var client = source.Clients.FirstOrDefault(x => x.Id == model.Id);
+            var implementer = source.Implementers.FirstOrDefault(x => x.Id == model.ImplementerId);
+            if (sushi != null)
+                model.SushiName = sushi.SushiName;
             if (client != null)
                 model.ClientFIO = client.ClientFIO;
+            if (implementer != null)
+                model.ImplementerName = implementer.ImplementerFIO;
             return model;
         }
     }