SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/BusinessLogic/ClientLogic.cs

@@ -0,0 +1,119 @@
+using AbstractSoftwareInstallationContracts.BindingModels;
+using AbstractSoftwareInstallationContracts.BusinessLogicsContracts;
+using AbstractSoftwareInstallationContracts.SearchModels;
+using AbstractSoftwareInstallationContracts.StoragesContracts;
+using AbstractSoftwareInstallationContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
+{
+    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}. Email:{ Email}. Password: { Password}. Id: { Id}", model.ClientFIO, model.Email, model.Password, model.Id);
+            var element = _clientStorage.GetElement(new ClientSearchModel
+            {
+                ClientFIO = model.ClientFIO,
+                Email = model.Email
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Такой клиент уже есть");
+            }
+        }
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -29,7 +29,11 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
             }
             if (model.PackageId < 0)
             {
-                throw new ArgumentNullException("Некорректный идентификатор у суши", nameof(model.PackageId));
+                throw new ArgumentNullException("Некорректный идентификатор у пакета", nameof(model.PackageId));
+            }
+            if (model.ClientId < 0)
+            {
+                throw new ArgumentNullException("Некорректный идентификатор у клиента", nameof(model.ClientId));
             }
             if (model.Count <= 0)
             {
@@ -39,7 +43,7 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
             {
                 throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum));
             }
-            _logger.LogInformation("Order. OrderID:{Id}. Sum:{ Sum}. PackageId: { PackageId}", model.Id, model.Sum, model.PackageId);
+            _logger.LogInformation("Order. OrderID:{Id}. Sum:{ Sum}. PackageId: { PackageId}. ClientId: { ClientId}", model.Id, model.Sum, model.PackageId, model.ClientId);
         }
 
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)

SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/ClientBindingModel.cs

@@ -0,0 +1,20 @@
+using AbstractSoftwareInstallationDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationContracts.BindingModels
+{
+    public class ClientBindingModel : IClientModel
+    {
+        public string ClientFIO { get; set; } = string.Empty;
+
+        public string Email { get; set; } = string.Empty;
+
+        public string Password { get; set; } = string.Empty;
+
+        public int Id { get; set; }
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/OrderBindingModel.cs

@@ -12,6 +12,7 @@ namespace AbstractSoftwareInstallationContracts.BindingModels
     {
         public int Id { get; set; }
         public int PackageId { get; set; }
+        public int ClientId { get; set; }
         public int Count { get; set; }
         public double Sum { get; set; }
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/ReportBindingModel.cs

@@ -11,5 +11,6 @@ namespace AbstractSoftwareInstallationContracts.BindingModels
         public string FileName { get; set; } = string.Empty;
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set; }
+
     }
 }

SoftwareInstallation/AbstractSoftwareInstallationContracts/BusinessLogicsContracts/IClientLogic.cs

@@ -0,0 +1,20 @@
+using AbstractSoftwareInstallationContracts.BindingModels;
+using AbstractSoftwareInstallationContracts.SearchModels;
+using AbstractSoftwareInstallationContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationContracts.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);
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationContracts/SearchModels/ClientSearchModel.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationContracts.SearchModels
+{
+    public class ClientSearchModel
+    {
+        public int? Id { get; set; }
+        public string? ClientFIO { get; set; }
+
+        public string? Email { get; set; }
+
+        public string? Password { get; set; }
+        
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationContracts/SearchModels/OrderSearchModel.cs

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

SoftwareInstallation/AbstractSoftwareInstallationContracts/StoragesContracts/IClientStorage.cs

@@ -0,0 +1,22 @@
+using AbstractSoftwareInstallationContracts.BindingModels;
+using AbstractSoftwareInstallationContracts.SearchModels;
+using AbstractSoftwareInstallationContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationContracts.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);
+
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationContracts/ViewModels/ClientViewModel.cs

@@ -0,0 +1,22 @@
+using AbstractSoftwareInstallationDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationContracts.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;
+
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationContracts/ViewModels/OrderViewModel.cs

@@ -15,8 +15,12 @@ namespace AbstractSoftwareInstallationContracts.ViewModels
         [DisplayName("Номер заказа")]
         public int Id { get; set; }
         public int PackageId { get; set; }
+        public int ClientId { get; set; }
         [DisplayName("Пакет")]
         public string PackageName { get; set; } = string.Empty;
+
+        [DisplayName("ФИО клиента")]
+        public string ClientFIO { get; set; } = string.Empty;
         [DisplayName("Количество")]
         public int Count { get; set; }
         [DisplayName("Сумма")]

SoftwareInstallation/AbstractSoftwareInstallationDataModels/Models/IClientModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationDataModels.Models
+{
+    public interface IClientModel : IId
+    {
+        string ClientFIO { get; }
+        string Email { get; }
+        string Password { get; }
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationDataModels/Models/IOrderModel.cs

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

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/AbstractSoftwareInstallationDatabase.cs

@@ -24,5 +24,6 @@ optionsBuilder)
         public virtual DbSet<Package> Packages { set; get; }
         public virtual DbSet<PackageSoftware> PackageSoftwares { set; get; }
         public virtual DbSet<Order> Orders { set; get; }
+        public virtual DbSet<Client> Clients { set; get; }
     }
 }

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Implements/ClientStorage.cs

@@ -0,0 +1,89 @@
+using AbstractSoftwareInstallationContracts.BindingModels;
+using AbstractSoftwareInstallationContracts.SearchModels;
+using AbstractSoftwareInstallationContracts.StoragesContracts;
+using AbstractSoftwareInstallationContracts.ViewModels;
+using AbstractSoftwareInstallationDatabaseImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationDatabaseImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new AbstractSoftwareInstallationDatabase();
+            return context.Clients
+                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email)
+                        && x.Email == model.Email)
+                    || (model.Id.HasValue && x.Id == model.Id))
+                ?.GetViewModel;
+        }
+
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email))
+            {
+                return new();
+            }
+            using var context = new AbstractSoftwareInstallationDatabase();
+            return context.Clients
+                .Where(x => x.Email.Contains(model.Email))
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+
+        public List<ClientViewModel> GetFullList()
+        {
+            using var context = new AbstractSoftwareInstallationDatabase();
+            return context.Clients
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            var newClient = Client.Create(model);
+            if (newClient == null)
+            {
+                return null;
+            }
+            using var context = new AbstractSoftwareInstallationDatabase();
+            context.Clients.Add(newClient);
+            context.SaveChanges();
+            return newClient.GetViewModel;
+        }
+
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            using var context = new AbstractSoftwareInstallationDatabase();
+            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 AbstractSoftwareInstallationDatabase();
+            var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Clients.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/20230422195123_Client.Designer.cs

@@ -0,0 +1,214 @@
+// <auto-generated />
+using System;
+using AbstractSoftwareInstallationDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
+{
+    [DbContext(typeof(AbstractSoftwareInstallationDatabase))]
+    [Migration("20230422195123_Client")]
+    partial class Client
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("AbstractPackageInstallationDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("PackageId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("PackageId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("PackageName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Packages");
+                });
+
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.PackageSoftware", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("PackageId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SoftwareId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackageId");
+
+                    b.HasIndex("SoftwareId");
+
+                    b.ToTable("PackageSoftwares");
+                });
+
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Software", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("float");
+
+                    b.Property<string>("SoftwareName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Softwares");
+                });
+
+            modelBuilder.Entity("AbstractPackageInstallationDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
+                        .WithMany("Orders")
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Package");
+                });
+
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.PackageSoftware", b =>
+                {
+                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
+                        .WithMany("Softwares")
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Software", "Software")
+                        .WithMany("PackageSoftwares")
+                        .HasForeignKey("SoftwareId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Package");
+
+                    b.Navigation("Software");
+                });
+
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
+                {
+                    b.Navigation("Orders");
+
+                    b.Navigation("Softwares");
+                });
+
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Software", b =>
+                {
+                    b.Navigation("PackageSoftwares");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/20230422195123_Client.cs

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

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Migrations/AbstractSoftwareInstallationDatabaseModelSnapshot.cs

@@ -30,6 +30,9 @@ namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
                     b.Property<int>("Count")
                         .HasColumnType("int");
 
@@ -50,11 +53,38 @@ namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("ClientId");
+
                     b.HasIndex("PackageId");
 
                     b.ToTable("Orders");
                 });
 
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
             modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
                 {
                     b.Property<int>("Id")
@@ -123,12 +153,20 @@ namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
 
             modelBuilder.Entity("AbstractPackageInstallationDatabaseImplement.Models.Order", b =>
                 {
+                    b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.HasOne("AbstractSoftwareInstallationDatabaseImplement.Models.Package", "Package")
                         .WithMany("Orders")
                         .HasForeignKey("PackageId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.Navigation("Client");
+
                     b.Navigation("Package");
                 });
 
@@ -151,6 +189,11 @@ namespace AbstractSoftwareInstallationDatabaseImplement.Migrations
                     b.Navigation("Software");
                 });
 
+            modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
             modelBuilder.Entity("AbstractSoftwareInstallationDatabaseImplement.Models.Package", b =>
                 {
                     b.Navigation("Orders");

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Models/Client.cs

@@ -0,0 +1,59 @@
+using AbstractPackageInstallationDatabaseImplement.Models;
+using AbstractSoftwareInstallationContracts.BindingModels;
+using AbstractSoftwareInstallationContracts.ViewModels;
+using AbstractSoftwareInstallationDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationDatabaseImplement.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;
+        [ForeignKey("ClientId")]
+        public virtual List<Order> Orders { get; set; } = new();
+
+        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
+        };
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/Models/Order.cs

@@ -19,6 +19,8 @@ namespace AbstractPackageInstallationDatabaseImplement.Models
         [Required]
         public int PackageId { get; private set; }
         [Required]
+        public int ClientId { get; private set; }
+        [Required]
         public int Count { get; private set; }
         [Required]
         public double Sum { get; private set; }
@@ -29,6 +31,7 @@ namespace AbstractPackageInstallationDatabaseImplement.Models
 
         public DateTime? DateImplement { get; private set; }
         public virtual Package Package { get; set; }
+        public virtual Client Client { get; set; }
 
         public static Order? Create(OrderBindingModel? model)
         {
@@ -39,6 +42,7 @@ namespace AbstractPackageInstallationDatabaseImplement.Models
             return new Order
             {
                 PackageId = model.PackageId,
+                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -62,6 +66,7 @@ namespace AbstractPackageInstallationDatabaseImplement.Models
         {
             Id = Id,
             PackageId = PackageId,
+            ClientId = ClientId,
             Count = Count,
             Sum = Sum,
             Status = Status,

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/DataFileSingleton.cs

@@ -10,9 +10,11 @@ namespace AbstractSoftwareInstallationFileImplement
         private readonly string SoftwareFileName = "Software.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string PackageFileName = "Package.xml";
+        private readonly string ClientFileName = "Package.xml";
         public List<Software> Softwares { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Package> Packages { get; private set; }
+        public List<Client> Clients { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -24,11 +26,15 @@ namespace AbstractSoftwareInstallationFileImplement
         public void SaveSoftwares() => SaveData(Softwares, SoftwareFileName, "Softwares", x => x.GetXElement);
         public void SavePackages() => SaveData(Packages, PackageFileName, "Packages", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+        public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
+
         private DataFileSingleton()
         {
             Softwares = LoadData(SoftwareFileName, "Software", x => Software.Create(x)!)!;
             Packages = LoadData(PackageFileName, "Package", x => Package.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
+            Clients = LoadData(OrderFileName, "Client", x => Client.Create(x)!)!;
+
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/Implements/ClientStorage.cs

@@ -0,0 +1,81 @@
+using AbstractSoftwareInstallationContracts.BindingModels;
+using AbstractSoftwareInstallationContracts.SearchModels;
+using AbstractSoftwareInstallationContracts.StoragesContracts;
+using AbstractSoftwareInstallationContracts.ViewModels;
+using AbstractSoftwareInstallationFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationFileImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        private readonly DataFileSingleton _source;
+        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 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 List<ClientViewModel> GetFullList()
+        {
+            return _source.Clients.Select(x => x.GetViewModel).ToList();
+        }
+
+        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 Client = _source.Clients.FirstOrDefault(x => x.Id == model.Id);
+            if (Client == null)
+            {
+                return null;
+            }
+            _source.Clients.Remove(Client);
+            _source.SaveClients();
+            return Client.GetViewModel;
+        }
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/Models/Client.cs

@@ -0,0 +1,75 @@
+using AbstractSoftwareInstallationContracts.BindingModels;
+using AbstractSoftwareInstallationContracts.ViewModels;
+using AbstractSoftwareInstallationDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace AbstractSoftwareInstallationFileImplement.Models
+{
+    internal class Client : IClientModel
+    {
+        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 int Id { get; private set; }
+        public Dictionary<int, int> Clients { get; private set; } = new();
+
+        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("ClientEmail")!.Value,
+                Password = element.Element("ClientEmail")!.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));
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationFileImplement/Models/Order.cs

@@ -14,6 +14,7 @@ namespace AbstractSoftwareInstallationFileImplement.Models
     internal class Order : IOrderModel
     {
         public int PackageId { get; private set; }
+        public int ClientId { get; private set; }
 
         public int Count { get; private set; }
 
@@ -33,6 +34,7 @@ namespace AbstractSoftwareInstallationFileImplement.Models
             return new Order
             {
                 PackageId = model.PackageId,
+                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -49,6 +51,7 @@ namespace AbstractSoftwareInstallationFileImplement.Models
             {
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 PackageId = Convert.ToInt32(element.Element("PackageId")!.Value),
+                ClientId = Convert.ToInt32(element.Element("PackageId")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
                 Count = Convert.ToInt32(element.Element("Count")!.Value),
                 Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
@@ -70,6 +73,7 @@ namespace AbstractSoftwareInstallationFileImplement.Models
         {
             Id = Id,
             PackageId = PackageId,
+            ClientId = ClientId,
             Count = Count,
             Sum = Sum,
             Status = Status,
@@ -80,6 +84,7 @@ namespace AbstractSoftwareInstallationFileImplement.Models
             "Order",
              new XAttribute("Id", Id),
              new XElement("PackageId", PackageId.ToString()),
+             new XElement("ClientId", PackageId.ToString()),
              new XElement("Count", Count.ToString()),
              new XElement("Sum", Sum.ToString()),
              new XElement("Status", Status.ToString()),

SoftwareInstallation/AbstractSoftwareInstallationListImplement/DataListSingleton.cs

@@ -1,4 +1,5 @@
-using AbstractSoftwareInstallationListImplement.Models;
+using AbstractClientInstallationListImplement.Models;
+using AbstractSoftwareInstallationListImplement.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,11 +14,13 @@ namespace AbstractSoftwareInstallationListImplement
         public List<Software> Softwares { get; set; }
         public List<Order> Orders { get; set; }
         public List<Package> Packages { get; set; }
+        public List<Client> Clients { get; set; }
         private DataListSingleton()
         {
             Softwares = new List<Software>();
             Orders = new List<Order>();
             Packages = new List<Package>();
+            Clients = new List<Client>();
         }
         public static DataListSingleton GetInstance()
         {

SoftwareInstallation/AbstractSoftwareInstallationListImplement/Implements/ClientStorage.cs

@@ -0,0 +1,103 @@
+using AbstractClientInstallationListImplement.Models;
+using AbstractSoftwareInstallationContracts.BindingModels;
+using AbstractSoftwareInstallationContracts.SearchModels;
+using AbstractSoftwareInstallationContracts.StoragesContracts;
+using AbstractSoftwareInstallationContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractSoftwareInstallationListImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        private readonly DataListSingleton _source;
+        public ClientStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ClientFIO) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            foreach (var client in _source.Clients)
+            {
+                if ((!string.IsNullOrEmpty(model.ClientFIO) &&
+               client.ClientFIO == model.ClientFIO) ||
+                (model.Id.HasValue && client.Id == model.Id))
+                {
+                    return client.GetViewModel;
+                }
+            }
+            return null;
+        }
+
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            var result = new List<ClientViewModel>();
+            if (string.IsNullOrEmpty(model.ClientFIO))
+            {
+                return result;
+            }
+            foreach (var client in _source.Clients)
+            {
+                if (client.ClientFIO.Contains(model.ClientFIO))
+                {
+                    result.Add(client.GetViewModel);
+                }
+            }
+            return result;
+        }
+
+        public List<ClientViewModel> GetFullList()
+        {
+            var result = new List<ClientViewModel>();
+            foreach (var client in _source.Clients)
+            {
+                result.Add(client.GetViewModel);
+            }
+            return result;
+        }
+
+        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;
+        }
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationListImplement/Models/Client.cs

@@ -0,0 +1,55 @@
+using AbstractSoftwareInstallationContracts.BindingModels;
+using AbstractSoftwareInstallationContracts.ViewModels;
+using AbstractSoftwareInstallationDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractClientInstallationListImplement.Models
+{
+    public class Client : IClientModel
+    {
+        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 int Id { 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
+        };
+
+
+    }
+}

SoftwareInstallation/AbstractSoftwareInstallationListImplement/Models/Order.cs

@@ -8,6 +8,7 @@ namespace AbstractSoftwareInstallationListImplement.Models
     public class Order : IOrderModel
     {
         public int PackageId { get; private set; }
+        public int ClientId { get; private set; }
 
         public int Count { get; private set; }
 
@@ -27,6 +28,7 @@ namespace AbstractSoftwareInstallationListImplement.Models
             return new Order
             {
                 PackageId = model.PackageId,
+                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -49,6 +51,7 @@ namespace AbstractSoftwareInstallationListImplement.Models
         {
             Id = Id,
             PackageId = PackageId,
+            ClientId = ClientId,
             Count = Count,
             Sum = Sum,
             Status = Status,

SoftwareInstallation/SoftwareInstallation/FormCreateOrder.cs

@@ -97,6 +97,7 @@ namespace SoftwareInstallationView
                 var operationResult = _logicO.CreateOrder(new OrderBindingModel
                 {
                     PackageId = Convert.ToInt32(comboBoxPackage.SelectedValue),
+                    //ClientId = Convert.ToInt32(comboBoxPackage.SelectedValue),
                     Count = Convert.ToInt32(textBoxCount.Text),
                     Sum = Convert.ToDouble(textBoxSum.Text)
                 });