From a420278bcb42d0920a1c7b55b035b0a54f96e04e Mon Sep 17 00:00:00 2001
From: Sergey Kozyrev <s.kozyrev-s@yandex.ru>
Date: Fri, 22 Mar 2024 00:02:47 +0400
Subject: [PATCH 1/2] NameChecker

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

diff --git a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
index 7c3a4af..c4061a6 100644
--- a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
+++ b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
@@ -46,7 +46,7 @@ namespace SewingDressesDatabaseImplement.Implements
         }
         public OrderViewModel? Update(OrderBindingModel model)
         {
-            
+
             using var context = new SewingDressesDatabase();
             var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
             if (order == null)
@@ -77,16 +77,14 @@ namespace SewingDressesDatabaseImplement.Implements
                 return null;
             }
             using var context = new SewingDressesDatabase();
-            foreach(var dress in context.Dresses)
+            var dress = context.Dresses.FirstOrDefault(x => x.Id == model.DressId);
+            if (dress == null)
             {
-                if (dress.Id == model.DressId)
-                {
-                    model.DressName = dress.DressName;
-                    break;
-                }
+                return null;
             }
+            model.DressName = dress.DressName;
             return model;
         }
-        
+
     }
 }

From 10e49e048a68348b49286408d2b13f107bde2b65 Mon Sep 17 00:00:00 2001
From: Sergey Kozyrev <s.kozyrev-s@yandex.ru>
Date: Fri, 22 Mar 2024 00:06:07 +0400
Subject: [PATCH 2/2] Context

---
 .../Implements/OrderStorage.cs                    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
index c4061a6..b482b0e 100644
--- a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
+++ b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
@@ -11,7 +11,7 @@ namespace SewingDressesDatabaseImplement.Implements
         public List<OrderViewModel?> GetFullList()
         {
             using var context = new SewingDressesDatabase();
-            return context.Orders.Select(x => AcessDressesStorage(x.GetViewModel)).ToList();
+            return context.Orders.Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
         }
         public List<OrderViewModel?> GetFilteredList(OrderSearchModel model)
         {
@@ -20,7 +20,7 @@ namespace SewingDressesDatabaseImplement.Implements
                 return new();
             }
             using var context = new SewingDressesDatabase();
-            return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel)).ToList();
+            return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
         }
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
@@ -29,7 +29,7 @@ namespace SewingDressesDatabaseImplement.Implements
                 return null;
             }
             using var context = new SewingDressesDatabase();
-            return AcessDressesStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
+            return AcessDressesStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel, context);
         }
         public OrderViewModel? Insert(OrderBindingModel model)
         {
@@ -41,7 +41,7 @@ namespace SewingDressesDatabaseImplement.Implements
             using var context = new SewingDressesDatabase();
             context.Orders.Add(order);
             context.SaveChanges();
-            return AcessDressesStorage(order.GetViewModel);
+            return AcessDressesStorage(order.GetViewModel, context);
 
         }
         public OrderViewModel? Update(OrderBindingModel model)
@@ -55,7 +55,7 @@ namespace SewingDressesDatabaseImplement.Implements
             }
             order.Update(model);
             context.SaveChanges();
-            return AcessDressesStorage(order.GetViewModel);
+            return AcessDressesStorage(order.GetViewModel, context);
 
         }
         public OrderViewModel? Delete(OrderBindingModel model)
@@ -68,15 +68,14 @@ namespace SewingDressesDatabaseImplement.Implements
             }
             context.Orders.Remove(element);
             context.SaveChanges();
-            return AcessDressesStorage(element.GetViewModel);
+            return AcessDressesStorage(element.GetViewModel, context);
         }
-        public static OrderViewModel? AcessDressesStorage(OrderViewModel? model)
+        public static OrderViewModel? AcessDressesStorage(OrderViewModel? model, SewingDressesDatabase context)
         {
             if (model == null)
             {
                 return null;
             }
-            using var context = new SewingDressesDatabase();
             var dress = context.Dresses.FirstOrDefault(x => x.Id == model.DressId);
             if (dress == null)
             {