From cf431df3044e9218c56df40ff8c1f71134af565e Mon Sep 17 00:00:00 2001
From: Viltskaa <andrewstyou@gmail.com>
Date: Fri, 5 May 2023 09:36:49 +0400
Subject: [PATCH] Edit dependencies

---
 SushiBar/SushiBar/FormMain.cs                 | 40 +++++--------------
 SushiBar/SushiBar/FormStores.cs               | 30 +++++---------
 .../SushiBarDatabaseImplement/Models/Sushi.cs |  2 +-
 3 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/SushiBar/SushiBar/FormMain.cs b/SushiBar/SushiBar/FormMain.cs
index 0609bae..34fa60a 100644
--- a/SushiBar/SushiBar/FormMain.cs
+++ b/SushiBar/SushiBar/FormMain.cs
@@ -204,32 +204,20 @@ namespace SushiBar
 
         private void StoreToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormStores));
-
-            if (service is FormStores form)
-            {
-                form.ShowDialog();
-            }
+            var service = DependencyManager.Instance.Resolve<FormStores>();
+            service.ShowDialog();
         }
 
         private void ButtonReplenishment_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormStoreReplenishment));
-
-            if (service is FormStoreReplenishment form)
-            {
-                form.ShowDialog();
-            }
+            var service = DependencyManager.Instance.Resolve<FormStoreReplenishment>();
+            service.ShowDialog();
         }
 
         private void ButtonSell_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormStoreSell));
-
-            if (service is FormStoreSell form)
-            {
-                form.ShowDialog();
-            }
+            var service = DependencyManager.Instance.Resolve<FormStoreSell>();
+            service.ShowDialog();
         }
 
         private void StoreListToolStripMenuItem_Click(object sender, EventArgs e)
@@ -245,22 +233,14 @@ namespace SushiBar
 
         private void StoreWorkloadToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormStoreWorkload));
-
-            if (service is FormStoreWorkload form)
-            {
-                form.ShowDialog();
-            }
+            var service = DependencyManager.Instance.Resolve<FormStoreWorkload>();
+            service.ShowDialog();
         }
 
         private void OrderListWithGroupByToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrdersGroupByDate));
-
-            if (service is FormReportOrdersGroupByDate form)
-            {
-                form.ShowDialog();
-            }
+            var service = DependencyManager.Instance.Resolve<FormReportOrdersGroupByDate>();
+            service.ShowDialog();
         }
 
         private void MailsToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/SushiBar/SushiBar/FormStores.cs b/SushiBar/SushiBar/FormStores.cs
index 2584d50..aabc132 100644
--- a/SushiBar/SushiBar/FormStores.cs
+++ b/SushiBar/SushiBar/FormStores.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.DI;
 
 namespace SushiBar
 {
@@ -41,14 +42,10 @@ namespace SushiBar
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormStore));
-
-            if (service is FormStore form)
+            var service = DependencyManager.Instance.Resolve<FormStore>();
+            if (service.ShowDialog() == DialogResult.OK)
             {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
+                LoadData();
             }
         }
 
@@ -84,19 +81,14 @@ namespace SushiBar
 
         private void ButtonChange_Click(object sender, EventArgs e)
         {
-            if (dataGridView.SelectedRows.Count == 1)
+            if (dataGridView.SelectedRows.Count != 1) return;
+            var service = DependencyManager.Instance.Resolve<FormStore>();
+
+            service.id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+
+            if (service.ShowDialog() == DialogResult.OK)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormStore));
-
-                if (service is FormStore form)
-                {
-                    form.id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
+                LoadData();
             }
         }
 
diff --git a/SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs b/SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs
index d34c1dc..4e689c0 100644
--- a/SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs
@@ -75,7 +75,7 @@ public class Sushi : ISushiModel
             }
             context.SaveChanges();
         }
-        var sushi = context.Sushi.First(x => x.Id == Id);
+        var sushi = context.Sushis.First(x => x.Id == Id);
         foreach (var pc in model.SushiComponents)
         {
             context.SushiComponents.Add(new SushiComponent