From 49b8f15517620e023f929ac6d61384dab2243401 Mon Sep 17 00:00:00 2001
From: the <jmobj@mail.ru>
Date: Thu, 18 May 2023 18:33:33 +0400
Subject: [PATCH] Assembly orders 2

---
 .../BindingModels/AssemblyBindingModel.cs                | 5 +++++
 .../ViewModels/AssemblyViewModel.cs                      | 5 +++++
 .../ComputerShopDatabaseImplement/Models/Assembly.cs     | 9 ++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ComputerShopProvider/ComputerShopContracts/BindingModels/AssemblyBindingModel.cs b/ComputerShopProvider/ComputerShopContracts/BindingModels/AssemblyBindingModel.cs
index 1a09b89..d1c3b31 100644
--- a/ComputerShopProvider/ComputerShopContracts/BindingModels/AssemblyBindingModel.cs
+++ b/ComputerShopProvider/ComputerShopContracts/BindingModels/AssemblyBindingModel.cs
@@ -18,5 +18,10 @@ namespace ComputerShopContracts.BindingModels
             get;
             set;
         } = new();
+        public Dictionary<int, (IOrderModel, int)> AssemblyOrders
+        {
+            get;
+            set;
+        } = new();
     }
 }
diff --git a/ComputerShopProvider/ComputerShopContracts/ViewModels/AssemblyViewModel.cs b/ComputerShopProvider/ComputerShopContracts/ViewModels/AssemblyViewModel.cs
index 239fc2a..bdf1af4 100644
--- a/ComputerShopProvider/ComputerShopContracts/ViewModels/AssemblyViewModel.cs
+++ b/ComputerShopProvider/ComputerShopContracts/ViewModels/AssemblyViewModel.cs
@@ -21,6 +21,11 @@ namespace ComputerShopContracts.ViewModels
             get;
             set;
         } = new();
+        public Dictionary<int, (IOrderModel, int)> AssemblyOrders
+        {
+            get;
+            set;
+        } = new();
         public int ClientId { get; set; }
 
         [DisplayName("ФИО клиента")]
diff --git a/ComputerShopProvider/ComputerShopDatabaseImplement/Models/Assembly.cs b/ComputerShopProvider/ComputerShopDatabaseImplement/Models/Assembly.cs
index fa75bbe..711f131 100644
--- a/ComputerShopProvider/ComputerShopDatabaseImplement/Models/Assembly.cs
+++ b/ComputerShopProvider/ComputerShopDatabaseImplement/Models/Assembly.cs
@@ -39,7 +39,7 @@ namespace ComputerShopDatabaseImplement.Models
 
         private Dictionary<int, (IOrderModel, int)>? _assemblyOrders = null;
         [NotMapped]
-        public Dictionary<int, (IOrderModel, int)> AssemblyPrders
+        public Dictionary<int, (IOrderModel, int)> AssemblyOrders
         {
             get
             {
@@ -70,6 +70,12 @@ namespace ComputerShopDatabaseImplement.Models
                 {
                     Component = context.Components.First(y => y.Id == x.Key),
                     Count = x.Value.Item2
+                }).ToList(),
+                Orders = model.AssemblyOrders.Select(x => new
+                AssemblyOrder
+                {
+                    Order = context.Orders.First(y => y.Id == x.Key),
+                    Count = x.Value.Item2
                 }).ToList()
             };
         }
@@ -84,6 +90,7 @@ namespace ComputerShopDatabaseImplement.Models
             AssemblyName = AssemblyName,
             Price = Price,
             AssemblyComponents = AssemblyComponents,
+            AssemblyOrders = AssemblyOrders,
             ClientId = ClientId
         };
         public void UpdateComponents(ComputerShopDatabase context, AssemblyBindingModel model)