Mb done

SushiBar/SushiBar.sln

@@ -13,7 +13,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarBusinessLogic", "Su
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarListImplement", "SushiBarListImplement\SushiBarListImplement.csproj", "{81A91405-3721-40EF-A47C-CEBD92C0A4D0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarFileImplement", "SushiBarFileImplement\SushiBarFileImplement.csproj", "{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarFileImplement", "SushiBarFileImplement\SushiBarFileImplement.csproj", "{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarDatabaseImplement", "SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj", "{D3D85527-BE71-4EDE-8A08-6FF380F92E4C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,6 +47,10 @@ Global
 		{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A26B0D9A-31CB-4845-ABC3-D84E60BECE46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3D85527-BE71-4EDE-8A08-6FF380F92E4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3D85527-BE71-4EDE-8A08-6FF380F92E4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3D85527-BE71-4EDE-8A08-6FF380F92E4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3D85527-BE71-4EDE-8A08-6FF380F92E4C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

SushiBar/SushiBar/Program.cs

@@ -4,7 +4,7 @@ using NLog.Extensions.Logging;
 using SushiBarBusinessLogic.BusinessLogics;
 using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.StoragesContracts;
-using SushiBarFileImplement.Implements;
+using SushiBarDatabaseImplement.Implements;
 
 namespace SushiBarView
 {

SushiBar/SushiBar/SushiBarView.csproj

@@ -2,21 +2,26 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\SushiBarBusinessLogic\SushiBarBusinessLogic.csproj" />
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj" />
+    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
     <ProjectReference Include="..\SushiBarFileImplement\SushiBarFileImplement.csproj" />
     <ProjectReference Include="..\SushiBarListImplement\SushiBarListImplement.csproj" />
   </ItemGroup>

SushiBar/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj

@@ -1,17 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
   </ItemGroup>

SushiBar/SushiBarContracts/SushiBarContracts.csproj

@@ -1,17 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
   </ItemGroup>

SushiBar/SushiBarDataModels/SushiBarDataModels.csproj

@@ -1,15 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
   </ItemGroup>
 
 </Project>

SushiBar/SushiBarDatabaseImplement/Implements/IngredientStorage.cs

@@ -0,0 +1,83 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+    public class IngredientStorage : IIngredientStorage
+    {
+        public List<IngredientViewModel> GetFullList()
+        {
+            using var context = new SushiBarDatabase();
+            return context.Ingredients
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+
+        public List<IngredientViewModel> GetFilteredList(IngredientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.IngredientName))
+            {
+                return new();
+            }
+            using var context = new SushiBarDatabase();
+            return context.Ingredients
+                    .Where(x => x.IngredientName.Contains(model.IngredientName))
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+
+        public IngredientViewModel? GetElement(IngredientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.IngredientName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            return context.Ingredients
+                    .FirstOrDefault(x => (!string.IsNullOrEmpty(model.IngredientName) && x.IngredientName == model.IngredientName) ||
+                        (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+
+        public IngredientViewModel? Insert(IngredientBindingModel model)
+        {
+            var newIngredient = Ingredient.Create(model);
+            if (newIngredient == null)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            context.Ingredients.Add(newIngredient);
+            context.SaveChanges();
+            return newIngredient.GetViewModel;
+        }
+
+        public IngredientViewModel? Update(IngredientBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var ingredient = context.Ingredients.FirstOrDefault(x => x.Id == model.Id);
+            if (ingredient == null)
+            {
+                return null;
+            }
+            ingredient.Update(model);
+            context.SaveChanges();
+            return ingredient.GetViewModel;
+        }
+
+        public IngredientViewModel? Delete(IngredientBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var element = context.Ingredients.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Ingredients.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs

@@ -0,0 +1,93 @@
+using Microsoft.EntityFrameworkCore;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+    public class OrderStorage : IOrderStorage
+    {
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var element = context.Orders
+                .Include(x => x.Sushi)
+                .FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Orders.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            return context.Orders
+                .Include(x => x.Sushi)
+                .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
+                ?.GetViewModel;
+        }
+
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return new();
+            }
+            using var context = new SushiBarDatabase();
+            return context.Orders
+                .Include(x => x.Sushi)
+                .Where(x => x.Id == model.Id)
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+        public List<OrderViewModel> GetFullList()
+        {
+            using var context = new SushiBarDatabase();
+            return context.Orders
+                .Include(x => x.Sushi)
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+
+        public OrderViewModel? Insert(OrderBindingModel model)
+        {
+            var newOrder = Order.Create(model);
+            if (newOrder == null)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            context.Orders.Add(newOrder);
+            context.SaveChanges();
+            return context.Orders
+                          .Include(x => x.Sushi)
+                          .FirstOrDefault(x => x.Id == newOrder.Id)
+                          ?.GetViewModel;
+        }
+
+        public OrderViewModel? Update(OrderBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var order = context.Orders
+                .Include(x => x.Sushi)
+                .FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            order.Update(model);
+            context.SaveChanges();
+            return order.GetViewModel;
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Implements/SushiStorage.cs

@@ -0,0 +1,107 @@
+using Microsoft.EntityFrameworkCore;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+    public class SushiStorage : ISushiStorage
+    {
+        public List<SushiViewModel> GetFullList()
+        {
+            using var context = new SushiBarDatabase();
+            return context.ListSushi
+                    .Include(x => x.Ingredients)
+                    .ThenInclude(x => x.Ingredient)
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+
+        public List<SushiViewModel> GetFilteredList(SushiSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.SushiName))
+            {
+                return new();
+            }
+            using var context = new SushiBarDatabase();
+            return context.ListSushi
+                    .Include(x => x.Ingredients)
+                    .ThenInclude(x => x.Ingredient)
+                    .Where(x => x.SushiName.Contains(model.SushiName))
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+
+        public SushiViewModel? GetElement(SushiSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.SushiName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new SushiBarDatabase();
+            return context.ListSushi
+                .Include(x => x.Ingredients)
+                .ThenInclude(x => x.Ingredient)
+                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.SushiName) && x.SushiName == model.SushiName) ||
+                                (model.Id.HasValue && x.Id == model.Id))
+                ?.GetViewModel;
+        }
+
+        public SushiViewModel? Insert(SushiBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var newSushi = Sushi.Create(context, model);
+            if (newSushi == null)
+            {
+                return null;
+            }
+            context.ListSushi.Add(newSushi);
+            context.SaveChanges();
+            return newSushi.GetViewModel;
+        }
+
+        public SushiViewModel? Update(SushiBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            using var transaction = context.Database.BeginTransaction();
+            try
+            {
+                var sushi = context.ListSushi.FirstOrDefault(rec => rec.Id == model.Id);
+                if (sushi == null)
+                {
+                    return null;
+                }
+                sushi.Update(model);
+                context.SaveChanges();
+                sushi.UpdateIngredients(context, model);
+                transaction.Commit();
+                return sushi.GetViewModel;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+
+        public SushiViewModel? Delete(SushiBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            var element = context.ListSushi
+                .Include(x => x.Ingredients)
+                .Include(x => x.Orders)
+                .FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.ListSushi.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/20240403125318_InitialCreate.Designer.cs

@@ -0,0 +1,171 @@
+// <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("20240403125318_InitialCreate")]
+    partial class InitialCreate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            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>("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("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.Sushi", "Sushi")
+                        .WithMany("Orders")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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.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/20240403125318_InitialCreate.cs

@@ -0,0 +1,125 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialCreate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Ingredients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    IngredientName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Cost = table.Column<double>(type: "float", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Ingredients", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ListSushi",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SushiName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Price = table.Column<double>(type: "float", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ListSushi", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Orders",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SushiId = table.Column<int>(type: "int", nullable: false),
+                    Count = table.Column<int>(type: "int", nullable: false),
+                    Sum = table.Column<double>(type: "float", nullable: false),
+                    Status = table.Column<int>(type: "int", nullable: false),
+                    DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Orders", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Orders_ListSushi_SushiId",
+                        column: x => x.SushiId,
+                        principalTable: "ListSushi",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "SushiIngredients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SushiId = table.Column<int>(type: "int", nullable: false),
+                    IngredientId = table.Column<int>(type: "int", nullable: false),
+                    Count = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SushiIngredients", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_SushiIngredients_Ingredients_IngredientId",
+                        column: x => x.IngredientId,
+                        principalTable: "Ingredients",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_SushiIngredients_ListSushi_SushiId",
+                        column: x => x.SushiId,
+                        principalTable: "ListSushi",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_SushiId",
+                table: "Orders",
+                column: "SushiId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SushiIngredients_IngredientId",
+                table: "SushiIngredients",
+                column: "IngredientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SushiIngredients_SushiId",
+                table: "SushiIngredients",
+                column: "SushiId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "SushiIngredients");
+
+            migrationBuilder.DropTable(
+                name: "Ingredients");
+
+            migrationBuilder.DropTable(
+                name: "ListSushi");
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -0,0 +1,168 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SushiBarDatabaseImplement;
+
+#nullable disable
+
+namespace SushiBarDatabaseImplement.Migrations
+{
+    [DbContext(typeof(SushiBarDatabase))]
+    partial class SushiBarDatabaseModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            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>("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("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.Sushi", "Sushi")
+                        .WithMany("Orders")
+                        .HasForeignKey("SushiId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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.Ingredient", b =>
+                {
+                    b.Navigation("SushiIngredients");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
+                {
+                    b.Navigation("Ingredients");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/Ingredient.cs

@@ -0,0 +1,63 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class Ingredient : IIngredientModel
+    {
+        public int Id { get; private set; }
+
+        [Required]
+        public string IngredientName { get; private set; } = string.Empty;
+
+        [Required]
+        public double Cost { get; set; }
+
+        [ForeignKey("IngredientId")]
+        public virtual List<SushiIngredient> SushiIngredients { get; set; } = new();
+
+        public static Ingredient? Create(IngredientBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Ingredient()
+            {
+                Id = model.Id,
+                IngredientName = model.IngredientName,
+                Cost = model.Cost
+            };
+        }
+
+        public static Ingredient Create(IngredientViewModel model)
+        {
+            return new Ingredient
+            {
+                Id = model.Id,
+                IngredientName = model.IngredientName,
+                Cost = model.Cost
+            };
+        }
+
+        public void Update(IngredientBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            IngredientName = model.IngredientName;
+            Cost = model.Cost;
+        }
+
+        public IngredientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            IngredientName = IngredientName,
+            Cost = Cost
+        };
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/Order.cs

@@ -0,0 +1,64 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Enums;
+using SushiBarDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class Order : IOrderModel
+    {
+        [Required]
+        public int SushiId { get; set; }
+        [Required]
+        public int Count { get; set; }
+        [Required]
+        public double Sum { get; set; }
+        [Required]
+        public OrderStatus Status { get; set; }
+        [Required]
+        public DateTime DateCreate { get; set; }
+        public DateTime? DateImplement { get; set; }
+        public int Id { get; set; }
+        public Sushi Sushi { get; set; }
+        public static Order? Create(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = model.Id,
+                SushiId = model.SushiId,
+                Count = model.Count,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+            };
+        }
+
+        public void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Status = model.Status;
+            DateImplement = model.DateImplement;
+        }
+
+        public OrderViewModel GetViewModel => new()
+        {
+            SushiId = SushiId,
+            Count = Count,
+            Sum = Sum,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+            Id = Id,
+            Status = Status,
+            SushiName = Sushi.SushiName,
+        };
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs

@@ -0,0 +1,98 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class Sushi : ISushiModel
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string SushiName { get; set; } = string.Empty;
+
+        [Required]
+        public double Price { get; set; }
+
+        private Dictionary<int, (IIngredientModel, int)>? _sushiIngredients = null;
+
+        [NotMapped]
+        public Dictionary<int, (IIngredientModel, int)> SushiIngredients
+        {
+            get
+            {
+                if (_sushiIngredients == null)
+                {
+                    _sushiIngredients = Ingredients
+                            .ToDictionary(recPC => recPC.IngredientId, recPC => (recPC.Ingredient as IIngredientModel, recPC.Count));
+                }
+                return _sushiIngredients;
+            }
+        }
+
+        [ForeignKey("SushiId")]
+        public virtual List<SushiIngredient> Ingredients { get; set; } = new();
+        [ForeignKey("SushiId")]
+        public virtual List<Order> Orders { get; set; } = new();
+
+        public static Sushi Create(SushiBarDatabase context, SushiBindingModel model)
+        {
+            return new Sushi()
+            {
+                Id = model.Id,
+                SushiName = model.SushiName,
+                Price = model.Price,
+                Ingredients = model.SushiIngredients.Select(x => new SushiIngredient
+                {
+                    Ingredient = context.Ingredients.First(y => y.Id == x.Key),
+                    Count = x.Value.Item2
+                }).ToList()
+            };
+        }
+
+        public void Update(SushiBindingModel model)
+        {
+            SushiName = model.SushiName;
+            Price = model.Price;
+        }
+
+        public SushiViewModel GetViewModel => new()
+        {
+            Id = Id,
+            SushiName = SushiName,
+            Price = Price,
+            SushiIngredients = SushiIngredients
+        };
+
+        public void UpdateIngredients(SushiBarDatabase context, SushiBindingModel model)
+        {
+            var sushiIngredients = context.SushiIngredients.Where(rec => rec.SushiId == model.Id).ToList();
+            if (sushiIngredients != null && sushiIngredients.Count > 0)
+            {   // удалили те, которых нет в модели
+                context.SushiIngredients.RemoveRange(sushiIngredients.Where(rec => !model.SushiIngredients.ContainsKey(rec.IngredientId)));
+                context.SaveChanges();
+                // обновили количество у существующих записей
+                foreach (var updateIngredient in sushiIngredients)
+                {
+                    updateIngredient.Count = model.SushiIngredients[updateIngredient.IngredientId].Item2;
+                    model.SushiIngredients.Remove(updateIngredient.IngredientId);
+                }
+                context.SaveChanges();
+            }
+            var sushi = context.ListSushi.First(x => x.Id == Id);
+            foreach (var si in model.SushiIngredients)
+            {
+                context.SushiIngredients.Add(new SushiIngredient
+                {
+                    Sushi = sushi,
+                    Ingredient = context.Ingredients.First(x => x.Id == si.Key),
+                    Count = si.Value.Item2
+                });
+                context.SaveChanges();
+            }
+            _sushiIngredients = null;
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/SushiIngredient.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace SushiBarDatabaseImplement.Models
+{
+    public class SushiIngredient
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public int SushiId { get; set; }
+
+        [Required]
+        public int IngredientId { get; set; }
+
+        [Required]
+        public int Count { get; set; }
+
+        public virtual Ingredient Ingredient { get; set; } = new();
+
+        public virtual Sushi Sushi { get; set; } = new();
+    }
+}

SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore;
+using SushiBarDatabaseImplement.Models;
+
+namespace SushiBarDatabaseImplement
+{
+    public class SushiBarDatabase : DbContext
+    {
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            if (optionsBuilder.IsConfigured == false)
+            {
+                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-E2VPEN3\SQLEXPRESS;Initial Catalog=SushiBarDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+            }
+            base.OnConfiguring(optionsBuilder);
+        }
+
+        public virtual DbSet<Ingredient> Ingredients { set; get; }
+
+        public virtual DbSet<Sushi> ListSushi { set; get; }
+
+        public virtual DbSet<SushiIngredient> SushiIngredients { set; get; }
+
+        public virtual DbSet<Order> Orders { set; get; }
+    }
+}

SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
+  </ItemGroup>
+
+</Project>

SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

SushiBar/SushiBarListImplement/SushiBarListImplement.csproj

@@ -1,17 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
     <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />