first commit

MotorPlant/MotorPlantBusinessLogic/BusinessLogic/ClientLogic.cs

@@ -0,0 +1,115 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+
+namespace MotorPlantBusinessLogic.BusinessLogics
+{
+    public class ClientLogic : IClientLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IClientStorage _clientStorage;
+        public ClientLogic(ILogger<ClientLogic> logger, IClientStorage 
+            clientStorage)
+        {
+            _logger = logger;
+            _clientStorage = clientStorage;
+        }
+        public List<ClientViewModel>? ReadList(ClientSearchModel? model)
+        {
+            _logger.LogInformation("ReadList. Email:{Email}.Id:{ Id}", model?.Email, model?.Id);
+            var list = model == null ? _clientStorage.GetFullList() :
+            _clientStorage.GetFilteredList(model);
+            if (list == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+            return list;
+        }
+        public ClientViewModel? ReadElement(ClientSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadElement. Email:{Email}.Id:{ Id}", model.Email, model.Id);
+            var element = _clientStorage.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(ClientBindingModel model)
+        {
+            CheckModel(model);
+            if (_clientStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool Update(ClientBindingModel model)
+        {
+            CheckModel(model);
+            if (_clientStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+        public bool Delete(ClientBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_clientStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+        private void CheckModel(ClientBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(model.ClientFIO))
+            {
+                throw new ArgumentNullException("Нет ФИО пользователя",
+               nameof(model.ClientFIO));
+            }
+            if (string.IsNullOrEmpty(model.Email))
+            {
+                throw new ArgumentNullException("Нет логина (почты) пользователя",
+               nameof(model.Email));
+            }
+            if (string.IsNullOrEmpty(model.Password))
+            {
+                throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password));
+            }
+            _logger.LogInformation("Client. ClientFIO:{ClientFIO}. Password:{ Password}. Email:{ Email}. Id: { Id}", model.ClientFIO, model.Password, model.Email, model.Id);
+            var element = _clientStorage.GetElement(new ClientSearchModel
+            {
+                Email = model.Email
+            });;
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Пользователь с таким же логином (почтой) уже есть");
+            }
+        }
+    }
+}

MotorPlant/MotorPlantContracts/BindingModels/ClientBindingModel.cs

@@ -0,0 +1,12 @@
+using MotorPlantDataModels.Models;
+
+namespace MotorPlantContracts.BindingModels
+{
+    public class ClientBindingModel : IClientModel
+    {
+        public int Id { get; set; }
+        public string ClientFIO { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+    }
+}

MotorPlant/MotorPlantContracts/BindingModels/OrderBindingModel.cs

@@ -14,6 +14,8 @@ namespace MotorPlantContracts.BindingModels
 
         public int EngineId { get; set; }
 
+		public int ClientId { get; set; }
+
 		public int Count { get; set; }
 
         public double Sum { get; set; }

MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IClientLogic.cs

@@ -0,0 +1,15 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantContracts.SearchModels;
+
+namespace MotorPlantContracts.BusinessLogicsContracts
+{
+    public interface IClientLogic
+    {
+        List<ClientViewModel>? ReadList(ClientSearchModel? model);
+        ClientViewModel? ReadElement(ClientSearchModel model);
+        bool Create(ClientBindingModel model);
+        bool Update(ClientBindingModel model);
+        bool Delete(ClientBindingModel model);
+    }
+}

MotorPlant/MotorPlantContracts/SearchModels/ClientSearchModel.cs

@@ -0,0 +1,9 @@
+namespace MotorPlantContracts.SearchModels
+{
+    public class ClientSearchModel
+    {
+        public int? Id { get; set; }
+        public string? Email { get; set; }
+        public string? Password { get; set; }
+    }
+}

MotorPlant/MotorPlantContracts/SearchModels/OrderSearchModel.cs

@@ -4,6 +4,8 @@
     {
         public int? Id { get; set; }
 
+		public int? ClientId { get; set; }
+
 		public DateTime? DateFrom { get; set; }
 
         public DateTime? DateTo { get; set;}

MotorPlant/MotorPlantContracts/StoragesContracts/IClientStorage.cs

@@ -0,0 +1,17 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.ViewModels;
+
+namespace MotorPlantContracts.StoragesContracts
+{
+    public interface IClientStorage
+    {
+        List<ClientViewModel> GetFullList();
+        List<ClientViewModel> GetFilteredList(ClientSearchModel model);
+        ClientViewModel? GetElement(ClientSearchModel model);
+        ClientViewModel? Insert(ClientBindingModel model);
+        ClientViewModel? Update(ClientBindingModel model);
+        ClientViewModel? Delete(ClientBindingModel model);
+
+    }
+}

MotorPlant/MotorPlantContracts/ViewModels/ClientViewModel.cs

@@ -0,0 +1,17 @@
+using MotorPlantDataModels.Models;
+using System.ComponentModel;
+
+namespace MotorPlantContracts.ViewModels
+{
+    public class ClientViewModel : IClientModel
+	{
+        public int Id { get; set; }
+        [DisplayName("ФИО клиента")]
+        public string ClientFIO { get; set; } = string.Empty;
+        [DisplayName("Логин (эл. почта)")]
+        public string Email { get; set; } = string.Empty;
+        [DisplayName("Пароль")]
+        public string Password { get; set; } = string.Empty;
+
+    }
+}

MotorPlant/MotorPlantContracts/ViewModels/OrderViewModel.cs

@@ -17,10 +17,15 @@ namespace MotorPlantContracts.ViewModels
 
         public int EngineId { get; set; }
 
+		public int ClientId { get; set; }
+
 		[DisplayName("Изделие")]
 
         public string EngineName { get; set; } = string.Empty;
 
+		[DisplayName("ФИО клиента")]
+		public string ClientFIO { get; set; } = string.Empty;
+
 		[DisplayName("Количество")]
 
         public int Count { get; set; }

MotorPlant/MotorPlantDataModels/Models/IClientModel.cs

@@ -0,0 +1,9 @@
+namespace MotorPlantDataModels.Models
+{
+    public interface IClientModel : IId
+    {
+        string ClientFIO { get; }
+        string Email { get; }
+        string Password { get; }
+    }
+}

MotorPlant/MotorPlantDataModels/Models/IOrderModel.cs

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

MotorPlant/MotorPlantDatabaseImplement/Implements/ClientStorage.cs

@@ -0,0 +1,80 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDatabaseImplement.Models;
+
+namespace MotorPlantDatabaseImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        public List<ClientViewModel> GetFullList()
+        {
+            using var context = new MotorPlantDatabase();
+            return context.Clients
+            .Select(x => x.GetViewModel)
+           .ToList();
+        }
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel
+       model)
+        {
+            if (string.IsNullOrEmpty(model.Email))
+            {
+                return new();
+            }
+            using var context = new MotorPlantDatabase();
+            return context.Clients
+            .Where(x => x.Email.Contains(model.Email))
+           .Select(x => x.GetViewModel)
+           .ToList();
+        }
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new MotorPlantDatabase();
+            return context.Clients
+            .FirstOrDefault(x =>
+           (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email) ||
+            (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            var newClient = Client.Create(model);
+            if (newClient == null)
+            {
+                return null;
+            }
+            using var context = new MotorPlantDatabase();
+            context.Clients.Add(newClient);
+            context.SaveChanges();
+            return newClient.GetViewModel;
+        }
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            using var context = new MotorPlantDatabase();
+            var client = context.Clients.FirstOrDefault(x => x.Id == model.Id);
+            if (client == null)
+            {
+                return null;
+            }
+            client.Update(model);
+            context.SaveChanges();
+            return client.GetViewModel;
+        }
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            using var context = new MotorPlantDatabase();
+            var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Clients.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Implements/OrderStorage.cs

@@ -1,5 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.SearchModels;
 using MotorPlantContracts.StoragesContracts;
 using MotorPlantContracts.ViewModels;
@@ -13,28 +12,23 @@ namespace MotorPlantDatabaseImplement.Implements
 		public List<OrderViewModel> GetFullList()
 		{
 			using var context = new MotorPlantDatabase();
-            return context.Orders.Include(x => x.Engine).Select(x => x.GetViewModel).ToList();
+			return context.Orders
+			.Select(x => AccessEngineStorage(x.GetViewModel))
+		   .ToList();
 		}
 		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
 		{
-            if (!model.Id.HasValue && !model.DateFrom.HasValue)
+			if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue)
 			{
 				return new();
 			}
 			using var context = new MotorPlantDatabase();
-            if (model.DateFrom.HasValue)
+			if (model.Id.HasValue)
-            {
+				return context.Orders.Where(x => x.Id == model.Id).Select(x => AccessEngineStorage(x.GetViewModel)).ToList();
-                return context.Orders
+			if (model.ClientId.HasValue)
-                    .Include(x => x.Engine)
+				return context.Orders.Where(x => x.ClientId == model.ClientId).Select(x => AccessEngineStorage(x.GetViewModel)).ToList();
-                    .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+			return context.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).
-                    .Select(x => x.GetViewModel)
+					Select(x => AccessEngineStorage(x.GetViewModel)).ToList();
-                    .ToList();
-            }
-            return context.Orders
-                    .Include(x => x.Engine)
-                    .Where(x => x.Id == model.Id)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
 		}
 		public OrderViewModel? GetElement(OrderSearchModel model)
 		{
@@ -43,8 +37,7 @@ namespace MotorPlantDatabaseImplement.Implements
 				return null;
 			}
 			using var context = new MotorPlantDatabase();
-            return context.Orders.Include(x => x.Engine)
+			return AccessEngineStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
-                .FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
 		}
 		public OrderViewModel? Insert(OrderBindingModel model)
 		{
@@ -56,25 +49,20 @@ namespace MotorPlantDatabaseImplement.Implements
 			using var context = new MotorPlantDatabase();
 			context.Orders.Add(newOrder);
 			context.SaveChanges();
-            return context.Orders
+			return AccessEngineStorage(newOrder.GetViewModel);
-                      .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);
+			var order = context.Orders.FirstOrDefault(x => x.Id ==
+		   model.Id);
 			if (order == null)
 			{
 				return null;
 			}
 			order.Update(model);
 			context.SaveChanges();
-            return context.Orders
+			return AccessEngineStorage(order.GetViewModel);
-                         .Include(x => x.Engine)
-                         .FirstOrDefault(x => x.Id == model.Id)
-                         ?.GetViewModel;
 		}
 		public OrderViewModel? Delete(OrderBindingModel model)
 		{
@@ -82,15 +70,35 @@ namespace MotorPlantDatabaseImplement.Implements
 			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 AccessEngineStorage(element.GetViewModel);
 			}
 			return null;
 		}
+
+		public static OrderViewModel AccessEngineStorage(OrderViewModel model)
+		{
+			if (model == null)
+				return null;
+			using var context = new MotorPlantDatabase();
+			foreach (var Flower in context.Engines)
+			{
+				if (Flower.Id == model.EngineId)
+				{
+					model.EngineName = Flower.EngineName;
+					break;
+				}
+			}
+			foreach (var client in context.Clients)
+			{
+				if (client.Id == model.ClientId)
+				{
+					model.ClientFIO = client.ClientFIO;
+					return model;
+				}
+			}
+			return model;
+		}
 	}
 }

MotorPlant/MotorPlantDatabaseImplement/Migrations/20240407191059_NewMigration1.Designer.cs

@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace MotorPlantDatabaseImplement.Migrations
 {
     [DbContext(typeof(MotorPlantDatabase))]
-    [Migration("20240404091307_NewMig")]
+    [Migration("20240407191059_NewMigration1")]
-    partial class NewMig
+    partial class NewMigration1
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -25,6 +25,31 @@ namespace MotorPlantDatabaseImplement.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
             modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
                 {
                     b.Property<int>("Id")
@@ -99,6 +124,9 @@ namespace MotorPlantDatabaseImplement.Migrations
 
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("Count")
                         .HasColumnType("integer");
 
@@ -145,13 +173,11 @@ namespace MotorPlantDatabaseImplement.Migrations
 
             modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
                 {
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", null)
                         .WithMany("Orders")
                         .HasForeignKey("EngineId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Engine");
                 });
 
             modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>

MotorPlant/MotorPlantDatabaseImplement/Migrations/20240407191059_NewMigration1.cs

@@ -7,11 +7,26 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace MotorPlantDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class NewMig : Migration
+    public partial class NewMigration1 : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.CreateTable(
+                name: "Clients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ClientFIO = table.Column<string>(type: "text", nullable: false),
+                    Email = table.Column<string>(type: "text", nullable: false),
+                    Password = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Clients", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Components",
                 columns: table => new
@@ -74,6 +89,7 @@ namespace MotorPlantDatabaseImplement.Migrations
                     Id = table.Column<int>(type: "integer", nullable: false)
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
                     EngineId = table.Column<int>(type: "integer", nullable: false),
+                    ClientId = 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),
@@ -110,6 +126,9 @@ namespace MotorPlantDatabaseImplement.Migrations
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropTable(
+                name: "Clients");
+
             migrationBuilder.DropTable(
                 name: "EngineComponents");
 

MotorPlant/MotorPlantDatabaseImplement/Migrations/MotorPlantDatabaseModelSnapshot.cs

@@ -22,6 +22,31 @@ namespace MotorPlantDatabaseImplement.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
             modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
                 {
                     b.Property<int>("Id")
@@ -96,6 +121,9 @@ namespace MotorPlantDatabaseImplement.Migrations
 
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("Count")
                         .HasColumnType("integer");
 
@@ -142,13 +170,11 @@ namespace MotorPlantDatabaseImplement.Migrations
 
             modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
                 {
-                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", null)
                         .WithMany("Orders")
                         .HasForeignKey("EngineId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
-
-                    b.Navigation("Engine");
                 });
 
             modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>

MotorPlant/MotorPlantDatabaseImplement/Models/Client.cs

@@ -0,0 +1,59 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace MotorPlantDatabaseImplement.Models
+{
+    public class Client : IClientModel
+    {
+        public int Id { get; private set; }
+        [Required]
+        public string ClientFIO { get; private set; } = string.Empty;
+        [Required]
+        public string Email { get; private set; } = string.Empty;
+        [Required]
+        public string Password { get; private set; } = string.Empty;
+        public static Client? Create(ClientBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Client()
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password = model.Password,
+            };
+        }
+        public static Client Create(ClientViewModel model)
+        {
+            return new Client
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password = model.Password,
+            };
+        }
+        public void Update(ClientBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ClientFIO = model.ClientFIO;
+            Email = model.Email;
+            Password = model.Password;
+        }
+        public ClientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ClientFIO = ClientFIO,
+            Email = Email,
+            Password = Password,
+        };
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Models/Order.cs

@@ -10,9 +10,10 @@ namespace MotorPlantDatabaseImplement.Models
     {
         public int Id { get; private set; }
 
-        [Required]
         public int EngineId { get; private set; }
 
+		public int ClientId { get; private set; }
+
 		[Required]
         public int Count { get; private set; }
 
@@ -27,8 +28,6 @@ namespace MotorPlantDatabaseImplement.Models
 
         public DateTime? DateImplement { get; private set; }
 
-        public virtual Engine Engine { get; set; }
-
         public static Order? Create(OrderBindingModel? model)
         {
             if (model == null)
@@ -39,6 +38,7 @@ namespace MotorPlantDatabaseImplement.Models
             {
                 Id = model.Id,
                 EngineId = model.EngineId,
+				ClientId = model.ClientId,
 				Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -61,12 +61,12 @@ namespace MotorPlantDatabaseImplement.Models
         {
             Id = Id,
             EngineId = EngineId,
+			ClientId = ClientId,
 			Count = Count,
             Sum = Sum,
             Status = Status,
             DateCreate = DateCreate,
             DateImplement = DateImplement,
-            EngineName = Engine.EngineName
         };
     }
 }

MotorPlant/MotorPlantDatabaseImplement/MotorPlantDatabase.cs

@@ -19,5 +19,6 @@ namespace MotorPlantDatabaseImplement
         public virtual DbSet<Engine> Engines { get; set; }
         public virtual DbSet<EngineComponent> EngineComponents { get; set; }
         public virtual DbSet<Order> Orders { get; set; }
+		public virtual DbSet<Client> Clients { set; get; }
 	}
 }

MotorPlant/MotorPlantDatabaseImplement/MotorPlantDatabaseImplement.csproj

@@ -21,8 +21,4 @@
     <ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Implements\" />
-  </ItemGroup>
-
 </Project>

MotorPlant/MotorPlantFileImplement/DataFileSingleton.cs

@@ -13,12 +13,16 @@ namespace MotorPlantFileImplement
 
         private readonly string EngineFileName = "Engine.xml";
 
+		private readonly string ClientFileName = "Client.xml";
+
 		public List<Component> Components { get; private set; }
 
         public List<Order> Orders { get; private set; }
 
         public List<Engine> Engines { get; private set; }
 
+		public List<Client> Clients { get; private set; }
+
 		public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -33,11 +37,14 @@ namespace MotorPlantFileImplement
 
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
 
+		public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", 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)!)!;
+			Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
 		}
 
 		private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)

MotorPlant/MotorPlantFileImplement/Implements/ClientStorage.cs

@@ -0,0 +1,82 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantFileImplement.Models;
+
+namespace MotorPlantFileImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        private readonly DataFileSingleton source;
+        public ClientStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<ClientViewModel> GetFullList()
+        {
+            return source.Clients
+            .Select(x => x.GetViewModel)
+           .ToList();
+        }
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email))
+            {
+                return new();
+            }
+            return source.Clients
+            .Where(x => x.Email.Contains(model.Email))
+           .Select(x => x.GetViewModel)
+           .ToList();
+        }
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Clients
+            .FirstOrDefault(x =>
+           (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email) ||
+            (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            model.Id = source.Clients.Count > 0 ? source.Clients.Max(x => x.Id) + 1 : 1;
+            var newClient = Client.Create(model);
+            if (newClient == null)
+            {
+                return null;
+            }
+            source.Clients.Add(newClient);
+            source.SaveClients();
+            return newClient.GetViewModel;
+        }
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            var client = source.Clients.FirstOrDefault(x => x.Id ==
+           model.Id);
+            if (client == null)
+            {
+                return null;
+            }
+            client.Update(model);
+            source.SaveClients();
+            return client.GetViewModel;
+        }
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            var element = source.Clients.FirstOrDefault(x => x.Id ==
+           model.Id);
+            if (element != null)
+            {
+                source.Clients.Remove(element);
+                source.SaveClients();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+
+}

MotorPlant/MotorPlantFileImplement/Implements/OrderStorage.cs

@@ -14,12 +14,25 @@ namespace MotorPlantFileImplement.Implements
     public class OrderStorage : IOrderStorage
     {
 		private readonly DataFileSingleton source;
-
 		public OrderStorage()
 		{
 			source = DataFileSingleton.GetInstance();
 		}
-
+		public List<OrderViewModel> GetFullList()
+		{
+			return source.Orders.Select(x => GetViewModel(x)).ToList();
+		}
+		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+		{
+			if (model.Id.HasValue)
+				return source.Orders.Where(x => x.Id == model.Id)
+					.Select(x => GetViewModel(x))
+					.ToList();
+			if (model.ClientId.HasValue)
+				return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => GetViewModel(x)).ToList();
+			return source.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).
+				   Select(x => GetViewModel(x)).ToList();
+		}
 		public OrderViewModel? GetElement(OrderSearchModel model)
 		{
 			if (!model.Id.HasValue)
@@ -28,24 +41,6 @@ namespace MotorPlantFileImplement.Implements
 			}
 			return GetViewModel(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id));
 		}
-
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-			if (!model.Id.HasValue && !model.DateFrom.HasValue || !model.DateTo.HasValue)
-			{
-                return new();
-            }
-			return source.Orders
-					.Where(x => x.Id == model.Id || (model.DateTo >= x.DateCreate && model.DateFrom <= x.DateCreate))
-					.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;
@@ -56,38 +51,37 @@ namespace MotorPlantFileImplement.Implements
 			}
 			source.Orders.Add(newOrder);
 			source.SaveOrders();
-            return GetViewModel(newOrder);
+			return newOrder.GetViewModel;
 		}
-
 		public OrderViewModel? Update(OrderBindingModel model)
 		{
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+			var component = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
+			if (component == null)
 			{
 				return null;
 			}
-            order.Update(model);
+			component.Update(model);
 			source.SaveOrders();
-            return GetViewModel(order);
+			return component.GetViewModel;
 		}
-
 		public OrderViewModel? Delete(OrderBindingModel model)
 		{
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+			var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
+			if (element != null)
 			{
+				source.Orders.Remove(element);
+				source.SaveOrders();
+				return element.GetViewModel;
+			}
 			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);
+			var flower = source.Engines.FirstOrDefault(x => x.Id == order.EngineId);
-            viewModel.EngineName = engine?.EngineName;
+			var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId);
+			viewModel.EngineName = flower?.EngineName;
+			viewModel.ClientFIO = client?.ClientFIO;
 			return viewModel;
 		}
 	}

MotorPlant/MotorPlantFileImplement/Models/Client.cs

@@ -0,0 +1,66 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System.Xml.Linq;
+
+namespace MotorPlantFileImplement.Models
+{
+    public class Client : IClientModel
+    {
+        public int Id { get; private set; }
+        public string ClientFIO { get; private set; } = string.Empty;
+        public string Email { get; private set; } = string.Empty;
+        public string Password { get; private set; } = string.Empty;
+        public static Client? Create(ClientBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Client()
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password = model.Password,
+            };
+        }
+        public static Client? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Client()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ClientFIO = element.Element("ClientFIO")!.Value,
+                Email = element.Element("Email")!.Value,
+                Password = element.Element("Password")!.Value,
+            };
+        }
+        public void Update(ClientBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ClientFIO = model.ClientFIO;
+            Email = model.Email;
+            Password = model.Password;
+        }
+        public ClientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ClientFIO = ClientFIO,
+            Email = Email,
+            Password = Password,
+        };
+        public XElement GetXElement => new("Client",
+        new XAttribute("Id", Id),
+        new XElement("ClientFIO", ClientFIO),
+        new XElement("Email", Email),
+        new XElement("Password", Password));
+    }
+
+}

MotorPlant/MotorPlantFileImplement/Models/Order.cs

@@ -9,6 +9,7 @@ namespace MotorPlantFileImplement.Models
     public class Order : IOrderModel
     {
         public int EngineId { get; private set; }
+		public int ClientId { get; private set; }
 		public int Count { get; private set; }
         public double Sum { get; private set; }
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
@@ -25,6 +26,7 @@ namespace MotorPlantFileImplement.Models
             {
                 Id = model.Id,
                 EngineId = model.EngineId,
+                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -42,6 +44,7 @@ namespace MotorPlantFileImplement.Models
             {
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 EngineId = Convert.ToInt32(element.Element("EngineId")!.Value),
+				ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
 				Count = Convert.ToInt32(element.Element("Count")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
                 DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null),
@@ -63,13 +66,21 @@ namespace MotorPlantFileImplement.Models
             {
                 return;
             }
+			Id = model.Id;
+			EngineId = model.EngineId;
+			ClientId = model.ClientId;
+			Count = model.Count;
+			Sum = model.Sum;
 			Status = model.Status;
+			DateCreate = model.DateCreate;
 			DateImplement = model.DateImplement;
 		}
         public OrderViewModel GetViewModel => new()
         {
             Id = Id,
             EngineId = EngineId,
+			ClientId = ClientId,
+
 			Count = Count,
             Sum = Sum,
             Status = Status,
@@ -79,6 +90,7 @@ namespace MotorPlantFileImplement.Models
         public XElement GetXElement => new("Order",
           new XAttribute("Id", Id),
           new XElement("EngineId", EngineId),
+		  new XElement("ClientId", ClientId.ToString()),
 		  new XElement("Count", Count.ToString()),
           new XElement("Sum", Sum.ToString()),
           new XElement("Status", Status.ToString()),

MotorPlant/MotorPlantListImplement/DataListSingleton.cs

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

MotorPlant/MotorPlantListImplement/Implements/ClientStorage.cs

@@ -0,0 +1,103 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantListImplement.Models;
+
+namespace MotorPlantListImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        private readonly DataListSingleton _source;
+        public ClientStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+        public List<ClientViewModel> GetFullList()
+        {
+            var result = new List<ClientViewModel>();
+            foreach (var client in _source.Clients)
+            {
+                result.Add(client.GetViewModel);
+            }
+            return result;
+        }
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            var result = new List<ClientViewModel>();
+            if (string.IsNullOrEmpty(model.Email))
+            {
+                return result;
+            }
+            foreach (var client in _source.Clients)
+            {
+                if (client.Email.Contains(model.Email))
+                {
+                    result.Add(client.GetViewModel);
+                }
+            }
+            return result;
+        }
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            foreach (var client in _source.Clients)
+            {
+                if ((!string.IsNullOrEmpty(model.Email) &&
+               client.Email == model.Email) ||
+                (model.Id.HasValue && client.Id == model.Id))
+                {
+                    return client.GetViewModel;
+                }
+            }
+            return null;
+        }
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            model.Id = 1;
+            foreach (var client in _source.Clients)
+            {
+                if (model.Id <= client.Id)
+                {
+                    model.Id = client.Id + 1;
+                }
+            }
+            var newClient = Client.Create(model);
+            if (newClient == null)
+            {
+                return null;
+            }
+            _source.Clients.Add(newClient);
+            return newClient.GetViewModel;
+        }
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            foreach (var client in _source.Clients)
+            {
+                if (client.Id == model.Id)
+                {
+                    client.Update(model);
+                    return client.GetViewModel;
+                }
+            }
+            return null;
+        }
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            for (int i = 0; i < _source.Clients.Count; ++i)
+            {
+                if (_source.Clients[i].Id == model.Id)
+                {
+                    var element = _source.Clients[i];
+                    _source.Clients.RemoveAt(i);
+                    return element.GetViewModel;
+                }
+            }
+            return null;
+        }
+
+    }
+}

MotorPlant/MotorPlantListImplement/Implements/OrderStorage.cs

@@ -24,7 +24,7 @@ namespace MotorPlantListImplement.Implements
 			var result = new List<OrderViewModel>();
 			foreach (var order in _source.Orders)
 			{
-                result.Add(AttachEngineName(order.GetViewModel));
+				result.Add(AttachNames(order.GetViewModel));
 			}
 			return result;
 		}
@@ -35,15 +35,22 @@ namespace MotorPlantListImplement.Implements
 			{
 				return result;
 			}
-			if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
+			if (model.ClientId.HasValue)
 			{
+				foreach (var order in _source.Orders)
+				{
+					if (order.Id == model.Id && order.ClientId == model.ClientId)
+					{
+						result.Add(AttachNames(order.GetViewModel));
+					}
+				}
 				return result;
 			}
 			foreach (var order in _source.Orders)
 			{
-				if (order.Id == model.Id || (model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo))
+				if (order.Id == model.Id && order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
 				{
-                    result.Add(AttachEngineName(order.GetViewModel));
+					result.Add(AttachNames(order.GetViewModel));
 				}
 			}
 			return result;
@@ -58,7 +65,7 @@ namespace MotorPlantListImplement.Implements
 			{
 				if (model.Id.HasValue && order.Id == model.Id)
 				{
-                    return AttachEngineName(order.GetViewModel);
+					return AttachNames(order.GetViewModel);
 				}
 			}
 			return null;
@@ -79,7 +86,7 @@ namespace MotorPlantListImplement.Implements
 				return null;
 			}
 			_source.Orders.Add(newOrder);
-            return AttachEngineName(newOrder.GetViewModel);
+			return AttachNames(newOrder.GetViewModel);
 		}
 		public OrderViewModel? Update(OrderBindingModel model)
 		{
@@ -88,7 +95,7 @@ namespace MotorPlantListImplement.Implements
 				if (order.Id == model.Id)
 				{
 					order.Update(model);
-                    return AttachEngineName(order.GetViewModel);
+					return AttachNames(order.GetViewModel);
 				}
 			}
 			return null;
@@ -101,18 +108,26 @@ namespace MotorPlantListImplement.Implements
 				{
 					var element = _source.Orders[i];
 					_source.Orders.RemoveAt(i);
-                    return AttachEngineName(element.GetViewModel);
+					return AttachNames(element.GetViewModel);
 				}
 			}
 			return null;
 		}
-        private OrderViewModel AttachEngineName(OrderViewModel model)
+		private OrderViewModel AttachNames(OrderViewModel model)
 		{
-            foreach (var Engine in _source.Engines)
+			foreach (var engine in _source.Engines)
 			{
-                if (Engine.Id == model.EngineId)
+				if (engine.Id == model.EngineId)
 				{
-                    model.EngineName = Engine.EngineName;
+					model.EngineName = engine.EngineName;
+					return model;
+				}
+			}
+			foreach (var client in _source.Clients)
+			{
+				if (client.Id == model.ClientId)
+				{
+					model.ClientFIO = client.ClientFIO;
 					return model;
 				}
 			}

MotorPlant/MotorPlantListImplement/Models/Client.cs

@@ -0,0 +1,45 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+
+namespace MotorPlantListImplement.Models
+{
+    public class Client : IClientModel
+    {
+        public int Id { get; private set; }
+        public string ClientFIO { get; private set; }
+        public string Email { get; private set; }
+        public string Password { get; private set; }
+        public static Client? Create(ClientBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Client()
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password = model.Password,
+            };
+        }
+        public void Update(ClientBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ClientFIO = model.ClientFIO;
+            Email = model.Email;
+            Password = model.Password;
+        }
+        public ClientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ClientFIO = ClientFIO,
+            Email = Email,
+            Password = Password,
+        };
+    }
+}

MotorPlant/MotorPlantListImplement/Models/Order.cs

@@ -16,6 +16,8 @@ namespace MotorPlantListImplement.Models
 
         public int EngineId { get; private set; }
 
+		public int ClientId { get; private set; }
+
 		public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -36,6 +38,7 @@ namespace MotorPlantListImplement.Models
             {
                 Id = model.Id,
                 EngineId = model.EngineId,
+				ClientId = model.ClientId,
 				Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -49,13 +52,20 @@ namespace MotorPlantListImplement.Models
             {
                 return;
             }
+			Id = model.Id;
+			EngineId = model.EngineId;
+			ClientId = model.ClientId;
+			Count = model.Count;
+			Sum = model.Sum;
 			Status = model.Status;
+			DateCreate = model.DateCreate;
 			DateImplement = model.DateImplement;
 		}
         public OrderViewModel GetViewModel => new()
         {
             Id = Id,
             EngineId = EngineId,
+			ClientId = ClientId,
 			Count = Count,
             Sum = Sum,
             Status = Status,

MotorPlant/MotorPlantView/FormClients.Designer.cs

@@ -0,0 +1,88 @@
+namespace MotorPlantView
+{
+	partial class FormClients
+	{
+		/// <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()
+		{
+			buttonRef = new Button();
+			buttonDel = new Button();
+			dataGridView = new DataGridView();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// buttonRef
+			// 
+			buttonRef.Location = new Point(413, 46);
+			buttonRef.Name = "buttonRef";
+			buttonRef.Size = new Size(103, 28);
+			buttonRef.TabIndex = 9;
+			buttonRef.Text = "Обновить";
+			buttonRef.UseVisualStyleBackColor = true;
+			buttonRef.Click += buttonRef_Click;
+			// 
+			// buttonDel
+			// 
+			buttonDel.Location = new Point(413, 12);
+			buttonDel.Name = "buttonDel";
+			buttonDel.Size = new Size(103, 28);
+			buttonDel.TabIndex = 8;
+			buttonDel.Text = "Удалить";
+			buttonDel.UseVisualStyleBackColor = true;
+			buttonDel.Click += buttonDel_Click;
+			// 
+			// dataGridView
+			// 
+			dataGridView.BackgroundColor = Color.White;
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Location = new Point(12, 12);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowTemplate.Height = 25;
+			dataGridView.Size = new Size(345, 426);
+			dataGridView.TabIndex = 5;
+			// 
+			// FormClients
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(528, 450);
+			Controls.Add(buttonRef);
+			Controls.Add(buttonDel);
+			Controls.Add(dataGridView);
+			Name = "FormClients";
+			Text = "Клиенты";
+			Load += FormClients_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+		}
+
+		#endregion
+
+		private Button buttonRef;
+		private Button buttonDel;
+		private DataGridView dataGridView;
+	}
+}

MotorPlant/MotorPlantView/FormClients.cs

@@ -0,0 +1,79 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+
+namespace MotorPlantView
+{
+	public partial class FormClients : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IClientLogic _logic;
+		public FormClients(ILogger<FormClients> logger, IClientLogic logic)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logic = logic;
+		}
+
+		private void FormClients_Load(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+
+		private void LoadData()
+		{
+			try
+			{
+				var list = _logic.ReadList(null);
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["Id"].Visible = false;
+				}
+				_logger.LogInformation("Загрузка клиентов");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки клиентов");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+			   MessageBoxIcon.Error);
+			}
+		}
+
+		private void buttonDel_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 ClientBindingModel
+						{
+							Id = id
+						}))
+						{
+							throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+						}
+						LoadData();
+					}
+					catch (Exception ex)
+					{
+						_logger.LogError(ex, "Ошибка удаления клиента");
+						MessageBox.Show(ex.Message, "Ошибка",
+					   MessageBoxButtons.OK, MessageBoxIcon.Error);
+					}
+				}
+			}
+		}
+
+		private void buttonRef_Click(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+	}
+}

MotorPlant/MotorPlantView/FormClients.resx

@@ -0,0 +1,120 @@
+<?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/FormCreateOrder.Designer.cs

@@ -36,70 +36,68 @@
 			textBoxSum = new TextBox();
 			buttonSave = new Button();
 			buttonCancel = new Button();
+			label4 = new Label();
+			comboBoxClient = new ComboBox();
 			SuspendLayout();
 			// 
 			// label1
 			// 
 			label1.AutoSize = true;
-            label1.Location = new Point(22, 16);
+			label1.Location = new Point(19, 12);
 			label1.Name = "label1";
-            label1.Size = new Size(71, 20);
+			label1.Size = new Size(56, 15);
 			label1.TabIndex = 0;
 			label1.Text = "Изделие:";
 			// 
 			// label2
 			// 
 			label2.AutoSize = true;
-            label2.Location = new Point(22, 59);
+			label2.Location = new Point(19, 77);
 			label2.Name = "label2";
-            label2.Size = new Size(93, 20);
+			label2.Size = new Size(75, 15);
 			label2.TabIndex = 1;
 			label2.Text = "Количество:";
 			// 
 			// label3
 			// 
 			label3.AutoSize = true;
-            label3.Location = new Point(22, 93);
+			label3.Location = new Point(19, 103);
 			label3.Name = "label3";
-            label3.Size = new Size(58, 20);
+			label3.Size = new Size(48, 15);
 			label3.TabIndex = 2;
 			label3.Text = "Сумма:";
 			// 
 			// textBoxCount
 			// 
-            textBoxCount.Location = new Point(118, 55);
+			textBoxCount.Location = new Point(103, 74);
-            textBoxCount.Margin = new Padding(3, 4, 3, 4);
 			textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(281, 27);
+			textBoxCount.Size = new Size(246, 23);
 			textBoxCount.TabIndex = 3;
 			textBoxCount.TextChanged += textBoxCount_TextChanged;
 			// 
 			// comboBoxEngine
 			// 
 			comboBoxEngine.FormattingEnabled = true;
-            comboBoxEngine.Location = new Point(118, 13);
+			comboBoxEngine.Location = new Point(103, 10);
-            comboBoxEngine.Margin = new Padding(3, 4, 3, 4);
 			comboBoxEngine.Name = "comboBoxEngine";
-            comboBoxEngine.Size = new Size(281, 28);
+			comboBoxEngine.Size = new Size(246, 23);
 			comboBoxEngine.TabIndex = 4;
 			comboBoxEngine.SelectedIndexChanged += ComboBoxEngine_SelectedIndexChanged;
 			// 
 			// textBoxSum
 			// 
 			textBoxSum.BackColor = SystemColors.ControlLightLight;
-            textBoxSum.Location = new Point(118, 93);
+			textBoxSum.Location = new Point(103, 103);
-            textBoxSum.Margin = new Padding(3, 4, 3, 4);
 			textBoxSum.Name = "textBoxSum";
 			textBoxSum.ReadOnly = true;
-            textBoxSum.Size = new Size(281, 27);
+			textBoxSum.Size = new Size(246, 23);
 			textBoxSum.TabIndex = 5;
 			// 
 			// buttonSave
 			// 
-            buttonSave.Location = new Point(171, 135);
+			buttonSave.Location = new Point(150, 134);
-            buttonSave.Margin = new Padding(3, 4, 3, 4);
 			buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(107, 35);
+			buttonSave.Size = new Size(94, 26);
 			buttonSave.TabIndex = 6;
 			buttonSave.Text = "Сохранить";
 			buttonSave.UseVisualStyleBackColor = true;
@@ -107,20 +105,39 @@
 			// 
 			// buttonCancel
 			// 
-            buttonCancel.Location = new Point(285, 135);
+			buttonCancel.Location = new Point(249, 134);
-            buttonCancel.Margin = new Padding(3, 4, 3, 4);
 			buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(107, 35);
+			buttonCancel.Size = new Size(94, 26);
 			buttonCancel.TabIndex = 7;
 			buttonCancel.Text = "Отмена";
 			buttonCancel.UseVisualStyleBackColor = true;
 			buttonCancel.Click += buttonCancel_Click;
 			// 
+			// label4
+			// 
+			label4.AutoSize = true;
+			label4.Location = new Point(19, 48);
+			label4.Name = "label4";
+			label4.Size = new Size(49, 15);
+			label4.TabIndex = 14;
+			label4.Text = "Клиент:";
+			// 
+			// comboBoxClient
+			// 
+			comboBoxClient.DropDownStyle = ComboBoxStyle.DropDownList;
+			comboBoxClient.FormattingEnabled = true;
+			comboBoxClient.Location = new Point(99, 45);
+			comboBoxClient.Name = "comboBoxClient";
+			comboBoxClient.Size = new Size(250, 23);
+			comboBoxClient.TabIndex = 13;
+			// 
 			// FormCreateOrder
 			// 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+			AutoScaleDimensions = new SizeF(7F, 15F);
 			AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(427, 181);
+			ClientSize = new Size(374, 195);
+			Controls.Add(label4);
+			Controls.Add(comboBoxClient);
 			Controls.Add(buttonCancel);
 			Controls.Add(buttonSave);
 			Controls.Add(textBoxSum);
@@ -129,7 +146,6 @@
 			Controls.Add(label3);
 			Controls.Add(label2);
 			Controls.Add(label1);
-            Margin = new Padding(3, 4, 3, 4);
 			Name = "FormCreateOrder";
 			Text = "Заказ";
 			Load += FormCreateOrder_Load;
@@ -147,5 +163,7 @@
 		private TextBox textBoxSum;
 		private Button buttonSave;
 		private Button buttonCancel;
+		private Label label4;
+		private ComboBox comboBoxClient;
 	}
 }

MotorPlant/MotorPlantView/FormCreateOrder.cs

@@ -9,32 +9,52 @@ namespace MotorPlantView.Forms
 	{
 		private readonly ILogger _logger;
 		private readonly IEngineLogic _logicP;
+		private readonly IClientLogic _logicC;
 		private readonly IOrderLogic _logicO;
-        public FormCreateOrder(ILogger<FormCreateOrder> logger, IEngineLogic logicP, IOrderLogic logicO)
+		public FormCreateOrder(ILogger<FormCreateOrder> logger, IEngineLogic logicP, IClientLogic logicC, IOrderLogic logicO)
 		{
 			InitializeComponent();
 			_logger = logger;
 			_logicP = logicP;
+			_logicC = logicC;
 			_logicO = logicO;
 		}
 
 		private void FormCreateOrder_Load(object sender, EventArgs e)
 		{
+			_logger.LogInformation("Загрузка цветов для заказа");
 			try
 			{
-                var list = _logicP.ReadList(null);
+				var _list = _logicP.ReadList(null);
-                if (list != null)
+				if (_list != null)
 				{
 					comboBoxEngine.DisplayMember = "EngineName";
 					comboBoxEngine.ValueMember = "Id";
-                    comboBoxEngine.DataSource = list;
+					comboBoxEngine.DataSource = _list;
 					comboBoxEngine.SelectedItem = null;
-                    _logger.LogInformation("Загрузка изделий для заказа");
 				}
 			}
 			catch (Exception ex)
 			{
-                _logger.LogError(ex, "Ошибка загрузки списка изделий");
+				_logger.LogError(ex, "Ошибка загрузки цветов для заказа");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+			_logger.LogInformation("Загрузка клиентов для заказа");
+			try
+			{
+				var _list = _logicC.ReadList(null);
+				if (_list != null)
+				{
+					comboBoxClient.DisplayMember = "ClientFIO";
+					comboBoxClient.ValueMember = "Id";
+					comboBoxClient.DataSource = _list;
+					comboBoxClient.SelectedItem = null;
+				}
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки клиентов для заказа");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 		}
 		private void CalcSum()

MotorPlant/MotorPlantView/FormMain.Designer.cs

@@ -42,6 +42,7 @@
 			buttonIssuedOrder = new Button();
 			buttonRef = new Button();
 			dataGridView = new DataGridView();
+			клиентыToolStripMenuItem = new ToolStripMenuItem();
 			toolStrip1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
 			SuspendLayout();
@@ -59,7 +60,7 @@
 			// toolStripDropDownButton1
 			// 
 			toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem });
+			toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem, клиентыToolStripMenuItem });
 			toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
 			toolStripDropDownButton1.Name = "toolStripDropDownButton1";
 			toolStripDropDownButton1.Size = new Size(88, 22);
@@ -68,14 +69,14 @@
 			// КомпонентыToolStripMenuItem
 			// 
 			КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
-            КомпонентыToolStripMenuItem.Size = new Size(145, 22);
+			КомпонентыToolStripMenuItem.Size = new Size(180, 22);
 			КомпонентыToolStripMenuItem.Text = "Компоненты";
 			КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
 			// 
 			// ДвигателиToolStripMenuItem
 			// 
 			ДвигателиToolStripMenuItem.Name = "ДвигателиToolStripMenuItem";
-            ДвигателиToolStripMenuItem.Size = new Size(145, 22);
+			ДвигателиToolStripMenuItem.Size = new Size(180, 22);
 			ДвигателиToolStripMenuItem.Text = "Двигатели";
 			ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
 			// 
@@ -181,6 +182,13 @@
 			dataGridView.Size = new Size(780, 441);
 			dataGridView.TabIndex = 6;
 			// 
+			// клиентыToolStripMenuItem
+			// 
+			клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+			клиентыToolStripMenuItem.Size = new Size(180, 22);
+			клиентыToolStripMenuItem.Text = "Клиенты";
+			клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
+			// 
 			// FormMain
 			// 
 			AutoScaleDimensions = new SizeF(7F, 15F);
@@ -219,5 +227,6 @@
 		private ToolStripMenuItem списокДвигателейToolStripMenuItem;
 		private ToolStripMenuItem компонентыПоДвигателямToolStripMenuItem;
 		private ToolStripMenuItem списокЗаказовToolStripMenuItem;
+		private ToolStripMenuItem клиентыToolStripMenuItem;
 	}
 }

MotorPlant/MotorPlantView/FormMain.cs

@@ -32,14 +32,15 @@ namespace MotorPlantView.Forms
 				{
 					dataGridView.DataSource = list;
 					dataGridView.Columns["EngineId"].Visible = false;
+					dataGridView.Columns["ClientId"].Visible = false;
 					dataGridView.Columns["EngineName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
 				}
-
-                _logger.LogInformation("Загрузка заказов");
 			}
 			catch (Exception ex)
 			{
 				_logger.LogError(ex, "Ошибка загрузки заказов");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 		}
 		private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
@@ -174,5 +175,14 @@ namespace MotorPlantView.Forms
 				form.ShowDialog();
 			}
 		}
+
+		private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+			if (service is FormClients form)
+			{
+				form.ShowDialog();
+			}
+		}
 	}
 }

MotorPlant/MotorPlantView/Program.cs

@@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 using MotorPlantBusinessLogic.BusinessLogics;
-using System;
 using MotorPlantBusinessLogic.BusinessLogic;
 using MotorPlantBusinessLogic.OfficePackage.Implements;
 using MotorPlantBusinessLogic.OfficePackage;
@@ -44,14 +43,18 @@ namespace MotorPlantView
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IEngineStorage, EngineStorage>();
+			services.AddTransient<IClientStorage, ClientStorage>();
+
 			services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IEngineLogic, EngineLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
+			services.AddTransient<IClientLogic, ClientLogic>();
 
-            services.AddTransient<AbstractSaveToWord, SaveToWord>();
 			services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
+
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -59,8 +62,9 @@ namespace MotorPlantView
             services.AddTransient<FormEngine>();
             services.AddTransient<FormEngineComponent>();
             services.AddTransient<FormEngines>();
-            services.AddTransient<FormReportEngineComponents>();
             services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormReportEngineComponents>();
+			services.AddTransient<FormClients>();
         }
     }
 }