From 209db67a01ac382313f4292000209d8423b264b7 Mon Sep 17 00:00:00 2001
From: Allllen4a <a30122004z@gmail.com>
Date: Wed, 24 Apr 2024 14:02:00 +0400
Subject: [PATCH] =?UTF-8?q?=D0=95=D1=89=D0=B5=20=D0=BD=D0=B5=D0=B1=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=88=D0=B8=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BeautySalonDataModels/Models/IClientModel.cs |  1 +
 .../BeautySalonDatabaseImplement/Models/Order.cs | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs b/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs
index 0725eec..1c1d0a6 100644
--- a/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs
+++ b/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs
@@ -6,5 +6,6 @@
         string ClientFIO { get; }
         string ClientEmail { get; }
         string ClientPassword { get; }
+
     }
 }
\ No newline at end of file
diff --git a/BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs b/BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs
index 7b921d6..f9fc9bd 100644
--- a/BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs
+++ b/BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs
@@ -55,12 +55,26 @@ namespace BeautySalonDatabaseImplement.Models
             }
         }
 
+        public List<OrderCosmeticViewModel> OrderCosmetics
+        {
+            get
+            {
+                _orderCosmetics ??= Cosmetic
+                    .Select(pc => new OrderCosmeticViewModel(pc.Cosmetic.GetViewModel, pc.OrderCosmeticCount))
+                    .ToList();
+                return _orderCosmetics;
+            }
+        }
+
         // связь услуги и заказов многие - ко - многим
         [ForeignKey("OrderId")]
         public virtual List<OrderService> Services { get; set; } = new();
 
         [ForeignKey("OrderId")]
-        public virtual List<OrderCosmetic> Procedures { get; set; } = new();
+        public virtual List<OrderCosmetic> Cosmetics { get; set; } = new();
+
+        [ForeignKey("OrderId")]
+        public virtual List<OrderProcedure> Procedures { get; set; } = new();
 
         public static Order Create(BeautySalonDatabase context, OrderBindingModel model)
         {