.gitignore

@@ -398,3 +398,4 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
+/FishFactory/ImplementationExtensions

FishFactory/FishFactory/FishFactoryView.csproj

@@ -9,6 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />

FishFactory/FishFactory/FormMain.Designer.cs

@@ -186,6 +186,7 @@
             this.MainMenuStrip = this.menuStrip1;
             this.Name = "FormMain";
             this.Text = "Рыбный завод";
+            this.Load += new System.EventHandler(this.FormMain_Load);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
             this.menuStrip1.ResumeLayout(false);
             this.menuStrip1.PerformLayout();

FishFactory/FishFactory/FormMain.cs

@@ -82,16 +82,10 @@ namespace FishFactoryView
                 int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                 
                 _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id);
-            try{
+                try{
                     var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
-                    { Id = id
-                        /*CannedId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["CannedId"].Value),
-                        *//*CannedName = dataGridView.SelectedRows[0].Cells["CannedName"].Value.ToString,*//*
-                        Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
-                        Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
-                        Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
-                        DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),*/
-
+                    { 
+                        Id = id
                     });
                     if (!operationResult)
                     {
@@ -118,12 +112,6 @@ namespace FishFactoryView
                     var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
                     {
                         Id = id,
-                        CannedId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["CannedId"].Value),
-                        /*CannedName = dataGridView.SelectedRows[0].Cells["CannedName"].Value.ToString,*/
-                        Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
-                        Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
-                        Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
-                        DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
                     });
                     if (!operationResult)
                     {

FishFactory/FishFactory/FormShop.cs

@@ -101,7 +101,7 @@ namespace FishFactoryView
                     Id = _id ?? 0,
                     ShopName = textBoxShop.Text,
                     Address = textBoxAddress.Text,
-                    DateOpening = dateTimePicker.Value.Date,
+                    DateOpening = DateTime.SpecifyKind(DateTime.Parse(dateTimePicker.Text), DateTimeKind.Utc),
                     ListCanneds = _shopListCanneds,
                     MaxCountCanneds = (int)numericUpDownCount.Value
                 };

FishFactory/FishFactoryBusinessLogic/OrderLogic.cs

@@ -58,7 +58,7 @@ namespace FishFactoryBusinessLogic.BusinessLogics
             model.Status = newStatus;
             if (model.Status == OrderStatus.Готов)
             {
-                model.DateImplement = DateTime.Now;
+                model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
                 var canned = _cannedStorage.GetElement(new() { Id = viewModel.CannedId });
                 if (canned == null)
                 {

FishFactory/FishFactoryContracts/BindingModels/ShopBindingModel.cs

@@ -15,7 +15,7 @@ namespace FishFactoryContracts.BindingModels
 
         public string Address { get; set; } = string.Empty;
 
-        public DateTime DateOpening { get; set; } = DateTime.Now;
+        public DateTime DateOpening { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
 
         public Dictionary<int, (ICannedModel, int)> ListCanneds
         {

FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabase.cs

@@ -4,6 +4,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Intrinsics.Arm;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -23,5 +24,7 @@ namespace FishFactoryDatabaseImplement
         public virtual DbSet<Canned> Canneds { set; get; }
         public virtual DbSet<CannedComponent> CannedComponents { set; get; }
         public virtual DbSet<Order> Orders { set; get; }
+        public virtual DbSet<Shop> Shops { set; get; }
+        public virtual DbSet<ShopCanned> ShopCanned { set; get; }
     }
 }

FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj

@@ -7,8 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
   </ItemGroup>
 
   <ItemGroup>

FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs

@@ -3,6 +3,7 @@ using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.StoragesContracts;
 using FishFactoryContracts.ViewModels;
 using FishFactoryDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -39,7 +40,9 @@ namespace FishFactoryDatabaseImplement.Implements
 
             using var context = new FishFactoryDatabase();
 
-            return GetViewModel(context.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id)));
+            return GetViewModel(context.Orders
+                .Include(x => x.Canned)
+                .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id)));
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@@ -51,14 +54,21 @@ namespace FishFactoryDatabaseImplement.Implements
 
             using var context = new FishFactoryDatabase();
 
-            return context.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList();
+            return context.Orders
+                .Include(x => x.Canned)
+                .Where(x => x.Id == model.Id)
+                .Select(x => GetViewModel(x))
+                .ToList();
         }
 
         public List<OrderViewModel> GetFullList()
         {
             using var context = new FishFactoryDatabase();
 
-            return context.Orders.Select(x => GetViewModel(x)).ToList();
+            return context.Orders
+                .Include(x => x.Canned)
+                .Select(x => GetViewModel(x))
+                .ToList();
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -73,14 +83,19 @@ namespace FishFactoryDatabaseImplement.Implements
 
             context.Orders.Add(newOrder);
             context.SaveChanges();
-            return GetViewModel(newOrder);
+            return context.Orders
+                         .Include(x => x.Canned)
+                         .FirstOrDefault(x => x.Id == newOrder.Id)
+                         ?.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
         {
             using var context = new FishFactoryDatabase();
 
-            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
+            var order = context.Orders
+                .Include(x => x.Canned)
+                .FirstOrDefault(x => x.Id == model.Id);
 
             if (order == null)
             {

FishFactory/FishFactoryDatabaseImplement/Implements/ShopStorage.cs

@@ -0,0 +1,155 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDatabaseImplement.Models;
+using FishFactoryDataModels.Models;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryDatabaseImplement.Implements
+{
+    public class ShopStorage : IShopStorage
+    {
+        public List<ShopViewModel> GetFullList()
+        {
+            using var context = new FishFactoryDatabase();
+            return context.Shops
+                    .Include(x => x.ListCannedFk)
+                    .ThenInclude(x => x.Canned)
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                return new();
+            }
+            using var context = new FishFactoryDatabase();
+            return context.Shops
+                    .Include(x => x.ListCannedFk)
+                    .ThenInclude(x => x.Canned)
+                    .Where(x => x.ShopName.Contains(model.ShopName))
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
+        public ShopViewModel? GetElement(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new FishFactoryDatabase();
+            return context.Shops
+                .Include(x => x.ListCannedFk)
+                .ThenInclude(x => x.Canned)
+                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
+                                (model.Id.HasValue && x.Id == model.Id))
+                ?.GetViewModel;
+        }
+        public ShopViewModel? Insert(ShopBindingModel model)
+        {
+            using var context = new FishFactoryDatabase();
+            var newShop = Shop.Create(context, model);
+            if (newShop == null)
+            {
+                return null;
+            }
+            context.Shops.Add(newShop);
+            context.SaveChanges();
+            return newShop.GetViewModel;
+        }
+        public ShopViewModel? Update(ShopBindingModel model)
+        {
+            using var context = new FishFactoryDatabase();
+            using var transaction = context.Database.BeginTransaction();
+            try
+            {
+                var shop = context.Shops.FirstOrDefault(rec => rec.Id == model.Id);
+                if (shop == null)
+                {
+                    return null;
+                }
+                shop.Update(model);
+                context.SaveChanges();
+                shop.UpdateSushi(context, model);
+                transaction.Commit();
+                return shop.GetViewModel;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+        public ShopViewModel? Delete(ShopBindingModel model)
+        {
+            using var context = new FishFactoryDatabase();
+            var element = context.Shops
+                .Include(x => x.ListCannedFk)
+                .FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Shops.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+        public bool SellCanneds(ICannedModel model, int count)
+        {
+            using var context = new FishFactoryDatabase();
+            using var transaction = context.Database.BeginTransaction();
+            try
+            {
+                foreach (var shop in context.Shops
+                    .Include(x => x.ListCannedFk)
+                    .ThenInclude(x => x.Canned)
+                    .ToList()
+                    .Where(x => x.ListCanneds.ContainsKey(model.Id)))
+                {
+                    int countInCurrentShop = shop.ListCanneds[model.Id].Item2;
+                    if (countInCurrentShop <= count)
+                    {
+                        var elem = context.ShopCanned
+                            .Where(x => x.CannedId == model.Id)
+                            .FirstOrDefault(x => x.ShopId == shop.Id);
+                        context.ShopCanned.Remove(elem);
+                        shop.ListCanneds.Remove(model.Id);
+                        count -= countInCurrentShop;
+                    }
+                    else
+                    {
+                        shop.ListCanneds[model.Id] = (shop.ListCanneds[model.Id].Item1, countInCurrentShop - count);
+                        count = 0;
+                        shop.UpdateSushi(context, new()
+                        {
+                            Id = shop.Id,
+                            ListCanneds = shop.ListCanneds,
+                        });
+                    }
+                    if (count == 0)
+                    {
+                        context.SaveChanges();
+                        transaction.Commit();
+                        return true;
+                    }
+                }
+                transaction.Rollback();
+                return false;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+    }
+}

FishFactory/FishFactoryDatabaseImplement/Migrations/20230504165216_Init3.Designer.cs

@@ -0,0 +1,246 @@
+// <auto-generated />
+using System;
+using FishFactoryDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FishFactoryDatabaseImplement.Migrations
+{
+    [DbContext(typeof(FishFactoryDatabase))]
+    [Migration("20230504165216_Init3")]
+    partial class Init3
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("CannedName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Canneds");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CannedId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CannedId");
+
+                    b.HasIndex("ComponentId");
+
+                    b.ToTable("CannedComponents");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CannedId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CannedId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateOpening")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("MaxCountCanneds")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ShopName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shops");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.ShopCanned", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CannedId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ShopId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CannedId");
+
+                    b.HasIndex("ShopId");
+
+                    b.ToTable("ShopCanned");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
+                {
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
+                        .WithMany("Components")
+                        .HasForeignKey("CannedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
+                        .WithMany("CannedComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Canned");
+
+                    b.Navigation("Component");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", null)
+                        .WithMany("Orders")
+                        .HasForeignKey("CannedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.ShopCanned", b =>
+                {
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
+                        .WithMany()
+                        .HasForeignKey("CannedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("ListCannedFk")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Canned");
+
+                    b.Navigation("Shop");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("CannedComponents");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("ListCannedFk");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

FishFactory/FishFactoryDatabaseImplement/Migrations/20230504165216_Init3.cs

@@ -0,0 +1,79 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FishFactoryDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class Init3 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Shops",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ShopName = table.Column<string>(type: "text", nullable: false),
+                    Address = table.Column<string>(type: "text", nullable: false),
+                    DateOpening = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    MaxCountCanneds = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Shops", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ShopCanned",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    CannedId = table.Column<int>(type: "integer", nullable: false),
+                    ShopId = table.Column<int>(type: "integer", nullable: false),
+                    Count = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ShopCanned", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ShopCanned_Canneds_CannedId",
+                        column: x => x.CannedId,
+                        principalTable: "Canneds",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ShopCanned_Shops_ShopId",
+                        column: x => x.ShopId,
+                        principalTable: "Shops",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ShopCanned_CannedId",
+                table: "ShopCanned",
+                column: "CannedId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ShopCanned_ShopId",
+                table: "ShopCanned",
+                column: "ShopId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ShopCanned");
+
+            migrationBuilder.DropTable(
+                name: "Shops");
+        }
+    }
+}

FishFactory/FishFactoryDatabaseImplement/Migrations/20230504172335_Init4.Designer.cs

@@ -0,0 +1,248 @@
+// <auto-generated />
+using System;
+using FishFactoryDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FishFactoryDatabaseImplement.Migrations
+{
+    [DbContext(typeof(FishFactoryDatabase))]
+    [Migration("20230504172335_Init4")]
+    partial class Init4
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("CannedName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Canneds");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CannedId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CannedId");
+
+                    b.HasIndex("ComponentId");
+
+                    b.ToTable("CannedComponents");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CannedId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CannedId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateOpening")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("MaxCountCanneds")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ShopName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shops");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.ShopCanned", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CannedId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ShopId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CannedId");
+
+                    b.HasIndex("ShopId");
+
+                    b.ToTable("ShopCanned");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
+                {
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
+                        .WithMany("Components")
+                        .HasForeignKey("CannedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
+                        .WithMany("CannedComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Canned");
+
+                    b.Navigation("Component");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
+                        .WithMany("Orders")
+                        .HasForeignKey("CannedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Canned");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.ShopCanned", b =>
+                {
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
+                        .WithMany()
+                        .HasForeignKey("CannedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("ListCannedFk")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Canned");
+
+                    b.Navigation("Shop");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("CannedComponents");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("ListCannedFk");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

FishFactory/FishFactoryDatabaseImplement/Migrations/20230504172335_Init4.cs

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

FishFactory/FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace FishFactoryDatabaseImplement.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("ProductVersion", "7.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -121,6 +121,59 @@ namespace FishFactoryDatabaseImplement.Migrations
                     b.ToTable("Orders");
                 });
 
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateOpening")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("MaxCountCanneds")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ShopName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shops");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.ShopCanned", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CannedId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ShopId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CannedId");
+
+                    b.HasIndex("ShopId");
+
+                    b.ToTable("ShopCanned");
+                });
+
             modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
                 {
                     b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
@@ -142,11 +195,32 @@ namespace FishFactoryDatabaseImplement.Migrations
 
             modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
                 {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", null)
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
                         .WithMany("Orders")
                         .HasForeignKey("CannedId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Canned");
+                });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.ShopCanned", b =>
+                {
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
+                        .WithMany()
+                        .HasForeignKey("CannedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("FishFactoryDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("ListCannedFk")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Canned");
+
+                    b.Navigation("Shop");
                 });
 
             modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
@@ -160,6 +234,11 @@ namespace FishFactoryDatabaseImplement.Migrations
                 {
                     b.Navigation("CannedComponents");
                 });
+
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("ListCannedFk");
+                });
 #pragma warning restore 612, 618
         }
     }

FishFactory/FishFactoryDatabaseImplement/Models/Order.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Reflection.Metadata;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -31,6 +32,8 @@ namespace FishFactoryDatabaseImplement.Models
 
         public DateTime? DateImplement { get; set; }
 
+        public virtual Canned Canned { get; set; }
+
         public static Order? Create(OrderBindingModel model)
         {
             if (model == null)
@@ -68,12 +71,7 @@ namespace FishFactoryDatabaseImplement.Models
             {
                 return;
             }
-            Id = model.Id;
-            CannedId = model.CannedId;
-            Count = model.Count;
-            Sum = model.Sum;
             Status = model.Status;
-            DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
         }
         public OrderViewModel GetViewModel => new()

FishFactory/FishFactoryDatabaseImplement/Models/Shop.cs

@@ -0,0 +1,109 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FishFactoryDataModels.Models;
+
+namespace FishFactoryDatabaseImplement.Models
+{
+    public class Shop : IShopModel
+    {
+        public int Id { get; private set; }
+        [Required]
+        public string ShopName { get; private set; } = string.Empty;
+        [Required]
+        public string Address { get; private set; } = string.Empty;
+        [Required]
+        public DateTime DateOpening { get; private set; }
+        [Required]
+        public int MaxCountCanneds { get; private set; }
+
+        private Dictionary<int, (ICannedModel, int)>? _shopCanned = null;
+
+        [NotMapped]
+        public Dictionary<int, (ICannedModel, int)> ListCanneds
+        {
+            get
+            {
+                if (_shopCanned == null)
+                {
+                    _shopCanned = ListCannedFk.ToDictionary(recPC => recPC.CannedId, recPC => (recPC.Canned as ICannedModel, recPC.Count));
+                }
+                return _shopCanned;
+            }
+        }
+
+        [ForeignKey("ShopId")]
+        public virtual List<ShopCanned> ListCannedFk { get; set; } = new();
+
+        public static Shop Create(FishFactoryDatabase context, ShopBindingModel model)
+        {
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Address = model.Address,
+                DateOpening = model.DateOpening,
+                MaxCountCanneds = model.MaxCountCanneds,
+                ListCannedFk = model.ListCanneds.Select(x => new ShopCanned
+                {
+                    Canned = context.Canneds.First(y => y.Id == x.Key),
+                    Count = x.Value.Item2
+                }).ToList()
+            };
+        }
+
+        public void Update(ShopBindingModel model)
+        {
+            ShopName = model.ShopName;
+            Address = model.Address;
+            DateOpening = model.DateOpening;
+            MaxCountCanneds = model.MaxCountCanneds;
+        }
+
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            DateOpening = DateOpening,
+            MaxCountCanneds = MaxCountCanneds,
+            ListCanneds = ListCanneds
+        };
+
+        public void UpdateSushi(FishFactoryDatabase context, ShopBindingModel model)
+        {
+            var shopCanned = context.ShopCanned.Where(rec => rec.ShopId == model.Id).ToList();
+            if (shopCanned != null && shopCanned.Count > 0)
+            {   // удалили те, которых нет в модели
+                context.ShopCanned.RemoveRange(shopCanned.Where(rec => !model.ListCanneds.ContainsKey(rec.CannedId)));
+                context.SaveChanges();
+                // обновили количество у существующих записей
+                foreach (var updateCanned in shopCanned)
+                {
+                    updateCanned.Count = model.ListCanneds[updateCanned.CannedId].Item2;
+                    model.ListCanneds.Remove(updateCanned.CannedId);
+                }
+                context.SaveChanges();
+            }
+            var shop = context.Shops.First(x => x.Id == Id);
+            foreach (var ss in model.ListCanneds)
+            {
+                context.ShopCanned.Add(new ShopCanned
+                {
+                    Shop = shop,
+                    Canned = context.Canneds.First(x => x.Id == ss.Key),
+                    Count = ss.Value.Item2
+                });
+                context.SaveChanges();
+            }
+            _shopCanned = null;
+        }
+    }
+}

FishFactory/FishFactoryDatabaseImplement/Models/ShopCanned.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryDatabaseImplement.Models
+{
+    public class ShopCanned
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public int CannedId { get; set; }
+
+        [Required]
+        public int ShopId { get; set; }
+
+        [Required]
+        public int Count { get; set; }
+
+        public virtual Shop Shop { get; set; } = new();
+
+        public virtual Canned Canned { get; set; } = new();
+    }
+}