From 52a01e59314dbf7547c81e481c33226185baa740 Mon Sep 17 00:00:00 2001
From: prodigygirl <Prodigygirl1.0@yandex.ru>
Date: Thu, 9 Mar 2023 20:41:08 +0400
Subject: [PATCH 1/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=B7=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs
index dde2a1d..781f225 100644
--- a/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs
+++ b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs
@@ -123,7 +123,7 @@
             this.Controls.Add(this.labelCount);
             this.Controls.Add(this.labelFurniture);
             this.Name = "FormCreateOrder";
-            this.Text = "FormCreateOrder";
+            this.Text = "Создание заказа";
             this.Load += new System.EventHandler(this.FormCreateOrder_Load);
             this.ResumeLayout(false);
             this.PerformLayout();

From 2a0061014a90993d4d8369aee897d8ea481c648e Mon Sep 17 00:00:00 2001
From: prodigygirl <Prodigygirl1.0@yandex.ru>
Date: Thu, 9 Mar 2023 20:46:49 +0400
Subject: [PATCH 2/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FurnitureAssemblyListImplement/Models/Order.cs        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs
index 04b3752..27101c3 100644
--- a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs
+++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs
@@ -55,12 +55,8 @@ namespace FurnitureAssemblyListImplement.Models
             {
                 return;
             }
-            FurnitureId = model.FurnitureId;
-            FurnitureName = model.FurnitureName;
-            Count = model.Count;
-            Sum = model.Sum;
-            Status = model.Status;
-            DateCreate = model.DateCreate;
+           
+            Status = model.Status;           
             DateImplement = model.DateImplement;     
         }
 

From f43443cb14fc9d044da07d2481009bbb6d9518e7 Mon Sep 17 00:00:00 2001
From: prodigygirl <Prodigygirl1.0@yandex.ru>
Date: Thu, 9 Mar 2023 21:16:13 +0400
Subject: [PATCH 3/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5:=20=D0=B2=D1=8B=D1=87=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D0=BC=D0=BE=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=80=D0=B5=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=B2=D1=8B=D1=87=D0=B8=D1=81=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=B5=D0=BC=D0=BE=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FurnitureAssembly/FormCreateOrder.cs      |  3 +--
 .../OrderLogic.cs                             |  7 +++--
 .../BindingModels/OrderBindingModel.cs        |  1 -
 .../Implements/OrderStorage.cs                | 26 ++++++++++++++-----
 .../Models/Order.cs                           |  4 ---
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.cs b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.cs
index f506bb3..6810051 100644
--- a/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.cs
+++ b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.cs
@@ -48,8 +48,7 @@ namespace FurnitureAssembly
             {
                 var operationResult = _logicO.CreateOrder(new OrderBindingModel
                 {
-                    FurnitureId = Convert.ToInt32(comboBoxProduct.SelectedValue),
-                    FurnitureName = comboBoxProduct.Text,
+                    FurnitureId = Convert.ToInt32(comboBoxProduct.SelectedValue),                   
                     Count = Convert.ToInt32(textBoxCount.Text),
                     Sum = Convert.ToDouble(textBoxSum.Text)
                 });
diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OrderLogic.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OrderLogic.cs
index bbe6d31..9bd343e 100644
--- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OrderLogic.cs
+++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OrderLogic.cs
@@ -139,11 +139,11 @@ namespace FurnitureAssemblyBusinessLogic
                 throw new ArgumentNullException("Стоимость заказа должна быть больше 0", nameof(model.Sum));
             }
             _logger.LogInformation("Order. OrderId: { Id}. OrderStatus: {OrderStatus} DateCreate: {DateCreate} " +
-                "FurnitureId:{FurnitureId}. FurnitureName:{FurnitureName}. Count:{ Count}. Sum:{ Sum}. ", 
-                model.Id, model.Status, model.DateCreate, model.FurnitureId, model.FurnitureName, model.Count, model.Sum);
+                "FurnitureId:{FurnitureId}. Count:{ Count}. Sum:{ Sum}. ", 
+                model.Id, model.Status, model.DateCreate, model.FurnitureId, model.Count, model.Sum);
         }
 
-        private OrderBindingModel Find(OrderBindingModel model)
+        private OrderBindingModel? Find(OrderBindingModel model)
         {
             var modelView = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
             if (modelView == null)
@@ -155,7 +155,6 @@ namespace FurnitureAssemblyBusinessLogic
             model.Count = modelView.Count;
             model.Sum = modelView.Sum;
             model.FurnitureId = model.FurnitureId;
-            model.FurnitureName = modelView.FurnitureName;
             model.Status = modelView.Status;
             return model;
         }
diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs
index ea145e7..280e941 100644
--- a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs
+++ b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs
@@ -12,7 +12,6 @@ namespace FurnitureAssemblyContracts.BindingModels
     {
         public int Id { get; set; }
         public int FurnitureId { get; set; }
-        public string FurnitureName { get; set; } = string.Empty;
         public int Count { get; set; }
         public double Sum { get; set; }
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs
index eeb359d..0e279ea 100644
--- a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs
+++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs
@@ -26,7 +26,7 @@ namespace FurnitureAssemblyListImplement.Implements
                 {
                     var element = _source.Orders[i];
                     _source.Orders.RemoveAt(i);
-                    return element.GetViewModel;
+                    return GetOrderViewModel(element);
                 }
             }
             return null;
@@ -43,7 +43,7 @@ namespace FurnitureAssemblyListImplement.Implements
             {
                 if (model.Id.HasValue && order.Id == model.Id)
                 {
-                    return order.GetViewModel;
+                    return GetOrderViewModel(order);
                 }
             }
             return null;
@@ -57,7 +57,7 @@ namespace FurnitureAssemblyListImplement.Implements
             {
                 if (order.Id.Equals(model.Id))
                 {
-                    result.Add(order.GetViewModel);
+                    result.Add(GetOrderViewModel(order));
                 }
             }
             return result;
@@ -68,7 +68,7 @@ namespace FurnitureAssemblyListImplement.Implements
             var result = new List<OrderViewModel>();
             foreach (var order in _source.Orders)
             {
-                result.Add(order.GetViewModel);
+                result.Add(GetOrderViewModel(order));
             }
             return result;
         }
@@ -89,7 +89,7 @@ namespace FurnitureAssemblyListImplement.Implements
                 return null;
             }
             _source.Orders.Add(newOrder);
-            return newOrder.GetViewModel;
+            return GetOrderViewModel(newOrder);
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -99,10 +99,24 @@ namespace FurnitureAssemblyListImplement.Implements
                 if (order.Id == model.Id)
                 {
                     order.Update(model);
-                    return order.GetViewModel;
+                    return GetOrderViewModel(order);
                 }
             }
             return null;
         }
+
+        private OrderViewModel GetOrderViewModel(Order order)
+        {
+            OrderViewModel orderViewModel = order.GetViewModel;
+
+            foreach (var furniture in _source.Furnitures)
+            {
+                if (furniture.Id == order.Id)
+                {
+                    orderViewModel.FurnitureName = furniture.FurnitureName;
+                }
+            }
+            return orderViewModel;
+        }
     }
 }
diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs
index 27101c3..570d67d 100644
--- a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs
+++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs
@@ -16,8 +16,6 @@ namespace FurnitureAssemblyListImplement.Models
     {
         public int FurnitureId { get; private set; }
 
-        public string FurnitureName { get; private set; } = string.Empty;
-
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -40,7 +38,6 @@ namespace FurnitureAssemblyListImplement.Models
             {
                 Id = model.Id,
                 FurnitureId = model.FurnitureId,
-                FurnitureName = model.FurnitureName,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -64,7 +61,6 @@ namespace FurnitureAssemblyListImplement.Models
         {
             Id = Id,
             FurnitureId = FurnitureId,
-            FurnitureName = FurnitureName,
             Count = Count,
             Sum = Sum,
             Status = Status,