Add_Client in BD

SushiBar/SushiBar/FormMain.cs

@@ -31,6 +31,7 @@ namespace SushiBarView
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["SushiId"].Visible = false;
+
                 }
                 _logger.LogInformation("Загрузка заказов");
             }

SushiBar/SushiBar/Program.cs

@@ -7,6 +7,7 @@ using SushiBarBusinessLogic.OfficePackage;
 using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.StoragesContracts;
 using SushiBarDatabaseImplement.Implements;
+using SushiBarBusinessLogic;
 
 namespace SushiBarView
 {
@@ -41,11 +42,15 @@ namespace SushiBarView
             services.AddTransient<IIngredientStorage, IngredientStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ISushiStorage, SushiStorage>();
+            services.AddTransient<IClientStorage, ClientStorage>();
+
             services.AddTransient<IIngredientLogic, IngredientLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ISushiLogic, SushiLogic>();
+            services.AddTransient<IClientLogic, ClientLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
 
+
             services.AddTransient<FormMain>();
             services.AddTransient<FormIngredient>();
             services.AddTransient<FormIngredients>();
@@ -53,6 +58,7 @@ namespace SushiBarView
             services.AddTransient<FormSushi>();
             services.AddTransient<FormSushiIngredients>();
             services.AddTransient<FormListSushi>();
+            services.AddTransient<FormClients>();
             services.AddTransient<FormReportSushiIngredients>();
             services.AddTransient<FormReportOrders>();
 

SushiBar/SushiBar/SushiBarView.csproj

@@ -11,8 +11,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.5.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

SushiBar/SushiBarClientApp/Controllers/HomeController.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using SushiBarClientApp.Models;
 using SushiBarContracts.BindingModel;
+using SushiBarContracts.BindingModels;
 using SushiBarContracts.ViewModels;
 using System.Diagnostics;
 

SushiBar/SushiBarClientApp/SushiBarClientApp.csproj

@@ -9,7 +9,7 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.26" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.4" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>

SushiBar/SushiBarContracts/BindingModels/OrderBindingModel.cs

@@ -12,5 +12,8 @@ namespace SushiBarContracts.BindingModels
         public DateTime DateCreate { get; set; } = DateTime.Now;
         public DateTime? DateImplement { get; set; }
         public int Id { get; set; }
+
+        public int ClientId { get; set; }
+        public string ClientFIO { get; set; } = string.Empty;
     }
 }

SushiBar/SushiBarContracts/SearchModels/OrderSearchModel.cs

@@ -6,6 +6,7 @@ namespace SushiBarContracts.SearchModels
         public int? Id { get; set; }
         public DateTime? DateTo { get; set; }
         public DateTime? DateFrom { get; set; }
+        public int ClientId { get; set; }
     }
 
 }

SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs

@@ -8,9 +8,13 @@ namespace SushiBarContracts.ViewModels
     {
         [DisplayName("Номер")]
         public int Id { get; set; }
+        public int ClientId { get; set; }
+        [DisplayName("Имя клиента")]
+        public string ClientFIO { get; set; } = string.Empty;
         public int SushiId { get; set; }
         [DisplayName("Суши")]
         public string SushiName { get; set; } = string.Empty;
+
         [DisplayName("Количество")]
         public int Count { get; set; }
         [DisplayName("Сумма")]

SushiBar/SushiBarDataModels/Models/IOrderModel.cs

@@ -5,6 +5,7 @@ namespace SushiBarDataModels.Models
     public interface IOrderModel : IId
     {
         int SushiId { get; }
+        int ClientId { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs

@@ -32,7 +32,7 @@ namespace SushiBarDatabaseImplement.Implements
             }
             using var context = new SushiBarDatabase();
             return context.Orders
-                .Include(x => x.Sushi)
+                .Include(x => x.Sushi).Include(x => x.Client)
                 .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
                 ?.GetViewModel;
         }
@@ -48,6 +48,7 @@ namespace SushiBarDatabaseImplement.Implements
             {
                 return context.Orders
                     .Include(x => x.Sushi)
+                    .Include(x => x.Client)
                     .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -74,6 +75,7 @@ namespace SushiBarDatabaseImplement.Implements
             context.SaveChanges();
             return context.Orders
                           .Include(x => x.Sushi)
+                          .Include(x => x.Client)
                           .FirstOrDefault(x => x.Id == newOrder.Id)
                           ?.GetViewModel;
         }
@@ -83,6 +85,7 @@ namespace SushiBarDatabaseImplement.Implements
             using var context = new SushiBarDatabase();
             var order = context.Orders
                 .Include(x => x.Sushi)
+                .Include(x => x.Client)
                 .FirstOrDefault(x => x.Id == model.Id);
             if (order == null)
             {

SushiBar/SushiBarDatabaseImplement/Migrations/20240501085423_Add_client.Designer.cs

@@ -0,0 +1,214 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SushiBarDatabaseImplement;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    [DbContext(typeof(SushiBarDatabase))]
+    [Migration("20240501085423_Add_client")]
+    partial class Add_client
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Ingredient", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("float");
+
+                    b.Property<string>("IngredientName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Ingredients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("float");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.Property<string>("SushiName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ListSushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiIngredient", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("IngredientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SushiId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IngredientId");
+
+                    b.HasIndex("SushiId");
+
+                    b.ToTable("SushiIngredients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("Orders")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiIngredient", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Ingredient", "Ingredient")
+                        .WithMany("SushiIngredients")
+                        .HasForeignKey("IngredientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
+                        .WithMany("Ingredients")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ingredient");
+
+                    b.Navigation("Sushi");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Ingredient", b =>
+                {
+                    b.Navigation("SushiIngredients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Navigation("Ingredients");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/20240501085423_Add_client.cs

@@ -0,0 +1,68 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class Add_client : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ClientId",
+                table: "Orders",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.CreateTable(
+                name: "Clients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    ClientFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Clients", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ClientId",
+                table: "Orders",
+                column: "ClientId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders",
+                column: "ClientId",
+                principalTable: "Clients",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "Clients");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Orders_ClientId",
+                table: "Orders");
+
+            migrationBuilder.DropColumn(
+                name: "ClientId",
+                table: "Orders");
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -17,11 +17,36 @@ namespace SushiBarDatabaseImplement.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.3")
+                .HasAnnotation("ProductVersion", "8.0.4")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Ingredient", b =>
                 {
                     b.Property<int>("Id")
@@ -50,6 +75,9 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
                     b.Property<int>("Count")
                         .HasColumnType("int");
 
@@ -70,6 +98,8 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("ClientId");
+
                     b.HasIndex("SushiId");
 
                     b.ToTable("Orders");
@@ -123,12 +153,20 @@ namespace SushiBarDatabaseImplement.Migrations
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
                         .WithMany("Orders")
                         .HasForeignKey("SushiId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.Navigation("Client");
+
                     b.Navigation("Sushi");
                 });
 
@@ -151,6 +189,11 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Ingredient", b =>
                 {
                     b.Navigation("SushiIngredients");

SushiBar/SushiBarDatabaseImplement/Models/Client.cs

@@ -19,7 +19,7 @@ namespace SushiBarDatabaseImplement.Models
         [Required]
         public string Password { get; private set; } = string.Empty;
 
-        [ForeignKey("ID")]
+        [ForeignKey("ClientId")]
         public virtual List<Order> Orders { get; set; } = new();
 
         public static Client? Create(ClientBindingModel? model)

SushiBar/SushiBarDatabaseImplement/Models/Order.cs

@@ -3,6 +3,7 @@ using SushiBarContracts.ViewModels;
 using SushiBarDataModels.Enums;
 using SushiBarDataModels.Models;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace SushiBarDatabaseImplement.Models
 {
@@ -13,6 +14,8 @@ namespace SushiBarDatabaseImplement.Models
         [Required]
         public int Count { get; set; }
         [Required]
+        public int ClientId { get; set; }
+        [Required]
         public double Sum { get; set; }
         [Required]
         public OrderStatus Status { get; set; }
@@ -20,7 +23,8 @@ namespace SushiBarDatabaseImplement.Models
         public DateTime DateCreate { get; set; }
         public DateTime? DateImplement { get; set; }
         public int Id { get; set; }
-        public Sushi Sushi { get; set; }
+        public virtual Client? Client { get; set; }
+        public Sushi? Sushi { get; set; }
         public static Order? Create(OrderBindingModel? model)
         {
             if (model == null)
@@ -36,6 +40,7 @@ namespace SushiBarDatabaseImplement.Models
                 Status = model.Status,
                 DateCreate = model.DateCreate,
                 DateImplement = model.DateImplement,
+                ClientId = model.ClientId
             };
         }
 
@@ -59,6 +64,8 @@ namespace SushiBarDatabaseImplement.Models
             Id = Id,
             Status = Status,
             SushiName = Sushi.SushiName,
+            ClientId = ClientId,
+            ClientFIO = Client.ClientFIO
         };
     }
 }

SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs

@@ -19,7 +19,6 @@ namespace SushiBarDatabaseImplement
         public virtual DbSet<Sushi> ListSushi { set; get; }
 
         public virtual DbSet<SushiIngredient> SushiIngredients { set; get; }
-
         public virtual DbSet<Order> Orders { set; get; }
         public virtual DbSet<Client> Clients { set; get; }
     }

SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

SushiBar/SushiBarFileImplement/Models/Order.cs

@@ -10,6 +10,7 @@ namespace SushiBarFileImplement.Models
     {
         public int Id { get; private set; }
         public int SushiId { get; private set; }
+        public int ClientId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
@@ -25,6 +26,7 @@ namespace SushiBarFileImplement.Models
             {
                 Id = model.Id,
                 SushiId = model.SushiId,
+                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -43,6 +45,7 @@ namespace SushiBarFileImplement.Models
             {
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 SushiId = Convert.ToInt32(element.Element("SushiId")!.Value),
+                ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
                 Count = Convert.ToInt32(element.Element("Count")!.Value),
                 Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
@@ -70,11 +73,13 @@ namespace SushiBarFileImplement.Models
             DateImplement = DateImplement,
             Id = Id,
             Status = Status,
+            ClientId = ClientId,
         };
 
         public XElement GetXElement => new("Order",
           new XAttribute("Id", Id),
           new XElement("SushiId", SushiId),
+          new XElement("ClientId", ClientId.ToString()),
           new XElement("Count", Count.ToString()),
           new XElement("Sum", Sum.ToString()),
           new XElement("Status", Status.ToString()),

SushiBar/SushiBarListImplement/Models/Order.cs

@@ -9,6 +9,7 @@ namespace SushiBarListImplement.Models
     {
         public int Id { get; private set; }
         public int SushiId { get; private set; }
+        public int ClientId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
@@ -29,6 +30,7 @@ namespace SushiBarListImplement.Models
                 DateCreate = model.DateCreate,
                 DateImplement = model.DateImplement,
                 Id = model.Id,
+                ClientId = model.ClientId,
             };
         }
         public void Update(OrderBindingModel? model)
@@ -37,18 +39,24 @@ namespace SushiBarListImplement.Models
             {
                 return;
             }
+            SushiId = model.SushiId;
+            Count = model.Count;
+            Sum = model.Sum;
             Status = model.Status;
+            DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
+            ClientId = model.ClientId;
         }
         public OrderViewModel GetViewModel => new()
         {
+            Id = Id,
             SushiId = SushiId,
             Count = Count,
             Sum = Sum,
+            Status = Status,
             DateCreate = DateCreate,
             DateImplement = DateImplement,
-            Id = Id,
+            ClientId = ClientId,
-            Status = Status,
         };
     }
 }

SushiBar/SushiBarRestApi/Controllers/MainController.cs

@@ -1,8 +1,10 @@
 using DocumentFormat.OpenXml.Office2010.Excel;
 using Microsoft.AspNetCore.Mvc;
 using SushiBarContracts.BindingModel;
+using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.SearchModel;
+using SushiBarContracts.SearchModels;
 using SushiBarContracts.ViewModels;
 
 namespace SushiBarRestApi.Controllers

SushiBar/SushiBarRestApi/Program.cs

@@ -2,8 +2,8 @@ using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.StoragesContracts;
 using SushiBarDatabaseImplement.Implements;
 using Microsoft.OpenApi.Models;
-using SushiBarBusinessLogic.BusinessLogic;
 using SushiBarBusinessLogic;
+using SushiBarBusinessLogic.BusinessLogics;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Logging.SetMinimumLevel(LogLevel.Trace);