+ классы и интерфейсы для сущности «Клиент» (много)

Confectionery/ConfectioneryContracts/BindingModels/ClientBindingModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryContracts.BindingModels
+{
+    public class ClientBindingModel
+    {
+        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;
+    }
+}

Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IClientLogic.cs

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

Confectionery/ConfectioneryContracts/SearchModels/ClientSearchModel.cs

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

Confectionery/ConfectioneryContracts/StoragesContracts/IClientStorage.cs

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

Confectionery/ConfectioneryContracts/ViewModels/ClientViewModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryContracts.ViewModels
+{
+    public class ClientViewModel
+    {
+        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;
+    }
+}

Confectionery/ConfectioneryDatabaseImplement/Client.cs

@@ -0,0 +1,73 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryDatabaseImplement.Models
+{
+    internal class Client : IClientModel
+    {
+        public int Id { get; private 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)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Client()
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password = model.Password
+            };
+        }
+
+        public static Client Create(ClientViewModel model)
+        {
+            return new Client
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password = model.Password
+            };
+        }
+
+        public void Update(ClientBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ClientFIO = model.ClientFIO;
+            Email = model.Email;
+            Password = model.Password;
+        }
+
+        public ClientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ClientFIO = ClientFIO,
+            Email = Email,
+            Password = Password
+        };
+    }
+}

Confectionery/ConfectioneryDatabaseImplement/ClientStorage.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDatabaseImplement.Models;
+
+namespace ConfectioneryDatabaseImplement
+{
+    public class ClientStorage : IClientStorage
+    {
+        public List<ClientViewModel> GetFullList()
+        {
+            using var context = new ConfectioneryDatabase();
+            return context.Clients.Select(x => x.GetViewModel).ToList();
+        }
+
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ClientFIO))
+            {
+                return new();
+            }
+            using var context = new ConfectioneryDatabase();
+            return context.Clients.Where(x => x.ClientFIO.Contains(model.ClientFIO)).Select(x => x.GetViewModel).ToList();
+        }
+
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            using var context = new ConfectioneryDatabase();
+            return context.Clients.FirstOrDefault(x =>
+            (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) ||
+            (model.Id.HasValue && x.Id == model.Id))
+                ?.GetViewModel;
+        }
+
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            var newComponent = Client.Create(model);
+            if (newComponent == null)
+            {
+                return null;
+            }
+            using var context = new ConfectioneryDatabase();
+            context.Clients.Add(newComponent);
+            context.SaveChanges();
+            return newComponent.GetViewModel;
+        }
+
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            using var context = new ConfectioneryDatabase();
+            var component = context.Clients.FirstOrDefault(x => x.Id == model.Id);
+            if (component == null)
+            {
+                return null;
+            }
+            component.Update(model);
+            context.SaveChanges();
+            return component.GetViewModel;
+        }
+
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            using var context = new ConfectioneryDatabase();
+            var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Clients.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs

@@ -23,5 +23,6 @@ namespace ConfectioneryDatabaseImplement
         public virtual DbSet<Pastry> Pastrys { set; get; }
         public virtual DbSet<PastryComponent> PastryComponents { set; get; }
         public virtual DbSet<Order> Orders { set; get; }
+        public virtual DbSet<Client> Clients { set; get; }
     }
 }

Confectionery/ConfectioneryFileImplement/Client.cs

@@ -0,0 +1,76 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement
+{
+    public class Client : IClientModel
+    {
+        public int Id { get; set; }
+        public string ClientFIO { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
+
+        public static Client? Create(ClientBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Client()
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Password = model.Password,
+                Email = model.Email
+            };
+        }
+
+        public static Client? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Client()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ClientFIO = element.Attribute("ClientFIO")!.Value,
+                Password = element.Attribute("Password")!.Value,
+                Email = element.Attribute("Email")!.Value
+            };
+        }
+
+        public void Update(ClientBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ClientFIO = model.ClientFIO;
+            Password = model.Password;
+            Email = model.Email;
+        }
+
+        public ClientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ClientFIO = ClientFIO,
+            Password = Password,
+            Email = Email
+        };
+
+        public XElement GetXElement => new("Client",
+            new XAttribute("Id", Id),
+            new XElement("ClientFIO", ClientFIO),
+            new XElement("Password", Password),
+            new XElement("Email", Email));
+    }
+}
+

Confectionery/ConfectioneryFileImplement/ClientStorage.cs

@@ -0,0 +1,86 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryFileImplement.Models;
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryFileImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        private readonly DataFileSingleton source;
+
+        public ClientStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+
+        public List<ClientViewModel> GetFullList()
+        {
+            return source.Clients.Select(x => x.GetViewModel).ToList();
+        }
+
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email))
+            {
+                return new();
+            }
+            return source.Clients.Where(x => x.Email.Contains(model.Email)).Select(x => x.GetViewModel).ToList();
+        }
+
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            return source.Clients
+                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email) ||
+                (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+        }
+
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            model.Id = source.Clients.Count > 0 ? source.Clients.Max(x => x.Id) + 1 : 1;
+            var newClient = Client.Create(model);
+            if (newClient == null)
+            {
+                return null;
+            }
+            source.Clients.Add(newClient);
+            source.SaveClients();
+            return newClient.GetViewModel;
+        }
+
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            var ingredient = source.Clients.FirstOrDefault(x => x.Id == model.Id);
+            if (ingredient == null)
+            {
+                return null;
+            }
+            ingredient.Update(model);
+            source.SaveClients();
+            return ingredient.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;
+        }
+    }
+}

Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs

@@ -14,9 +14,11 @@ namespace ConfectioneryFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string PastryFileName = "Pastry.xml";
+        private readonly string ClientFileName = "Client.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Pastry> Pastrys { get; private set; }
+        public List<Client> Clients { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -31,11 +33,14 @@ namespace ConfectioneryFileImplement
        "Pastrys", 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()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
             Pastrys = LoadData(PastryFileName, "Pastry", x => Pastry.Create(x)!)!; 
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
+            Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

Confectionery/ConfectioneryListImplement/Client.cs

@@ -0,0 +1,53 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryListImplement.Models
+{
+    public class Client : IClientModel
+    {
+        public int Id { get; private set; }
+        public string ClientFIO { get; private set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
+        public string Password { get; 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,
+        };
+    }
+}

Confectionery/ConfectioneryListImplement/ClientStorage.cs

@@ -0,0 +1,111 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryListImplement.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))
+            {
+                return result;
+            }
+            foreach (var client in _source.Clients)
+            {
+                if (client.ClientFIO.Contains(model.ClientFIO))
+                {
+                    result.Add(client.GetViewModel);
+                }
+            }
+            return result;
+        }
+
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            foreach (var client in _source.Clients)
+            {
+                if (model.Id.HasValue && model.Id == client.Id)
+                    return client.GetViewModel;
+                if (!string.IsNullOrEmpty(model.Email) && !string.IsNullOrEmpty(model.Password) &&
+                    client.Email.Equals(model.Email) && client.Password.Equals(model.Password))
+                    return client.GetViewModel;
+                if (!string.IsNullOrEmpty(model.Email) && client.Email.Equals(model.Email))
+                    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;
+        }
+    }
+}

Confectionery/ConfectioneryListImplement/DataListSingleton.cs

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