Добавление моделей

AutomobilePlant/AbstractAutoContracts/BindingModels/ClientBindingModel.cs

@@ -0,0 +1,18 @@
+using AutomobilePlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutomobilePlantContracts.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;
+
+    }
+}

AutomobilePlant/AbstractAutoContracts/BindingModels/OrderBindingModel.cs

@@ -13,6 +13,8 @@ namespace AutomobilePlantContracts.BindingModels
         public int Id { get; set; }
         public int CarId { get; set; }
         public string CarName { get; set; } = string.Empty;
+        public int ClientId { get; set; }
+        public string ClientName { get; set; } = string.Empty;
         public int Count { get; set; }
         public double Sum { get; set; }
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

AutomobilePlant/AbstractAutoContracts/BusinessLogicsContracts/IClientLogic.cs

@@ -0,0 +1,21 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.SearchModel;
+using AutomobilePlantContracts.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutomobilePlantContracts.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);
+
+    }
+}

AutomobilePlant/AbstractAutoContracts/SearchModel/ClientSearchModel.cs

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

AutomobilePlant/AbstractAutoContracts/SearchModel/OrderSearchModel.cs

@@ -9,6 +9,7 @@ namespace AutomobilePlantContracts.SearchModel
     public class OrderSearchModel
     {
         public int? Id { get; set; }
+        public int? ClientId { get; set; }
         public DateTime? DateFrom { get; set; }
 
         public DateTime? DateTo { get; set; }

AutomobilePlant/AbstractAutoContracts/StoragesContracts/IClientStorage.cs

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

AutomobilePlant/AbstractAutoContracts/ViewModel/ClientViewModel.cs

@@ -0,0 +1,21 @@
+using AutomobilePlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutomobilePlantContracts.ViewModel
+{
+    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;
+    }
+}

AutomobilePlant/AbstractAutoContracts/ViewModel/OrderViewModel.cs

@@ -16,6 +16,9 @@ namespace AutomobilePlantContracts.ViewModel
         public int CarId { get; set; }
         [DisplayName("Изделие")]
         public string CarName { get; set; } = string.Empty;
+        public int ClientId { get; set; }
+        [DisplayName("Клиент")]
+        public string ClientName { get; set; } = string.Empty;
         [DisplayName("Количество")]
         public int Count { get; set; }
         [DisplayName("Сумма")]

AutomobilePlant/AbstractAutoDataModels/Models/IClientModel.cs

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

AutomobilePlant/AbstractAutoDataModels/Models/IOrderModel.cs

@@ -11,6 +11,8 @@ namespace AutomobilePlantDataModels.Models
     {
         int CarId { get; }
         string CarName { get; }
+        int ClientId { get; }
+        string ClientName { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

AutomobilePlant/AbstractAutoListImplement/DataListSingleton.cs

@@ -13,11 +13,13 @@ namespace AutomobilePlantListImplement
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Car> Cars { get; set; }
+        public List<Client> Clients { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Cars = new List<Car>();
+            Clients = new List<Client>();
         }
         public static DataListSingleton GetInstance()
         {

AutomobilePlant/AbstractAutoListImplement/Implements/ClientStorage.cs

@@ -0,0 +1,126 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.SearchModel;
+using AutomobilePlantContracts.StoragesContracts;
+using AutomobilePlantContracts.ViewModel;
+using AutomobilePlantListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutomobilePlantListImplement.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.ClientFIO)&& string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password))
+            {
+                return result;
+            }
+
+            foreach (var client in _source.Clients)
+            {
+                if (client.ClientFIO.Contains(model.ClientFIO)|| client.Email.Contains(model.Email)|| client.Password.Contains(model.Password))
+                {
+                    result.Add(client.GetViewModel);
+                }
+            }
+
+            return result;
+        }
+
+        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 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;
+        }
+    }
+}

AutomobilePlant/AbstractAutoListImplement/Implements/OrderStorage.cs

@@ -42,7 +42,11 @@ namespace AutomobilePlantListImplement.Implements
 
             foreach (var order in _source.Orders)
             {
-                if (order.DateCreate > model.DateFrom && order.DateCreate < model.DateTo)
+                if (model.ClientId.HasValue && order.ClientId == model.ClientId)
+                { result.Add(order.GetViewModel);
+                    continue;
+                }
+                if ( order.DateCreate > model.DateFrom && order.DateCreate < model.DateTo)
                 {
                     result.Add(order.GetViewModel);
                 }

AutomobilePlant/AbstractAutoListImplement/Models/Client.cs

@@ -0,0 +1,50 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.ViewModel;
+using AutomobilePlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutomobilePlantListImplement.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 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
+        };
+    }
+}

AutomobilePlant/AbstractAutoListImplement/Models/Order.cs

@@ -14,6 +14,8 @@ namespace AutomobilePlantListImplement.Models
     {
         public int Id { get; private set; }
         public int CarId { get; private set; }
+        public int ClientId { get; private set; }
+        public string ClientName { get; private set; } = string.Empty;
         public string CarName { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
@@ -31,6 +33,7 @@ namespace AutomobilePlantListImplement.Models
             {
                 Id = model.Id,
                 CarId = model.CarId,
+                ClientId = model.ClientId,
                 CarName = model.CarName,
                 Count = model.Count,
                 Sum = model.Sum,
@@ -54,6 +57,7 @@ namespace AutomobilePlantListImplement.Models
         {
             Id = Id,
             CarId = CarId,
+            ClientId=ClientId,
             CarName = CarName,
             Count = Count,
             Sum = Sum,

AutomobilePlant/AutomobilePlantDataBaseImplements/AutoPlantDataBase.cs

@@ -27,5 +27,6 @@ namespace AutomobilePlantDataBaseImplements
         public virtual DbSet<CarComponent> CarComponents { set; get; }
 
         public virtual DbSet<Order> Orders { set; get; }
+        public virtual DbSet<Client> Clients { set; get; }
     }
 }

AutomobilePlant/AutomobilePlantDataBaseImplements/Implements/ClientStorage.cs

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

AutomobilePlant/AutomobilePlantDataBaseImplements/Implements/OrderStorage.cs

@@ -29,8 +29,24 @@ namespace AutomobilePlantDataBaseImplements.Implements
                 return new();
             }
             using var context = new AutoPlantDataBase();
+            if (model.DateTo != null && model.DateFrom != null && model.ClientId.HasValue)
+            {
+                return context.Orders
+                    .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo && x.ClientId==model.ClientId)
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+            else if (model.DateTo != null && model.DateFrom != null)
+            {
+                return context.Orders
+                    .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+                    .ToList()
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
             return context.Orders
-                    .Where(x =>  x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+                    .Where(x => x.ClientId == model.ClientId)
                     .ToList()
                     .Select(x => x.GetViewModel)
                     .ToList();

AutomobilePlant/AutomobilePlantDataBaseImplements/Migrations/20230419155808_addClient.Designer.cs

@@ -0,0 +1,222 @@
+// <auto-generated />
+using System;
+using AutomobilePlantDataBaseImplements;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace AutomobilePlantDataBaseImplements.Migrations
+{
+    [DbContext(typeof(AutoPlantDataBase))]
+    [Migration("20230419155808_addClient")]
+    partial class addClient
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.Car", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("CarName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Cars");
+                });
+
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.CarComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CarId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CarId");
+
+                    b.HasIndex("ComponentId");
+
+                    b.ToTable("CarComponents");
+                });
+
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.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("AutomobilePlantDataBaseImplements.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CarId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CarName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ClientName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CarId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.CarComponent", b =>
+                {
+                    b.HasOne("AutomobilePlantDataBaseImplements.Models.Car", "Car")
+                        .WithMany("Components")
+                        .HasForeignKey("CarId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("AutomobilePlantDataBaseImplements.Models.Component", "Component")
+                        .WithMany("CarComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Car");
+
+                    b.Navigation("Component");
+                });
+
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.Order", b =>
+                {
+                    b.HasOne("AutomobilePlantDataBaseImplements.Models.Car", "car")
+                        .WithMany("Orders")
+                        .HasForeignKey("CarId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("AutomobilePlantDataBaseImplements.Models.Client", "client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("car");
+
+                    b.Navigation("client");
+                });
+
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.Car", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.Component", b =>
+                {
+                    b.Navigation("CarComponents");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

AutomobilePlant/AutomobilePlantDataBaseImplements/Migrations/20230419155808_addClient.cs

@@ -0,0 +1,80 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace AutomobilePlantDataBaseImplements.Migrations
+{
+    /// <inheritdoc />
+    public partial class addClient : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ClientId",
+                table: "Orders",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ClientName",
+                table: "Orders",
+                type: "text",
+                nullable: false,
+                defaultValue: "");
+
+            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.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");
+
+            migrationBuilder.DropColumn(
+                name: "ClientName",
+                table: "Orders");
+        }
+    }
+}

AutomobilePlant/AutomobilePlantDataBaseImplements/Migrations/AutoPlantDataBaseModelSnapshot.cs

@@ -68,6 +68,31 @@ namespace AutomobilePlantDataBaseImplements.Migrations
                     b.ToTable("CarComponents");
                 });
 
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.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("AutomobilePlantDataBaseImplements.Models.Component", b =>
                 {
                     b.Property<int>("Id")
@@ -103,6 +128,13 @@ namespace AutomobilePlantDataBaseImplements.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ClientName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
                     b.Property<int>("Count")
                         .HasColumnType("integer");
 
@@ -122,6 +154,8 @@ namespace AutomobilePlantDataBaseImplements.Migrations
 
                     b.HasIndex("CarId");
 
+                    b.HasIndex("ClientId");
+
                     b.ToTable("Orders");
                 });
 
@@ -152,7 +186,15 @@ namespace AutomobilePlantDataBaseImplements.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("AutomobilePlantDataBaseImplements.Models.Client", "client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.Navigation("car");
+
+                    b.Navigation("client");
                 });
 
             modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.Car", b =>
@@ -162,6 +204,11 @@ namespace AutomobilePlantDataBaseImplements.Migrations
                     b.Navigation("Orders");
                 });
 
+            modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
             modelBuilder.Entity("AutomobilePlantDataBaseImplements.Models.Component", b =>
                 {
                     b.Navigation("CarComponents");

AutomobilePlant/AutomobilePlantDataBaseImplements/Models/Client.cs

@@ -0,0 +1,61 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.SearchModel;
+using AutomobilePlantContracts.StoragesContracts;
+using AutomobilePlantContracts.ViewModel;
+using AutomobilePlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutomobilePlantDataBaseImplements.Models
+{
+    public class Client : IClientModel
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string ClientFIO { get; set; } = string.Empty;
+
+        [Required]
+        public string Email { get; set; } = string.Empty;
+
+        [Required]
+        public string Password { get; set; } = string.Empty;
+
+
+        [ForeignKey("ClientId")]
+        public virtual List<Order> Orders { get; set; } = new();
+
+        public static Client Create( ClientBindingModel model)
+        {
+            return new Client()
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password=model.Password
+            };
+        }
+
+        public void Update(ClientBindingModel model)
+        {
+            ClientFIO = model.ClientFIO;
+            Email = model.Email;
+            Password = model.Password;
+        }
+
+        public ClientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ClientFIO = ClientFIO,
+            Email = Email,
+            Password = Password
+        };
+
+        
+    }
+}

AutomobilePlant/AutomobilePlantDataBaseImplements/Models/Order.cs

@@ -17,7 +17,11 @@ namespace AutomobilePlantDataBaseImplements.Models
         public int Id { get; private set; }
         [Required]
         public int CarId { get; private set; }
-        public string CarName { get; private set; }
+        [Required]
+        public int ClientId { get; private set; }
+        public string ClientName { get; private set; } = string.Empty;
+        public string CarName { get; private set; } = string.Empty;
+        public Client client { get; private set; }
         public Car car { get; private set; }
         [Required]
         public int Count { get; private set; }
@@ -39,7 +43,9 @@ namespace AutomobilePlantDataBaseImplements.Models
             {
                 Id = model.Id,
                 CarId = model.CarId,
+                ClientId = model.ClientId,
                 CarName = model.CarName,
+                ClientName = model.ClientName,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -62,7 +68,9 @@ namespace AutomobilePlantDataBaseImplements.Models
         {
             Id = Id,
             CarId = CarId,
+            ClientId = ClientId,
             CarName = CarName,
+            ClientName = ClientName,
             Count = Count,
             Sum = Sum,
             Status = Status,

AutomobilePlant/AutomomilePlantFileImplement/DataFileSingleton.cs

@@ -14,9 +14,11 @@ namespace AutomomilePlantFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string CarFileName = "Car.xml";
+        private readonly string ClientFileName = "Client.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Car> Cars { get; private set; }
+        public List<Client> Clients { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -29,6 +31,8 @@ namespace AutomomilePlantFileImplement
        "Components", x => x.GetXElement);
         public void SaveCars() => SaveData(Cars, CarFileName,
        "Cars", x => x.GetXElement);
+        public void SaveClients() => SaveData(Clients, ClientFileName,
+       "Clients", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x
        => x.GetXElement);
         private DataFileSingleton()
@@ -38,6 +42,9 @@ namespace AutomomilePlantFileImplement
             Cars = LoadData(CarFileName, "Car", x =>
            Car.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
+            Clients = LoadData(ClientFileName, "Clients", x =>
+           Client.Create(x)!)!;
+            Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName,
        Func<XElement, T> selectFunction)

AutomobilePlant/AutomomilePlantFileImplement/Implements/ClientStorage.cs

@@ -0,0 +1,90 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.SearchModel;
+using AutomobilePlantContracts.StoragesContracts;
+using AutomobilePlantContracts.ViewModel;
+using AutomomilePlantFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutomomilePlantFileImplement.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.ClientFIO)&& string.IsNullOrEmpty(model.Email)&& string.IsNullOrEmpty(model.Password))
+            {
+                return new();
+            }
+            return source.Clients
+            .Where(x => x.ClientFIO.Contains(model.ClientFIO)|| x.Email.Contains(model.Email)|| x.Password.Contains(model.Password))
+           .Select(x => x.GetViewModel)
+           .ToList();
+        }
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ClientFIO) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Clients
+            .FirstOrDefault(x =>
+           (!string.IsNullOrEmpty(model.ClientFIO) && x.ClientFIO ==
+           model.ClientFIO) ||
+            (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;
+        }
+    }
+}

AutomobilePlant/AutomomilePlantFileImplement/Implements/OrderStorage.cs

@@ -49,8 +49,15 @@ namespace AutomomilePlantFileImplement.Implements
             {
                 return new();
             }
+            if(model.ClientId.HasValue)
+            {
+                return source.Orders
+            .Where(x => x.ClientId==model.ClientId)
+           .Select(x => x.GetViewModel)
+           .ToList();
+            }
             return source.Orders
-            .Where(x => x.DateCreate > model.DateFrom && x.DateCreate < model.DateTo)
+            .Where(x =>  x.DateCreate > model.DateFrom && x.DateCreate < model.DateTo)
            .Select(x => x.GetViewModel)
            .ToList();
         }

AutomobilePlant/AutomomilePlantFileImplement/Models/Client.cs

@@ -0,0 +1,72 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.ViewModel;
+using AutomobilePlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace AutomomilePlantFileImplement.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)
+            );
+    }
+}

AutomobilePlant/AutomomilePlantFileImplement/Models/Order.cs

@@ -14,7 +14,8 @@ namespace AutomomilePlantFileImplement.Models
     public class Order : IOrderModel
     {
         public int CarId { get; private set; }
-
+        public int ClientId { get; private set; }
+        public string ClientName { get; private set; } = string.Empty;
         public string CarName  { get; private set; } = string.Empty;
 
         public int Count { get; private set; }
@@ -23,7 +24,7 @@ namespace AutomomilePlantFileImplement.Models
 
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
 
-        public DateTime DateCreate { get; private set; } = DateTime.Now;
+        public DateTime DateCreate { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
 
         public DateTime? DateImplement { get; private set; } = null;