definitely commit

MotorPlant/MotorPlant.sln

@@ -13,6 +13,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MotorPlantListImplement", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MotorPlantBusinessLogic", "MotorPlantBusinessLogic\MotorPlantBusinessLogic.csproj", "{75003AA5-9D46-45B6-9EF0-BAF16E2790EA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotorPlantFileImplement", "MotorPlantFileImplement\MotorPlantFileImplement.csproj", "{183138D6-8EC0-46FD-9B1B-03DBCFEDD7F4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotorPlantDatabaseImplement", "MotorPlantDatabaseImplement\MotorPlantDatabaseImplement.csproj", "{30979D82-B5E7-470E-8083-1207FE9ADA5C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +43,14 @@ Global
 		{75003AA5-9D46-45B6-9EF0-BAF16E2790EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75003AA5-9D46-45B6-9EF0-BAF16E2790EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75003AA5-9D46-45B6-9EF0-BAF16E2790EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{183138D6-8EC0-46FD-9B1B-03DBCFEDD7F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{183138D6-8EC0-46FD-9B1B-03DBCFEDD7F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{183138D6-8EC0-46FD-9B1B-03DBCFEDD7F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{183138D6-8EC0-46FD-9B1B-03DBCFEDD7F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30979D82-B5E7-470E-8083-1207FE9ADA5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30979D82-B5E7-470E-8083-1207FE9ADA5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30979D82-B5E7-470E-8083-1207FE9ADA5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30979D82-B5E7-470E-8083-1207FE9ADA5C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

MotorPlant/MotorPlantBusinessLogic/BusinessLogic/ShopLogic.cs

@@ -1,156 +0,0 @@
-using Microsoft.Extensions.Logging;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantBusinessLogic.BusinessLogic
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-        }
-        public List<ShopViewModel> ReadList(ShopSearchModel model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{Name}. Id:{ Id}", model?.Name, model?.Id);
-            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-        public ShopViewModel ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.Name, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentNullException("Нет названия магазина",
-               nameof(model.ShopName));
-            }
-            if (string.IsNullOrEmpty(model.Adress))
-            {
-                throw new ArgumentNullException("Нет адресса магазина",
-               nameof(model.ShopName));
-            }
-            if (model.DateOpen == null)
-            {
-                throw new ArgumentNullException("Нет даты открытия магазина",
-               nameof(model.ShopName));
-            }
-            _logger.LogInformation("Shop. ShopName:{ShopName}.Address:{Address}. DateOpen:{DateOpen}. Id: { Id}", model.ShopName, model.Adress, model.DateOpen, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Name = model.ShopName
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-        public bool MakeSupply(ShopSearchModel model, IEngineModel engine, int count)
-        {
-            if (model == null)
-                throw new ArgumentNullException(nameof(model));
-            if (engine == null)
-                throw new ArgumentNullException(nameof(engine));
-            if (count <= 0)
-                throw new ArgumentNullException("Количество должно быть положительным числом");
-
-            ShopViewModel? curModel = _shopStorage.GetElement(model);
-            _logger.LogInformation("Make Supply. Id: {Id}. ShopName: {Name}", model.Id, model.Name);
-            if (curModel == null)
-                throw new ArgumentNullException(nameof(curModel));
-            if (curModel.ShopEngines.TryGetValue(engine.Id, out var pair))
-            {
-                curModel.ShopEngines[engine.Id] = (pair.Item1, pair.Item2 + count);
-                _logger.LogInformation("Make Supply. Add Engine. EngineName: {Name}. Count: {Count}", pair.Item1, count + pair.Item2);
-            }
-            else
-            {
-                curModel.ShopEngines.Add(engine.Id, (engine, count));
-                _logger.LogInformation("Make Supply. Add new Engine. EngineName: {Name}. Count: {Count}", pair.Item1, count);
-            }
-
-            return Update(new()
-            {
-                Id = curModel.Id,
-                ShopName = curModel.ShopName,
-                DateOpen = curModel.DateOpen,
-                Adress = curModel.Adress,
-                ShopEngines = curModel.ShopEngines,
-            });
-        }
-    }
-}

MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
   </ItemGroup>
 
   <ItemGroup>

MotorPlant/MotorPlantContracts/BindingModels/ShopBindingModel.cs

@@ -1,18 +0,0 @@
-using MotorPlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public int Id { get; set; }
-        public string ShopName { get; set; }
-        public string Adress { get; set; }
-        public DateTime DateOpen { get; set; }
-        public Dictionary<int, (IEngineModel, int)> ShopEngines { get; set; } = new();
-    }
-}

MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,22 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-        ShopViewModel? ReadElement(ShopSearchModel? model);
-        bool Create(ShopBindingModel? model);
-        bool Update(ShopBindingModel? model);
-        bool Delete(ShopBindingModel? model);
-        bool MakeSupply(ShopSearchModel model, IEngineModel engine, int count);
-    }
-}

MotorPlant/MotorPlantContracts/MotorPlantContracts.csproj

@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
   </ItemGroup>

MotorPlant/MotorPlantContracts/SearchModels/ShopSearchModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantContracts.SearchModels
-{
-    public class ShopSearchModel
-    {
-        public int? Id { get; set; }
-        public string? Name { get; set; }
-    }
-}

MotorPlant/MotorPlantContracts/StoragesContracts/IShopStorage.cs

@@ -1,21 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantContracts.StoragesContracts
-{
-    public interface IShopStorage
-    {
-        List<ShopViewModel> GetFullList();
-        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
-        ShopViewModel? GetElement(ShopSearchModel model);
-        ShopViewModel? Insert(ShopBindingModel model);
-        ShopViewModel? Update(ShopBindingModel model);
-        ShopViewModel? Delete(ShopBindingModel model);
-    }
-}

MotorPlant/MotorPlantContracts/ViewModels/ShopViewModel.cs

@@ -1,29 +0,0 @@
-using MotorPlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantContracts.ViewModels
-{
-    public class ShopViewModel : IShopModel
-    {
-        public int Id { get; set; }
-
-        [DisplayName("Название магазина")]
-
-        public string ShopName { get; set; } = string.Empty;
-
-        [DisplayName("Адрес")]
-
-        public string Adress { get; set; } = string.Empty;
-
-        [DisplayName("Дата открытия")]
-
-        public DateTime DateOpen { get; set; }
-
-        public Dictionary<int, (IEngineModel, int)> ShopEngines { get; set; } = new();
-    }
-}

MotorPlant/MotorPlantDataModels/Models/IShopModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        string ShopName { get; }
-        string Adress { get; }
-        DateTime DateOpen { get; }
-    }
-}

MotorPlant/MotorPlantDataModels/MotorPlantDataModels.csproj

@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+  </ItemGroup>
+
 </Project>

MotorPlant/MotorPlantDatabaseImplement/Implements/ComponentStorage.cs

@@ -0,0 +1,71 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDatabaseImplement.Models;
+
+namespace MotorPlantDatabaseImplement.Implements
+{
+    public class ComponentStorage : IComponentStorage
+    {
+        public List<ComponentViewModel> GetFullList()
+        {
+            using var context = new MotorPlantDatabase();
+            return context.Components.Select(x => x.GetViewModel).ToList();
+        }
+        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ComponentName))
+            {
+                return new();
+            }
+            using var context = new MotorPlantDatabase();
+            return context.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
+        }
+        public ComponentViewModel? GetElement(ComponentSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new MotorPlantDatabase();
+            return context.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        public ComponentViewModel? Insert(ComponentBindingModel model)
+        {
+            var newComponent = Component.Create(model);
+            if (newComponent == null)
+            {
+                return null;
+            }
+            using var context = new MotorPlantDatabase();
+            context.Components.Add(newComponent);
+            context.SaveChanges();
+            return newComponent.GetViewModel;
+        }
+        public ComponentViewModel? Update(ComponentBindingModel model)
+        {
+            using var context = new MotorPlantDatabase();
+            var component = context.Components.FirstOrDefault(x => x.Id == model.Id);
+            if (component == null)
+            {
+                return null;
+            }
+            component.Update(model);
+            context.SaveChanges();
+            return component.GetViewModel;
+        }
+        public ComponentViewModel? Delete(ComponentBindingModel model)
+        {
+            using var context = new MotorPlantDatabase();
+            var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element == null)
+            {
+                return null;
+            }
+            context.Components.Remove(element);
+            context.SaveChanges();
+            return element.GetViewModel;
+        }
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Implements/EngineStorage.cs

@@ -0,0 +1,89 @@
+using Microsoft.EntityFrameworkCore;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDatabaseImplement.Models;
+
+namespace MotorPlantDatabaseImplement.Implements
+{
+    public class EngineStorage : IEngineStorage
+    {
+        public List<EngineViewModel> GetFullList()
+        {
+            using var context = new MotorPlantDatabase();
+            return context.Engines.Include(x => x.Components).ThenInclude(x => x.Component).ToList().Select(x => x.GetViewModel).ToList();
+        }
+        public List<EngineViewModel> GetFilteredList(EngineSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.EngineName))
+            {
+                return new();
+            }
+            using var context = new MotorPlantDatabase();
+            return context.Engines.Include(x => x.Components).ThenInclude(x => x.Component).Where(x => x.EngineName.Contains(model.EngineName)).ToList().Select(x => x.GetViewModel).ToList();
+
+        }
+        public EngineViewModel? GetElement(EngineSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.EngineName) &&
+            !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new MotorPlantDatabase();
+            return context.Engines.Include(x => x.Components).ThenInclude(x => x.Component)
+                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.EngineName) && x.EngineName == model.EngineName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        public EngineViewModel? Insert(EngineBindingModel model)
+        {
+            using var context = new MotorPlantDatabase();
+            var newEngine = Engine.Create(context, model);
+            if (newEngine == null)
+            {
+                return null;
+            }
+            context.Engines.Add(newEngine);
+            context.SaveChanges();
+            return newEngine.GetViewModel;
+        }
+        public EngineViewModel? Update(EngineBindingModel model)
+        {
+            using var context = new MotorPlantDatabase();
+            using var transaction = context.Database.BeginTransaction();
+            try
+            {
+                var engine = context.Engines.FirstOrDefault(rec =>
+                rec.Id == model.Id);
+                if (engine == null)
+                {
+                    return null;
+                }
+                engine.Update(model);
+                context.SaveChanges();
+                engine.UpdateComponents(context, model);
+                transaction.Commit();
+                return engine.GetViewModel;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+        public EngineViewModel? Delete(EngineBindingModel model)
+        {
+            using var context = new MotorPlantDatabase();
+            var element = context.Engines
+            .Include(x => x.Components)
+            .FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Engines.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Implements/OrderStorage.cs

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

MotorPlant/MotorPlantDatabaseImplement/Migrations/20240403225731_InitMigration.Designer.cs

@@ -0,0 +1,171 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using MotorPlantDatabaseImplement;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MotorPlantDatabaseImplement.Migrations
+{
+    [DbContext(typeof(MotorPlantDatabase))]
+    [Migration("20240403225731_InitMigration")]
+    partial class InitMigration
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.16")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.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("MotorPlantDatabaseImplement.Models.Engine", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("EngineName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Engines");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("EngineId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("EngineId");
+
+                    b.ToTable("EngineComponents");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("EngineId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EngineId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
+                {
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Component", "Component")
+                        .WithMany("EngineComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
+                        .WithMany("Components")
+                        .HasForeignKey("EngineId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Engine");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
+                        .WithMany("Orders")
+                        .HasForeignKey("EngineId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Engine");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("EngineComponents");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Engine", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Migrations/20240403225731_InitMigration.cs

@@ -0,0 +1,126 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MotorPlantDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitMigration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Components",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ComponentName = table.Column<string>(type: "text", nullable: false),
+                    Cost = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Components", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Engines",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    EngineName = table.Column<string>(type: "text", nullable: false),
+                    Price = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Engines", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "EngineComponents",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    EngineId = table.Column<int>(type: "integer", nullable: false),
+                    ComponentId = table.Column<int>(type: "integer", nullable: false),
+                    Count = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EngineComponents", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_EngineComponents_Components_ComponentId",
+                        column: x => x.ComponentId,
+                        principalTable: "Components",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_EngineComponents_Engines_EngineId",
+                        column: x => x.EngineId,
+                        principalTable: "Engines",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Orders",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    EngineId = table.Column<int>(type: "integer", nullable: false),
+                    Count = table.Column<int>(type: "integer", nullable: false),
+                    Sum = table.Column<double>(type: "double precision", nullable: false),
+                    Status = table.Column<int>(type: "integer", nullable: false),
+                    DateCreate = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    DateImplement = table.Column<DateTime>(type: "timestamp without time zone", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Orders", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Orders_Engines_EngineId",
+                        column: x => x.EngineId,
+                        principalTable: "Engines",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EngineComponents_ComponentId",
+                table: "EngineComponents",
+                column: "ComponentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EngineComponents_EngineId",
+                table: "EngineComponents",
+                column: "EngineId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_EngineId",
+                table: "Orders",
+                column: "EngineId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EngineComponents");
+
+            migrationBuilder.DropTable(
+                name: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "Components");
+
+            migrationBuilder.DropTable(
+                name: "Engines");
+        }
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Migrations/MotorPlantDatabaseModelSnapshot.cs

@@ -0,0 +1,168 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using MotorPlantDatabaseImplement;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MotorPlantDatabaseImplement.Migrations
+{
+    [DbContext(typeof(MotorPlantDatabase))]
+    partial class MotorPlantDatabaseModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.16")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.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("MotorPlantDatabaseImplement.Models.Engine", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("EngineName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Engines");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("EngineId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("EngineId");
+
+                    b.ToTable("EngineComponents");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("EngineId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EngineId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
+                {
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Component", "Component")
+                        .WithMany("EngineComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
+                        .WithMany("Components")
+                        .HasForeignKey("EngineId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Engine");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
+                        .WithMany("Orders")
+                        .HasForeignKey("EngineId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Engine");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("EngineComponents");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Engine", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Models/Component.cs

@@ -0,0 +1,56 @@
+using MotorPlantDataModels.Models;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+
+namespace MotorPlantDatabaseImplement.Models
+{
+    public class Component : IComponentModel
+    {
+        public int Id { get; private set; }
+        [Required]
+        public string ComponentName { get; private set; } = string.Empty;
+        [Required]
+        public double Cost { get; set; }
+        [ForeignKey("ComponentId")]
+        public virtual List<EngineComponent> EngineComponents { get; set; } = new();
+        public static Component? Create(ComponentBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Component
+            {
+                Id = model.Id,
+                ComponentName = model.ComponentName,
+                Cost = model.Cost
+            };
+        }
+        public static Component Create(ComponentViewModel model)
+        {
+            return new Component
+            {
+                Id = model.Id,
+                ComponentName = model.ComponentName,
+                Cost = model.Cost
+            };
+        }
+        public void Update(ComponentBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ComponentName = model.ComponentName;
+            Cost = model.Cost;
+        }
+        public ComponentViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ComponentName = ComponentName,
+            Cost = Cost
+        };
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Models/Engine.cs

@@ -0,0 +1,87 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace MotorPlantDatabaseImplement.Models
+{
+    public class Engine : IEngineModel
+    {
+        public int Id { get; set; }
+        [Required]
+        public string EngineName { get; set; } = string.Empty;
+        [Required]
+        public double Price { get; set; }
+        private Dictionary<int, (IComponentModel, int)>? _engineComponents = null;
+        [NotMapped]
+        public Dictionary<int, (IComponentModel, int)> EngineComponents
+        {
+            get
+            {
+                if (_engineComponents == null)
+                {
+                    _engineComponents = Components.ToDictionary(recDC => recDC.ComponentId, recDC => (recDC.Component as IComponentModel, recDC.Count));
+                }
+                return _engineComponents;
+            }
+        }
+        [ForeignKey("EngineId")]
+        public virtual List<EngineComponent> Components { get; set; } = new();
+        [ForeignKey("EngineId")]
+        public virtual List<Order> Orders { get; set; } = new();
+        public static Engine Create(MotorPlantDatabase context, EngineBindingModel model)
+        {
+            return new Engine()
+            {
+                Id = model.Id,
+                EngineName = model.EngineName,
+                Price = model.Price,
+                Components = model.EngineComponents.Select(x => new EngineComponent
+                {
+                    Component = context.Components.First(y => y.Id == x.Key),
+                    Count = x.Value.Item2
+                }).ToList()
+            };
+        }
+        public void Update(EngineBindingModel model)
+        {
+            EngineName = model.EngineName;
+            Price = model.Price;
+        }
+        public EngineViewModel GetViewModel => new()
+        {
+            Id = Id,
+            EngineName = EngineName,
+            Price = Price,
+            EngineComponents = EngineComponents
+        };
+        public void UpdateComponents(MotorPlantDatabase context, EngineBindingModel model)
+        {
+            var engineComponents = context.EngineComponents.Where(rec => rec.EngineId == model.Id).ToList();
+            if (engineComponents != null && engineComponents.Count > 0)
+            {
+                context.EngineComponents.RemoveRange(engineComponents.Where(rec => !model.EngineComponents.ContainsKey(rec.ComponentId)));
+                context.SaveChanges();
+                foreach (var updateComponent in engineComponents)
+                {
+                    updateComponent.Count = model.EngineComponents[updateComponent.ComponentId].Item2;
+                    model.EngineComponents.Remove(updateComponent.ComponentId);
+                }
+                context.SaveChanges();
+            }
+            var engine = context.Engines.First(x => x.Id == Id);
+            foreach (var pc in model.EngineComponents)
+            {
+                context.EngineComponents.Add(new EngineComponent
+                {
+                    Engine = engine,
+                    Component = context.Components.First(x => x.Id == pc.Key),
+                    Count = pc.Value.Item2
+                });
+                context.SaveChanges();
+            }
+            _engineComponents = null;
+        }
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Models/EngineComponent.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace MotorPlantDatabaseImplement.Models
+{
+    public class EngineComponent
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public int EngineId { get; set; }
+
+        [Required]
+        public int ComponentId { get; set; }
+
+        [Required]
+        public int Count { get; set; }
+
+        public virtual Component Component { get; set; } = new();
+
+        public virtual Engine Engine { get; set; } = new();
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Models/Order.cs

@@ -0,0 +1,72 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Enums;
+using MotorPlantDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace MotorPlantDatabaseImplement.Models
+{
+    public class Order : IOrderModel
+    {
+        public int Id { get; private set; }
+
+        [Required]
+        public int EngineId { get; private set; }
+
+        [Required]
+        public int Count { get; private set; }
+
+        [Required]
+        public double Sum { get; private set; }
+
+        [Required]
+        public OrderStatus Status { get; private set; }
+
+        [Required]
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
+
+        public DateTime? DateImplement { get; private set; }
+
+        public virtual Engine Engine { get; set; }
+
+        public static Order? Create(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = model.Id,
+                EngineId = model.EngineId,
+                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()
+        {
+            Id = Id,
+            EngineId = EngineId,
+            Count = Count,
+            Sum = Sum,
+            Status = Status,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+            EngineName = Engine.EngineName
+        };
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/MotorPlantDatabase.cs

@@ -0,0 +1,23 @@
+using MotorPlantDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace MotorPlantDatabaseImplement
+{
+    public class MotorPlantDatabase : DbContext
+    {
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            if (optionsBuilder.IsConfigured == false)
+            {
+                optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=MotorPlant_db;Username=postgres;Password=admin");
+            }
+            base.OnConfiguring(optionsBuilder);
+            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+            AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
+        }
+        public virtual DbSet<Component> Components { get; set; }
+        public virtual DbSet<Engine> Engines { get; set; }
+        public virtual DbSet<EngineComponent> EngineComponents { get; set; }
+        public virtual DbSet<Order> Orders { get; set; }
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/MotorPlantDatabaseImplement.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.16" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.16">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
+    <ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Implements\" />
+  </ItemGroup>
+
+</Project>

MotorPlant/MotorPlantFileImplement/DataFileSingleton.cs

@@ -0,0 +1,61 @@
+using MotorPlantFileImplement.Models;
+using System.Xml.Linq;
+
+namespace MotorPlantFileImplement
+{
+    public class DataFileSingleton
+    {
+        private static DataFileSingleton? instance;
+
+        private readonly string ComponentFileName = "Component.xml";
+
+        private readonly string OrderFileName = "Order.xml";
+
+        private readonly string EngineFileName = "Engine.xml";
+
+        public List<Component> Components { get; private set; }
+
+        public List<Order> Orders { get; private set; }
+
+        public List<Engine> Engines { get; private set; }
+
+        public static DataFileSingleton GetInstance()
+        {
+            if (instance == null)
+            {
+                instance = new DataFileSingleton();
+            }
+            return instance;
+        }
+        public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
+
+        public void SaveEngines() => SaveData(Engines, EngineFileName, "Engines", x => x.GetXElement);
+
+        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+
+        private DataFileSingleton()
+        {
+            Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
+            Engines = LoadData(EngineFileName, "Engine", x => Engine.Create(x)!)!;
+            Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
+        }
+
+        private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
+        {
+            if (File.Exists(filename))
+            {
+                return
+               XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
+            }
+            return new List<T>();
+        }
+
+        private static void SaveData<T>(List<T> data, string filename, string xmlNodeName, Func<T, XElement> selectFunction)
+        {
+            if (data != null)
+            {
+                new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
+            }
+        }
+    }
+}

MotorPlant/MotorPlantFileImplement/Implements/ComponentStorage.cs

@@ -0,0 +1,72 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantFileImplement.Models;
+
+namespace MotorPlantFileImplement.Implements
+{
+    public class ComponentStorage : IComponentStorage
+    {
+        private readonly DataFileSingleton source;
+        public ComponentStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<ComponentViewModel> GetFullList()
+        {
+            return source.Components.Select(x => x.GetViewModel).ToList();
+        }
+        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ComponentName))
+            {
+                return new();
+            }
+            return source.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
+        }
+        public ComponentViewModel? GetElement(ComponentSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) ||
+            (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        public ComponentViewModel? Insert(ComponentBindingModel model)
+        {
+            model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1;
+            var newComponent = Component.Create(model);
+            if (newComponent == null)
+            {
+                return null;
+            }
+            source.Components.Add(newComponent);
+            source.SaveComponents();
+            return newComponent.GetViewModel;
+        }
+        public ComponentViewModel? Update(ComponentBindingModel model)
+        {
+            var component = source.Components.FirstOrDefault(x => x.Id == model.Id);
+            if (component == null)
+            {
+                return null;
+            }
+            component.Update(model);
+            source.SaveComponents();
+            return component.GetViewModel;
+        }
+        public ComponentViewModel? Delete(ComponentBindingModel model)
+        {
+            var element = source.Components.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                source.Components.Remove(element);
+                source.SaveComponents();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

MotorPlant/MotorPlantFileImplement/Implements/EngineStorage.cs

@@ -0,0 +1,78 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantFileImplement.Models;
+
+namespace MotorPlantFileImplement.Implements
+{
+    public class EngineStorage : IEngineStorage
+    {
+        private readonly DataFileSingleton source;
+
+        public EngineStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+
+        public EngineViewModel? GetElement(EngineSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.EngineName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Engines.FirstOrDefault(x => (!string.IsNullOrEmpty(model.EngineName) && x.EngineName == model.EngineName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+
+        public List<EngineViewModel> GetFilteredList(EngineSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.EngineName))
+            {
+                return new();
+            }
+            return source.Engines.Where(x => x.EngineName.Contains(model.EngineName)).Select(x => x.GetViewModel).ToList();
+        }
+
+        public List<EngineViewModel> GetFullList()
+        {
+            return source.Engines.Select(x => x.GetViewModel).ToList();
+        }
+
+        public EngineViewModel? Insert(EngineBindingModel model)
+        {
+            model.Id = source.Engines.Count > 0 ? source.Engines.Max(x => x.Id) + 1 : 1;
+            var newDoc = Engine.Create(model);
+            if (newDoc == null)
+            {
+                return null;
+            }
+            source.Engines.Add(newDoc);
+            source.SaveEngines();
+            return newDoc.GetViewModel;
+        }
+
+        public EngineViewModel? Update(EngineBindingModel model)
+        {
+            var document = source.Engines.FirstOrDefault(x => x.Id == model.Id);
+            if (document == null)
+            {
+                return null;
+            }
+            document.Update(model);
+            source.SaveEngines();
+            return document.GetViewModel;
+        }
+
+        public EngineViewModel? Delete(EngineBindingModel model)
+        {
+            var document = source.Engines.FirstOrDefault(x => x.Id == model.Id);
+            if (document == null)
+            {
+                return null;
+            }
+            document.Update(model);
+            source.SaveEngines();
+            return document.GetViewModel;
+        }
+    }
+}

MotorPlant/MotorPlantFileImplement/Implements/OrderStorage.cs

@@ -0,0 +1,91 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantFileImplement.Implements
+{
+    public class OrderStorage : IOrderStorage
+    {
+        private readonly DataFileSingleton source;
+
+        public OrderStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
+            return GetViewModel(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id));
+        }
+
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
+            if (!model.Id.HasValue)
+            {
+                return new();
+            }
+            return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList();
+        }
+
+        public List<OrderViewModel> GetFullList()
+        {
+            return source.Orders.Select(x => GetViewModel(x)).ToList();
+        }
+
+        public OrderViewModel? Insert(OrderBindingModel model)
+        {
+            model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
+            var newOrder = Order.Create(model);
+            if (newOrder == null)
+            {
+                return null;
+            }
+            source.Orders.Add(newOrder);
+            source.SaveOrders();
+            return GetViewModel(newOrder);
+        }
+
+        public OrderViewModel? Update(OrderBindingModel model)
+        {
+            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            order.Update(model);
+            source.SaveOrders();
+            return GetViewModel(order);
+        }
+
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
+            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (order == null)
+            {
+                return null;
+            }
+            order.Update(model);
+            source.SaveOrders();
+            return GetViewModel(order);
+        }
+
+        private OrderViewModel GetViewModel(Order order)
+        {
+            var viewModel = order.GetViewModel;
+            var engine = source.Engines.FirstOrDefault(x => x.Id == order.EngineId);
+            viewModel.EngineName = engine?.EngineName;
+            return viewModel;
+        }
+    }
+}

MotorPlant/MotorPlantFileImplement/Models/Component.cs

@@ -0,0 +1,59 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System.Xml.Linq;
+
+namespace MotorPlantFileImplement.Models
+{
+    public class Component : IComponentModel
+    {
+        public int Id { get; private set; }
+        public string ComponentName { get; private set; } = string.Empty;
+        public double Cost { get; set; }
+        public static Component? Create(ComponentBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Component()
+            {
+                Id = model.Id,
+                ComponentName = model.ComponentName,
+                Cost = model.Cost
+            };
+        }
+        public static Component? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Component()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ComponentName = element.Element("ComponentName")!.Value,
+                Cost = Convert.ToDouble(element.Element("Cost")!.Value)
+            };
+        }
+        public void Update(ComponentBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ComponentName = model.ComponentName;
+            Cost = model.Cost;
+        }
+        public ComponentViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ComponentName = ComponentName,
+            Cost = Cost
+        };
+        public XElement GetXElement => new("Component",
+            new XAttribute("Id", Id),
+            new XElement("ComponentName", ComponentName),
+            new XElement("Cost", Cost.ToString()));
+    }
+}

MotorPlant/MotorPlantFileImplement/Models/Engine.cs

@@ -0,0 +1,91 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System.Xml.Linq;
+
+namespace MotorPlantFileImplement.Models
+{
+    public class Engine : IEngineModel
+    {
+         public int Id { get; private set; }
+        public string EngineName { get; private set; } = string.Empty;
+        public double Price { get; private set; }
+        public Dictionary<int, int> Components { get; private set; } = new();
+        private Dictionary<int, (IComponentModel, int)>? _EngineComponents = null;
+        public Dictionary<int, (IComponentModel, int)> EngineComponents
+        {
+            get
+            {
+                if (_EngineComponents == null)
+                {
+                    var source = DataFileSingleton.GetInstance();
+                    _EngineComponents = Components.ToDictionary(x => x.Key, y =>
+                    ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!,
+                    y.Value));
+                }
+                return _EngineComponents;
+            }
+        }
+        public static Engine? Create(EngineBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Engine()
+            {
+                Id = model.Id,
+                EngineName = model.EngineName,
+                Price = model.Price,
+                Components = model.EngineComponents.ToDictionary(x => x.Key, x
+               => x.Value.Item2)
+            };
+        }
+        public static Engine? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Engine()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                EngineName = element.Element("EngineName")!.Value,
+                Price = Convert.ToDouble(element.Element("Price")!.Value),
+                Components =
+           element.Element("EngineComponents")!.Elements("EngineComponent")
+            .ToDictionary(x =>
+           Convert.ToInt32(x.Element("Key")?.Value), x =>
+           Convert.ToInt32(x.Element("Value")?.Value))
+            };
+        }
+        public void Update(EngineBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            EngineName = model.EngineName;
+            Price = model.Price;
+            Components = model.EngineComponents.ToDictionary(x => x.Key, x =>
+           x.Value.Item2);
+            _EngineComponents = null;
+        }
+        public EngineViewModel GetViewModel => new()
+        {
+            Id = Id,
+            EngineName = EngineName,
+            Price = Price,
+            EngineComponents = EngineComponents
+        };
+        public XElement GetXElement => new("Engine",
+            new XAttribute("Id", Id),
+            new XElement("EngineName", EngineName),
+            new XElement("Price", Price.ToString()),
+            new XElement("EngineComponents", Components.Select(x => new XElement("EngineComponent", 
+                                                                            new XElement("Key", x.Key), 
+                                                                            new XElement("Value", x.Value)))
+
+                                                                .ToArray()));
+    }
+}

MotorPlant/MotorPlantFileImplement/Models/Order.cs

@@ -0,0 +1,88 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Enums;
+using MotorPlantDataModels.Models;
+using System.Xml.Linq;
+
+namespace MotorPlantFileImplement.Models
+{
+    public class Order : IOrderModel
+    {
+        public int EngineId { get; private set; }
+        public int Count { get; private set; }
+        public double Sum { get; private set; }
+        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
+        public DateTime? DateImplement { get; private set; }
+        public int Id { get; private set; }
+        public static Order? Create(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = model.Id,
+                EngineId = model.EngineId,
+                Count = model.Count,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement
+            };
+        }
+        public static Order? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            var order = new Order()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                EngineId = Convert.ToInt32(element.Element("EngineId")!.Value),
+                Count = Convert.ToInt32(element.Element("Count")!.Value),
+                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+                DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null),
+            };
+            DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl);
+
+            order.DateImplement = dateImpl;
+
+            if (!Enum.TryParse(element.Element("Status")!.Value, out OrderStatus status))
+            {
+                return null;
+            }
+            order.Status = status;
+            return order;
+        }
+        public void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Status = model.Status;
+            DateImplement = model.DateImplement;
+        }
+        public OrderViewModel GetViewModel => new()
+        {
+            Id = Id,
+            EngineId = EngineId,
+            Count = Count,
+            Sum = Sum,
+            Status = Status,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement
+        };
+        public XElement GetXElement => new("Order",
+          new XAttribute("Id", Id),
+          new XElement("EngineId", EngineId),
+          new XElement("Count", Count.ToString()),
+          new XElement("Sum", Sum.ToString()),
+          new XElement("Status", Status.ToString()),
+          new XElement("DateCreate", DateCreate.ToString()),
+          new XElement("DateImplement", DateImplement.ToString()));
+    }
+}

MotorPlant/MotorPlantFileImplement/MotorPlantFileImplement.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
+    <ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
+  </ItemGroup>
+
+</Project>

MotorPlant/MotorPlantListImplement/DataListSingleton.cs

@@ -12,14 +12,11 @@ namespace MotorPlantListImplement
 
         public List<Engine> Engines { get; set; }
 
-        public List<Shop> Shops { get; set; }
-
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Engines = new List<Engine>();
-            Shops = new List<Shop>();
         }
 
         public static DataListSingleton GetInstance()

MotorPlant/MotorPlantListImplement/Implements/ShopStorage.cs

@@ -1,107 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using MotorPlantListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantListImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataListSingleton _source;
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public List<ShopViewModel> GetFullList()
-        {
-            var result = new List<ShopViewModel>();
-            foreach (var shop in _source.Shops)
-            {
-                result.Add(shop.GetViewModel);
-            }
-            return result;
-        }
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            var result = new List<ShopViewModel>();
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                return result;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.ShopName.Contains(model.Name))
-                {
-                    result.Add(shop.GetViewModel);
-                }
-            }
-            return result;
-        }
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Name) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(model.Name) &&
-               shop.ShopName == model.Name) ||
-                (model.Id.HasValue && shop.Id == model.Id))
-                {
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var shop in _source.Shops)
-            {
-                if (model.Id <= shop.Id)
-                {
-                    model.Id = shop.Id + 1;
-                }
-            }
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            _source.Shops.Add(newShop);
-            return newShop.GetViewModel;
-        }
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Id == model.Id)
-                {
-                    shop.Update(model);
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            for (int i = 0; i < _source.Shops.Count; ++i)
-            {
-                if (_source.Shops[i].Id == model.Id)
-                {
-                    var element = _source.Shops[i];
-                    _source.Shops.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
-}

MotorPlant/MotorPlantListImplement/Models/Shop.cs

@@ -1,54 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantListImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string ShopName { get; private set; }
-        public string Adress { get; private set; }
-        public DateTime DateOpen { get; private set; }
-        public Dictionary<int, (IEngineModel, int)> ShopEngines { get; private set; } = new();
-        public static Shop? Create(ShopBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Adress = model.Adress,
-                DateOpen = model.DateOpen,
-                ShopEngines = new()
-            };
-        }
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Adress = model.Adress;
-            DateOpen = model.DateOpen;
-            ShopEngines = model.ShopEngines;
-        }
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Adress = Adress,
-            DateOpen = DateOpen,
-            ShopEngines = ShopEngines
-        };
-    }
-}

MotorPlant/MotorPlantListImplement/MotorPlantListImplement.csproj

@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
     <ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />

MotorPlant/MotorPlantView/FormEngines.cs

@@ -15,6 +15,11 @@ namespace MotorPlantView.Forms
             _logic = logic;
         }
 
+        private void FormEngines_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
         private void LoadData()
         {
             try
@@ -32,13 +37,7 @@ namespace MotorPlantView.Forms
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Ошибка загрузки компонентов");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-        }
-
-        private void FormEngines_Load(object sender, EventArgs e)
-        {
-            LoadData();
+            }
         }
 
         private void buttonAdd_Click(object sender, EventArgs e)

MotorPlant/MotorPlantView/FormMain.Designer.cs

@@ -32,8 +32,6 @@
             toolStripDropDownButton1 = new ToolStripDropDownButton();
             КомпонентыToolStripMenuItem = new ToolStripMenuItem();
             ДвигателиToolStripMenuItem = new ToolStripMenuItem();
-            ShopsToolStripMenuItem = new ToolStripMenuItem();
-            поставкиToolStripMenuItem = new ToolStripMenuItem();
             buttonCreateOrder = new Button();
             buttonTakeOrderInWork = new Button();
             buttonOrderReady = new Button();
@@ -50,54 +48,41 @@
             toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 });
             toolStrip1.Location = new Point(0, 0);
             toolStrip1.Name = "toolStrip1";
-            toolStrip1.Size = new Size(985, 25);
+            toolStrip1.Size = new Size(1126, 27);
             toolStrip1.TabIndex = 0;
             toolStrip1.Text = "toolStrip1";
             // 
             // toolStripDropDownButton1
             // 
             toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem, ShopsToolStripMenuItem, поставкиToolStripMenuItem });
+            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem });
             toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
             toolStripDropDownButton1.Name = "toolStripDropDownButton1";
-            toolStripDropDownButton1.Size = new Size(88, 22);
+            toolStripDropDownButton1.Size = new Size(108, 24);
             toolStripDropDownButton1.Text = "Справочник";
             // 
             // КомпонентыToolStripMenuItem
             // 
             КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
-            КомпонентыToolStripMenuItem.Size = new Size(180, 22);
+            КомпонентыToolStripMenuItem.Size = new Size(224, 26);
             КомпонентыToolStripMenuItem.Text = "Компоненты";
             КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
             // 
             // ДвигателиToolStripMenuItem
             // 
             ДвигателиToolStripMenuItem.Name = "ДвигателиToolStripMenuItem";
-            ДвигателиToolStripMenuItem.Size = new Size(180, 22);
+            ДвигателиToolStripMenuItem.Size = new Size(224, 26);
             ДвигателиToolStripMenuItem.Text = "Двигатели";
             ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
             // 
-            // ShopsToolStripMenuItem
-            // 
-            ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem";
-            ShopsToolStripMenuItem.Size = new Size(180, 22);
-            ShopsToolStripMenuItem.Text = "Магазины";
-            ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
-            // 
-            // поставкиToolStripMenuItem
-            // 
-            поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem";
-            поставкиToolStripMenuItem.Size = new Size(180, 22);
-            поставкиToolStripMenuItem.Text = "Поставки";
-            поставкиToolStripMenuItem.Click += SupplyToolStripMenuItem_Click;
-            // 
             // buttonCreateOrder
             // 
             buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             buttonCreateOrder.BackColor = SystemColors.ControlLight;
-            buttonCreateOrder.Location = new Point(797, 146);
+            buttonCreateOrder.Location = new Point(911, 195);
+            buttonCreateOrder.Margin = new Padding(3, 4, 3, 4);
             buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonCreateOrder.Size = new Size(178, 30);
+            buttonCreateOrder.Size = new Size(203, 40);
             buttonCreateOrder.TabIndex = 1;
             buttonCreateOrder.Text = "Создать заказ";
             buttonCreateOrder.UseVisualStyleBackColor = false;
@@ -107,9 +92,10 @@
             // 
             buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             buttonTakeOrderInWork.BackColor = SystemColors.ControlLight;
-            buttonTakeOrderInWork.Location = new Point(797, 194);
+            buttonTakeOrderInWork.Location = new Point(911, 258);
+            buttonTakeOrderInWork.Margin = new Padding(3, 4, 3, 4);
             buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            buttonTakeOrderInWork.Size = new Size(178, 30);
+            buttonTakeOrderInWork.Size = new Size(203, 40);
             buttonTakeOrderInWork.TabIndex = 2;
             buttonTakeOrderInWork.Text = "Отдать на выполнение";
             buttonTakeOrderInWork.UseVisualStyleBackColor = false;
@@ -119,9 +105,10 @@
             // 
             buttonOrderReady.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             buttonOrderReady.BackColor = SystemColors.ControlLight;
-            buttonOrderReady.Location = new Point(797, 242);
+            buttonOrderReady.Location = new Point(911, 323);
+            buttonOrderReady.Margin = new Padding(3, 4, 3, 4);
             buttonOrderReady.Name = "buttonOrderReady";
-            buttonOrderReady.Size = new Size(178, 30);
+            buttonOrderReady.Size = new Size(203, 40);
             buttonOrderReady.TabIndex = 3;
             buttonOrderReady.Text = "Заказ готов";
             buttonOrderReady.UseVisualStyleBackColor = false;
@@ -131,9 +118,10 @@
             // 
             buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             buttonIssuedOrder.BackColor = SystemColors.ControlLight;
-            buttonIssuedOrder.Location = new Point(797, 287);
+            buttonIssuedOrder.Location = new Point(911, 383);
+            buttonIssuedOrder.Margin = new Padding(3, 4, 3, 4);
             buttonIssuedOrder.Name = "buttonIssuedOrder";
-            buttonIssuedOrder.Size = new Size(178, 30);
+            buttonIssuedOrder.Size = new Size(203, 40);
             buttonIssuedOrder.TabIndex = 4;
             buttonIssuedOrder.Text = "Заказ выдан";
             buttonIssuedOrder.UseVisualStyleBackColor = false;
@@ -143,9 +131,10 @@
             // 
             buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             buttonRef.BackColor = SystemColors.ControlLight;
-            buttonRef.Location = new Point(797, 100);
+            buttonRef.Location = new Point(911, 133);
+            buttonRef.Margin = new Padding(3, 4, 3, 4);
             buttonRef.Name = "buttonRef";
-            buttonRef.Size = new Size(178, 30);
+            buttonRef.Size = new Size(203, 40);
             buttonRef.TabIndex = 5;
             buttonRef.Text = "Обновить список";
             buttonRef.UseVisualStyleBackColor = false;
@@ -156,20 +145,21 @@
             dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(11, 28);
+            dataGridView.Location = new Point(0, 35);
+            dataGridView.Margin = new Padding(3, 4, 3, 4);
             dataGridView.Name = "dataGridView";
             dataGridView.ReadOnly = true;
             dataGridView.RowHeadersWidth = 51;
             dataGridView.RowTemplate.Height = 24;
             dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(780, 441);
+            dataGridView.Size = new Size(891, 588);
             dataGridView.TabIndex = 6;
             // 
             // FormMain
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(985, 467);
+            ClientSize = new Size(1126, 623);
             Controls.Add(dataGridView);
             Controls.Add(buttonRef);
             Controls.Add(buttonIssuedOrder);
@@ -177,6 +167,7 @@
             Controls.Add(buttonTakeOrderInWork);
             Controls.Add(buttonCreateOrder);
             Controls.Add(toolStrip1);
+            Margin = new Padding(3, 4, 3, 4);
             Name = "FormMain";
             Text = "Моторный завод";
             Load += FormMain_Load;
@@ -199,7 +190,5 @@
         private ToolStripDropDownButton toolStripDropDownButton1;
         private ToolStripMenuItem КомпонентыToolStripMenuItem;
         private ToolStripMenuItem ДвигателиToolStripMenuItem;
-        private ToolStripMenuItem ShopsToolStripMenuItem;
-        private ToolStripMenuItem поставкиToolStripMenuItem;
     }
 }

MotorPlant/MotorPlantView/FormMain.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantView;
 
 namespace MotorPlantView.Forms
 {
@@ -144,24 +143,5 @@ namespace MotorPlantView.Forms
         {
             LoadData();
         }
-        private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void SupplyToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSupply));
-
-            if (service is FormSupply form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

MotorPlant/MotorPlantView/FormShop.Designer.cs

@@ -1,193 +0,0 @@
-namespace MotorPlantView
-{
-    partial class FormShop
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            dateTimePicker = new DateTimePicker();
-            textBoxName = new TextBox();
-            textBoxAdress = new TextBox();
-            dataGridView = new DataGridView();
-            IdColumn = new DataGridViewTextBoxColumn();
-            Title = new DataGridViewTextBoxColumn();
-            Cost = new DataGridViewTextBoxColumn();
-            Count = new DataGridViewTextBoxColumn();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            label1 = new Label();
-            label2 = new Label();
-            label3 = new Label();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // dateTimePicker
-            // 
-            dateTimePicker.Location = new Point(714, 34);
-            dateTimePicker.Name = "dateTimePicker";
-            dateTimePicker.Size = new Size(250, 27);
-            dateTimePicker.TabIndex = 0;
-            // 
-            // textBoxName
-            // 
-            textBoxName.Location = new Point(714, 85);
-            textBoxName.Name = "textBoxName";
-            textBoxName.Size = new Size(250, 27);
-            textBoxName.TabIndex = 1;
-            // 
-            // textBoxAdress
-            // 
-            textBoxAdress.Location = new Point(714, 139);
-            textBoxAdress.Name = "textBoxAdress";
-            textBoxAdress.Size = new Size(250, 27);
-            textBoxAdress.TabIndex = 2;
-            // 
-            // dataGridView
-            // 
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { IdColumn, Title, Cost, Count });
-            dataGridView.Location = new Point(10, 32);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowHeadersWidth = 51;
-            dataGridView.RowTemplate.Height = 29;
-            dataGridView.Size = new Size(554, 380);
-            dataGridView.TabIndex = 3;
-            // 
-            // IdColumn
-            // 
-            IdColumn.HeaderText = "Номер платья";
-            IdColumn.MinimumWidth = 6;
-            IdColumn.Name = "IdColumn";
-            IdColumn.Visible = false;
-            IdColumn.Width = 125;
-            // 
-            // Title
-            // 
-            Title.HeaderText = "Название";
-            Title.MinimumWidth = 6;
-            Title.Name = "Title";
-            Title.Width = 125;
-            // 
-            // Cost
-            // 
-            Cost.HeaderText = "Цена";
-            Cost.MinimumWidth = 6;
-            Cost.Name = "Cost";
-            Cost.Width = 125;
-            // 
-            // Count
-            // 
-            Count.HeaderText = "Количество";
-            Count.MinimumWidth = 6;
-            Count.Name = "Count";
-            Count.Width = 125;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(714, 219);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(94, 29);
-            buttonSave.TabIndex = 4;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(870, 219);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(94, 29);
-            buttonCancel.TabIndex = 5;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(592, 39);
-            label1.Name = "label1";
-            label1.Size = new Size(110, 20);
-            label1.TabIndex = 6;
-            label1.Text = "Дата создания";
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(592, 88);
-            label2.Name = "label2";
-            label2.Size = new Size(77, 20);
-            label2.TabIndex = 7;
-            label2.Text = "Название";
-            // 
-            // label3
-            // 
-            label3.AutoSize = true;
-            label3.Location = new Point(592, 142);
-            label3.Name = "label3";
-            label3.Size = new Size(51, 20);
-            label3.TabIndex = 8;
-            label3.Text = "Адрес";
-            // 
-            // ShopForm
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(976, 450);
-            Controls.Add(label3);
-            Controls.Add(label2);
-            Controls.Add(label1);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(dataGridView);
-            Controls.Add(textBoxAdress);
-            Controls.Add(textBoxName);
-            Controls.Add(dateTimePicker);
-            Name = "ShopForm";
-            Text = "Форма магазина";
-            Load += ShopForm_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private DateTimePicker dateTimePicker;
-        private TextBox textBoxName;
-        private TextBox textBoxAdress;
-        private DataGridView dataGridView;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private Label label1;
-        private Label label2;
-        private Label label3;
-        private DataGridViewTextBoxColumn IdColumn;
-        private DataGridViewTextBoxColumn Title;
-        private DataGridViewTextBoxColumn Cost;
-        private DataGridViewTextBoxColumn Count;
-    }
-}

MotorPlant/MotorPlantView/FormShop.cs

@@ -1,122 +0,0 @@
-using Microsoft.Extensions.Logging;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace MotorPlantView
-{
-    public partial class FormShop : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-        public int? _id;
-        private Dictionary<int, (IEngineModel, int)> _engine;
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void ShopForm_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Shop load");
-                try
-                {
-                    var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
-                    if (shop != null)
-                    {
-                        textBoxName.Text = shop.ShopName;
-                        textBoxAdress.Text = shop.Adress;
-                        dateTimePicker.Text = shop.DateOpen.ToString();
-                        _engine = shop.ShopEngines;
-                    }
-                    LoadData();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Load shop error");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Load engines");
-            try
-            {
-                if (_engine != null)
-                {
-                    foreach (var engine in _engine)
-                    {
-                        dataGridView.Rows.Add(new object[] { engine.Key, engine.Value.Item1.EngineName, engine.Value.Item1.Price, engine.Value.Item2 });
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Load engines into shop error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-               MessageBoxIcon.Error);
-            }
-        }
-        private void buttonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxName.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxAdress.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Save shop");
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    ShopName = textBoxName.Text,
-                    Adress = textBoxAdress.Text,
-                    DateOpen = dateTimePicker.Value.Date,
-                    ShopEngines = _engine
-                };
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Save shop error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

MotorPlant/MotorPlantView/FormShop.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

MotorPlant/MotorPlantView/FormShops.Designer.cs

@@ -1,114 +0,0 @@
-namespace MotorPlantView
-{
-    partial class FormShops
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            dataGridView = new DataGridView();
-            buttonAdd = new Button();
-            buttonUpdate = new Button();
-            buttonReset = new Button();
-            buttonDelete = new Button();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(12, 12);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(617, 426);
-            dataGridView.TabIndex = 0;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.Location = new Point(665, 114);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(123, 45);
-            buttonAdd.TabIndex = 1;
-            buttonAdd.Text = "Добавить";
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // buttonUpdate
-            // 
-            buttonUpdate.Location = new Point(665, 165);
-            buttonUpdate.Name = "buttonUpdate";
-            buttonUpdate.Size = new Size(123, 44);
-            buttonUpdate.TabIndex = 2;
-            buttonUpdate.Text = "Изменить";
-            buttonUpdate.UseVisualStyleBackColor = true;
-            buttonUpdate.Click += buttonUpdate_Click;
-            // 
-            // buttonReset
-            // 
-            buttonReset.Location = new Point(665, 215);
-            buttonReset.Name = "buttonReset";
-            buttonReset.Size = new Size(123, 48);
-            buttonReset.TabIndex = 3;
-            buttonReset.Text = "Обновить";
-            buttonReset.UseVisualStyleBackColor = true;
-            buttonReset.Click += buttonReset_Click;
-            // 
-            // buttonDelete
-            // 
-            buttonDelete.Location = new Point(665, 269);
-            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(123, 48);
-            buttonDelete.TabIndex = 4;
-            buttonDelete.Text = "Удалить";
-            buttonDelete.UseVisualStyleBackColor = true;
-            buttonDelete.Click += buttonDelete_Click;
-            // 
-            // FormShops
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
-            Controls.Add(buttonDelete);
-            Controls.Add(buttonReset);
-            Controls.Add(buttonUpdate);
-            Controls.Add(buttonAdd);
-            Controls.Add(dataGridView);
-            Name = "FormShops";
-            Text = "FormShops";
-            Load += FormShops_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private DataGridView dataGridView;
-        private Button buttonAdd;
-        private Button buttonUpdate;
-        private Button buttonReset;
-        private Button buttonDelete;
-    }
-}

MotorPlant/MotorPlantView/FormShops.cs

@@ -1,108 +0,0 @@
-using Microsoft.Extensions.Logging;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantView.Forms;
-
-namespace MotorPlantView
-{
-    public partial class FormShops : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-        public FormShops(ILogger<FormShops> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["Adress"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["DateOpen"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["ShopEngines"].Visible = false;
-                }
-                _logger.LogInformation("Load shops");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Load shop error");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void FormShops_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void buttonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-            if (service is FormShop form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-
-        private void buttonUpdate_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-                if (service is FormShop form)
-                {
-                    var tmp = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    form._id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void buttonReset_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void buttonDelete_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление магазина");
-                    try
-                    {
-                        if (!_logic.Delete(new ShopBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления магазина");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-    }
-}

MotorPlant/MotorPlantView/FormShops.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

MotorPlant/MotorPlantView/FormSupply.Designer.cs

@@ -1,147 +0,0 @@
-namespace MotorPlantView
-{
-    partial class FormSupply
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            ShopComboBox = new ComboBox();
-            EngineComboBox = new ComboBox();
-            CountTextBox = new TextBox();
-            SaveButton = new Button();
-            Cancel = new Button();
-            label1 = new Label();
-            label2 = new Label();
-            label3 = new Label();
-            SuspendLayout();
-            // 
-            // ShopComboBox
-            // 
-            ShopComboBox.FormattingEnabled = true;
-            ShopComboBox.Location = new Point(136, 26);
-            ShopComboBox.Margin = new Padding(3, 2, 3, 2);
-            ShopComboBox.Name = "ShopComboBox";
-            ShopComboBox.Size = new Size(279, 23);
-            ShopComboBox.TabIndex = 0;
-            // 
-            // EngineComboBox
-            // 
-            EngineComboBox.FormattingEnabled = true;
-            EngineComboBox.Location = new Point(136, 59);
-            EngineComboBox.Margin = new Padding(3, 2, 3, 2);
-            EngineComboBox.Name = "EngineComboBox";
-            EngineComboBox.Size = new Size(279, 23);
-            EngineComboBox.TabIndex = 1;
-            // 
-            // CountTextBox
-            // 
-            CountTextBox.Location = new Point(136, 96);
-            CountTextBox.Margin = new Padding(3, 2, 3, 2);
-            CountTextBox.Name = "CountTextBox";
-            CountTextBox.Size = new Size(279, 23);
-            CountTextBox.TabIndex = 2;
-            // 
-            // SaveButton
-            // 
-            SaveButton.Location = new Point(220, 150);
-            SaveButton.Margin = new Padding(3, 2, 3, 2);
-            SaveButton.Name = "SaveButton";
-            SaveButton.Size = new Size(94, 27);
-            SaveButton.TabIndex = 3;
-            SaveButton.Text = "Сохранить";
-            SaveButton.UseVisualStyleBackColor = true;
-            SaveButton.Click += SaveButton_Click;
-            // 
-            // Cancel
-            // 
-            Cancel.Location = new Point(319, 150);
-            Cancel.Margin = new Padding(3, 2, 3, 2);
-            Cancel.Name = "Cancel";
-            Cancel.Size = new Size(94, 27);
-            Cancel.TabIndex = 4;
-            Cancel.Text = "Отмена";
-            Cancel.UseVisualStyleBackColor = true;
-            Cancel.Click += CancelButton_Click;
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(35, 28);
-            label1.Name = "label1";
-            label1.Size = new Size(54, 15);
-            label1.TabIndex = 5;
-            label1.Text = "Магазин";
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(35, 62);
-            label2.Name = "label2";
-            label2.Size = new Size(64, 15);
-            label2.TabIndex = 6;
-            label2.Text = "Двигатели";
-            // 
-            // label3
-            // 
-            label3.AutoSize = true;
-            label3.Location = new Point(35, 98);
-            label3.Name = "label3";
-            label3.Size = new Size(72, 15);
-            label3.TabIndex = 7;
-            label3.Text = "Количество";
-            // 
-            // FormSupply
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(443, 195);
-            Controls.Add(label3);
-            Controls.Add(label2);
-            Controls.Add(label1);
-            Controls.Add(Cancel);
-            Controls.Add(SaveButton);
-            Controls.Add(CountTextBox);
-            Controls.Add(EngineComboBox);
-            Controls.Add(ShopComboBox);
-            Margin = new Padding(3, 2, 3, 2);
-            Name = "FormSupply";
-            Text = "Форма поставки";
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private ComboBox ShopComboBox;
-        private ComboBox EngineComboBox;
-        private TextBox CountTextBox;
-        private Button SaveButton;
-        private Button Cancel;
-        private Label label1;
-        private Label label2;
-        private Label label3;
-    }
-}

MotorPlant/MotorPlantView/FormSupply.cs

@@ -1,140 +0,0 @@
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels.Models;
-
-namespace MotorPlantView
-{
-    public partial class FormSupply : Form
-    {
-        private readonly List<EngineViewModel>? _engineList;
-        private readonly List<ShopViewModel>? _shopsList;
-        IShopLogic _shopLogic;
-        IEngineLogic _engineLogic;
-        public int ShopId
-        {
-            get
-            {
-                return Convert.ToInt32(ShopComboBox.SelectedValue);
-            }
-            set
-            {
-                ShopComboBox.SelectedValue = value;
-            }
-        }
-        public int EngineId
-        {
-            get
-            {
-                return Convert.ToInt32(EngineComboBox.SelectedValue);
-            }
-            set
-            {
-                EngineComboBox.SelectedValue = value;
-            }
-        }
-
-        public IEngineModel? EngineModel
-        {
-            get
-            {
-                if (_engineList == null)
-                {
-                    return null;
-                }
-                foreach (var elem in _engineList)
-                {
-                    if (elem.Id == EngineId)
-                    {
-                        return elem;
-                    }
-                }
-                return null;
-            }
-        }
-
-
-        public int Count
-        {
-            get { return Convert.ToInt32(CountTextBox.Text); }
-            set
-            { CountTextBox.Text = value.ToString(); }
-        }
-        public FormSupply(IEngineLogic engineLogic, IShopLogic shopLogic)
-        {
-            InitializeComponent();
-            _shopLogic = shopLogic;
-            _engineLogic = engineLogic;
-            _engineList = engineLogic.ReadList(null);
-            _shopsList = shopLogic.ReadList(null);
-            if (_engineList != null)
-            {
-                EngineComboBox.DisplayMember = "EngineName";
-                EngineComboBox.ValueMember = "Id";
-                EngineComboBox.DataSource = _engineList;
-                EngineComboBox.SelectedItem = null;
-            }
-            if (_shopsList != null)
-            {
-                ShopComboBox.DisplayMember = "ShopName";
-                ShopComboBox.ValueMember = "Id";
-                ShopComboBox.DataSource = _shopsList;
-                ShopComboBox.SelectedItem = null;
-            }
-        }
-
-        private void SaveButton_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(CountTextBox.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (EngineComboBox.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите двигатель", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (ShopComboBox.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            try
-            {
-                int count = Convert.ToInt32(CountTextBox.Text);
-
-                bool res = _shopLogic.MakeSupply(
-                    new ShopSearchModel() { Id = Convert.ToInt32(ShopComboBox.SelectedValue) },
-                    _engineLogic.ReadElement(new() { Id = Convert.ToInt32(EngineComboBox.SelectedValue) }),
-                    count
-                );
-
-                if (!res)
-                {
-                    throw new Exception("Ошибка при пополнении. Дополнительная информация в логах");
-                }
-
-                MessageBox.Show("Пополнение прошло успешно");
-                DialogResult = DialogResult.OK;
-                Close();
-
-            }
-            catch (Exception er)
-            {
-                MessageBox.Show("Ошибка пополнения");
-                return;
-            }
-        }
-
-        private void CancelButton_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

MotorPlant/MotorPlantView/FormSupply.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

MotorPlant/MotorPlantView/MotorPlantView.csproj

@@ -19,15 +19,22 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MotorPlantBusinessLogic\MotorPlantBusinessLogic.csproj" />
     <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
+    <ProjectReference Include="..\MotorPlantDatabaseImplement\MotorPlantDatabaseImplement.csproj" />
+    <ProjectReference Include="..\MotorPlantFileImplement\MotorPlantFileImplement.csproj" />
     <ProjectReference Include="..\MotorPlantListImplement\MotorPlantListImplement.csproj" />
   </ItemGroup>
 

MotorPlant/MotorPlantView/Program.cs

@@ -1,13 +1,12 @@
 using MotorPlantView.Forms;
 using MotorPlantContracts.BusinessLogicsContracts;
 using MotorPlantContracts.StoragesContracts;
-using MotorPlantListImplement.Implements;
+using MotorPlantDatabaseImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 using MotorPlantBusinessLogic.BusinessLogics;
-using MotorPlantBusinessLogic.BusinessLogic;
-using MotorPlantView;
+using System;
 
 namespace MotorPlantView
 {
@@ -43,8 +42,6 @@ namespace MotorPlantView
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IEngineLogic, EngineLogic>();
-            services.AddTransient<IShopStorage, ShopStorage>();
-            services.AddTransient<IShopLogic, ShopLogic>();
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -52,9 +49,6 @@ namespace MotorPlantView
             services.AddTransient<FormEngine>();
             services.AddTransient<FormEngineComponent>();
             services.AddTransient<FormEngines>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormSupply>();
         }
     }
 }

MotorPlant/ShopsForm/Form1.Designer.cs

@@ -1,39 +0,0 @@
-namespace ShopsForm
-{
-    partial class Form1
-    {
-        /// <summary>
-        ///  Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        ///  Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        ///  Required method for Designer support - do not modify
-        ///  the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Text = "Form1";
-        }
-
-        #endregion
-    }
-}

MotorPlant/ShopsForm/Form1.cs

@@ -1,10 +0,0 @@
-namespace ShopsForm
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}

MotorPlant/ShopsForm/Form1.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

MotorPlant/ShopsForm/Program.cs

@@ -1,17 +0,0 @@
-namespace ShopsForm
-{
-    internal static class Program
-    {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            Application.Run(new Form1());
-        }
-    }
-}

MotorPlant/ShopsForm/ShopsForm.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-</Project>