From 93054ac4a5420e4c36fe5d1a9595b5e57cff037d Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Wed, 28 Feb 2024 16:05:10 +0300
Subject: [PATCH] =?UTF-8?q?=D1=87=D1=82=D0=BE=20=D0=B2=D0=B5=D1=80=D1=88?=
 =?UTF-8?q?=D0=B8=D1=82=20=D1=81=D1=83=D0=B4=D1=8C=D0=B1=D1=83=20=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=BE=D0=B2=D0=B5=D1=87=D0=B5=D1=81=D1=82=D0=B2?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D1=8D=D1=82=D0=BE=D0=BC=20=D0=BC=D0=B8=D1=80?=
 =?UTF-8?q?=D0=B5=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FlowerShopFileImplement/DataFileSingleton.cs |  7 ++++---
 FlowerShopFileImplement/Flower.cs            |  1 +
 FlowerShopFileImplement/OrderStorage.cs      | 14 +++++++-------
 ProjectFlowerShop/MainForm.cs                |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/FlowerShopFileImplement/DataFileSingleton.cs b/FlowerShopFileImplement/DataFileSingleton.cs
index c39bd1a..83754aa 100644
--- a/FlowerShopFileImplement/DataFileSingleton.cs
+++ b/FlowerShopFileImplement/DataFileSingleton.cs
@@ -24,12 +24,13 @@ internal class DataFileSingleton
    "Components", x => x.GetXElement);
     public void SaveFlowers() => SaveData(Flowers, FlowerFileName,
    "Flowers", x => x.GetXElement);
-    public void SaveOrders() { }
-    private DataFileSingleton()
+    public void SaveOrders() => SaveData(Orders, OrderFileName,
+       "Orders", x => x.GetXElement);
+private DataFileSingleton()
     {
         Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
         Flowers = LoadData(FlowerFileName, "Flower", x => Flower.Create(x)!)!;
-        Orders = new List<Order>();
+        Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
     }
     private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
     {
diff --git a/FlowerShopFileImplement/Flower.cs b/FlowerShopFileImplement/Flower.cs
index fce4568..71dd4b5 100644
--- a/FlowerShopFileImplement/Flower.cs
+++ b/FlowerShopFileImplement/Flower.cs
@@ -1,6 +1,7 @@
 using FlowerShopContracts.BindingModels;
 using FlowerShopContracts.ViewModels;
 using FlowerShopDataModels.Models;
+using FlowerShopFileImplement.Implements;
 using System.Xml.Linq;
 namespace FlowerShopFileImplement.Models
 {
diff --git a/FlowerShopFileImplement/OrderStorage.cs b/FlowerShopFileImplement/OrderStorage.cs
index 5c2f3b7..65a5196 100644
--- a/FlowerShopFileImplement/OrderStorage.cs
+++ b/FlowerShopFileImplement/OrderStorage.cs
@@ -23,7 +23,7 @@ namespace FlowerShopFileImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             return source.Orders
-            .Select(x => AccessIceCreamStorage(x.GetViewModel))
+            .Select(x => AccessFlowerStorage(x.GetViewModel))
            .ToList();
         }
 
@@ -35,7 +35,7 @@ namespace FlowerShopFileImplement.Implements
             }
             return source.Orders
                .Where(x => x.Id == model.Id)
-               .Select(x => AccessIceCreamStorage(x.GetViewModel))
+               .Select(x => AccessFlowerStorage(x.GetViewModel))
                .ToList();
         }
 
@@ -45,7 +45,7 @@ namespace FlowerShopFileImplement.Implements
             {
                 return null;
             }
-            return AccessIceCreamStorage(source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel);
+            return AccessFlowerStorage(source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel);
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -58,7 +58,7 @@ namespace FlowerShopFileImplement.Implements
             }
             source.Orders.Add(newOrder);
             source.SaveOrders();
-            return AccessIceCreamStorage(newOrder.GetViewModel);
+            return AccessFlowerStorage(newOrder.GetViewModel);
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -70,7 +70,7 @@ namespace FlowerShopFileImplement.Implements
             }
             order.Update(model);
             source.SaveOrders();
-            return AccessIceCreamStorage(order.GetViewModel);
+            return AccessFlowerStorage(order.GetViewModel);
         }
         public OrderViewModel? Delete(OrderBindingModel model)
         {
@@ -80,12 +80,12 @@ namespace FlowerShopFileImplement.Implements
             {
                 source.Orders.Remove(element);
                 source.SaveOrders();
-                return AccessIceCreamStorage(element.GetViewModel);
+                return AccessFlowerStorage(element.GetViewModel);
             }
             return null;
         }
 
-        public OrderViewModel AccessIceCreamStorage(OrderViewModel model)
+        public OrderViewModel AccessFlowerStorage(OrderViewModel model)
         {
             if (model == null)
                 return null;
diff --git a/ProjectFlowerShop/MainForm.cs b/ProjectFlowerShop/MainForm.cs
index 5d70efb..13fab38 100644
--- a/ProjectFlowerShop/MainForm.cs
+++ b/ProjectFlowerShop/MainForm.cs
@@ -87,7 +87,7 @@ namespace ProjectFlowerShop
             return new OrderBindingModel
             {
                 Id = id,
-                FlowerId = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["IceCreamId"].Value),
+                FlowerId = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["FlowerId"].Value),
                 Status = Enum.Parse<OrderStatus>(DataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
                 Count = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Count"].Value),
                 Sum = double.Parse(DataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),