чиним

BeautySalonView/BeautySalonContracts/ViewModels/OrderCosmeticViewModel.cs

@@ -3,14 +3,12 @@
     public class OrderCosmeticViewModel
     {
         public CosmeticViewModel Cosmetic { get; set; } = null!;
-        public int Count { get; set; }
 
         public OrderCosmeticViewModel() { }
 
-        public OrderCosmeticViewModel(CosmeticViewModel cosmetic, int count)
+        public OrderCosmeticViewModel(CosmeticViewModel cosmetic)
         {
             Cosmetic = cosmetic;
-            Count = count;
         }
     }
 }

BeautySalonView/BeautySalonDatabaseImplement/BeautySalonDatabase.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace BeautySalonDatabaseImplement
 {
-    public class BeautySalonDataBase : DbContext
+    public class BeautySalonDatabase : DbContext
     {
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -21,7 +21,7 @@ namespace BeautySalonDatabaseImplement
             }
             base.OnConfiguring(optionsBuilder);
         }
-        public virtual DbSet<Order> Orders { set; get; }
+        public virtual DbSet<Order_> Orders { set; get; }
         public virtual DbSet<LaborCosts> LaborCosts { set; get; }
         public virtual DbSet<Cosmetic> Cosmetics { set; get; }
         public virtual DbSet<Service> Services { set; get; }

BeautySalonView/BeautySalonDatabaseImplement/Implements/OrderStorage.cs

@@ -111,7 +111,7 @@ namespace BeautySalonDatabaseImplement.Implements
         public OrderViewModel? Insert(OrderBindingModel model)
         {
             using var context = new BeautySalonDatabase();
-            var newOrder = Order.Create(context, model);
+            var newOrder = Order_.Create(context, model);
             if (newOrder == null)
             {
                 return null;

BeautySalonView/BeautySalonDatabaseImplement/Models/Client.cs

@@ -25,7 +25,7 @@ namespace BeautySalonDatabaseImplement.Models
         public virtual List<Evaluation> Evaluations { get; set; } = new();
 
         [ForeignKey("ClientId")]
-        public virtual List<Order> Orders { get; set; } = new();
+        public virtual List<Order_> Orders { get; set; } = new();
 
         [ForeignKey("ClientId")]
         public virtual List<Procedure> Procedures { get; set; } = new();

BeautySalonView/BeautySalonDatabaseImplement/Models/Cosmetic.cs

@@ -26,8 +26,8 @@ namespace BeautySalonDatabaseImplement.Models
         public int LaborCostId { get; set; }
         public virtual LaborCosts LaborCost { get; set; }
 
-        //[ForeignKey("CosmeticId")]
-        //public virtual List<ProcedureCosmetic> Procedures { get; set; } = new();
+        [ForeignKey("CosmeticId")]
+        public virtual List<ProcedureCosmetic> Procedures { get; set; } = new();
 
         [ForeignKey("CosmeticId")]
         public virtual List<ServiceCosmetic> Services { get; set; } = new();

BeautySalonView/BeautySalonDatabaseImplement/Models/OrderCosmetic.cs

@@ -15,13 +15,10 @@ namespace BeautySalonDatabaseImplement.Models
         public int OrderId { get; set; }
 
         [Required]
-        public int ProcedureId { get; set; }
+        public int CosmeticId { get; set; }
 
-        [Required]
-        public int OrderProcedureCount { get; set; }
+        public virtual Order_ Order { get; set; } = new();
 
-        public virtual Order Order { get; set; } = new();
-
-        public virtual Procedure Procedure { get; set; } = new();
+        public virtual Cosmetic Cosmetic { get; set; } = new();
     }
 }

BeautySalonView/BeautySalonDatabaseImplement/Models/OrderProcedure.cs

@@ -20,7 +20,7 @@ namespace BeautySalonDatabaseImplement.Models
         [Required]
         public int OrderProcedureCount { get; set; }
 
-        public virtual Order Order { get; set; } = new();
+        public virtual Order_ Order { get; set; } = new();
 
         public virtual Procedure Procedure { get; set; } = new();
     }

BeautySalonView/BeautySalonDatabaseImplement/Models/OrderService.cs

@@ -20,7 +20,7 @@ namespace BeautySalonDatabaseImplement.Models
         [Required]
         public int OrderServiceCount { get; set; }
 
-        public virtual Order Order { get; set; } = new();
+        public virtual Order_ Order { get; set; } = new();
 
         public virtual Service Service { get; set; } = new();
     }

BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace BeautySalonDatabaseImplement.Models
 {
-    public class Order : IOrderModel
+    public class Order_ : IOrderModel
     {
         public int Id { get; set; }
 
@@ -60,7 +60,7 @@ namespace BeautySalonDatabaseImplement.Models
             get
             {
                 _orderCosmetics ??= Cosmetic
-                    .Select(pc => new OrderCosmeticViewModel(pc.Cosmetic.GetViewModel, pc.OrderCosmeticCount))
+                    .Select(pc => new OrderCosmeticViewModel(pc.Cosmetic.GetViewModel))
                     .ToList();
                 return _orderCosmetics;
             }
@@ -76,9 +76,9 @@ namespace BeautySalonDatabaseImplement.Models
         [ForeignKey("OrderId")]
         public virtual List<OrderProcedure> Procedures { get; set; } = new();
 
-        public static Order Create(BeautySalonDatabase context, OrderBindingModel model)
+        public static Order_ Create(BeautySalonDatabase context, OrderBindingModel model)
         {
-            return new Order()
+            return new Order_()
             {
                 Id = model.Id,
                 OrderDate = model.OrderDate,
@@ -88,7 +88,7 @@ namespace BeautySalonDatabaseImplement.Models
                     Service = context.Services.First(y => y.Id == x.Service.Id),
                     OrderServiceCount = x.Count
                 }).ToList(),
-                Procedures = model.OrderProcedures.Select(x => new OrderCosmetic()
+                Procedures = model.OrderProcedures.Select(x => new OrderProcedure()
                 {
                     Procedure = context.Procedures.First(y => y.Id == x.Procedure.Id),
                     OrderProcedureCount = x.Count
@@ -144,7 +144,7 @@ namespace BeautySalonDatabaseImplement.Models
             var order = context.Orders.First(x => x.Id == Id);
             foreach (var record in model.OrderProcedures)
             {
-                context.OrderProcedures.Add(new OrderCosmetic
+                context.OrderProcedures.Add(new OrderProcedure
                 {
                     Order = order,
                     Procedure = context.Procedures.First(x => x.Id == record.Procedure.Id),

BeautySalonView/BeautySalonDatabaseImplement/Models/Service.cs

@@ -26,6 +26,8 @@ namespace BeautySalonDatabaseImplement.Models
 
         private List<ServiceCosmeticViewModel>? _serviceCosmetics = null;
 
+        private List<ServiceProcedureViewModel>? _serviceProcedure = null;
+
         [NotMapped]
         public List<ServiceCosmeticViewModel> ServiceCosmetics
         {

BeautySalonView/BeautySalonDatabaseImplement/Models/ServiceProcedure.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeautySalonDatabaseImplement.Models
+{
+    public class ServiceProcedure
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public int ServiceId { get; set; }
+
+        [Required]
+        public int ProcedureId { get; set; }
+
+        [Required]
+        public int ServiceProcedureCount { get; set; }
+
+        public virtual Service Service { get; set; } = new();
+
+        public virtual Procedure Procedure { get; set; } = new();
+    }
+}