сплю

BeautySalonView/BeautySalonContracts/ViewModels/EvaluationViewModel.cs

@@ -18,7 +18,7 @@ namespace BeautySalonContracts.ViewModels
         [DisplayName("Баллы за косметику")]
         public double PointsCosmetics { get; set; }
         public int WorkerId { get; set; }
-        public string Client_Name { get; set; } = string.Empty;       
+        public string Worker_Name { get; set; } = string.Empty;       
         public int ProcedureId { get; set; }
         public string Procedure_Name { get; set; } = string.Empty;
     }

BeautySalonView/BeautySalonContracts/ViewModels/ProcedureViewModel.cs

@@ -21,6 +21,7 @@ namespace BeautySalonContracts.ViewModels
         [DisplayName("Продолжительность процедуры")]
         public double ProcedureDuration { get; set; }
         public int WorkerId { get; set; }
+        public string WorkerName { get; set; } = string.Empty;
 
         public Dictionary<int, (ICosmeticModel, int)> ProcedureCosmetics
         {

BeautySalonView/BeautySalonDatabaseImplement/Implements/EvaluationStorage.cs

@@ -19,6 +19,7 @@ namespace BeautySalonDatabaseImplement.Implements
             using var context = new BeautySalonDatabase();
             return context.Evaluations
                     .Include(x => x.Procedure)
+                    .Include(x => x.Worker)
                     .ToList()
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -31,6 +32,7 @@ namespace BeautySalonDatabaseImplement.Implements
             {
                 return context.Evaluations
                     .Include(x => x.Procedure)
+                    .Include(x => x.Worker)
                     .Where(x => x.Id == model.Id)
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -39,6 +41,7 @@ namespace BeautySalonDatabaseImplement.Implements
             {
                 return context.Evaluations
                     .Include(x => x.Procedure)
+                    .Include(x => x.Worker)
                     .Where(x => x.WorkerId == model.WorkerId)
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -55,6 +58,7 @@ namespace BeautySalonDatabaseImplement.Implements
             using var context = new BeautySalonDatabase();
             return context.Evaluations
                 .Include(x => x.Procedure)
+                .Include(x => x.Worker)
                 .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
                 ?.GetViewModel;
         }
@@ -71,6 +75,7 @@ namespace BeautySalonDatabaseImplement.Implements
             context.SaveChanges();
             return context.Evaluations
                           .Include(x => x.Procedure)
+                          .Include(x => x.Worker)
                           .FirstOrDefault(x => x.Id == newEvaluation.Id)
                           ?.GetViewModel;
         }
@@ -80,6 +85,7 @@ namespace BeautySalonDatabaseImplement.Implements
             using var context = new BeautySalonDatabase();
             var сosmetic = context.Evaluations
                 .Include(x => x.Procedure)
+                .Include(x => x.Worker)
                 .FirstOrDefault(x => x.Id == model.Id);
             if (сosmetic == null)
             {
@@ -95,6 +101,7 @@ namespace BeautySalonDatabaseImplement.Implements
             using var context = new BeautySalonDatabase();
             var element = context.Evaluations
                 .Include(x => x.Procedure)
+                .Include(x => x.Worker)
                 .FirstOrDefault(rec => rec.Id == model.Id);
             if (element != null)
             {

BeautySalonView/BeautySalonDatabaseImplement/Implements/ProcedureStorage.cs

@@ -19,6 +19,7 @@ namespace BeautySalonDatabaseImplement.Implements
             using var context = new BeautySalonDatabase();
             var element = context.Procedures
                 .Include(x => x.Cosmetics)
+                .Include(x => x.Worker)
                 .FirstOrDefault(rec => rec.Id == model.Id);
             if (element != null)
             {
@@ -37,6 +38,7 @@ namespace BeautySalonDatabaseImplement.Implements
             }
             using var context = new BeautySalonDatabase();
             return context.Procedures
+                .Include(x => x.Worker)
                 .Include(x => x.Cosmetics)
                 .ThenInclude(x => x.Cosmetic)
                 .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ProcedureName) && x.ProcedureName == model.ProcedureName) ||
@@ -50,6 +52,7 @@ namespace BeautySalonDatabaseImplement.Implements
             if (model.Id.HasValue)
             {
                 return context.Procedures
+                    .Include(x => x.Worker)
                     .Where(x => x.Id == model.Id)
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -57,6 +60,7 @@ namespace BeautySalonDatabaseImplement.Implements
             if (model.WorkerId.HasValue)
             {
                 return context.Procedures
+                    .Include(x => x.Worker)
                     .Where(x => x.WorkerId == model.WorkerId)
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -68,6 +72,7 @@ namespace BeautySalonDatabaseImplement.Implements
         {
             using var context = new BeautySalonDatabase();
             return context.Procedures
+                .Include(x => x.Worker)
                     .Include(x => x.Cosmetics)
                     .ThenInclude(x => x.Cosmetic)
                     .Select(x => x.GetViewModel)

BeautySalonView/BeautySalonDatabaseImplement/Migrations/20240529203744_InitialCreate.Designer.cs

@@ -261,9 +261,6 @@ namespace BeautySalonDatabaseImplement.Migrations
                     b.Property<double>("OrderAmount")
                         .HasColumnType("float");
 
-                    b.Property<DateTime>("OrderDate")
-                        .HasColumnType("datetime2");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 

BeautySalonView/BeautySalonDatabaseImplement/Migrations/20240529203744_InitialCreate.cs

@@ -116,7 +116,6 @@ namespace BeautySalonDatabaseImplement.Migrations
                 {
                     Id = table.Column<int>(type: "int", nullable: false)
                         .Annotation("SqlServer:Identity", "1, 1"),
-                    OrderDate = table.Column<DateTime>(type: "datetime2", nullable: false),
                     OrderAmount = table.Column<double>(type: "float", nullable: false),
                     WorkerId = table.Column<int>(type: "int", nullable: false),
                     Status = table.Column<int>(type: "int", nullable: false),

BeautySalonView/BeautySalonDatabaseImplement/Migrations/20240529221403_RemoveUselessDate.Designer.cs

@@ -0,0 +1,677 @@
+// <auto-generated />
+using System;
+using BeautySalonDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BeautySalonDatabaseImplement.Migrations
+{
+    [DbContext(typeof(BeautySalonDatabase))]
+    [Migration("20240529221403_RemoveUselessDate")]
+    partial class RemoveUselessDate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.17")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Cosmetic", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Brand")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CosmeticName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("CosmeticPrice")
+                        .HasColumnType("float");
+
+                    b.Property<int>("LaborCostId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LaborCostId");
+
+                    b.ToTable("Cosmetics");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.CosmeticProcedure", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CosmeticId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ProcedureId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CosmeticId");
+
+                    b.HasIndex("ProcedureId");
+
+                    b.ToTable("CosmeticProcedures");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Evaluation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("PointsCosmetics")
+                        .HasColumnType("float");
+
+                    b.Property<double>("PointsProcedure")
+                        .HasColumnType("float");
+
+                    b.Property<int>("ProcedureId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("WorkerId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProcedureId");
+
+                    b.HasIndex("WorkerId");
+
+                    b.ToTable("Evaluations");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.LaborCosts", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Difficulty")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("NumberHours")
+                        .HasColumnType("int");
+
+                    b.Property<int>("StorekeeperId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StorekeeperId");
+
+                    b.ToTable("LaborCosts");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.Property<string>("MessageId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("StorekeeperId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("WorkerId")
+                        .HasColumnType("int");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("StorekeeperId");
+
+                    b.HasIndex("WorkerId");
+
+                    b.ToTable("MessageInfos");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderCosmetic", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CosmeticId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("OrderId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CosmeticId");
+
+                    b.HasIndex("OrderId");
+
+                    b.ToTable("OrderCosmetics");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderProcedure", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("OrderId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("OrderProcedureCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ProcedureId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrderId");
+
+                    b.HasIndex("ProcedureId");
+
+                    b.ToTable("OrderProcedures");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderService", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("OrderId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("OrderServiceCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ServiceId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrderId");
+
+                    b.HasIndex("ServiceId");
+
+                    b.ToTable("OrderServices");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Order_", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("datetime2");
+
+                    b.Property<double>("OrderAmount")
+                        .HasColumnType("float");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("WorkerId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorkerId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Procedure", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("ProcedureDuration")
+                        .HasColumnType("float");
+
+                    b.Property<string>("ProcedureName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("ProcedurePrice")
+                        .HasColumnType("float");
+
+                    b.Property<int>("WorkerId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorkerId");
+
+                    b.ToTable("Procedures");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Service", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ServiceName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("ServicePrice")
+                        .HasColumnType("float");
+
+                    b.Property<int>("StorekeeperId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StorekeeperId");
+
+                    b.ToTable("Services");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.ServiceCosmetic", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CosmeticId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ServiceId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("serviceId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CosmeticId");
+
+                    b.HasIndex("serviceId");
+
+                    b.ToTable("ServiceCosmetics");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.ServiceProcedure", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ProcedureId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ServiceId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProcedureId");
+
+                    b.HasIndex("ServiceId");
+
+                    b.ToTable("ServiceProcedures");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Storekeeper", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Storekeepers");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Worker", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Workers");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Cosmetic", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.LaborCosts", "LaborCost")
+                        .WithMany("Cosmetics")
+                        .HasForeignKey("LaborCostId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LaborCost");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.CosmeticProcedure", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Cosmetic", "Cosmetic")
+                        .WithMany("Procedures")
+                        .HasForeignKey("CosmeticId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Procedure", "Procedure")
+                        .WithMany("Cosmetics")
+                        .HasForeignKey("ProcedureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Cosmetic");
+
+                    b.Navigation("Procedure");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Evaluation", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Procedure", "Procedure")
+                        .WithMany()
+                        .HasForeignKey("ProcedureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Worker", "Worker")
+                        .WithMany()
+                        .HasForeignKey("WorkerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Procedure");
+
+                    b.Navigation("Worker");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.LaborCosts", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Storekeeper", "Storekeeper")
+                        .WithMany()
+                        .HasForeignKey("StorekeeperId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Storekeeper");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Storekeeper", "Storekeeper")
+                        .WithMany()
+                        .HasForeignKey("StorekeeperId");
+
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Worker", "Worker")
+                        .WithMany()
+                        .HasForeignKey("WorkerId");
+
+                    b.Navigation("Storekeeper");
+
+                    b.Navigation("Worker");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderCosmetic", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Cosmetic", "Cosmetic")
+                        .WithMany()
+                        .HasForeignKey("CosmeticId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Order_", "Order")
+                        .WithMany("Cosmetics")
+                        .HasForeignKey("OrderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Cosmetic");
+
+                    b.Navigation("Order");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderProcedure", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Order_", "Order")
+                        .WithMany("Procedures")
+                        .HasForeignKey("OrderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Procedure", "Procedure")
+                        .WithMany()
+                        .HasForeignKey("ProcedureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Order");
+
+                    b.Navigation("Procedure");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderService", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Order_", "Order")
+                        .WithMany("Services")
+                        .HasForeignKey("OrderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Service", "Service")
+                        .WithMany()
+                        .HasForeignKey("ServiceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Order");
+
+                    b.Navigation("Service");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Order_", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Worker", "Worker")
+                        .WithMany()
+                        .HasForeignKey("WorkerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worker");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Procedure", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Worker", "Worker")
+                        .WithMany()
+                        .HasForeignKey("WorkerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worker");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Service", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Storekeeper", "Storekeeper")
+                        .WithMany()
+                        .HasForeignKey("StorekeeperId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Storekeeper");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.ServiceCosmetic", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Cosmetic", "Cosmetic")
+                        .WithMany()
+                        .HasForeignKey("CosmeticId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Service", "Service")
+                        .WithMany("Cosmetics")
+                        .HasForeignKey("serviceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Cosmetic");
+
+                    b.Navigation("Service");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.ServiceProcedure", b =>
+                {
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Procedure", "Procedure")
+                        .WithMany()
+                        .HasForeignKey("ProcedureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BeautySalonDatabaseImplement.Models.Service", "Service")
+                        .WithMany("Procedures")
+                        .HasForeignKey("ServiceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Procedure");
+
+                    b.Navigation("Service");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Cosmetic", b =>
+                {
+                    b.Navigation("Procedures");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.LaborCosts", b =>
+                {
+                    b.Navigation("Cosmetics");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Order_", b =>
+                {
+                    b.Navigation("Cosmetics");
+
+                    b.Navigation("Procedures");
+
+                    b.Navigation("Services");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Procedure", b =>
+                {
+                    b.Navigation("Cosmetics");
+                });
+
+            modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Service", b =>
+                {
+                    b.Navigation("Cosmetics");
+
+                    b.Navigation("Procedures");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

BeautySalonView/BeautySalonDatabaseImplement/Migrations/20240529221403_RemoveUselessDate.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BeautySalonDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class RemoveUselessDate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

BeautySalonView/BeautySalonDatabaseImplement/Migrations/BeautySalonDatabaseModelSnapshot.cs

@@ -258,9 +258,6 @@ namespace BeautySalonDatabaseImplement.Migrations
                     b.Property<double>("OrderAmount")
                         .HasColumnType("float");
 
-                    b.Property<DateTime>("OrderDate")
-                        .HasColumnType("datetime2");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 

BeautySalonView/BeautySalonDatabaseImplement/Models/Evaluation.cs

@@ -62,9 +62,9 @@ namespace BeautySalonDatabaseImplement.Models
             PointsProcedure=PointsProcedure,
             PointsCosmetics=PointsCosmetics,
             ProcedureId=ProcedureId,
-            WorkerId=WorkerId,
             Procedure_Name = Procedure.ProcedureName,
-            Client_Name = Worker.FullName
+            WorkerId=WorkerId,
+            Worker_Name =Worker.FullName
         };
     }
 }

BeautySalonView/BeautySalonDatabaseImplement/Models/LaborCosts.cs

@@ -54,7 +54,8 @@ namespace BeautySalonDatabaseImplement.Models
         {
             Id = Id,
             NumberHours = NumberHours,
-            Difficulty = Difficulty
+            Difficulty = Difficulty,
+            StorekeeperId = StorekeeperId
         };
     }
 

BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs

@@ -16,9 +16,6 @@ namespace BeautySalonDatabaseImplement.Models
     {
         public int Id { get; set; }
 
-        [Required]
-        public DateTime OrderDate { get; set; }
-
         [Required]
         public double OrderAmount { get; set; }
 

BeautySalonView/BeautySalonDatabaseImplement/Models/Procedure.cs

@@ -128,7 +128,8 @@ namespace BeautySalonDatabaseImplement.Models
             ProcedurePrice = ProcedurePrice,
             ProcedureDuration = ProcedureDuration,
             ProcedureCosmetics = ProcedureCosmetics,
-            WorkerId = WorkerId
+            WorkerId = WorkerId,
+            WorkerName = Worker.FullName
         };
 
         public void UpdateCosmetics(BeautySalonDatabase context, ProcedureBindingModel model)

BeautySalonView/BeautySalonRestApi/Controllers/ProcedureController.cs

@@ -2,6 +2,7 @@
 using BeautySalonContracts.BusinessLogicContracts;
 using BeautySalonContracts.SearchModels;
 using BeautySalonContracts.ViewModels;
+using BeautySalonRestApi.Controllers;
 using Microsoft.AspNetCore.Mvc;
 
 namespace BeutySalonClientApp.Controllers
@@ -10,112 +11,101 @@ namespace BeutySalonClientApp.Controllers
     [ApiController]
     public class ProcedureController : Controller
     {
-        private readonly ILogger logger;
+        private readonly ILogger _logger;
 
-        private readonly IProcedureLogic procedure;
+        private readonly IProcedureLogic _logic;
 
-        public ProcedureController(ILogger<ProcedureController> logger, IProcedureLogic procedure)
+        public ProcedureController(IProcedureLogic logic, ILogger<ProcedureController> logger)
         {
-            this.logger = logger;
-            this.procedure = procedure;
+            _logger = logger;
+            _logic = logic;
         }
 
+
         [HttpGet]
-        public ProcedureViewModel? Get(int id)
+        public ProcedureViewModel? GetProcedure(int id)
         {
             try
             {
-                return procedure.ReadElement(new ProcedureSearchModel { Id = id });
+                return _logic.ReadElement(new ProcedureSearchModel
+                {
+                    Id = id
+                });
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "Ошибка получения процедуры с id = {Id}", id);
+                _logger.LogError(ex, "Ошибка получения процедуры");
                 throw;
             }
         }
 
         [HttpGet]
-        public List<ProcedureViewModel>? GetAll()
+        public List<ProcedureViewModel>? GetAllProcedures()
         {
             try
             {
-                return procedure.ReadList(null);
+                return _logic.ReadList(null);
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "Ошибка получения списка процедур");
+                _logger.LogError(ex, "Ошибка получения списка процедур");
                 throw;
             }
         }
 
         [HttpGet]
-        public List<ProcedureViewModel>? GetAllByUser(int userId)
+        public List<ProcedureViewModel>? GetProcedures(int workerId)
         {
             try
             {
-                return procedure.ReadList(new ProcedureSearchModel { WorkerId = userId });
+                return _logic.ReadList(new ProcedureSearchModel { WorkerId = workerId });
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "Ошибка получения списка процедур пользователя");
+                _logger.LogError(ex, "Ошибка получения списка процедур сотрудника id={Id}", workerId);
                 throw;
             }
         }
 
-        [HttpGet]
-        public List<ProcedureViewModel>? GetMany(int userId, int page)
-        {
-            try
-            {
-                return procedure.ReadList(new ProcedureSearchModel { WorkerId = userId});
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Ошибка получения списка процедур клиента id = {Id}", userId);
-                throw;
-            }
-        }
-
-        
 
         [HttpPost]
-        public void Create(ProcedureBindingModel model)
+        public void CreateProcedure(ProcedureBindingModel model)
         {
             try
             {
-                procedure.Create(model);
+                _logic.Create(model);
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "Ошибка создания процедуры");
+                _logger.LogError(ex, "Ошибка создания процедуры");
                 throw;
             }
         }
 
         [HttpPost]
-        public void Update(ProcedureBindingModel model)
+        public void UpdateProcedure(ProcedureBindingModel model)
         {
             try
             {
-                procedure.Update(model);
+                _logic.Update(model);
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "Ошибка обновления процедуры");
+                _logger.LogError(ex, "Ошибка обновления процедуры");
                 throw;
             }
         }
 
-        [HttpPost]
-        public void Delete(ProcedureBindingModel model)
+        [HttpDelete]
+        public void DeleteProcedure(ProcedureBindingModel model)
         {
             try
             {
-                procedure.Delete(new() { Id = model.Id });
+                _logic.Delete(model);
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "Ошибка удаления процедуры");
+                _logger.LogError(ex, "Ошибка удаления процедуры");
                 throw;
             }
         }

BeautySalonView/BeautySalonRestApi/Program.cs

@@ -20,15 +20,26 @@ builder.Logging.AddLog4Net("log4net.config");
 // Add services to the container.
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IEvaluationStorage, EvaluationStorage>();
+builder.Services.AddTransient<IProcedureStorage, ProcedureStorage>();
+builder.Services.AddTransient<IWorkerStorage, WorkerStorage>();
+
 builder.Services.AddTransient<IServiceStorage, ServiceStorage>();
 builder.Services.AddTransient<ILaborCostsStorage, LaborCostsStorage>();
 builder.Services.AddTransient<ICosmeticStorage, CosmeticStorage>();
-builder.Services.AddTransient<IProcedureStorage, ProcedureStorage>();
+builder.Services.AddTransient<IStorekeeperStorage, StorekeeperStorage>();
+
+builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 builder.Services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
 builder.Services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
-builder.Services.AddTransient<IWorkerStorage, WorkerStorage>();
-builder.Services.AddTransient<IStorekeeperStorage, StorekeeperStorage>();
+
+builder.Services.AddTransient<IOrderLogic, OrderLogic>();
+builder.Services.AddTransient<IEvaluationLogic, EvaluationLogic>();
+builder.Services.AddTransient<IProcedureLogic, ProcedureLogic>();
 builder.Services.AddTransient<IWorkerLogic, WorkerLogic>();
+
+builder.Services.AddTransient<IServiceLogic, ServiceLogic>();
+builder.Services.AddTransient<ILaborCostsLogic, LaborCostsLogic>();
+builder.Services.AddTransient<ICosmeticLogic, CosmeticLogic>();
 builder.Services.AddTransient<IStorekeeperLogic, StorekeeperLogic>();
 
 builder.Services.AddTransient<AbstractSaveToWordStorekeeper, SaveToWordStorekeeper>();

BeautySalonView/ClientWebApp/Views/Home/Order.cshtml

@@ -42,7 +42,6 @@
             {
                 <tr class="table-row" id="row-@item.Id">
                     <td>@item.Id</td>
-                    <td>@item.OrderDate</td>
                     <td>@item.OrderAmount</td>
                 </tr>
             }