любимые фиксы

SoftwareInstallation/SoftWareInstallationDatabaseImplement/Shop.cs

@@ -1,118 +0,0 @@
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationDatabaseImplement;
-using SoftwareInstallationDataModels;
-using SoftwareInstallationDataModels.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging.Abstractions;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Xml.Linq;
-
-namespace SoftwareInstallationDatabaseImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        [Required]
-        public string Name { get; private set; } = string.Empty;
-
-        [Required]
-        public string Address { get; private set; } = string.Empty;
-
-        [Required]
-        public int MaxCountPackages { get; private set; }
-
-        public DateTime DateOpening { get; private set; }
-
-        private Dictionary<int, (IPackageModel, int)>? _cachedPackages = null;
-        [NotMapped]
-        public  Dictionary<int, (IPackageModel, int)> Packages
-        {
-            get
-            {
-                if (_cachedPackages == null)
-                {
-                    using var context = new SoftwareInstallationDatabase();
-                    _cachedPackages = ShopPackages
-                        .ToDictionary(x => x.PackageId, x => (context.Packages
-                        .FirstOrDefault(y => y.Id == x.PackageId)! as IPackageModel, x.Count));
-                }
-                return _cachedPackages;
-            }
-        }
-
-        public int Id { get; private set; }
-
-        [ForeignKey("ShopId")]
-        public virtual List<ShopPackage> ShopPackages { get; set; } = new();
-
-        public static Shop? Create(SoftwareInstallationDatabase context, ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                Name = model.Name,
-                Address = model.Address,
-                DateOpening = model.DateOpening,
-                MaxCountPackages = model.MaxCountPackages,
-                ShopPackages = model.Packages.Select(x => new ShopPackage
-                {
-                    Package = context.Packages.FirstOrDefault(y => y.Id == x.Key)!,
-                    Count = x.Value.Item2,
-                }).ToList()
-            };
-        }
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Name = model.Name;
-            Address = model.Address;
-            DateOpening = model.DateOpening;
-        }
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            Name = Name,
-            Address = Address,
-            Packages = Packages,
-            DateOpening = DateOpening,
-            MaxCountPackages = MaxCountPackages,
-        };
-
-        public void UpdatePackages(SoftwareInstallationDatabase context, ShopBindingModel model)
-        {
-            var shopPackages = context.ShopPackages
-                .Where(rec => rec.ShopId == model.Id)
-                .ToList();
-            // удалили те, которых нет в модели
-            if (shopPackages != null && shopPackages.Count > 0)
-            {
-                context.ShopPackages
-                    .RemoveRange(shopPackages
-                    .Where(rec => !model.Packages
-                                        .ContainsKey(rec.PackageId)));
-                // обновили количество у существующих записей
-                foreach (var updatePackage in shopPackages.Where(x => model.Packages.ContainsKey(x.PackageId)))
-                {
-                    updatePackage.Count = model.Packages[updatePackage.PackageId].Item2;
-                    model.Packages.Remove(updatePackage.PackageId);
-                }
-            }
-            var shop = context.Shops.First(x => x.Id == model.Id);
-            shop.ShopPackages.AddRange(model.Packages.Select(x => new ShopPackage
-            {
-                Package = context.Packages.First(y => y.Id == x.Key),
-                Count = x.Value.Item2,
-            }).Except(shopPackages ?? new()));
-            context.SaveChanges();
-            _cachedPackages = null;
-        }
-    }
-}

SoftwareInstallation/SoftWareInstallationDatabaseImplement/ShopPackage.cs

@@ -1,24 +0,0 @@
-using SoftwareInstallationDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationDatabaseImplement.Models
-{
-    public class ShopPackage
-    {
-        public int Id { get; set; }
-        [Required]
-        public int PackageId { get; set; }
-        [Required]
-        public int ShopId { get; set; }
-        [Required]
-        public int Count { get; set; }
-
-        public virtual Shop Shop { get; set; } = new();
-        public virtual Package Package { get; set; } = new();
-    }
-}

SoftwareInstallation/SoftWareInstallationDatabaseImplement/ShopStorage.cs

@@ -1,143 +0,0 @@
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.SearchModels;
-using SoftwareInstallationContracts.StoragesContracts;
-using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationDatabaseImplement.Models;
-using SoftwareInstallationDataModels;
-using SoftwareInstallationDataModels.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace SoftwareInstallationDatabaseImplement
-{
-    public class ShopStorage : IShopStorage
-    {
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            using var context = new SoftwareInstallationDatabase();
-            var element = context.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (element != null)
-            {
-                context.Shops.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new SoftwareInstallationDatabase();
-            return context.Shops
-                .Include(x => x.ShopPackages)
-                .ThenInclude(x => x.Package)
-                .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
-                ?.GetViewModel;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                return new();
-            }
-            using var context = new SoftwareInstallationDatabase();
-            return context.Shops
-                .Include(x => x.ShopPackages)
-                .ThenInclude(x => x.Package)
-                .Select(x => x.GetViewModel)
-                .Where(x => x.Name.Contains(model.Name ?? string.Empty))
-                .ToList();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            using var context = new SoftwareInstallationDatabase();
-            return context.Shops
-                .Include(x => x.ShopPackages)
-                .ThenInclude(x => x.Package)
-                .Select(shop => shop.GetViewModel)
-                .ToList();
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            using var context = new SoftwareInstallationDatabase();
-            using var transaction = context.Database.BeginTransaction();
-            try
-            {
-                var newShop = Shop.Create(context, model);
-                if (newShop == null)
-                {
-                    return null;
-                }
-                if (context.Shops.Any(x => x.Name == newShop.Name))
-                {
-                    throw new Exception("Не должно быть два магазина с одним названием");
-                }
-                context.Shops.Add(newShop);
-                context.SaveChanges();
-                transaction.Commit();
-                return newShop.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            using var context = new SoftwareInstallationDatabase();
-            var shop = context.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop == null)
-            {
-                return null;
-            }
-            shop.Update(model);
-            shop.UpdatePackages(context, model);
-            context.SaveChanges();
-            return shop.GetViewModel;
-        }
-
-        public bool HasNeedPackages(IPackageModel package, int needCount)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool SellPackages(IPackageModel package, int needCount)
-        {
-            using var context = new SoftwareInstallationDatabase();
-            using var transaction = context.Database.BeginTransaction();
-            foreach (var sp in context.ShopPackages.Where(x => x.PackageId == package.Id))
-            {
-                var res = Math.Min(needCount, sp.Count);
-                sp.Count -= res;
-                needCount -= res;
-                if (sp.Count == 0) // Изделия больше нет в магазине, значит удаляем его
-                {
-                    context.ShopPackages.Remove(sp);
-                }
-                if (needCount == 0) // Нельзя коммитить изменения в цикле, что использует контекст, поэтому выходим
-                {
-                    break;
-                }
-            }
-            if (needCount == 0)
-            {
-                context.SaveChanges();
-                transaction.Commit();
-            }
-            else
-            {
-                transaction.Rollback();
-            }
-            return needCount == 0;
-        }
-    }
-}

SoftwareInstallation/SoftWareInstallationFileImplement/Client.cs

@@ -0,0 +1,74 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.ViewModels;
+using SoftwareInstallationDataModels.Models;
+using System.Xml.Linq;
+
+namespace SoftwareInstallationFileImplement
+{
+    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()
+            {
+                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()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ClientFIO = element.Element("FIO")!.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("FIO", ClientFIO),
+            new XElement("Email", Email),
+            new XElement("Password", Password)
+            );
+    }
+}

SoftwareInstallation/SoftWareInstallationFileImplement/ClientStorage.cs

@@ -0,0 +1,90 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.SearchModels;
+using SoftwareInstallationContracts.StoragesContracts;
+using SoftwareInstallationContracts.ViewModels;
+
+namespace SoftwareInstallationFileImplement
+{
+    public class ClientStorage : IClientStorage
+    {
+        private readonly DataFileSingleton _source;
+        public ClientStorage()
+        {
+            _source = DataFileSingleton.GetInstance();
+        }
+
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            var res = _source.Clients.FirstOrDefault(x => x.Id == model.Id);
+            if (res != null) 
+            {
+                _source.Clients.Remove(res);
+                _source.SaveClients();
+            }
+            return res?.GetViewModel;
+        }
+
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (model.Id.HasValue)
+                return _source.Clients.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+            if (model.Email != null && model.Password != null)
+                return _source.Clients
+                    .FirstOrDefault(x => x.Email.Equals(model.Email)
+                                      && x.Password.Equals(model.Password))
+                    ?.GetViewModel;
+            if (model.Email != null)
+                return _source.Clients.FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel;
+            return null;
+        }
+
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            if (model == null)
+            {
+                return new();
+            }
+            if (model.Id.HasValue)
+            {
+                var res = GetElement(model);
+                return res != null ? new() { res } : new();
+            }
+            if (model.Email != null)
+            {
+                return _source.Clients
+                    .Where(x => x.Email.Contains(model.Email))
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+            return new();
+        }
+
+        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 res = Client.Create(model);
+            if (res != null)
+            {
+                _source.Clients.Add(res);
+                _source.SaveClients();
+            }
+            return res?.GetViewModel;
+        }
+
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            var res = _source.Clients.FirstOrDefault(x => x.Id == model.Id);
+            if (res != null)
+            {
+                res.Update(model);
+                _source.SaveClients();
+            }
+            return res?.GetViewModel;
+        }
+    }
+}

SoftwareInstallation/SoftWareInstallationFileImplement/Component.cs

@@ -3,7 +3,6 @@ using SoftwareInstallationContracts.ViewModels;
 using SoftwareInstallationDataModels.Models;
 using System.Xml.Linq;
 
-
 namespace SoftwareInstallationFileImplement.Models
 {
     public class Component : IComponentModel
@@ -11,7 +10,7 @@ namespace SoftwareInstallationFileImplement.Models
         public int Id { get; private set; }
         public string ComponentName { get; private set; } = string.Empty;
         public double Cost { get; set; }
-        public static Component? Create(ComponentBindingModel model)
+        public static Component? Create(ComponentBindingModel? model)
         {
             if (model == null)
             {
@@ -37,7 +36,7 @@ namespace SoftwareInstallationFileImplement.Models
                 Cost = Convert.ToDouble(element.Element("Cost")!.Value)
             };
         }
-        public void Update(ComponentBindingModel model)
+        public void Update(ComponentBindingModel? model)
         {
             if (model == null)
             {

SoftwareInstallation/SoftWareInstallationFileImplement/ComponentStorage.cs

@@ -8,16 +8,14 @@ namespace SoftwareInstallationFileImplement.Implements
 {
     public class ComponentStorage : IComponentStorage
     {
-        private readonly DataFileSingleton _source;
+        private readonly DataFileSingleton source;
         public ComponentStorage()
         {
-            _source = DataFileSingleton.GetInstance();
+            source = DataFileSingleton.GetInstance();
         }
         public List<ComponentViewModel> GetFullList()
         {
-            return _source.Components
-                .Select(x => x.GetViewModel)
-                .ToList();
+            return source.Components.Select(x => x.GetViewModel).ToList();
         }
         public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
         {
@@ -25,10 +23,7 @@ namespace SoftwareInstallationFileImplement.Implements
             {
                 return new();
             }
-            return _source.Components
-                .Where(x => x.ComponentName.Contains(model.ComponentName))
-                .Select(x => x.GetViewModel)
-                .ToList();
+            return source.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
         }
         public ComponentViewModel? GetElement(ComponentSearchModel model)
         {
@@ -36,41 +31,42 @@ namespace SoftwareInstallationFileImplement.Implements
             {
                 return null;
             }
-            return _source.Components.FirstOrDefault(x => 
-                    (!string.IsNullOrEmpty(model.ComponentName) && 
-                    x.ComponentName == model.ComponentName) ||
-                    (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+            return source.Components.FirstOrDefault(x =>
+            (!string.IsNullOrEmpty(model.ComponentName) && 
+            x.ComponentName == model.ComponentName) || 
+            (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
         }
         public ComponentViewModel? Insert(ComponentBindingModel model)
         {
-            model.Id = _source.Components.Count > 0 ? _source.Components.Max(x => x.Id) + 1 : 1;
+            model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1;
             var newComponent = Component.Create(model);
             if (newComponent == null)
             {
                 return null;
             }
-            _source.Components.Add(newComponent);
-            _source.SaveComponents();
+            source.Components.Add(newComponent);
+            source.SaveComponents();
             return newComponent.GetViewModel;
         }
         public ComponentViewModel? Update(ComponentBindingModel model)
         {
-            var component = _source.Components.FirstOrDefault(x => x.Id == model.Id);
+            var component = source.Components.FirstOrDefault(x => x.Id == model.Id);
             if (component == null)
             {
                 return null;
             }
             component.Update(model);
-            _source.SaveComponents();
+            source.SaveComponents();
             return component.GetViewModel;
+
         }
         public ComponentViewModel? Delete(ComponentBindingModel model)
         {
-            var element = _source.Components.FirstOrDefault(x => x.Id == model.Id);
+            var element = source.Components.FirstOrDefault(x => x.Id == model.Id);
             if (element != null)
             {
-                _source.Components.Remove(element);
-                _source.SaveComponents();
+                source.Components.Remove(element);
+                source.SaveComponents();
                 return element.GetViewModel;
             }
             return null;

SoftwareInstallation/SoftWareInstallationFileImplement/DataFileSingleton.cs

@@ -9,11 +9,15 @@ namespace SoftwareInstallationFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string PackageFileName = "Package.xml";
-        private readonly string ShopFileName = "Shop.xml";
-        public List<Component> Components { get; private set; }
+        private readonly string ClientFileName = "Client.xml";
+        private readonly string MessageInfoFileName = "MessageInfo.xml";
+        private readonly string ImplementerFileName = "Implementer.xml";
+		public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Package> Packages { get; private set; }
-        public List<Shop> Shops { get; private set; }
+        public List<Client> Clients { get; private set; }
+		public List<Implementer> Implementers { get; private set; }
+        public List<MessageInfo> Messages { get; private set; }
 
         public static DataFileSingleton GetInstance()
         {
@@ -23,23 +27,27 @@ namespace SoftwareInstallationFileImplement
             }
             return instance;
         }
-        public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
+        public void SaveComponents() => SaveData(Components, ComponentFileName,"Components", 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 SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
+        public void SaveClients() => SaveData(Clients, OrderFileName, "Clients", x => x.GetXElement);
+		public void SaveImplementers() => SaveData(Orders, ImplementerFileName, "Implementers", x => x.GetXElement);
+        public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement);
 
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
             Packages = LoadData(PackageFileName, "Package", x => Package.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
+            Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
+			Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
+            Messages = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {
             if (File.Exists(filename))
             {
-                return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
+               return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
             }
             return new List<T>();
         }
@@ -51,4 +59,4 @@ namespace SoftwareInstallationFileImplement
             }
         }
     }
-}
+}

SoftwareInstallation/SoftWareInstallationFileImplement/DataListSingleton.cs

@@ -0,0 +1,26 @@
+using SoftwareInstallationFileImplement.Models;
+
+namespace SoftwareInstallationFileImplement
+{
+    public class DataListSingleton
+    {
+        private static DataListSingleton? _instance;
+        public List<Component> Components { get; set; }
+        public List<Order> Orders { get; set; }
+        public List<Package> Packages { get; set; }
+        private DataListSingleton()
+        {
+            Components = new List<Component>();
+            Orders = new List<Order>();
+            Packages = new List<Package>();
+        }
+        public static DataListSingleton GetInstance()
+        {
+            if (_instance == null)
+            {
+                _instance = new DataListSingleton();
+            }
+            return _instance;
+        }
+    }
+}

SoftwareInstallation/SoftWareInstallationFileImplement/Implementer.cs

@@ -0,0 +1,82 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.ViewModels;
+using SoftwareInstallationDataModels.Models;
+using System.Xml.Linq;
+
+namespace SoftwareInstallationFileImplement
+{
+	public class Implementer : IImplementerModel
+	{
+		public int Id { get; private set; }
+
+		public string ImplementerFIO { get; private set; } = string.Empty;
+
+		public string Password { get; private set; } = string.Empty;
+
+		public int WorkExperience { get; private set; }
+
+		public int Qualification { get; private set; }
+
+		public static Implementer? Create(XElement element)
+		{
+			if (element == null)
+			{
+				return null;
+			}
+			return new()
+			{
+				ImplementerFIO = element.Element("FIO")!.Value,
+				Password       = element.Element("Password")!.Value,
+				Id             = Convert.ToInt32(element.Attribute("Id")!.Value),
+				Qualification  = Convert.ToInt32(element.Element("Qualification")!.Value),
+				WorkExperience = Convert.ToInt32(element.Element("WorkExperience")!.Value),
+			};
+		}
+
+		public static Implementer? Create(ImplementerBindingModel model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new()
+			{ 
+				Id = model.Id,
+				Password = model.Password,
+				Qualification = model.Qualification,
+				ImplementerFIO = model.ImplementerFIO,
+				WorkExperience = model.WorkExperience,
+			};
+		}
+
+
+
+		public void Update(ImplementerBindingModel model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			Password = model.Password;
+			Qualification = model.Qualification;
+			ImplementerFIO = model.ImplementerFIO;
+			WorkExperience = model.WorkExperience;
+		}
+
+		public ImplementerViewModel GetViewModel => new()
+		{ 
+			Id = Id, 
+			Password = Password, 
+			Qualification = Qualification, 
+			ImplementerFIO = ImplementerFIO, 
+		};
+
+		public XElement GetXElement => new("Client",
+			new XAttribute("Id", Id),
+			new XElement("Password", Password),
+			new XElement("FIO", ImplementerFIO),
+			new XElement("Qualification", Qualification),
+			new XElement("WorkExperience", WorkExperience)
+			);
+	}
+}

SoftwareInstallation/SoftWareInstallationFileImplement/ImplementerStorage.cs

@@ -0,0 +1,90 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.SearchModels;
+using SoftwareInstallationContracts.StoragesContracts;
+using SoftwareInstallationContracts.ViewModels;
+
+namespace SoftwareInstallationFileImplement
+{
+	public class ImplementerStorage : IImplementerStorage
+	{
+		private readonly DataFileSingleton _source;
+		public ImplementerStorage()
+		{
+			_source = DataFileSingleton.GetInstance();
+		}
+
+		public ImplementerViewModel? Delete(ImplementerBindingModel model)
+		{
+			var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			if (res != null)
+			{
+				_source.Implementers.Remove(res);
+				_source.SaveImplementers();
+			}
+			return res?.GetViewModel;
+		}
+
+		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+		{
+			if (model.Id.HasValue)
+				return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+			if (model.ImplementerFIO != null && model.Password != null)
+				return _source.Implementers
+					.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)
+									  && x.Password.Equals(model.Password))
+					?.GetViewModel;
+			if (model.ImplementerFIO != null)
+				return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
+			return null;
+		}
+
+		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
+		{
+			if (model == null)
+			{
+				return new();
+			}
+			if (model.Id.HasValue)
+			{
+				var res = GetElement(model);
+				return res != null ? new() { res } : new();
+			}
+			if (model.ImplementerFIO != null) // На случай если фио не будет уникальным (по заданию оно уникально)
+			{
+				return _source.Implementers
+					.Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))
+					.Select(x => x.GetViewModel)
+					.ToList();
+			}
+			return new();
+		}
+
+		public List<ImplementerViewModel> GetFullList()
+		{
+			return _source.Implementers.Select(x => x.GetViewModel).ToList();
+		}
+
+		public ImplementerViewModel? Insert(ImplementerBindingModel model)
+		{
+			model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1;
+			var res = Implementer.Create(model);
+			if (res != null)
+			{
+				_source.Implementers.Add(res);
+				_source.SaveImplementers();
+			}
+			return res?.GetViewModel;	
+		}
+
+		public ImplementerViewModel? Update(ImplementerBindingModel model)
+		{
+			var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			if (res != null)
+			{
+				res.Update(model);
+				_source.SaveImplementers();
+			}
+			return res?.GetViewModel;
+		}
+	}
+}

SoftwareInstallation/SoftWareInstallationFileImplement/MessageInfo.cs

@@ -0,0 +1,82 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.ViewModels;
+using SoftwareInstallationDataModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace SoftwareInstallationFileImplement.Models
+{
+	// Update в этой сущности не нужен, поскольку в логике мы не изменяем никакие поля после создания письма
+	public class MessageInfo : IMessageInfoModel
+	{
+		public string MessageId { get; private set; } = string.Empty;
+
+		public int? ClientId { get; private set; }
+
+		public string SenderName { get; private set; } = string.Empty;
+
+		public DateTime DateDelivery { get; private set; } = DateTime.Now;
+
+		public string Subject { get; private set; } = string.Empty;
+
+		public string Body { get; private set; } = string.Empty;
+
+		public static MessageInfo? Create(MessageInfoBindingModel model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new()
+			{
+				Body = model.Body,
+				Subject = model.Subject,
+				ClientId = model.ClientId,
+				MessageId = model.MessageId,
+				SenderName = model.SenderName,
+				DateDelivery = model.DateDelivery,
+			};
+		}
+
+		public static MessageInfo? Create(XElement element)
+		{
+			if (element == null)
+			{
+				return null;
+			}
+			return new()
+			{
+				Body = element.Attribute("Body")!.Value,
+				Subject = element.Attribute("Subject")!.Value,
+				ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value),
+				MessageId = element.Attribute("MessageId")!.Value,
+				SenderName = element.Attribute("SenderName")!.Value,
+				DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value),
+			};
+		}
+
+		public MessageInfoViewModel GetViewModel => new()
+		{
+			Body = Body,
+			Subject = Subject,
+			ClientId = ClientId,
+			MessageId = MessageId,
+			SenderName = SenderName,
+			DateDelivery = DateDelivery,
+		};
+
+		public XElement GetXElement => new("MessageInfo",
+			new XAttribute("Body", Body),
+			new XAttribute("Subject", Subject),
+			new XAttribute("ClientId", ClientId),
+			new XAttribute("MessageId", MessageId),
+			new XAttribute("SenderName", SenderName),
+			new XAttribute("DateDelivery", DateDelivery)
+			);
+	}
+
+}

SoftwareInstallation/SoftWareInstallationFileImplement/MessageInfoStorage.cs

@@ -0,0 +1,54 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.SearchModels;
+using SoftwareInstallationContracts.StoragesContracts;
+using SoftwareInstallationContracts.ViewModels;
+using SoftwareInstallationFileImplement.Models;
+using System.Reflection;
+
+namespace SoftwareInstallationFileImplement
+{
+	public class MessageInfoStorage : IMessageInfoStorage
+	{
+		private readonly DataFileSingleton _source;
+		public MessageInfoStorage()
+		{
+			_source = DataFileSingleton.GetInstance();
+		}
+
+		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
+		{
+			if (model.MessageId != null)
+			{
+				return _source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
+			}
+			return null;
+		}
+
+		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
+		{
+			return _source.Messages
+				.Where(x => x.ClientId == model.ClientId)
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public List<MessageInfoViewModel> GetFullList()
+		{
+			return _source.Messages
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
+		{
+			var newMessage = MessageInfo.Create(model);
+			if (newMessage == null)
+			{
+				return null;
+			}
+			_source.Messages.Add(newMessage);
+			_source.SaveMessages();
+			return newMessage.GetViewModel;
+		}
+	}
+}

SoftwareInstallation/SoftWareInstallationFileImplement/Order.cs

@@ -1,18 +1,20 @@
 using SoftwareInstallationContracts.BindingModels;
 using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationDataModels.Enums;
 using SoftwareInstallationDataModels.Models;
+using SoftwareInstallationDataModels.Enums;
 using System.Xml.Linq;
 
 namespace SoftwareInstallationFileImplement.Models
 {
     public class Order : IOrderModel
     {
-        public int Id { get; private set; }
-
         public int PackageId { get; private set; }
 
-        public int Count { get; private set; }
+        public int ClientId { get; set; }
+
+		public int? ImplementerId { get; set; }
+
+		public int Count { get; private set; }
 
         public double Sum { get; private set; }
 
@@ -22,6 +24,8 @@ namespace SoftwareInstallationFileImplement.Models
 
         public DateTime? DateImplement { get; private set; }
 
+        public int Id { get; private set; }
+        
         public static Order? Create(OrderBindingModel? model)
         {
             if (model == null)
@@ -31,14 +35,17 @@ namespace SoftwareInstallationFileImplement.Models
             return new Order()
             {
                 PackageId = model.PackageId,
+                ClientId = model.ClientId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
                 DateCreate = model.DateCreate,
                 DateImplement = model.DateImplement,
-                Id = model.Id,
+				ImplementerId = model.ImplementerId,
+				Id = model.Id,
             };
         }
+
         public static Order? Create(XElement element)
         {
             if (element == null)
@@ -48,13 +55,15 @@ namespace SoftwareInstallationFileImplement.Models
             var dateImplement = element.Element("DateImplement")!.Value;
             return new()
             {
-                Id            = Convert.ToInt32(element.Attribute("Id")!.Value),
-                Sum           = Convert.ToDouble(element.Element("Sum")!.Value),
-                Count         = Convert.ToInt32(element.Element("Count")!.Value),
-                Status        = (OrderStatus)Convert.ToInt32(element.Element("Status")!.Value),
-                PackageId      = Convert.ToInt32(element.Element("PackageId")!.Value),
-                DateCreate    = Convert.ToDateTime(element.Element("DateCreate")!.Value),
-                DateImplement = string.IsNullOrEmpty(dateImplement) ? null : Convert.ToDateTime(dateImplement),
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+                Count = Convert.ToInt32(element.Element("Count")!.Value),
+                Status = (OrderStatus)Convert.ToInt32(element.Element("Status")!.Value),
+                PackageId = Convert.ToInt32(element.Element("PackageId")!.Value),
+                ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
+                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+				ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value),
+				DateImplement = string.IsNullOrEmpty(dateImplement) ? null : Convert.ToDateTime(dateImplement),
             };
         }
 
@@ -64,33 +73,36 @@ namespace SoftwareInstallationFileImplement.Models
             {
                 return;
             }
-            PackageId = model.PackageId;
-            Count = model.Count;
-            Sum = model.Sum;
             Status = model.Status;
-            DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
-            Id = model.Id;
-        }
-        public OrderViewModel GetViewModel => new()
+			//ToDo
+			ImplementerId = model.ImplementerId;
+		}
+
+		public OrderViewModel GetViewModel => new()
         {
             PackageName = DataFileSingleton.GetInstance().Packages.FirstOrDefault(x => x.Id == PackageId)?.PackageName ?? string.Empty,
+            ClientFIO = DataFileSingleton.GetInstance().Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
             PackageId = PackageId,
+            ClientId = ClientId,
             Count = Count,
             Sum = Sum,
             Status = Status,
             DateCreate = DateCreate,
             DateImplement = DateImplement,
-            Id = Id,
+			ImplementerId = ImplementerId,
+			Id = Id,
         };
         public XElement GetXElement => new("Order",
             new XAttribute("Id", Id),
             new XElement("PackageId", PackageId),
+            new XElement("ClientId", ClientId),
             new XElement("Count", Count),
             new XElement("Sum", Sum.ToString()),
             new XElement("Status", (int)Status),
             new XElement("DateCreate", DateCreate),
-            new XElement("DateImplement", DateImplement)
-        );
+            new XElement("DateImplement", DateImplement),
+			new XElement("ImplementerId", ImplementerId)
+		);
     }
-}
+}

SoftwareInstallation/SoftWareInstallationFileImplement/OrderStorage.cs

@@ -4,7 +4,7 @@ using SoftwareInstallationContracts.StoragesContracts;
 using SoftwareInstallationContracts.ViewModels;
 using SoftwareInstallationFileImplement.Models;
 
-namespace SoftwareInstallationFileImplement
+namespace SoftwareInstallationFileImplement.Implements
 {
     public class OrderStorage : IOrderStorage
     {
@@ -13,7 +13,6 @@ namespace SoftwareInstallationFileImplement
         {
             _source = DataFileSingleton.GetInstance();
         }
-
         public OrderViewModel? Delete(OrderBindingModel model)
         {
             var element = _source.Orders.FirstOrDefault(x => x.Id == model.Id);
@@ -25,16 +24,22 @@ namespace SoftwareInstallationFileImplement
             }
             return null;
         }
-
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            return _source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
-        }
-
+			if (model.ImplementerId.HasValue && model.Statusses != null)
+			{
+				return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && model.Statusses.Contains(x.Status))?.GetViewModel;
+			}
+			if (model.ImplementerId.HasValue)
+			{
+				return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
+			}
+			if (!model.Id.HasValue)
+			{
+				return null;
+			}
+			return _source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel; 
+		}
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue) // если не ищем по айдишнику, значит ищем по диапазону дат
@@ -44,17 +49,27 @@ namespace SoftwareInstallationFileImplement
                     .Select(x => x.GetViewModel)
                     .ToList();
             }
-            var result = GetElement(model);
+            if (!model.Id.HasValue && model.ClientId.HasValue)
+            {
+                return _source.Orders
+                    .Where(x => x.ClientId == model.ClientId)
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+			if (!model.Id.HasValue && model.Statusses != null)
+			{
+				return _source.Orders
+					.Where(x => model.Statusses.Contains(x.Status))
+					.Select(x => x.GetViewModel)
+					.ToList();
+			}
+			var result = GetElement(model);
             return result != null ? new() { result } : new();
         }
-
         public List<OrderViewModel> GetFullList()
         {
-            return _source.Orders
-                .Select(x => x.GetViewModel)
-                .ToList();
+            return _source.Orders.Select(x => x.GetViewModel).ToList();
         }
-
         public OrderViewModel? Insert(OrderBindingModel model)
         {
             model.Id = _source.Orders.Count > 0 ? _source.Orders.Max(x => x.Id) + 1 : 1;
@@ -67,7 +82,6 @@ namespace SoftwareInstallationFileImplement
             _source.SaveOrders();
             return newOrder.GetViewModel;
         }
-
         public OrderViewModel? Update(OrderBindingModel model)
         {
             var order = _source.Orders.FirstOrDefault(x => x.Id == model.Id);
@@ -80,4 +94,4 @@ namespace SoftwareInstallationFileImplement
             return order.GetViewModel;
         }
     }
-}
+}

SoftwareInstallation/SoftWareInstallationFileImplement/Package.cs

@@ -3,6 +3,7 @@ using SoftwareInstallationContracts.ViewModels;
 using SoftwareInstallationDataModels.Models;
 using System.Xml.Linq;
 
+
 namespace SoftwareInstallationFileImplement.Models
 {
     public class Package : IPackageModel
@@ -11,22 +12,23 @@ namespace SoftwareInstallationFileImplement.Models
         public string PackageName { get; private set; } = string.Empty;
         public double Price { get; private set; }
         public Dictionary<int, int> Components { get; private set; } = new();
-        private Dictionary<int, (IComponentModel, int)>? _PackageComponents = null;
+        private Dictionary<int, (IComponentModel, int)>? _packageComponents = null;
         public Dictionary<int, (IComponentModel, int)> PackageComponents
         {
             get
             {
-                if (_PackageComponents == null)
+                if (_packageComponents == null)
                 {
                     var source = DataFileSingleton.GetInstance();
-                    _PackageComponents = Components.ToDictionary(x => x.Key, y =>
+                    _packageComponents = Components.ToDictionary(x => x.Key, y =>
                     ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!,
                     y.Value));
                 }
-                return _PackageComponents;
+                return _packageComponents;
             }
         }
-        public static Package? Create(PackageBindingModel model)
+
+        public static Package? Create(PackageBindingModel? model)
         {
             if (model == null)
             {
@@ -37,7 +39,8 @@ namespace SoftwareInstallationFileImplement.Models
                 Id = model.Id,
                 PackageName = model.PackageName,
                 Price = model.Price,
-                Components = model.PackageComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
+                Components = model.PackageComponents.ToDictionary(x => x.Key, x
+               => x.Value.Item2)
             };
         }
         public static Package? Create(XElement element)
@@ -52,11 +55,11 @@ namespace SoftwareInstallationFileImplement.Models
                 PackageName = element.Element("PackageName")!.Value,
                 Price = Convert.ToDouble(element.Element("Price")!.Value),
                 Components = element.Element("PackageComponents")!.Elements("PackageComponent").ToDictionary(x =>
-                            Convert.ToInt32(x.Element("Key")?.Value), x =>
-                            Convert.ToInt32(x.Element("Value")?.Value))
+                Convert.ToInt32(x.Element("Key")?.Value), x =>
+                Convert.ToInt32(x.Element("Value")?.Value))
             };
         }
-        public void Update(PackageBindingModel model)
+        public void Update(PackageBindingModel? model)
         {
             if (model == null)
             {
@@ -65,7 +68,7 @@ namespace SoftwareInstallationFileImplement.Models
             PackageName = model.PackageName;
             Price = model.Price;
             Components = model.PackageComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _PackageComponents = null;
+            _packageComponents = null;
         }
         public PackageViewModel GetViewModel => new()
         {
@@ -74,7 +77,7 @@ namespace SoftwareInstallationFileImplement.Models
             Price = Price,
             PackageComponents = PackageComponents
         };
-        public XElement GetXElement => new("Package",
+        public XElement GetXElement => new("Package", 
             new XAttribute("Id", Id),
             new XElement("PackageName", PackageName),
             new XElement("Price", Price.ToString()),

SoftwareInstallation/SoftWareInstallationFileImplement/PackageStorage.cs

@@ -4,7 +4,7 @@ using SoftwareInstallationContracts.StoragesContracts;
 using SoftwareInstallationContracts.ViewModels;
 using SoftwareInstallationFileImplement.Models;
 
-namespace SoftwareInstallationFileImplement
+namespace SoftwareInstallationFileImplement.Implements
 {
     public class PackageStorage : IPackageStorage
     {
@@ -32,10 +32,10 @@ namespace SoftwareInstallationFileImplement
             {
                 return null;
             }
-            return _source.Packages.FirstOrDefault
-                (x => (!string.IsNullOrEmpty(model.PackageName) && x.PackageName == model.PackageName) ||
-                      (model.Id.HasValue && x.Id == model.Id)
-                )?.GetViewModel;
+            return _source.Packages.FirstOrDefault(x => 
+                (!string.IsNullOrEmpty(model.PackageName) && 
+                x.PackageName == model.PackageName) ||
+                (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
         }
 
         public List<PackageViewModel> GetFilteredList(PackageSearchModel model)
@@ -82,4 +82,4 @@ namespace SoftwareInstallationFileImplement
             return package.GetViewModel;
         }
     }
-}
+}

SoftwareInstallation/SoftWareInstallationFileImplement/Shop.cs

@@ -1,109 +0,0 @@
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationDataModels;
-using SoftwareInstallationDataModels.Models;
-using System.Xml.Linq;
-
-namespace SoftwareInstallationFileImplement
-{
-    public class Shop : IShopModel
-    {
-        public string Name { get; private set; } = string.Empty;
-
-        public string Address { get; private set; } = string.Empty;
-
-        public int MaxCountPackages { get; private set; }
-
-        public DateTime DateOpening { get; private set; }
-
-        public Dictionary<int, int> CountPackages { get; private set; } = new();
-
-        private Dictionary<int, (IPackageModel, int)>? _cachedPackages = null;
-        public  Dictionary<int, (IPackageModel, int)> Packages
-        {
-            get
-            {
-                if (_cachedPackages == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _cachedPackages = CountPackages
-                        .ToDictionary(x => x.Key, x => (source.Packages
-                        .FirstOrDefault(y => y.Id == x.Key)! as IPackageModel, x.Value));
-                }
-                return _cachedPackages;
-            }
-        }
-
-        public int Id { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                Name = model.Name,
-                Address = model.Address,
-                DateOpening = model.DateOpening,
-                MaxCountPackages = model.MaxCountPackages,
-                CountPackages = new()
-            };
-        }
-        public static Shop? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Id               = Convert.ToInt32(element.Attribute("Id")!.Value),
-                Name             = element.Element("Name")!.Value,
-                Address          = element.Element("Address")!.Value,
-                DateOpening      = Convert.ToDateTime(element.Element("DateOpening")!.Value),
-                MaxCountPackages = Convert.ToInt32(element.Element("MaxCountPackages")!.Value),
-                CountPackages    = element.Element("CountPackages")!.Elements("CountPackage")
-                    .ToDictionary(
-                        x => Convert.ToInt32(x.Element("Key")?.Value),
-                        x => Convert.ToInt32(x.Element("Value")?.Value)
-                    )
-            };   
-        }
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Name = model.Name;
-            Address = model.Address;
-            DateOpening = model.DateOpening;
-            CountPackages = model.Packages.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _cachedPackages = null;
-        }
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            Name = Name,
-            Address = Address,
-            Packages = Packages,
-            DateOpening = DateOpening,
-            MaxCountPackages = MaxCountPackages,
-        };
-        public XElement GetXElement => new("Shop",
-             new XAttribute("Id", Id),
-             new XElement("Name", Name),
-             new XElement("Address", Address),
-             new XElement("DateOpening", DateOpening),
-             new XElement("MaxCountPackages", MaxCountPackages),
-             new XElement("CountPackages", CountPackages
-                 .Select(x => new XElement("CountPackage",
-                     new XElement("Key", x.Key),
-                     new XElement("Value", x.Value))
-                 ))
-         );
-    }
-}

SoftwareInstallation/SoftWareInstallationFileImplement/ShopStorage.cs

@@ -1,110 +0,0 @@
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.SearchModels;
-using SoftwareInstallationContracts.StoragesContracts;
-using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationDataModels;
-using SoftwareInstallationDataModels.Models;
-
-namespace SoftwareInstallationFileImplement
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton _source;
-        public ShopStorage()
-        {
-            _source = DataFileSingleton.GetInstance();
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            var element = _source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (element != null)
-            {
-                _source.Shops.Remove(element);
-                _source.SaveShops();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            return _source.Shops.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                return new();
-            }
-            return _source.Shops
-                .Select(x => x.GetViewModel)
-                .Where(x => x.Name.Contains(model.Name ?? string.Empty))
-                .ToList();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return _source.Shops
-                .Select(shop => shop.GetViewModel)
-                .ToList();
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = _source.Shops.Count > 0 ? _source.Shops.Max(x => x.Id) + 1 : 1;
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            _source.Shops.Add(newShop);
-            _source.SaveShops();
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            var shop = _source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop == null)
-            {
-                return null;
-            }
-            shop.Update(model);
-            _source.SaveShops();
-            return shop.GetViewModel;
-        }
-
-        public bool SellPackages(IPackageModel package, int needCount)
-        {
-            var resultCount = _source.Shops
-                .Select(shop => shop.Packages
-                .FirstOrDefault(x => x.Key == package.Id).Value.Item2)
-                .Sum();
-
-            if (resultCount >= needCount)
-            {
-                return false;
-            }
-            foreach (var shop in _source.Shops.Where(shop => shop.Packages.ContainsKey(package.Id)))
-            {
-                var tuple = shop.Packages[package.Id];
-                var diff = Math.Min(tuple.Item2, needCount);
-                shop.Packages[package.Id] = (tuple.Item1, tuple.Item2 - diff);
-                
-                needCount -= diff;
-                if (needCount <= 0)
-                {
-                    return true;
-                }
-            }
-                
-            return true;
-        }
-    }
-}

SoftwareInstallation/SoftWareInstallationFileImplement/SoftwareInstallationFileImplement.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>

SoftwareInstallation/SoftwareInstalationFileImplement/SoftwareInstalationFileImplement.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

SoftwareInstallation/SoftwareInstallation.sln

@@ -13,9 +13,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationListImp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationView", "SoftwareInstallationView\SoftwareInstallationView.csproj", "{564F09E4-FA75-4090-BBC8-656F23FC8F3E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftWareInstallationFileImplement", "SoftWareInstallationFileImplement\SoftWareInstallationFileImplement.csproj", "{B2816D6F-A74D-4533-8F37-3217FB028243}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationFileImplement", "SoftWareInstallationFileImplement\SoftwareInstallationFileImplement.csproj", "{AF966DC2-6172-49DE-97EE-525EF00EBC67}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftWareInstallationDatabaseImplement", "SoftWareInstallationDatabaseImplement\SoftWareInstallationDatabaseImplement.csproj", "{3DF577A0-54E7-4912-B655-294B6B14C020}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationDatabaseImplement", "SoftwareInstallationDatabaseImplement\SoftwareInstallationDatabaseImplement.csproj", "{449AC3EB-1361-40FC-A3B7-6886C917BBC7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationRestApi", "SoftwareInstallationRestApi\SoftwareInstallationRestApi.csproj", "{68CE709E-067B-4745-8893-B082C86A1FAB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationClientApp", "SoftwareInstallationClientApp\SoftwareInstallationClientApp.csproj", "{69FE812F-D1F0-4A4F-9844-C1E0212AC607}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,14 +47,22 @@ Global
 		{564F09E4-FA75-4090-BBC8-656F23FC8F3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{564F09E4-FA75-4090-BBC8-656F23FC8F3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{564F09E4-FA75-4090-BBC8-656F23FC8F3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2816D6F-A74D-4533-8F37-3217FB028243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2816D6F-A74D-4533-8F37-3217FB028243}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2816D6F-A74D-4533-8F37-3217FB028243}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2816D6F-A74D-4533-8F37-3217FB028243}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DF577A0-54E7-4912-B655-294B6B14C020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DF577A0-54E7-4912-B655-294B6B14C020}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DF577A0-54E7-4912-B655-294B6B14C020}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DF577A0-54E7-4912-B655-294B6B14C020}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF966DC2-6172-49DE-97EE-525EF00EBC67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF966DC2-6172-49DE-97EE-525EF00EBC67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF966DC2-6172-49DE-97EE-525EF00EBC67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF966DC2-6172-49DE-97EE-525EF00EBC67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{449AC3EB-1361-40FC-A3B7-6886C917BBC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{449AC3EB-1361-40FC-A3B7-6886C917BBC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{449AC3EB-1361-40FC-A3B7-6886C917BBC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{449AC3EB-1361-40FC-A3B7-6886C917BBC7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68CE709E-067B-4745-8893-B082C86A1FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68CE709E-067B-4745-8893-B082C86A1FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68CE709E-067B-4745-8893-B082C86A1FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68CE709E-067B-4745-8893-B082C86A1FAB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69FE812F-D1F0-4A4F-9844-C1E0212AC607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69FE812F-D1F0-4A4F-9844-C1E0212AC607}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69FE812F-D1F0-4A4F-9844-C1E0212AC607}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69FE812F-D1F0-4A4F-9844-C1E0212AC607}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ClientLogic.cs

@@ -0,0 +1,124 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.BusinessLogicsContracts;
+using SoftwareInstallationContracts.SearchModels;
+using SoftwareInstallationContracts.StoragesContracts;
+using SoftwareInstallationContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System.Text.RegularExpressions;
+
+namespace SoftwareInstallationBusinessLogic
+{
+    public class ClientLogic : IClientLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IClientStorage _clientStorage;
+        public ClientLogic(ILogger<ClientLogic> logger, IClientStorage clientStorage)
+        {
+            _logger = logger;
+            _clientStorage = clientStorage;
+        }
+
+        public bool Create(ClientBindingModel model)
+        {
+            CheckModel(model);
+            if (_clientStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert 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;
+        }
+
+        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 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 bool Update(ClientBindingModel model)
+        {
+            CheckModel(model);
+            if (_clientStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update 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 (!Regex.IsMatch(model.Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$"))
+            {
+                throw new ArgumentException("Некорретно введенный email", nameof(model.Email));
+            }
+            if (!Regex.IsMatch(model.Password, @"^(?=.*\d)(?=.*\W)(?=.*[^\d\s]).+$"))
+            {
+                throw new ArgumentException("Некорректно  введенный пароль. Пароль должен содержать хотя бы одну букву, цифру и не буквенный символ", nameof(model.Password));
+            }
+            _logger.LogInformation("Client. Id: {Id}, FIO: {fio}, email: {email}", model.Id, model.ClientFIO, model.Email);
+            var element = _clientStorage.GetElement(new ClientSearchModel
+            {
+                Email = model.Email,
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Клиент с таким логином уже есть");
+            }
+        }
+    }
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ComponentLogic.cs

@@ -4,6 +4,7 @@ using SoftwareInstallationContracts.SearchModels;
 using SoftwareInstallationContracts.StoragesContracts;
 using SoftwareInstallationContracts.ViewModels;
 using Microsoft.Extensions.Logging;
+
 namespace SoftwareInstallationBusinessLogic.BusinessLogics
 {
     public class ComponentLogic : IComponentLogic

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ImplementerLogic.cs

@@ -0,0 +1,124 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.BusinessLogicsContracts;
+using SoftwareInstallationContracts.SearchModels;
+using SoftwareInstallationContracts.StoragesContracts;
+using SoftwareInstallationContracts.ViewModels;
+using SoftwareInstallationDataModels;
+using Microsoft.Extensions.Logging;
+
+namespace SoftwareInstallationBusinessLogic
+{
+	public class ImplementerLogic : IImplementerLogic
+	{
+		private readonly ILogger _logger;
+		private readonly IImplementerStorage _implementerStorage;
+		public ImplementerLogic(ILogger<ImplementerLogic> logger, IImplementerStorage implementerStorage)
+		{
+			_logger = logger;
+			_implementerStorage = implementerStorage;
+		}
+
+		public bool Create(ImplementerBindingModel model)
+		{
+			CheckModel(model);
+			if (_implementerStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
+				return false;
+			}
+			return true;
+		}
+
+		public bool Delete(ImplementerBindingModel model)
+		{
+			CheckModel(model, false);
+			_logger.LogInformation("Delete. Id:{Id}", model.Id);
+			if (_implementerStorage.Delete(model) == null)
+			{
+				_logger.LogWarning("Delete operation failed");
+				return false;
+			}
+			return true;
+		}
+
+		public ImplementerViewModel? ReadElement(ImplementerSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			_logger.LogInformation("ReadElement. FIO:{FIO}.Id:{ Id}",
+				model.ImplementerFIO, model.Id);
+			var element = _implementerStorage.GetElement(model);
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
+				return null;
+			}
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+			return element;
+		}
+
+		public List<ImplementerViewModel>? ReadList(ImplementerSearchModel? model)
+		{
+			_logger.LogInformation("ReadList. FIO:{FIO}.Id:{ Id} ", model?.ImplementerFIO, model?.Id);
+			var list = (model == null) ? _implementerStorage.GetFullList() :
+			_implementerStorage.GetFilteredList(model);
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			return list;
+		}
+
+		public bool Update(ImplementerBindingModel model)
+		{
+			CheckModel(model);
+			if (_implementerStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
+				return false;
+			}
+			return true;
+		}
+
+		private void CheckModel(ImplementerBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			if (!withParams)
+			{
+				return;
+			}
+			if (model.WorkExperience < 0)
+			{
+				throw new ArgumentException("Опыт работы не должен быть отрицательным", nameof(model.WorkExperience));
+			}
+			if (model.Qualification < 0)
+			{
+				throw new ArgumentException("Квалификация не должна быть отрицательной", nameof(model.Qualification));
+			}
+			if (string.IsNullOrEmpty(model.Password))
+			{
+				throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.ImplementerFIO));
+			}
+			if (string.IsNullOrEmpty(model.ImplementerFIO))
+			{
+				throw new ArgumentNullException("Нет фио исполнителя", nameof(model.ImplementerFIO));
+			}
+			_logger.LogInformation("Implementer. Id: {Id}, FIO: {FIO}", model.Id, model.ImplementerFIO);
+			var element = _implementerStorage.GetElement(new ImplementerSearchModel
+			{
+				ImplementerFIO = model.ImplementerFIO,
+			});
+			if (element != null && element.Id != model.Id)
+			{
+				throw new InvalidOperationException("Исполнитель с таким фио уже есть");
+			}
+		}
+	}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/MessageInfoLogic.cs

@@ -0,0 +1,48 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.BusinessLogicsContracts;
+using SoftwareInstallationContracts.SearchModels;
+using SoftwareInstallationContracts.StoragesContracts;
+using SoftwareInstallationContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SoftwareInstallationBusinessLogic
+{
+	public class MessageInfoLogic : IMessageInfoLogic
+	{
+		private readonly ILogger _logger;
+		private readonly IMessageInfoStorage _messageInfoStorage;
+		public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage MessageInfoStorage)
+		{
+			_logger = logger;
+			_messageInfoStorage = MessageInfoStorage;
+		}
+
+		public bool Create(MessageInfoBindingModel model)
+		{
+			if (_messageInfoStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
+				return false;
+			}
+			return true;
+		}
+
+		public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
+		{
+			_logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId} ", model?.MessageId, model?.ClientId);
+			var list = (model == null) ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model);
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			return list;
+		}
+	}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -1,10 +1,12 @@
 using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationBusinessLogic.MailWorker;
 using SoftwareInstallationContracts.BusinessLogicsContracts;
 using SoftwareInstallationContracts.SearchModels;
 using SoftwareInstallationContracts.StoragesContracts;
 using SoftwareInstallationContracts.ViewModels;
 using SoftwareInstallationDataModels.Enums;
 using Microsoft.Extensions.Logging;
+using SoftwareInstallationBusinessLogic.MailWorker;
 
 namespace SoftwareInstallationBusinessLogic.BusinessLogics
 {
@@ -12,15 +14,15 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IPackageStorage _packageStorage;
-        private readonly IShopLogic _shopLogic;
+        private readonly AbstractMailWorker _mailWorker;
+        private readonly IClientLogic _clientLogic;
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IPackageStorage packageStorage, IShopLogic shopLogic)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic)
         {
             _logger = logger;
-            _shopLogic = shopLogic;
-            _packageStorage = packageStorage;
             _orderStorage = orderStorage;
+            _mailWorker = mailWorker;
+            _clientLogic = clientLogic;
         }
         public bool CreateOrder(OrderBindingModel model)
         {
@@ -33,11 +35,13 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics
             }
             model.Status = OrderStatus.Принят;
             model.DateCreate = DateTime.Now;
-            if (_orderStorage.Insert(model) == null)
+            var result = _orderStorage.Insert(model);
+            if (result == null)
             {
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
+            SendOrderStatusMail(result.ClientId, $"Новый заказ создан. Номер заказа #{result.Id}", $"Заказ #{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят");
             return true;
         }
 
@@ -55,7 +59,7 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
             _logger.LogInformation("ReadList. OrderName.Id:{ Id} ", model?.Id);
-            var list = (model == null) ? _orderStorage.GetFullList() :
+            var list = model == null ? _orderStorage.GetFullList() :
             _orderStorage.GetFilteredList(model);
             if (list == null)
             {
@@ -99,31 +103,55 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics
             }
             if ((int)viewModel.Status + 1 != (int)orderStatus)
             {
-                throw new ArgumentException($"Попытка перевести заказ не в следующий статус: " +
+                throw new InvalidOperationException($"Попытка перевести заказ не в следующий статус: " +
                     $"Текущий статус: {viewModel.Status} \n" +
                     $"Планируемый статус: {orderStatus} \n" +
-                    $"Доступный статус: {(OrderStatus)((int)viewModel.Status + 1)}",
-                    nameof(viewModel));
-            }
-            if (orderStatus == OrderStatus.Готов)
-            {
-                var vpackage = _packageStorage.GetElement(new() { Id = viewModel.PackageId });
-
-                if (vpackage == null || !_shopLogic.AddPackagesInShops(vpackage, viewModel.Count))
-                {
-                    throw new Exception($"Не удалось заполнить магазины изделием '{vpackage?.PackageName ?? string.Empty}' из заказа {viewModel.Id}");
-                }
+                    $"Доступный статус: {(OrderStatus)((int)viewModel.Status + 1)}");
             }
             if (model.DateImplement == null) model.DateImplement = viewModel.DateImplement;
-            model.Status = orderStatus;
+			if (viewModel.ImplementerId.HasValue) model.ImplementerId = viewModel.ImplementerId;
+			model.Status = orderStatus;
             model.Sum = viewModel.Sum;
             model.Count = viewModel.Count;
             model.PackageId = viewModel.PackageId;
-            if (_orderStorage.Update(model) == null)
+            var result = _orderStorage.Update(model);
+            if (result == null)
             {
                 _logger.LogWarning("Ошибка операции обновления");
                 return false;
             }
+            SendOrderStatusMail(result.ClientId, $"Изменен статус заказа #{result.Id}", $"Заказ #{model.Id} изменен статус на {result.Status}");
+            return true;
+        }
+		public OrderViewModel? ReadElement(OrderSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			_logger.LogInformation("ReadElement. Id:{ Id}", model.Id);
+			var element = _orderStorage.GetElement(model);
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
+				return null;
+			}
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+			return element;
+		}
+        private bool SendOrderStatusMail(int clientId, string subject, string text)
+        {
+            var client = _clientLogic.ReadElement(new() { Id = clientId });
+            if (client == null)
+            {
+                return false;
+            }
+            _mailWorker.MailSendAsync(new()
+            {
+                MailAddress = client.Email,
+                Subject = subject,
+                Text = text
+            });
             return true;
         }
     }

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/PackageLogic.cs

@@ -60,7 +60,7 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics
         public List<PackageViewModel>? ReadList(PackageSearchModel? model)
         {
             _logger.LogInformation("ReadList. PackageName:{PackageName}.Id:{ Id} ", model?.PackageName, model?.Id);
-            var list = (model == null) ? _componentStorage.GetFullList() : _componentStorage.GetFilteredList(model);
+            var list = model == null ? _componentStorage.GetFullList() : _componentStorage.GetFilteredList(model);
             if (list == null)
             {
                 _logger.LogWarning("ReadList return null list");

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ReportLogic.cs

@@ -0,0 +1,114 @@
+using SoftwareInstallationBusinessLogic.OfficePackage;
+using SoftwareInstallationBusinessLogic.OfficePackage.HelperModels;
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.BusinessLogicsContracts;
+using SoftwareInstallationContracts.SearchModels;
+using SoftwareInstallationContracts.StoragesContracts;
+using SoftwareInstallationContracts.ViewModels;
+
+namespace SoftwareInstallationBusinessLogic.BusinessLogics
+{
+    public class ReportLogic : IReportLogic
+    {
+        private readonly IComponentStorage _componentStorage;
+        private readonly IPackageStorage _packageStorage;
+        private readonly IOrderStorage _orderStorage;
+        private readonly AbstractSaveToExcel _saveToExcel;
+        private readonly AbstractSaveToWord _saveToWord;
+        private readonly AbstractSaveToPdf _saveToPdf;
+        public ReportLogic(IPackageStorage packageStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
+        AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+        {
+            _packageStorage = packageStorage;
+            _componentStorage = componentStorage;
+            _orderStorage = orderStorage;
+            _saveToExcel = saveToExcel;
+            _saveToWord = saveToWord;
+            _saveToPdf = saveToPdf;
+        }
+        /// <summary>
+        /// Получение списка компонент с указанием, в каких изделиях используются
+        /// </summary>
+        /// <returns></returns>
+        public List<ReportPackageComponentViewModel> GetPackageComponent()
+        {
+            var packages = _packageStorage.GetFullList();
+            var list = new List<ReportPackageComponentViewModel>();
+            foreach (var package in packages)
+            {
+                var record = new ReportPackageComponentViewModel
+                {
+                    PackageName = package.PackageName,
+                    Components = package.PackageComponents.Values.Select(x => Tuple.Create(x.Item1.ComponentName, x.Item2)).ToList(),
+                    TotalCount = package.PackageComponents.Values.Select(x => x.Item2).Sum(),
+                };
+                list.Add(record);
+            }
+            return list;
+        }
+        /// <summary>
+        /// Получение списка заказов за определенный период
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
+        {
+            return _orderStorage.GetFilteredList(new OrderSearchModel
+            {
+                DateFrom = model.DateFrom,
+                DateTo = model.DateTo
+                
+            })
+            .Select(x => new ReportOrdersViewModel
+            {
+                Id = x.Id,
+                DateCreate = x.DateCreate,
+                PackageName = x.PackageName,
+                OrderStatus = x.Status.ToString(),
+                Sum = x.Sum
+            })
+           .ToList();
+        }
+        /// <summary>
+        /// Сохранение изделий в файл-Word
+        /// </summary>
+        /// <param name="model"></param>
+        public void SaveComponentsToWordFile(ReportBindingModel model)
+        {
+            _saveToWord.CreateDoc(new WordInfo
+            {
+                FileName = model.FileName,
+                Title = "Список Изделий",
+                Packages = _packageStorage.GetFullList()
+            });
+        }
+        /// <summary>
+        /// Сохранение изделий с указаеним продуктов в файл-Excel
+        /// </summary>
+        /// <param name="model"></param>
+        public void SavePackageComponentToExcelFile(ReportBindingModel model)
+        {
+            _saveToExcel.CreateReport(new ExcelInfo
+            {
+                FileName = model.FileName,
+                Title = "Список изделий",
+                PackageComponents = GetPackageComponent()
+            });
+        }
+        /// <summary>
+        /// Сохранение заказов в файл-Pdf
+        /// </summary>
+        /// <param name="model"></param>
+        public void SaveOrdersToPdfFile(ReportBindingModel model)
+        {
+            _saveToPdf.CreateDoc(new PdfInfo
+            {
+                FileName = model.FileName,
+                Title = "Список заказов",
+                DateFrom = model.DateFrom!.Value,
+                DateTo = model.DateTo!.Value,
+                Orders = GetOrders(model)
+            });
+        }
+    }
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/WorkModeling.cs

@@ -0,0 +1,143 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.BusinessLogicsContracts;
+using SoftwareInstallationContracts.SearchModels;
+using SoftwareInstallationContracts.ViewModels;
+using SoftwareInstallationDataModels.Enums;
+using Microsoft.Extensions.Logging;
+
+namespace SoftwareInstallationBusinessLogic
+{
+	public class WorkModeling : IWorkProcess
+	{
+		private readonly ILogger _logger;
+
+		private readonly Random _rnd;
+
+		private IOrderLogic? _orderLogic;
+
+		public WorkModeling(ILogger<WorkModeling> logger)
+		{
+			_logger = logger;
+			_rnd = new Random(1000);
+		}
+
+		public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic)
+		{
+			_orderLogic = orderLogic;
+			var implementers = implementerLogic.ReadList(null);
+			if (implementers == null)
+			{
+				_logger.LogWarning("DoWork. Implementers is null");
+				return;
+			}
+			// Поскольку у нас могут быть заказы в работе мы не дожны заканчивать работы, если нет Принятых заказов
+			// Поэтому находим заказы в работе и продолжаем работу, если они есть
+			var orders = _orderLogic.ReadList(new OrderSearchModel { Statusses = new() { OrderStatus.Принят, OrderStatus.Выполняется } });
+			if (orders == null || orders.Count == 0)
+			{
+				_logger.LogWarning("DoWork. Orders is null or empty");
+				return;
+			}
+			_logger.LogDebug("DoWork for {Count} orders", orders.Count);
+			foreach (var implementer in implementers)
+			{
+				Task.Run(() => WorkerWorkAsync(implementer, orders));
+			}
+		}
+
+		/// <summary>
+		/// Иммитация работы исполнителя
+		/// </summary>
+		/// <param name="implementer"></param>
+		/// <param name="orders"></param>
+		private async Task WorkerWorkAsync(ImplementerViewModel implementer, List<OrderViewModel> orders)
+		{
+			if (_orderLogic == null || implementer == null)
+			{
+				return;
+			}
+			await RunOrderInWork(implementer, orders);
+
+			await Task.Run(() =>
+			{
+				foreach (var order in orders)
+				{
+					try
+					{
+						_logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
+						// пытаемся назначить заказ на исполнителя
+						_orderLogic.TakeOrderInWork(new OrderBindingModel
+						{
+							Id = order.Id,
+							ImplementerId = implementer.Id
+						});
+						// делаем работу
+						Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
+						_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
+						_orderLogic.FinishOrder(new OrderBindingModel
+						{
+							Id = order.Id
+						});
+						// отдыхаем
+						Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+					}
+					// кто-то мог уже перехватить заказ, игнорируем ошибку
+					catch (InvalidOperationException ex)
+					{
+						_logger.LogWarning(ex, "Error try get work");
+					}
+					// заканчиваем выполнение имитации в случае иной ошибки
+					catch (Exception ex)
+					{
+						_logger.LogError(ex, "Error while do work");
+						throw;
+					}
+				}
+			});
+		}
+
+		/// <summary>
+		/// Ищем заказ, которые уже в работе (вдруг исполнителя прервали)
+		/// </summary>
+		/// <param name="implementer"></param>
+		/// <returns></returns>
+		private async Task RunOrderInWork(ImplementerViewModel implementer, List<OrderViewModel> allOrders)
+		{
+			if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0)
+			{
+				return;
+			}
+			try
+			{
+				// Выбираем из всех заказов тот, который выполняется данным исполнителем
+				var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
+				if (runOrder == null)
+				{
+					return;
+				}
+
+				_logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
+				// доделываем работу
+				Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
+				_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
+				_orderLogic.FinishOrder(new OrderBindingModel
+				{
+					Id = runOrder.Id
+				});
+				// отдыхаем
+				Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+			}
+			// заказа может не быть, просто игнорируем ошибку
+			catch (InvalidOperationException ex)
+			{
+				_logger.LogWarning(ex, "Error try get work");
+			}
+			// а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Error while do work");
+				throw;
+			}
+		}
+	}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -0,0 +1,100 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SoftwareInstallationBusinessLogic.MailWorker
+{
+	public abstract class AbstractMailWorker
+	{
+		protected string _mailLogin = string.Empty;
+
+		protected string _mailPassword = string.Empty;
+
+		protected string _smtpClientHost = string.Empty;
+
+		protected int _smtpClientPort;
+
+		protected string _popHost = string.Empty;
+
+		protected int _popPort;
+
+		private readonly IMessageInfoLogic _messageInfoLogic;
+		private readonly IClientLogic _clientLogic;
+
+		private readonly ILogger _logger;
+
+		public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic)
+		{
+			_logger = logger;
+			_messageInfoLogic = messageInfoLogic;
+			_clientLogic = clientLogic;
+		}
+
+		public void MailConfig(MailConfigBindingModel config)
+		{
+			_mailLogin = config.MailLogin;
+			_mailPassword = config.MailPassword;
+			_smtpClientHost = config.SmtpClientHost;
+			_smtpClientPort = config.SmtpClientPort;
+			_popHost = config.PopHost;
+			_popPort = config.PopPort;
+			_logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, {popHost}, {popPort}", _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
+		}
+
+		public async void MailSendAsync(MailSendInfoBindingModel info)
+		{
+			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
+			{
+				return;
+			}
+
+			if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0)
+			{
+				return;
+			}
+
+			if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
+			{
+				return;
+			}
+
+			_logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject);
+			await SendMailAsync(info);
+		}
+
+		public async void MailCheck()
+		{
+			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
+			{
+				return;
+			}
+
+			if (string.IsNullOrEmpty(_popHost) || _popPort == 0)
+			{
+				return;
+			}
+
+			if (_messageInfoLogic == null)
+			{
+				return;
+			}
+
+			var list = await ReceiveMailAsync();
+			_logger.LogDebug("Check Mail: {Count} new mails", list.Count);
+			foreach (var mail in list)
+			{
+				mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id;
+				_messageInfoLogic.Create(mail);
+			}
+		}
+
+		protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
+
+		protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
+	}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/MailWorker/MailKitWorker.cs

@@ -0,0 +1,82 @@
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.BusinessLogicsContracts;
+using MailKit.Net.Pop3;
+using MailKit.Security;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SoftwareInstallationBusinessLogic.MailWorker
+{
+	public class MailKitWorker : AbstractMailWorker
+	{
+		public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) : base(logger, messageInfoLogic, clientLogic) { }
+
+		protected override async Task SendMailAsync(MailSendInfoBindingModel info)
+		{
+			using var objMailMessage = new MailMessage();
+			using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
+			try
+			{
+				objMailMessage.From = new MailAddress(_mailLogin);
+				objMailMessage.To.Add(new MailAddress(info.MailAddress));
+				objMailMessage.Subject = info.Subject;
+				objMailMessage.Body = info.Text;
+				objMailMessage.SubjectEncoding = Encoding.UTF8;
+				objMailMessage.BodyEncoding = Encoding.UTF8;
+
+				objSmtpClient.UseDefaultCredentials = false;
+				objSmtpClient.EnableSsl = true;
+				objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
+				objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
+
+				await Task.Run(() => objSmtpClient.Send(objMailMessage));
+			}
+			catch (Exception)
+			{
+				throw;
+			}
+		}
+
+		protected override async Task<List<MessageInfoBindingModel>> ReceiveMailAsync()
+		{
+			var list = new List<MessageInfoBindingModel>();
+			using var client = new Pop3Client();
+			await Task.Run(() =>
+			{
+				try
+				{
+					client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
+					client.Authenticate(_mailLogin, _mailPassword);
+					for (int i = 0; i < client.Count; i++)
+					{
+						var message = client.GetMessage(i);
+						foreach (var mail in message.From.Mailboxes)
+						{
+							list.Add(new MessageInfoBindingModel
+							{
+								DateDelivery = message.Date.DateTime,
+								MessageId = message.MessageId,
+								SenderName = mail.Address,
+								Subject = message.Subject,
+								Body = message.TextBody
+							});
+						}
+					}
+				}
+				catch (AuthenticationException)
+				{ }
+				finally
+				{
+					client.Disconnect(true);
+				}
+			});
+			return list;
+		}
+	}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -1,10 +1,5 @@
 using SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums;
 using SoftwareInstallationBusinessLogic.OfficePackage.HelperModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationBusinessLogic.OfficePackage
 {
@@ -14,10 +9,9 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage
         /// Создание отчета
         /// </summary>
         /// <param name="info"></param>
-        public void CreateReportShop(ExcelInfo info)
+        public void CreateReport(ExcelInfo info)
         {
             CreateExcel(info);
-
             InsertCellInWorksheet(new ExcelCellParameters
             {
                 ColumnName = "A",
@@ -25,99 +19,11 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage
                 Text = info.Title,
                 StyleInfo = ExcelStyleInfoType.Title
             });
-
             MergeCells(new ExcelMergeParameters
             {
                 CellFromName = "A1",
                 CellToName = "C1"
             });
-
-            uint rowIndex = 2;
-            foreach (var pc in info.ShopPackages)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = pc.ShopName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-
-                foreach (var (Shop, Count) in pc.Packages)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = rowIndex,
-                        Text = Shop,
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "C",
-                        RowIndex = rowIndex,
-                        Text = Count.ToString(),
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-                    rowIndex++;
-                }
-
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Итого",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = pc.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Загруженность",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = pc.Workload.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-            }
-
-            SaveExcel(info);
-        }
-
-        public void CreateReportPackage(ExcelInfoPackage info)
-        {
-            CreateExcel(new() { FileName = info.FileName });
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "C1"
-            });
-
             uint rowIndex = 2;
             foreach (var pc in info.PackageComponents)
             {
@@ -129,28 +35,26 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage
                     StyleInfo = ExcelStyleInfoType.Text
                 });
                 rowIndex++;
-
-                foreach (var (Package, Count) in pc.Components)
+                foreach (var package in pc.Components)
                 {
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "B",
                         RowIndex = rowIndex,
-                        Text = Package,
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        Text = package.Item1,
+                        StyleInfo =
+                    ExcelStyleInfoType.TextWithBroder
                     });
-
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "C",
                         RowIndex = rowIndex,
-                        Text = Count.ToString(),
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        Text = package.Item2.ToString(),
+                        StyleInfo =
+                    ExcelStyleInfoType.TextWithBroder
                     });
-
                     rowIndex++;
                 }
-
                 InsertCellInWorksheet(new ExcelCellParameters
                 {
                     ColumnName = "A",
@@ -167,28 +71,24 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage
                 });
                 rowIndex++;
             }
-
-            SaveExcel(new());
+            SaveExcel(info);
         }
-
         /// <summary>
         /// Создание excel-файла
         /// </summary>
         /// <param name="info"></param>
         protected abstract void CreateExcel(ExcelInfo info);
-
         /// <summary>
         /// Добавляем новую ячейку в лист
         /// </summary>
         /// <param name="cellParameters"></param>
-        protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
-
+        protected abstract void InsertCellInWorksheet(ExcelCellParameters
+        excelParams);
         /// <summary>
         /// Объединение ячеек
         /// </summary>
         /// <param name="mergeParameters"></param>
         protected abstract void MergeCells(ExcelMergeParameters excelParams);
-
         /// <summary>
         /// Сохранение файла
         /// </summary>

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -1,10 +1,7 @@
 using SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums;
 using SoftwareInstallationBusinessLogic.OfficePackage.HelperModels;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationBusinessLogic.OfficePackage
 {
@@ -13,54 +10,24 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage
         public void CreateDoc(PdfInfo info)
         {
             CreatePdf(info);
-            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-            CreateParagraph(new PdfParagraph { 
-                Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", 
-                ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-            CreateTable(new List<string> { "3cm", "4cm", "5cm" });
-
-            CreateRow(new PdfRowParameters
+            CreateParagraph(new PdfParagraph
             {
-                Texts = new List<string> { "Дата", "Количество", "Сумма" },
+                Text = info.Title,
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
-
-            foreach (var order in info.Orders)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { order.Date.ToShortDateString(), order.Count.ToString(), order.Sum.ToString() },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
-            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Rigth });
-
-            SavePdf(info);
-        }
-
-        public void CreateDocOrders(PdfInfoOrders info)
-        {
-            CreatePdf(info);
-            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
             CreateParagraph(new PdfParagraph
             {
-                Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}",
-                Style = "Normal",
+                Text = $"с{ info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style = "Normal",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
-
             CreateTable(new List<string> { "2cm", "3cm", "6cm", "4cm", "3cm" });
-
             CreateRow(new PdfRowParameters
             {
                 Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Статус заказа", "Сумма" },
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
-
             foreach (var order in info.Orders)
             {
                 CreateRow(new PdfRowParameters
@@ -70,41 +37,40 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage
                     ParagraphAlignment = PdfParagraphAlignmentType.Left
                 });
             }
-            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Rigth });
-
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t",
+                Style = "Normal",
+                ParagraphAlignment = PdfParagraphAlignmentType.Rigth
+            });
             SavePdf(info);
         }
-
         /// <summary>
-		/// Создание doc-файла
-		/// </summary>
-		/// <param name="info"></param>
+        /// Создание doc-файла
+        /// </summary>
+        /// <param name="info"></param>
         protected abstract void CreatePdf(PdfInfo info);
-
         /// <summary>
         /// Создание параграфа с текстом
         /// </summary>
         /// <param name="title"></param>
         /// <param name="style"></param>
         protected abstract void CreateParagraph(PdfParagraph paragraph);
-
         /// <summary>
         /// Создание таблицы
         /// </summary>
         /// <param name="title"></param>
         /// <param name="style"></param>
         protected abstract void CreateTable(List<string> columns);
-
         /// <summary>
         /// Создание и заполнение строки
         /// </summary>
         /// <param name="rowParameters"></param>
         protected abstract void CreateRow(PdfRowParameters rowParameters);
-
         /// <summary>
-		/// Сохранение файла
-		/// </summary>
-		/// <param name="info"></param>
+        /// Сохранение файла
+        /// </summary>
+        /// <param name="info"></param>
         protected abstract void SavePdf(PdfInfo info);
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -1,51 +1,13 @@
 using SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums;
 using SoftwareInstallationBusinessLogic.OfficePackage.HelperModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToWord
     {
-        public void CreateDocTable(WordInfoTable info)
-        {
-            CreateWord(info);
-
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            CreateTable(new() 
-            {
-                ("Название", 3000), 
-                ("Дата", null), 
-                ("Адрес открытия", 4500),
-            },
-            info.Shops
-            .Select(x => new List<string>
-            {
-                x.Name,
-                Convert.ToString(x.DateOpening),
-                x.Address,
-            })
-            .ToList());
-
-            SaveWord(info);
-        }
-
         public void CreateDoc(WordInfo info)
         {
-            CreateWord(new() { FileName = info.FileName });
-
+            CreateWord(info);
             CreateParagraph(new WordParagraph
             {
                 Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
@@ -55,14 +17,13 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage
                     JustificationType = WordJustificationType.Center
                 }
             });
-
             foreach (var package in info.Packages)
             {
                 CreateParagraph(new WordParagraph
                 {
                     Texts = new List<(string, WordTextProperties)>
                     {
-                        (package.PackageName      , new WordTextProperties { Size = "24", Bold = true}),
+                        (package.PackageName, new WordTextProperties { Size = "24", Bold = true}),
                         (" - цена: " + package.Price.ToString(), new WordTextProperties { Size = "24" })
                     },
                     TextProperties = new WordTextProperties
@@ -72,34 +33,23 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage
                     }
                 });
             }
-
-            SaveWord(new());
+            SaveWord(info);
         }
-
         /// <summary>
-		/// Создание doc-файла
-		/// </summary>
-		/// <param name="info"></param>
-        protected abstract void CreateWord(WordInfoTable info);
-
+        /// Создание doc-файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void CreateWord(WordInfo info);
         /// <summary>
         /// Создание абзаца с текстом
         /// </summary>
         /// <param name="paragraph"></param>
         /// <returns></returns>
         protected abstract void CreateParagraph(WordParagraph paragraph);
-
         /// <summary>
-        /// Создание таблицы в файле
+        /// Сохранение файла
         /// </summary>
-        /// <param name="nameAndWidthColumns">Строчка заголовок таблицы, определяет текст и ширину каждого столбца</param>
-        /// <param name="rows">The rows.</param>
-        protected abstract void CreateTable(List<(string, int?)> nameAndWidthColumns, List<List<string>> rows);
-
-        /// <summary>
-		/// Сохранение файла
-		/// </summary>
-		/// <param name="info"></param>
-        protected abstract void SaveWord(WordInfoTable info);
+        /// <param name="info"></param>
+        protected abstract void SaveWord(WordInfo info);
     }
 }

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums
+namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums
 {
     public enum ExcelStyleInfoType
     {

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperEnums/PdfInfo.cs

@@ -1,11 +1,6 @@
 using SoftwareInstallationContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
+
 {
     public class PdfInfo
     {
@@ -13,6 +8,6 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
         public string Title { get; set; } = string.Empty;
         public DateTime DateFrom { get; set; }
         public DateTime DateTo { get; set; }
-        public List<ReportGroupOrdersViewModel> Orders { get; set; } = new();
+        public List<ReportOrdersViewModel> Orders { get; set; } = new();
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums
+namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums
 {
     public enum PdfParagraphAlignmentType
     {
@@ -12,4 +6,4 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums
         Left,
         Rigth
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs

@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums
+namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums
 {
     public enum WordJustificationType
     {
         Center,
         Both
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs

@@ -10,4 +10,4 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
         public string CellReference => $"{ColumnName}{RowIndex}";
         public ExcelStyleInfoType StyleInfo { get; set; }
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -6,10 +6,10 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;
-        public List<ReportShopPackagetViewModel> ShopPackages
+        public List<ReportPackageComponentViewModel> PackageComponents
         {
             get;
             set;
         } = new();
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/ExcelInfoPastry.cs

@@ -1,20 +0,0 @@
-using SoftwareInstallationContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelInfoPackage
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ReportPackageComponentViewModel> PackageComponents
-        {
-            get;
-            set;
-        } = new();
-    }
-}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
+namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
 {
     public class ExcelMergeParameters
     {
@@ -12,4 +6,4 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
         public string CellToName { get; set; } = string.Empty;
         public string Merge => $"{CellFromName}:{CellToName}";
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/PdfInfoOrders.cs

@@ -1,29 +0,0 @@
-using SoftwareInstallationContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfInfoOrders
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public DateTime DateFrom { get; set; }
-        public DateTime DateTo { get; set; }
-        public List<ReportOrdersViewModel> Orders { get; set; } = new();
-
-        public static implicit operator PdfInfo(PdfInfoOrders orders)
-        {
-            return new PdfInfo() 
-            { 
-                DateFrom = orders.DateFrom, 
-                DateTo = orders.DateTo, 
-                FileName = orders.FileName, 
-                Title = orders.Title 
-            };
-        }
-    }
-}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs

@@ -8,4 +8,4 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
         public string Style { get; set; } = string.Empty;
         public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -7,6 +7,5 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;
         public List<PackageViewModel> Packages { get; set; } = new();
-        public List<ShopViewModel> Shops { get; set; } = new();
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/WordInfoTable.cs

@@ -1,16 +0,0 @@
-using SoftwareInstallationContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordInfoTable
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ShopViewModel> Shops { get; set; } = new();
-    }
-}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
+namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
 {
     public class WordParagraph
     {

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs

@@ -1,5 +1,4 @@
 using SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums;
-
 namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
 {
     public class WordTextProperties
@@ -8,4 +7,4 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.HelperModels
         public bool Bold { get; set; }
         public WordJustificationType JustificationType { get; set; }
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -1,21 +1,18 @@
 using SoftwareInstallationBusinessLogic.OfficePackage.HelperEnums;
 using SoftwareInstallationBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Office2010.Excel;
 using DocumentFormat.OpenXml.Office2013.Excel;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml;
 
 namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
 {
     public class SaveToExcel : AbstractSaveToExcel
     {
         private SpreadsheetDocument? _spreadsheetDocument;
-
         private SharedStringTablePart? _shareStringPart;
-
         private Worksheet? _worksheet;
-
         /// <summary>
         /// Настройка стилей для файла
         /// </summary>
@@ -24,105 +21,153 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
         {
             var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
             sp.Stylesheet = new Stylesheet();
-
             var fonts = new Fonts() { Count = 2U, KnownFonts = true };
-
             var fontUsual = new Font();
             fontUsual.Append(new FontSize() { Val = 12D });
-            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Theme = 1U });
             fontUsual.Append(new FontName() { Val = "Times New Roman" });
             fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
             fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
             var fontTitle = new Font();
             fontTitle.Append(new Bold());
             fontTitle.Append(new FontSize() { Val = 14D });
-            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Theme = 1U });
             fontTitle.Append(new FontName() { Val = "Times New Roman" });
             fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
             fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
             fonts.Append(fontUsual);
             fonts.Append(fontTitle);
-
             var fills = new Fills() { Count = 2U };
-
             var fill1 = new Fill();
             fill1.Append(new PatternFill() { PatternType = PatternValues.None });
-
             var fill2 = new Fill();
-            fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 });
-
+            fill2.Append(new PatternFill()
+            {
+                PatternType = PatternValues.Gray125
+            });
             fills.Append(fill1);
             fills.Append(fill2);
-
             var borders = new Borders() { Count = 2U };
-
             var borderNoBorder = new Border();
             borderNoBorder.Append(new LeftBorder());
             borderNoBorder.Append(new RightBorder());
             borderNoBorder.Append(new TopBorder());
             borderNoBorder.Append(new BottomBorder());
             borderNoBorder.Append(new DiagonalBorder());
-
             var borderThin = new Border();
-
             var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
-            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin };
-            rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
+            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
+            var rightBorder = new RightBorder()
+            {
+                Style = BorderStyleValues.Thin
+            };
+            rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
             var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
-            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin };
-            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
+            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
+            var bottomBorder = new BottomBorder()
+            {
+                Style = BorderStyleValues.Thin
+            };
+            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
             borderThin.Append(leftBorder);
             borderThin.Append(rightBorder);
             borderThin.Append(topBorder);
             borderThin.Append(bottomBorder);
             borderThin.Append(new DiagonalBorder());
-
             borders.Append(borderNoBorder);
             borders.Append(borderThin);
-
             var cellStyleFormats = new CellStyleFormats() { Count = 1U };
-            var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U };
-
+            var cellFormatStyle = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 0U
+            };
             cellStyleFormats.Append(cellFormatStyle);
-
             var cellFormats = new CellFormats() { Count = 3U };
-            var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true };
-            var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true };
-            var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true };
-
+            var cellFormatFont = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 0U,
+                FormatId = 0U,
+                ApplyFont = true
+            };
+            var cellFormatFontAndBorder = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 1U,
+                FormatId = 0U,
+                ApplyFont = true,
+                ApplyBorder = true
+            };
+            var cellFormatTitle = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 1U,
+                FillId = 0U,
+                BorderId = 0U,
+                FormatId = 0U,
+                Alignment = new Alignment()
+                {
+                    Vertical = VerticalAlignmentValues.Center,
+                    WrapText = true,
+                    Horizontal = HorizontalAlignmentValues.Center
+                },
+                ApplyFont = true
+            };
             cellFormats.Append(cellFormatFont);
             cellFormats.Append(cellFormatFontAndBorder);
             cellFormats.Append(cellFormatTitle);
-
             var cellStyles = new CellStyles() { Count = 1U };
+            cellStyles.Append(new CellStyle()
+            {
+                Name = "Normal",
+                FormatId = 0U,
+                BuiltinId = 0U
+            });
+            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats()
+            { Count = 0U };
 
-            cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U });
-
-            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U };
-
-            var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" };
-
+            var tableStyles = new TableStyles()
+            {
+                Count = 0U,
+                DefaultTableStyle = "TableStyleMedium2",
+                DefaultPivotStyle = "PivotStyleLight16"
+            };
             var stylesheetExtensionList = new StylesheetExtensionList();
-
-            var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" };
+            var stylesheetExtension1 = new StylesheetExtension()
+            {
+                Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
+            };
             stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
-            stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" });
-
-            var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" };
-            stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
-            stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" });
-
+            stylesheetExtension1.Append(new SlicerStyles()
+            {
+                DefaultSlicerStyle = "SlicerStyleLight1"
+            });
+            var stylesheetExtension2 = new StylesheetExtension()
+            {
+                Uri =
+           "{9260A510-F301-46a8-8635-F512D64BE5F5}"
+            };
+            stylesheetExtension2.AddNamespaceDeclaration("x15",
+           "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
+            stylesheetExtension2.Append(new TimelineStyles()
+            {
+                DefaultTimelineStyle = "TimeSlicerStyleLight1"
+            });
             stylesheetExtensionList.Append(stylesheetExtension1);
             stylesheetExtensionList.Append(stylesheetExtension2);
-
             sp.Stylesheet.Append(fonts);
             sp.Stylesheet.Append(fills);
             sp.Stylesheet.Append(borders);
@@ -133,7 +178,6 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
             sp.Stylesheet.Append(tableStyles);
             sp.Stylesheet.Append(stylesheetExtensionList);
         }
-
         /// <summary>
         /// Получение номера стиля из типа
         /// </summary>
@@ -149,31 +193,27 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
                 _ => 0U,
             };
         }
-
         protected override void CreateExcel(ExcelInfo info)
         {
             _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
             // Создаем книгу (в ней хранятся листы)
             var workbookpart = _spreadsheetDocument.AddWorkbookPart();
             workbookpart.Workbook = new Workbook();
-
             CreateStyles(workbookpart);
-
             // Получаем/создаем хранилище текстов для книги
             _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
-                ? _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
-                : _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
-
+            ?
+            _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
+            :
+            _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
             // Создаем SharedStringTable, если его нет
             if (_shareStringPart.SharedStringTable == null)
             {
                 _shareStringPart.SharedStringTable = new SharedStringTable();
             }
-
             // Создаем лист в книгу
             var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
             worksheetPart.Worksheet = new Worksheet(new SheetData());
-
             // Добавляем лист в книгу
             var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
             var sheet = new Sheet()
@@ -183,10 +223,8 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
                 Name = "Лист"
             };
             sheets.Append(sheet);
-
             _worksheet = worksheetPart.Worksheet;
         }
-
         protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
         {
             if (_worksheet == null || _shareStringPart == null)
@@ -198,20 +236,19 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
             {
                 return;
             }
-
             // Ищем строку, либо добавляем ее
             Row row;
             if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
             {
-                row = sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).First();
+                row = sheetData.Elements<Row>().Where(r => r.RowIndex! ==
+               excelParams.RowIndex).First();
             }
             else
             {
                 row = new Row() { RowIndex = excelParams.RowIndex };
                 sheetData.Append(row);
             }
-
-            // Ищем нужную ячейку  
+            // Ищем нужную ячейку
             Cell cell;
             if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
             {
@@ -224,28 +261,31 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
                 Cell? refCell = null;
                 foreach (Cell rowCell in row.Elements<Cell>())
                 {
-                    if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
+                    if (string.Compare(rowCell.CellReference!.Value,
+                   excelParams.CellReference, true) > 0)
                     {
                         refCell = rowCell;
                         break;
                     }
                 }
-
-                var newCell = new Cell() { CellReference = excelParams.CellReference };
+                var newCell = new Cell()
+                {
+                    CellReference =
+               excelParams.CellReference
+                };
                 row.InsertBefore(newCell, refCell);
-
                 cell = newCell;
             }
-
             // вставляем новый текст
-            _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
+            _shareStringPart.SharedStringTable.AppendChild(new
+           SharedStringItem(new Text(excelParams.Text)));
             _shareStringPart.SharedStringTable.Save();
-
-            cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
+            cell.CellValue = new
+           CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count(
+           ) - 1).ToString());
             cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
             cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
         }
-
         protected override void MergeCells(ExcelMergeParameters excelParams)
         {
             if (_worksheet == null)
@@ -253,7 +293,6 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
                 return;
             }
             MergeCells mergeCells;
-
             if (_worksheet.Elements<MergeCells>().Any())
             {
                 mergeCells = _worksheet.Elements<MergeCells>().First();
@@ -261,24 +300,23 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
             else
             {
                 mergeCells = new MergeCells();
-
                 if (_worksheet.Elements<CustomSheetView>().Any())
                 {
-                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<CustomSheetView>().First());
+                    _worksheet.InsertAfter(mergeCells,
+                   _worksheet.Elements<CustomSheetView>().First());
                 }
                 else
                 {
-                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<SheetData>().First());
+                    _worksheet.InsertAfter(mergeCells,
+                   _worksheet.Elements<SheetData>().First());
                 }
             }
-
             var mergeCell = new MergeCell()
             {
                 Reference = new StringValue(excelParams.Merge)
             };
             mergeCells.Append(mergeCell);
         }
-
         protected override void SaveExcel(ExcelInfo info)
         {
             if (_spreadsheetDocument == null)
@@ -289,4 +327,4 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
             _spreadsheetDocument.Close();
         }
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -9,12 +9,10 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
     public class SaveToPdf : AbstractSaveToPdf
     {
         private Document? _document;
-
         private Section? _section;
-
         private Table? _table;
-
-        private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
+        private static ParagraphAlignment
+       GetParagraphAlignment(PdfParagraphAlignmentType type)
         {
             return type switch
             {
@@ -24,7 +22,6 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
                 _ => ParagraphAlignment.Justify,
             };
         }
-
         /// <summary>
         /// Создание стилей для документа
         /// </summary>
@@ -34,19 +31,15 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
             var style = document.Styles["Normal"];
             style.Font.Name = "Times New Roman";
             style.Font.Size = 14;
-
             style = document.Styles.AddStyle("NormalTitle", "Normal");
             style.Font.Bold = true;
         }
-
         protected override void CreatePdf(PdfInfo info)
         {
             _document = new Document();
             DefineStyles(_document);
-
             _section = _document.AddSection();
         }
-
         protected override void CreateParagraph(PdfParagraph pdfParagraph)
         {
             if (_section == null)
@@ -55,10 +48,10 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
             }
             var paragraph = _section.AddParagraph(pdfParagraph.Text);
             paragraph.Format.SpaceAfter = "1cm";
-            paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
+            paragraph.Format.Alignment =
+           GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
             paragraph.Style = pdfParagraph.Style;
         }
-
         protected override void CreateTable(List<string> columns)
         {
             if (_document == null)
@@ -66,13 +59,11 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
                 return;
             }
             _table = _document.LastSection.AddTable();
-
             foreach (var elem in columns)
             {
                 _table.AddColumn(elem);
             }
         }
-
         protected override void CreateRow(PdfRowParameters rowParameters)
         {
             if (_table == null)
@@ -83,24 +74,20 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
             for (int i = 0; i < rowParameters.Texts.Count; ++i)
             {
                 row.Cells[i].AddParagraph(rowParameters.Texts[i]);
-
                 if (!string.IsNullOrEmpty(rowParameters.Style))
                 {
                     row.Cells[i].Style = rowParameters.Style;
                 }
-
                 Unit borderWidth = 0.5;
-
                 row.Cells[i].Borders.Left.Width = borderWidth;
                 row.Cells[i].Borders.Right.Width = borderWidth;
                 row.Cells[i].Borders.Top.Width = borderWidth;
                 row.Cells[i].Borders.Bottom.Width = borderWidth;
-
-                row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
+                row.Cells[i].Format.Alignment =
+               GetParagraphAlignment(rowParameters.ParagraphAlignment);
                 row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
             }
         }
-
         protected override void SavePdf(PdfInfo info)
         {
             var renderer = new PdfDocumentRenderer(true)
@@ -111,4 +98,4 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
             renderer.PdfDocument.Save(info.FileName);
         }
     }
-}
+}

SoftwareInstallation/SoftwareInstallationBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -9,15 +9,14 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
     public class SaveToWord : AbstractSaveToWord
     {
         private WordprocessingDocument? _wordDocument;
-
         private Body? _docBody;
-
         /// <summary>
         /// Получение типа выравнивания
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        private static JustificationValues GetJustificationValues(WordJustificationType type)
+        private static JustificationValues
+       GetJustificationValues(WordJustificationType type)
         {
             return type switch
             {
@@ -26,7 +25,6 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
                 _ => JustificationValues.Left,
             };
         }
-
         /// <summary>
         /// Настройки страницы
         /// </summary>
@@ -34,61 +32,56 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
         private static SectionProperties CreateSectionProperties()
         {
             var properties = new SectionProperties();
-
             var pageSize = new PageSize
             {
                 Orient = PageOrientationValues.Portrait
             };
-
             properties.AppendChild(pageSize);
-
             return properties;
         }
-
         /// <summary>
         /// Задание форматирования для абзаца
         /// </summary>
         /// <param name="paragraphProperties"></param>
         /// <returns></returns>
-        private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
+        private static ParagraphProperties?
+       CreateParagraphProperties(WordTextProperties? paragraphProperties)
         {
             if (paragraphProperties == null)
             {
                 return null;
             }
-
             var properties = new ParagraphProperties();
-
             properties.AppendChild(new Justification()
             {
-                Val = GetJustificationValues(paragraphProperties.JustificationType)
+                Val =
+           GetJustificationValues(paragraphProperties.JustificationType)
             });
-
             properties.AppendChild(new SpacingBetweenLines
             {
                 LineRule = LineSpacingRuleValues.Auto
             });
-
             properties.AppendChild(new Indentation());
-
             var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
             if (!string.IsNullOrEmpty(paragraphProperties.Size))
             {
-                paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size });
+                paragraphMarkRunProperties.AppendChild(new FontSize
+                {
+                    Val =
+               paragraphProperties.Size
+                });
             }
             properties.AppendChild(paragraphMarkRunProperties);
-
             return properties;
         }
-
-        protected override void CreateWord(WordInfoTable info)
+        protected override void CreateWord(WordInfo info)
         {
-            _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
+            _wordDocument = WordprocessingDocument.Create(info.FileName,
+           WordprocessingDocumentType.Document);
             MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
             mainPart.Document = new Document();
             _docBody = mainPart.Document.AppendChild(new Body());
         }
-
         protected override void CreateParagraph(WordParagraph paragraph)
         {
             if (_docBody == null || paragraph == null)
@@ -98,11 +91,9 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
             var docParagraph = new Paragraph();
 
             docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
-
             foreach (var run in paragraph.Texts)
             {
                 var docRun = new Run();
-
                 var properties = new RunProperties();
                 properties.AppendChild(new FontSize { Val = run.Item2.Size });
                 if (run.Item2.Bold)
@@ -110,66 +101,25 @@ namespace SoftwareInstallationBusinessLogic.OfficePackage.Implements
                     properties.AppendChild(new Bold());
                 }
                 docRun.AppendChild(properties);
-
-                docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
-
+                docRun.AppendChild(new Text
+                {
+                    Text = run.Item1,
+                    Space =
+               SpaceProcessingModeValues.Preserve
+                });
                 docParagraph.AppendChild(docRun);
             }
-
             _docBody.AppendChild(docParagraph);
         }
-
-        protected override void SaveWord(WordInfoTable info)
+        protected override void SaveWord(WordInfo info)
         {
             if (_docBody == null || _wordDocument == null)
             {
                 return;
             }
             _docBody.AppendChild(CreateSectionProperties());
-
             _wordDocument.MainDocumentPart!.Document.Save();
-
             _wordDocument.Close();
         }
-
-        private static TableCell GetTableCell(string text, int? widthCell = null)
-        {
-
-            TableCell cell = new(new Paragraph(new Run(new Text(text))));
-            if (widthCell != null)
-            {
-                cell.Append(new TableCellProperties()
-                {
-                    TableCellWidth = new() { Width = widthCell.ToString() }
-                });
-            }
-            return cell;
-        }
-
-        protected override void CreateTable(List<(string, int?)> nameAndWidthColumns, List<List<string>> rows)
-        {
-            if (_docBody == null)
-            {
-                return;
-            }
-            Table table = new();
-            TableProperties tblProp = new TableProperties(
-            new TableBorders(
-                    new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 }
-                )
-            );
-            table.AppendChild(tblProp);
-
-            table.Append(new TableRow(nameAndWidthColumns.Select(x => GetTableCell(x.Item1, x.Item2))));
-            
-            table.Append(rows.Select(x => new TableRow(x.Select(y => GetTableCell(y)))));
-
-            _docBody.Append(table);
-        }
     }
 }

SoftwareInstallation/SoftwareInstallationBusinessLogic/ReportLogic.cs

@@ -1,228 +0,0 @@
-using SoftwareInstallationBusinessLogic.OfficePackage.HelperModels;
-using SoftwareInstallationBusinessLogic.OfficePackage;
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.BusinessLogicsContracts;
-using SoftwareInstallationContracts.SearchModels;
-using SoftwareInstallationContracts.StoragesContracts;
-using SoftwareInstallationContracts.ViewModels;
-
-namespace SoftwareInstallationBusinessLogic
-{
-    public class ReportLogic : IReportLogic
-    {
-        private readonly IPackageStorage _packageStorage;
-
-        private readonly IOrderStorage _orderStorage;
-
-        private readonly IShopStorage _shopStorage;
-        private readonly IComponentStorage _componentStorage;
-
-        private readonly AbstractSaveToExcel _saveToExcel;
-
-        private readonly AbstractSaveToWord _saveToWord;
-
-        private readonly AbstractSaveToPdf _saveToPdf;
-
-        public ReportLogic(IPackageStorage PackageStorage, IOrderStorage orderStorage, IShopStorage shopStorage, IComponentStorage componentStorage,
-            AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
-        {
-            _componentStorage = componentStorage;
-            _packageStorage = PackageStorage;
-            _orderStorage = orderStorage;
-            _shopStorage = shopStorage;
-
-            _saveToExcel = saveToExcel;
-            _saveToWord = saveToWord;
-            _saveToPdf = saveToPdf;
-        }
-
-        /// <summary>
-        /// Получение списка магазинов с изделиями
-        /// </summary>
-        /// <returns></returns>
-        public List<ReportShopPackagetViewModel> GetShopPackages()
-        {
-            var shops = _shopStorage.GetFullList();
-
-            var packages = _packageStorage.GetFullList();
-
-            var list = new List<ReportShopPackagetViewModel>();
-
-            foreach (var shop in shops)
-            {
-                var record = new ReportShopPackagetViewModel
-                {
-                    ShopName = shop.Name,
-                    Packages = new List<Tuple<string, int>>(),
-                    TotalCount = 0
-                };
-                foreach (var package in packages)
-                {
-                    if (shop.Packages.ContainsKey(package.Id))
-                    {
-                        record.Packages.Add(new(package.PackageName, shop.Packages[package.Id].Item2));
-                        record.TotalCount += shop.Packages[package.Id].Item2;
-                    }
-                }
-                record.Workload = record.TotalCount / (double)shop.MaxCountPackages;
-                list.Add(record);
-            }
-
-            return list;
-        }
-
-        /// <summary>
-        /// Получение списка компонент с указанием, в каких изделиях используются
-        /// </summary>
-        /// <returns></returns>
-        public List<ReportPackageComponentViewModel> GetPackageComponent()
-        {
-            var components = _componentStorage.GetFullList();
-
-            var packages = _packageStorage.GetFullList();
-
-            var list = new List<ReportPackageComponentViewModel>();
-
-            foreach (var package in packages)
-            {
-                var record = new ReportPackageComponentViewModel
-                {
-                    PackageName = package.PackageName,
-                    Components = new List<Tuple<string, int>>(),
-                    TotalCount = 0
-                };
-                foreach (var component in components)
-                {
-                    if (package.PackageComponents.ContainsKey(component.Id))
-                    {
-                        record.Components.Add(new(component.ComponentName, package.PackageComponents[component.Id].Item2));
-                        record.TotalCount += package.PackageComponents[component.Id].Item2;
-                    }
-                }
-
-                list.Add(record);
-            }
-
-            return list;
-        }
-
-        /// <summary>
-        /// Получение списка заказов за определенный период
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
-        {
-            return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo })
-                    .Select(x => new ReportOrdersViewModel
-                    {
-                        Id = x.Id,
-                        DateCreate = x.DateCreate,
-                        PackageName = x.PackageName,
-                        OrderStatus = Convert.ToString(x.Status) ?? string.Empty,
-                        Sum = x.Sum
-                    })
-                    .ToList();
-        }
-
-        /// <summary>
-        /// Получение списка заказов за определенный период
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        public List<ReportGroupOrdersViewModel> GetGroupOrders(ReportBindingModel model)
-        {
-            return _orderStorage.GetFullList()
-                .GroupBy(x => x.DateCreate.Date)
-                .Select(x => new ReportGroupOrdersViewModel 
-                { 
-                    Date = x.Key,
-                    Count = x.Count(),
-                    Sum = x.Sum(y => y.Sum)
-                }).ToList();
-
-        }
-
-        /// <summary>
-        /// Сохранение магазинов в файл-Word
-        /// </summary>
-        /// <param name="model"></param>
-        public void SaveShopsTableToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateDocTable(new WordInfoTable
-            {
-                FileName = model.FileName,
-                Title = "Список магазинов",
-                Shops = _shopStorage.GetFullList()
-            });
-        }
-
-        public void SavePackagesToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateDoc(new WordInfo
-            {
-                FileName = model.FileName,
-                Title = "Список изделий",
-                Packages = _packageStorage.GetFullList()
-            });
-        }
-
-
-
-        /// <summary>
-        /// Сохранение магазинов с указаеним продуктов в файл-Excel
-        /// </summary>
-        /// <param name="model"></param>
-        public void SaveShopPackageToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateReportShop(new ExcelInfo
-            {
-                FileName = model.FileName,
-                Title = "Список магазинов",
-                ShopPackages = GetShopPackages()
-            });
-        }
-
-        public void SavePackageComponentToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateReportPackage(new ExcelInfoPackage
-            {
-                FileName = model.FileName,
-                Title = "Список изделий по компонентам",
-                PackageComponents = GetPackageComponent(),
-            });
-        }
-
-        /// <summary>
-        /// Сохранение заказов в файл-Pdf
-        /// </summary>
-        /// <param name="model"></param>
-        public void SaveGroupOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateDoc(new PdfInfo
-            {
-                FileName = model.FileName,
-                Title = "Список сгруппированных заказов по датам",
-                DateFrom = model.DateFrom!.Value,
-                DateTo = model.DateTo!.Value,
-                Orders = GetGroupOrders(model)
-            });
-        }
-        /// <summary>
-        /// Сохранение заказов в файл-Pdf
-        /// </summary>
-        /// <param name="model"></param>
-        public void SaveOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateDocOrders(new PdfInfoOrders
-            {
-                FileName = model.FileName,
-                Title = "Список заказов",
-                DateFrom = model.DateFrom!.Value,
-                DateTo = model.DateTo!.Value,
-                Orders = GetOrders(model),
-            });
-        }
-
-    }
-}

SoftwareInstallation/SoftwareInstallationBusinessLogic/ShopLogic.cs

@@ -1,215 +0,0 @@
-using SoftwareInstallationBusinessLogic.BusinessLogics;
-using SoftwareInstallationContracts.BindingModels;
-using SoftwareInstallationContracts.BusinessLogicsContracts;
-using SoftwareInstallationContracts.SearchModels;
-using SoftwareInstallationContracts.StoragesContracts;
-using SoftwareInstallationContracts.ViewModels;
-using SoftwareInstallationDataModels.Models;
-using Microsoft.Extensions.Logging;
-
-namespace SoftwareInstallationBusinessLogic
-{
-    public class ShopLogic : IShopLogic
-    { 
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-        }
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id} ",
-                model?.Name, model?.Id);
-            var list = (model == null) ? _shopStorage.GetFullList() :
-            _shopStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}",
-                model.Name, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            model.Packages = new();
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                throw new ArgumentNullException("Нет названия магазина",
-                nameof(model.Name));
-            }
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                throw new ArgumentNullException("Нет названия магазина",
-                nameof(model.Name));
-            }
-            if (model.MaxCountPackages < 0)
-            {
-                throw new ArgumentException(
-                    "Максимальное количество изделий в магазине не должно быть отрицательным",
-                    nameof(model.MaxCountPackages));
-            }
-            _logger.LogInformation("Shop. ShopName:{0}.Address:{1}. Id: {2}",
-                model.Name, model.Address, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Name = model.Name
-            });
-            if (element != null && element.Id != model.Id && element.Name == model.Name)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-
-        public bool AddPackage(ShopSearchModel model, IPackageModel package, int count)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (count <= 0)
-            {
-                throw new ArgumentException("Количество добавляемого изделия должно быть больше 0", nameof(count));
-            }
-            
-            _logger.LogInformation("AddPackageInShop. ShopName:{ShopName}.Id:{ Id}",
-                model.Name, model.Id);
-            var element = _shopStorage.GetElement(model);
-            int currCount = element.Packages.Values.FirstOrDefault().Item2;
-            if (element == null)
-            {
-                _logger.LogWarning("AddPackageInShop element not found");
-                return false;
-            }
-            if (count + currCount > element.MaxCountPackages)
-            {
-                throw new ArgumentException("Количество изделий не должно быть больше максимального количества изделий");
-                return false;
-            }
-           
-            _logger.LogInformation("AddPackageInShop find. Id:{Id}", element.Id);
-
-            var prevCount = element.Packages.GetValueOrDefault(package.Id, (package, 0)).Item2;
-            element.Packages[package.Id] = (package, prevCount + count);
-            _logger.LogInformation(
-                    "AddPackageInShop. Has been added {count} {package} in {ShopName}",
-                    count, package.PackageName, element.Name);
-
-            _shopStorage.Update(new()
-            {
-                Id = element.Id,
-                Address = element.Address,
-                Name = element.Name,
-                DateOpening = element.DateOpening,
-                Packages = element.Packages
-            });
-            return true;
-        }
-        public int GetFreePlacesWithPackagesInShops(int countPackages)
-        {
-            // Сумма разностей между максимальный кол-вом изделий и суммой всех изделий в магазине
-            return _shopStorage.GetFullList()
-                .Select(x => x.MaxCountPackages - x.Packages
-                .Select(p => p.Value.Item2).Sum())
-                .Sum() - countPackages;
-        }
-
-        public bool AddPackagesInShops(IPackageModel package, int count)
-        {
-            if (count <= 0)
-            {
-                _logger.LogWarning("AddPackagesInShops. Количество добавляемых изделий должно быть больше 0. Количество - {count}", count);
-                return false;
-            }
-            var freePlaces = GetFreePlacesWithPackagesInShops(count);
-            if (freePlaces < 0)
-            {
-                _logger.LogInformation("AddPackagesInShops. Не удалось добавить изделия в магазины, поскольку они переполнены." +
-                    "Освободите магазины на {places} изделий", -freePlaces);
-                return false;
-            }
-            foreach (var shop in _shopStorage.GetFullList())
-            {
-                var cnt = Math.Min(count, shop.MaxCountPackages - shop.Packages.Select(x => x.Value.Item2).Sum());
-                if (cnt <= 0)
-                {
-                    continue;
-                }
-                if (!AddPackage(new() { Id = shop.Id }, package, cnt))
-                {
-                    _logger.LogWarning("При добавления изделий во все магазины произошла ошибка");
-                    return false;
-                }
-                count -= cnt;
-                if (count == 0)
-                {
-                    return true;
-                }
-            }
-            return true;
-        }
-
-        public bool SellPackages(IPackageModel package, int needCount)
-        {
-            return _shopStorage.SellPackages(package, needCount);
-        }
-    }
-}

SoftwareInstallation/SoftwareInstallationBusinessLogic/SoftwareInstallationBusinessLogic.csproj

@@ -7,7 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
+    <PackageReference Include="MailKit" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="PDFsharp-MigraDoc-GDI" Version="1.50.5147" />
   </ItemGroup>

SoftwareInstallation/SoftwareInstallationClientApp/APIClient.cs

@@ -0,0 +1,49 @@
+using SoftwareInstallationContracts.ViewModels;
+using Newtonsoft.Json;
+using System.Net.Http.Headers;
+using System.Text;
+
+namespace SoftwareInstallationClientApp
+{
+    public class APIClient
+    {
+        private static readonly HttpClient _client = new();
+
+        public static ClientViewModel? Client { get; set; } = null;
+
+        public static void Connect(IConfiguration configuration)
+        {
+            _client.BaseAddress = new Uri(configuration["IPAddress"]);
+            _client.DefaultRequestHeaders.Accept.Clear();
+            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+        }
+
+        public static T? GetRequest<T>(string requestUrl)
+        {
+            var response = _client.GetAsync(requestUrl);
+            var result = response.Result.Content.ReadAsStringAsync().Result;
+            if (response.Result.IsSuccessStatusCode)
+            {
+                return JsonConvert.DeserializeObject<T>(result);
+            }
+            else
+            {
+				throw new Exception(result);
+			}
+		}
+
+        public static void PostRequest<T>(string requestUrl, T model)
+        {
+            var json = JsonConvert.SerializeObject(model);
+            var data = new StringContent(json, Encoding.UTF8, "application/json");
+
+            var response = _client.PostAsync(requestUrl, data);
+
+            var result = response.Result.Content.ReadAsStringAsync().Result;
+            if (!response.Result.IsSuccessStatusCode)
+            {
+                throw new Exception(result);
+            }
+        }
+    }
+}

SoftwareInstallation/SoftwareInstallationClientApp/Controllers/HomeController.cs

@@ -0,0 +1,159 @@
+using SoftwareInstallationClientApp.Models;
+using SoftwareInstallationClientApp;
+using SoftwareInstallationContracts.BindingModels;
+using SoftwareInstallationContracts.ViewModels;
+using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
+using SoftwareInstallationContracts.ViewModels;
+
+namespace SoftwareInstallationClientApp.Controllers
+{
+	public class HomeController : Controller
+	{
+		private readonly ILogger<HomeController> _logger;
+
+		public HomeController(ILogger<HomeController> logger)
+		{
+			_logger = logger;
+		}
+
+		public IActionResult Index()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+			return View(APIClient.GetRequest<List<OrderViewModel>>($"api/main/getorders?clientId={APIClient.Client.Id}"));
+		}
+
+		[HttpGet]
+		public IActionResult Privacy()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+			return View(APIClient.Client);
+		}
+
+		[HttpPost]
+		public void Privacy(string login, string password, string fio)
+		{
+			if (APIClient.Client == null)
+			{
+				throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+			}
+			if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
+			{
+				throw new Exception("Введите логин, пароль и ФИО");
+			}
+			APIClient.PostRequest("api/client/updatedata", new ClientBindingModel
+			{
+				Id = APIClient.Client.Id,
+				ClientFIO = fio,
+				Email = login,
+				Password = password
+			});
+
+			APIClient.Client.ClientFIO = fio;
+			APIClient.Client.Email = login;
+			APIClient.Client.Password = password;
+			Response.Redirect("Index");
+		}
+
+		[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+		public IActionResult Error()
+		{
+			return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+		}
+
+		[HttpGet]
+		public IActionResult Enter()
+		{
+			return View();
+		}
+
+		[HttpPost]
+		public void Enter(string login, string password)
+		{
+			if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password))
+			{
+				throw new Exception("Введите логин и пароль");
+			}
+			APIClient.Client = APIClient.GetRequest<ClientViewModel>($"api/client/login?login={login}&password={password}");
+			if (APIClient.Client == null)
+			{
+				throw new Exception("Неверный логин/пароль");
+			}
+			Response.Redirect("Index");
+		}
+
+		[HttpGet]
+		public IActionResult Register()
+		{
+			return View();
+		}
+
+		[HttpPost]
+		public void Register(string login, string password, string fio)
+		{
+			if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
+			{
+				throw new Exception("Введите логин, пароль и ФИО");
+			}
+			APIClient.PostRequest("api/client/register", new ClientBindingModel
+			{
+				ClientFIO = fio,
+				Email = login,
+				Password = password
+			});
+			Response.Redirect("Enter");
+			return;
+		}
+
+		[HttpGet]
+		public IActionResult Create()
+		{
+			ViewBag.Packages = APIClient.GetRequest<List<PackageViewModel>>("api/main/getpackagelist");
+			return View();
+		}
+
+		[HttpPost]
+		public void Create(int package, int count)
+		{
+			if (APIClient.Client == null)
+			{
+				throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+			}
+			if (count <= 0)
+			{
+				throw new Exception("Количество и сумма должны быть больше 0");
+			}
+			APIClient.PostRequest("api/main/createorder", new OrderBindingModel
+			{
+				ClientId = APIClient.Client.Id,
+				PackageId = package,
+				Count = count,
+				Sum = Calc(count, package)
+			});
+			Response.Redirect("Index");
+		}
+
+		[HttpPost]
+		public double Calc(int count, int package)
+		{
+			var prod = APIClient.GetRequest<PackageViewModel>($"api/main/getpackage?packageId={package}");
+			return count * (prod?.Price ?? 1);
+		}
+
+        [HttpGet]
+        public IActionResult Mails()
+        {
+            if (APIClient.Client == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
+        }
+    }
+}

SoftwareInstallation/SoftwareInstallationClientApp/Models/ErrorViewModel.cs

@@ -0,0 +1,9 @@
+namespace SoftwareInstallationClientApp.Models
+{
+    public class ErrorViewModel
+    {
+        public string? RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}

SoftwareInstallation/SoftwareInstallationClientApp/Program.cs

@@ -0,0 +1,31 @@
+using SoftwareInstallationClientApp;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+builder.Services.AddControllersWithViews();
+
+var app = builder.Build();
+
+APIClient.Connect(builder.Configuration);
+
+// Configure the HTTP request pipeline.
+if (!app.Environment.IsDevelopment())
+{
+    app.UseExceptionHandler("/Home/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
+}
+
+app.UseHttpsRedirection();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthorization();
+
+app.MapControllerRoute(
+    name: "default",
+    pattern: "{controller=Home}/{action=Index}/{id?}");
+
+app.Run();

SoftwareInstallation/SoftwareInstallationClientApp/Properties/launchSettings.json

@@ -0,0 +1,28 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:20662",
+      "sslPort": 44346
+    }
+  },
+  "profiles": {
+    "SoftwareInstallationClientApp": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:7085;http://localhost:5011",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

SoftwareInstallation/SoftwareInstallationClientApp/SoftwareInstallationClientApp.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SoftwareInstallationContracts\SoftwareInstallationContracts.csproj" />
+  </ItemGroup>
+
+</Project>

SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Create.cshtml

@@ -0,0 +1,50 @@
+@{
+	ViewData["Title"] = "Create";
+}
+<div class="text-center">
+	<h2 class="display-4">Создание заказа</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Изделие:</div>
+		<div class="col-8">
+			<select id="package" name="package" class="form-control" asp-items="@(new SelectList(@ViewBag.Packages, "Id", "PackageName"))"></select>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-4">Количество:</div>
+		<div class="col-8"><input type="text" name="count" id="count" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Сумма:</div>
+		<div class="col-8"><input type="text" id="sum" name="sum" readonly /></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4"><input type="submit" value="Создать" class="btn btn-primary" /></div>
+	</div>
+</form>
+
+<script>
+	$('#package').on('change', function () {
+		check();
+	});
+	$('#count').on('change', function () {
+		check();
+	});
+
+	function check() {
+		var count = $('#count').val();
+		var package = $('#package').val();
+		if (count && package) {
+			$.ajax({
+				method: "POST",
+				url: "/Home/Calc",
+				data: { count: count, package: package  },
+				success: function (result) {
+					$("#sum").val(result);
+				}
+			});
+		};
+	}
+</script>

SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Enter.cshtml

@@ -0,0 +1,21 @@
+@{
+	ViewData["Title"] = "Enter";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Вход в приложение</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Логин:</div>
+		<div class="col-8"><input type="text" name="login" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Пароль:</div>
+		<div class="col-8"><input type="password" name="password" /></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4"><input type="submit" value="Вход" class="btn btn-primary" /></div>
+	</div>
+</form>

SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Index.cshtml

@@ -0,0 +1,75 @@
+@using SoftwareInstallationContracts.ViewModels
+
+@model List<OrderViewModel>
+
+@{
+	ViewData["Title"] = "Home Page";
+}
+
+<div class="text-center">
+	<h1 class="display-4">Заказы</h1>
+</div>
+
+
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+					<h3 class="display-4">Авторизируйтесь</h3>
+			return;
+		}
+
+			<p>
+				<a asp-action="Create">Создать заказ</a>
+			</p>
+			<table class="table">
+				<thead>
+					<tr>
+						<th>
+							Номер
+						</th>
+						<th>
+							Изделие
+						</th>
+						<th>
+							Дата создания
+						</th>
+						<th>
+							Количество
+						</th>
+						<th>
+							Сумма
+						</th>
+						<th>
+							Статус
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+				@foreach (var item in Model)
+				{
+							<tr>
+								<td>
+							@Html.DisplayFor(modelItem => item.Id)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.PackageName)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.DateCreate)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.Count)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.Sum)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.Status)
+								</td>
+							</tr>
+				}
+				</tbody>
+			</table>
+	}
+</div>

SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Mails.cshtml

@@ -0,0 +1,54 @@
+@using SoftwareInstallationContracts.ViewModels
+
+@model List<MessageInfoViewModel>
+
+@{
+	ViewData["Title"] = "Mails";
+}
+
+<div class="text-center">
+	<h1 class="display-4">Письма</h1>
+</div>
+
+
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+			<h3 class="display-4">Авторизируйтесь</h3>
+			return;
+		}
+
+			<table class="table">
+				<thead>
+					<tr>
+						<th>
+							Дата письма
+						</th>
+						<th>
+							Заголовок
+						</th>
+						<th>
+							Текст
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+				@foreach (var item in Model)
+				{
+							<tr>
+								<td>
+							@Html.DisplayFor(modelItem => item.DateDelivery)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.Subject)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.Body)
+								</td>
+							</tr>
+				}
+				</tbody>
+			</table>
+	}
+</div>

SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Privacy.cshtml

@@ -0,0 +1,28 @@
+@using SoftwareInstallationContracts.ViewModels;
+
+@model ClientViewModel
+
+@{
+	ViewData["Title"] = "Privacy Policy";
+}
+<div class="text-center">
+	<h2 class="display-4">Личные данные</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Логин:</div>
+		<div class="col-8"><input type="text" name="login" value="@Model.Email"/></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Пароль:</div>
+		<div class="col-8"><input type="password" name="password"  value="@Model.Password"/></div>
+	</div>
+	<div class="row">
+		<div class="col-4">ФИО:</div>
+		<div class="col-8"><input type="text" name="fio"  value="@Model.ClientFIO"/></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4"><input type="submit" value="Сохранить" class="btn btn-primary" /></div>
+	</div>
+</form>

SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Register.cshtml

@@ -0,0 +1,25 @@
+@{
+	ViewData["Title"] = "Register";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Регистрация</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Логин:</div>
+		<div class="col-8"><input type="text" name="login" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Пароль:</div>
+		<div class="col-8"><input type="password" name="password" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">ФИО:</div>
+		<div class="col-8"><input type="text" name="fio" /></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4"><input type="submit" value="Регистрация" class="btn btn-primary" /></div>
+	</div>
+</form>

SoftwareInstallation/SoftwareInstallationClientApp/Views/Shared/Error.cshtml

@@ -0,0 +1,25 @@
+@model ErrorViewModel
+@{
+    ViewData["Title"] = "Error";
+}
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+@if (Model.ShowRequestId)
+{
+    <p>
+        <strong>Request ID:</strong> <code>@Model.RequestId</code>
+    </p>
+}
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+</p>
+<p>
+    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
+    It can result in displaying sensitive information from exceptions to end users.
+    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
+    and restarting the app.
+</p>

SoftwareInstallation/SoftwareInstallationClientApp/Views/Shared/_Layout.cshtml

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SoftwareInstallationClientApp</title>
+    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/SoftwareInstallationClientApp.styles.css" asp-append-version="true" />
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="~/js/site.js" asp-append-version="true"></script>
+</head>
+<body>
+    <header>
+        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
+            <div class="container-fluid">
+               <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Программное обеспечение</a>
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                        aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
+                    <ul class="navbar-nav flex-grow-1">
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Заказы</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Mails">Письма</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Register">Регистрация</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </nav>
+    </header>
+    <div class="container">
+        <main role="main" class="pb-3">
+            @RenderBody()
+        </main>
+    </div>
+
+    <footer class="border-top footer text-muted">
+        <div class="container">
+            &copy; 2023 - SoftwareInstallationClientApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+        </div>
+    </footer>
+    @await RenderSectionAsync("Scripts", required: false)
+</body>
+</html>

SoftwareInstallation/SoftwareInstallationClientApp/Views/Shared/_Layout.cshtml.css

@@ -0,0 +1,48 @@
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
+for details on configuring this project to bundle and minify static web assets. */
+
+a.navbar-brand {
+  white-space: normal;
+  text-align: center;
+  word-break: break-all;
+}
+
+a {
+  color: #0077cc;
+}
+
+.btn-primary {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.border-top {
+  border-top: 1px solid #e5e5e5;
+}
+.border-bottom {
+  border-bottom: 1px solid #e5e5e5;
+}
+
+.box-shadow {
+  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+}
+
+button.accept-policy {
+  font-size: 1rem;
+  line-height: inherit;
+}
+
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  white-space: nowrap;
+  line-height: 60px;
+}

SoftwareInstallation/SoftwareInstallationClientApp/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -0,0 +1,2 @@
+<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>

SoftwareInstallation/SoftwareInstallationClientApp/Views/_ViewImports.cshtml

@@ -0,0 +1,3 @@
+@using SoftwareInstallationClientApp
+@using SoftwareInstallationClientApp.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

SoftwareInstallation/SoftwareInstallationClientApp/Views/_ViewStart.cshtml

@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}

SoftwareInstallation/SoftwareInstallationClientApp/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

SoftwareInstallation/SoftwareInstallationClientApp/appsettings.json

@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "IPAddress": "http://localhost:5044"
+}

SoftwareInstallation/SoftwareInstallationClientApp/wwwroot/css/site.css

@@ -0,0 +1,18 @@
+html {
+  font-size: 14px;
+}
+
+@media (min-width: 768px) {
+  html {
+    font-size: 16px;
+  }
+}
+
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  margin-bottom: 60px;
+}

SoftwareInstallation/SoftwareInstallationClientApp/wwwroot/js/site.js

@@ -0,0 +1,4 @@
+// Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
+// for details on configuring this project to bundle and minify static web assets.
+
+// Write your JavaScript code.

SoftwareInstallation/SoftwareInstallationClientApp/wwwroot/lib/bootstrap/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2011-2021 Twitter, Inc.
+Copyright (c) 2011-2021 The Bootstrap Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

SoftwareInstallation/SoftwareInstallationClientApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css

@@ -0,0 +1,427 @@
+/*!
+ * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
+ * Copyright 2011-2021 The Bootstrap Authors
+ * Copyright 2011-2021 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  :root {
+    scroll-behavior: smooth;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: var(--bs-body-font-family);
+  font-size: var(--bs-body-font-size);
+  font-weight: var(--bs-body-font-weight);
+  line-height: var(--bs-body-line-height);
+  color: var(--bs-body-color);
+  text-align: var(--bs-body-text-align);
+  background-color: var(--bs-body-bg);
+  -webkit-text-size-adjust: 100%;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+hr {
+  margin: 1rem 0;
+  color: inherit;
+  background-color: currentColor;
+  border: 0;
+  opacity: 0.25;
+}
+
+hr:not([size]) {
+  height: 1px;
+}
+
+h6, h5, h4, h3, h2, h1 {
+  margin-top: 0;
+  margin-bottom: 0.5rem;
+  font-weight: 500;
+  line-height: 1.2;
+}
+
+h1 {
+  font-size: calc(1.375rem + 1.5vw);
+}
+@media (min-width: 1200px) {
+  h1 {
+    font-size: 2.5rem;
+  }
+}
+
+h2 {
+  font-size: calc(1.325rem + 0.9vw);
+}
+@media (min-width: 1200px) {
+  h2 {
+    font-size: 2rem;
+  }
+}
+
+h3 {
+  font-size: calc(1.3rem + 0.6vw);
+}
+@media (min-width: 1200px) {
+  h3 {
+    font-size: 1.75rem;
+  }
+}
+
+h4 {
+  font-size: calc(1.275rem + 0.3vw);
+}
+@media (min-width: 1200px) {
+  h4 {
+    font-size: 1.5rem;
+  }
+}
+
+h5 {
+  font-size: 1.25rem;
+}
+
+h6 {
+  font-size: 1rem;
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+abbr[title],
+abbr[data-bs-original-title] {
+  -webkit-text-decoration: underline dotted;
+  text-decoration: underline dotted;
+  cursor: help;
+  -webkit-text-decoration-skip-ink: none;
+  text-decoration-skip-ink: none;
+}
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit;
+}
+
+ol,
+ul {
+  padding-left: 2rem;
+}
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0;
+}
+
+dt {
+  font-weight: 700;
+}
+
+dd {
+  margin-bottom: 0.5rem;
+  margin-left: 0;
+}
+
+blockquote {
+  margin: 0 0 1rem;
+}
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+small {
+  font-size: 0.875em;
+}
+
+mark {
+  padding: 0.2em;
+  background-color: #fcf8e3;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 0.75em;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+a {
+  color: #0d6efd;
+  text-decoration: underline;
+}
+a:hover {
+  color: #0a58ca;
+}
+
+a:not([href]):not([class]), a:not([href]):not([class]):hover {
+  color: inherit;
+  text-decoration: none;
+}
+
+pre,
+code,
+kbd,
+samp {
+  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  font-size: 1em;
+  direction: ltr /* rtl:ignore */;
+  unicode-bidi: bidi-override;
+}
+
+pre {
+  display: block;
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+  font-size: 0.875em;
+}
+pre code {
+  font-size: inherit;
+  color: inherit;
+  word-break: normal;
+}
+
+code {
+  font-size: 0.875em;
+  color: #d63384;
+  word-wrap: break-word;
+}
+a > code {
+  color: inherit;
+}
+
+kbd {
+  padding: 0.2rem 0.4rem;
+  font-size: 0.875em;
+  color: #fff;
+  background-color: #212529;
+  border-radius: 0.2rem;
+}
+kbd kbd {
+  padding: 0;
+  font-size: 1em;
+  font-weight: 700;
+}
+
+figure {
+  margin: 0 0 1rem;
+}
+
+img,
+svg {
+  vertical-align: middle;
+}
+
+table {
+  caption-side: bottom;
+  border-collapse: collapse;
+}
+
+caption {
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+  color: #6c757d;
+  text-align: left;
+}
+
+th {
+  text-align: inherit;
+  text-align: -webkit-match-parent;
+}
+
+thead,
+tbody,
+tfoot,
+tr,
+td,
+th {
+  border-color: inherit;
+  border-style: solid;
+  border-width: 0;
+}
+
+label {
+  display: inline-block;
+}
+
+button {
+  border-radius: 0;
+}
+
+button:focus:not(:focus-visible) {
+  outline: 0;
+}
+
+input,
+button,
+select,
+optgroup,
+textarea {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+[role=button] {
+  cursor: pointer;
+}
+
+select {
+  word-wrap: normal;
+}
+select:disabled {
+  opacity: 1;
+}
+
+[list]::-webkit-calendar-picker-indicator {
+  display: none;
+}
+
+button,
+[type=button],
+[type=reset],
+[type=submit] {
+  -webkit-appearance: button;
+}
+button:not(:disabled),
+[type=button]:not(:disabled),
+[type=reset]:not(:disabled),
+[type=submit]:not(:disabled) {
+  cursor: pointer;
+}
+
+::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+
+textarea {
+  resize: vertical;
+}
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  float: left;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 0.5rem;
+  font-size: calc(1.275rem + 0.3vw);
+  line-height: inherit;
+}
+@media (min-width: 1200px) {
+  legend {
+    font-size: 1.5rem;
+  }
+}
+legend + * {
+  clear: left;
+}
+
+::-webkit-datetime-edit-fields-wrapper,
+::-webkit-datetime-edit-text,
+::-webkit-datetime-edit-minute,
+::-webkit-datetime-edit-hour-field,
+::-webkit-datetime-edit-day-field,
+::-webkit-datetime-edit-month-field,
+::-webkit-datetime-edit-year-field {
+  padding: 0;
+}
+
+::-webkit-inner-spin-button {
+  height: auto;
+}
+
+[type=search] {
+  outline-offset: -2px;
+  -webkit-appearance: textfield;
+}
+
+/* rtl:raw:
+[type="tel"],
+[type="url"],
+[type="email"],
+[type="number"] {
+  direction: ltr;
+}
+*/
+::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+::-webkit-color-swatch-wrapper {
+  padding: 0;
+}
+
+::file-selector-button {
+  font: inherit;
+}
+
+::-webkit-file-upload-button {
+  font: inherit;
+  -webkit-appearance: button;
+}
+
+output {
+  display: inline-block;
+}
+
+iframe {
+  border: 0;
+}
+
+summary {
+  display: list-item;
+  cursor: pointer;
+}
+
+progress {
+  vertical-align: baseline;
+}
+
+[hidden] {
+  display: none !important;
+}
+
+/*# sourceMappingURL=bootstrap-reboot.css.map */

SoftwareInstallation/SoftwareInstallationClientApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css

@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
+ * Copyright 2011-2021 The Bootstrap Authors
+ * Copyright 2011-2021 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */*,::after,::before{box-sizing:border-box}@media (prefers-reduced-motion:no-preference){:root{scroll-behavior:smooth}}body{margin:0;font-family:var(--bs-body-font-family);font-size:var(--bs-body-font-size);font-weight:var(--bs-body-font-weight);line-height:var(--bs-body-line-height);color:var(--bs-body-color);text-align:var(--bs-body-text-align);background-color:var(--bs-body-bg);-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}hr{margin:1rem 0;color:inherit;background-color:currentColor;border:0;opacity:.25}hr:not([size]){height:1px}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem;font-weight:500;line-height:1.2}h1{font-size:calc(1.375rem + 1.5vw)}@media (min-width:1200px){h1{font-size:2.5rem}}h2{font-size:calc(1.325rem + .9vw)}@media (min-width:1200px){h2{font-size:2rem}}h3{font-size:calc(1.3rem + .6vw)}@media (min-width:1200px){h3{font-size:1.75rem}}h4{font-size:calc(1.275rem + .3vw)}@media (min-width:1200px){h4{font-size:1.5rem}}h5{font-size:1.25rem}h6{font-size:1rem}p{margin-top:0;margin-bottom:1rem}abbr[data-bs-original-title],abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}ol,ul{padding-left:2rem}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:.875em}mark{padding:.2em;background-color:#fcf8e3}sub,sup{position:relative;font-size:.75em;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#0d6efd;text-decoration:underline}a:hover{color:#0a58ca}a:not([href]):not([class]),a:not([href]):not([class]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em;direction:ltr;unicode-bidi:bidi-override}pre{display:block;margin-top:0;margin-bottom:1rem;overflow:auto;font-size:.875em}pre code{font-size:inherit;color:inherit;word-break:normal}code{font-size:.875em;color:#d63384;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:.875em;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:1em;font-weight:700}figure{margin:0 0 1rem}img,svg{vertical-align:middle}table{caption-side:bottom;border-collapse:collapse}caption{padding-top:.5rem;padding-bottom:.5rem;color:#6c757d;text-align:left}th{text-align:inherit;text-align:-webkit-match-parent}tbody,td,tfoot,th,thead,tr{border-color:inherit;border-style:solid;border-width:0}label{display:inline-block}button{border-radius:0}button:focus:not(:focus-visible){outline:0}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}select:disabled{opacity:1}[list]::-webkit-calendar-picker-indicator{display:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}::-moz-focus-inner{padding:0;border-style:none}textarea{resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{float:left;width:100%;padding:0;margin-bottom:.5rem;font-size:calc(1.275rem + .3vw);line-height:inherit}@media (min-width:1200px){legend{font-size:1.5rem}}legend+*{clear:left}::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-fields-wrapper,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-text,::-webkit-datetime-edit-year-field{padding:0}::-webkit-inner-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:textfield}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-color-swatch-wrapper{padding:0}::file-selector-button{font:inherit}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}iframe{border:0}summary{display:list-item;cursor:pointer}progress{vertical-align:baseline}[hidden]{display:none!important}
+/*# sourceMappingURL=bootstrap-reboot.min.css.map */

SoftwareInstallation/SoftwareInstallationClientApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css

@@ -0,0 +1,424 @@
+/*!
+ * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
+ * Copyright 2011-2021 The Bootstrap Authors
+ * Copyright 2011-2021 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  :root {
+    scroll-behavior: smooth;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: var(--bs-body-font-family);
+  font-size: var(--bs-body-font-size);
+  font-weight: var(--bs-body-font-weight);
+  line-height: var(--bs-body-line-height);
+  color: var(--bs-body-color);
+  text-align: var(--bs-body-text-align);
+  background-color: var(--bs-body-bg);
+  -webkit-text-size-adjust: 100%;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+hr {
+  margin: 1rem 0;
+  color: inherit;
+  background-color: currentColor;
+  border: 0;
+  opacity: 0.25;
+}
+
+hr:not([size]) {
+  height: 1px;
+}
+
+h6, h5, h4, h3, h2, h1 {
+  margin-top: 0;
+  margin-bottom: 0.5rem;
+  font-weight: 500;
+  line-height: 1.2;
+}
+
+h1 {
+  font-size: calc(1.375rem + 1.5vw);
+}
+@media (min-width: 1200px) {
+  h1 {
+    font-size: 2.5rem;
+  }
+}
+
+h2 {
+  font-size: calc(1.325rem + 0.9vw);
+}
+@media (min-width: 1200px) {
+  h2 {
+    font-size: 2rem;
+  }
+}
+
+h3 {
+  font-size: calc(1.3rem + 0.6vw);
+}
+@media (min-width: 1200px) {
+  h3 {
+    font-size: 1.75rem;
+  }
+}
+
+h4 {
+  font-size: calc(1.275rem + 0.3vw);
+}
+@media (min-width: 1200px) {
+  h4 {
+    font-size: 1.5rem;
+  }
+}
+
+h5 {
+  font-size: 1.25rem;
+}
+
+h6 {
+  font-size: 1rem;
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+abbr[title],
+abbr[data-bs-original-title] {
+  -webkit-text-decoration: underline dotted;
+  text-decoration: underline dotted;
+  cursor: help;
+  -webkit-text-decoration-skip-ink: none;
+  text-decoration-skip-ink: none;
+}
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit;
+}
+
+ol,
+ul {
+  padding-right: 2rem;
+}
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0;
+}
+
+dt {
+  font-weight: 700;
+}
+
+dd {
+  margin-bottom: 0.5rem;
+  margin-right: 0;
+}
+
+blockquote {
+  margin: 0 0 1rem;
+}
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+small {
+  font-size: 0.875em;
+}
+
+mark {
+  padding: 0.2em;
+  background-color: #fcf8e3;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 0.75em;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+a {
+  color: #0d6efd;
+  text-decoration: underline;
+}
+a:hover {
+  color: #0a58ca;
+}
+
+a:not([href]):not([class]), a:not([href]):not([class]):hover {
+  color: inherit;
+  text-decoration: none;
+}
+
+pre,
+code,
+kbd,
+samp {
+  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  font-size: 1em;
+  direction: ltr ;
+  unicode-bidi: bidi-override;
+}
+
+pre {
+  display: block;
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+  font-size: 0.875em;
+}
+pre code {
+  font-size: inherit;
+  color: inherit;
+  word-break: normal;
+}
+
+code {
+  font-size: 0.875em;
+  color: #d63384;
+  word-wrap: break-word;
+}
+a > code {
+  color: inherit;
+}
+
+kbd {
+  padding: 0.2rem 0.4rem;
+  font-size: 0.875em;
+  color: #fff;
+  background-color: #212529;
+  border-radius: 0.2rem;
+}
+kbd kbd {
+  padding: 0;
+  font-size: 1em;
+  font-weight: 700;
+}
+
+figure {
+  margin: 0 0 1rem;
+}
+
+img,
+svg {
+  vertical-align: middle;
+}
+
+table {
+  caption-side: bottom;
+  border-collapse: collapse;
+}
+
+caption {
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+  color: #6c757d;
+  text-align: right;
+}
+
+th {
+  text-align: inherit;
+  text-align: -webkit-match-parent;
+}
+
+thead,
+tbody,
+tfoot,
+tr,
+td,
+th {
+  border-color: inherit;
+  border-style: solid;
+  border-width: 0;
+}
+
+label {
+  display: inline-block;
+}
+
+button {
+  border-radius: 0;
+}
+
+button:focus:not(:focus-visible) {
+  outline: 0;
+}
+
+input,
+button,
+select,
+optgroup,
+textarea {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+[role=button] {
+  cursor: pointer;
+}
+
+select {
+  word-wrap: normal;
+}
+select:disabled {
+  opacity: 1;
+}
+
+[list]::-webkit-calendar-picker-indicator {
+  display: none;
+}
+
+button,
+[type=button],
+[type=reset],
+[type=submit] {
+  -webkit-appearance: button;
+}
+button:not(:disabled),
+[type=button]:not(:disabled),
+[type=reset]:not(:disabled),
+[type=submit]:not(:disabled) {
+  cursor: pointer;
+}
+
+::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+
+textarea {
+  resize: vertical;
+}
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  float: right;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 0.5rem;
+  font-size: calc(1.275rem + 0.3vw);
+  line-height: inherit;
+}
+@media (min-width: 1200px) {
+  legend {
+    font-size: 1.5rem;
+  }
+}
+legend + * {
+  clear: right;
+}
+
+::-webkit-datetime-edit-fields-wrapper,
+::-webkit-datetime-edit-text,
+::-webkit-datetime-edit-minute,
+::-webkit-datetime-edit-hour-field,
+::-webkit-datetime-edit-day-field,
+::-webkit-datetime-edit-month-field,
+::-webkit-datetime-edit-year-field {
+  padding: 0;
+}
+
+::-webkit-inner-spin-button {
+  height: auto;
+}
+
+[type=search] {
+  outline-offset: -2px;
+  -webkit-appearance: textfield;
+}
+
+[type="tel"],
+[type="url"],
+[type="email"],
+[type="number"] {
+  direction: ltr;
+}
+::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+::-webkit-color-swatch-wrapper {
+  padding: 0;
+}
+
+::file-selector-button {
+  font: inherit;
+}
+
+::-webkit-file-upload-button {
+  font: inherit;
+  -webkit-appearance: button;
+}
+
+output {
+  display: inline-block;
+}
+
+iframe {
+  border: 0;
+}
+
+summary {
+  display: list-item;
+  cursor: pointer;
+}
+
+progress {
+  vertical-align: baseline;
+}
+
+[hidden] {
+  display: none !important;
+}
+/*# sourceMappingURL=bootstrap-reboot.rtl.css.map */

SoftwareInstallation/SoftwareInstallationClientApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css

@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
+ * Copyright 2011-2021 The Bootstrap Authors
+ * Copyright 2011-2021 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */*,::after,::before{box-sizing:border-box}@media (prefers-reduced-motion:no-preference){:root{scroll-behavior:smooth}}body{margin:0;font-family:var(--bs-body-font-family);font-size:var(--bs-body-font-size);font-weight:var(--bs-body-font-weight);line-height:var(--bs-body-line-height);color:var(--bs-body-color);text-align:var(--bs-body-text-align);background-color:var(--bs-body-bg);-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}hr{margin:1rem 0;color:inherit;background-color:currentColor;border:0;opacity:.25}hr:not([size]){height:1px}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem;font-weight:500;line-height:1.2}h1{font-size:calc(1.375rem + 1.5vw)}@media (min-width:1200px){h1{font-size:2.5rem}}h2{font-size:calc(1.325rem + .9vw)}@media (min-width:1200px){h2{font-size:2rem}}h3{font-size:calc(1.3rem + .6vw)}@media (min-width:1200px){h3{font-size:1.75rem}}h4{font-size:calc(1.275rem + .3vw)}@media (min-width:1200px){h4{font-size:1.5rem}}h5{font-size:1.25rem}h6{font-size:1rem}p{margin-top:0;margin-bottom:1rem}abbr[data-bs-original-title],abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}ol,ul{padding-right:2rem}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-right:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:.875em}mark{padding:.2em;background-color:#fcf8e3}sub,sup{position:relative;font-size:.75em;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#0d6efd;text-decoration:underline}a:hover{color:#0a58ca}a:not([href]):not([class]),a:not([href]):not([class]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em;direction:ltr;unicode-bidi:bidi-override}pre{display:block;margin-top:0;margin-bottom:1rem;overflow:auto;font-size:.875em}pre code{font-size:inherit;color:inherit;word-break:normal}code{font-size:.875em;color:#d63384;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:.875em;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:1em;font-weight:700}figure{margin:0 0 1rem}img,svg{vertical-align:middle}table{caption-side:bottom;border-collapse:collapse}caption{padding-top:.5rem;padding-bottom:.5rem;color:#6c757d;text-align:right}th{text-align:inherit;text-align:-webkit-match-parent}tbody,td,tfoot,th,thead,tr{border-color:inherit;border-style:solid;border-width:0}label{display:inline-block}button{border-radius:0}button:focus:not(:focus-visible){outline:0}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}select:disabled{opacity:1}[list]::-webkit-calendar-picker-indicator{display:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}::-moz-focus-inner{padding:0;border-style:none}textarea{resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{float:right;width:100%;padding:0;margin-bottom:.5rem;font-size:calc(1.275rem + .3vw);line-height:inherit}@media (min-width:1200px){legend{font-size:1.5rem}}legend+*{clear:right}::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-fields-wrapper,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-text,::-webkit-datetime-edit-year-field{padding:0}::-webkit-inner-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:textfield}[type=email],[type=number],[type=tel],[type=url]{direction:ltr}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-color-swatch-wrapper{padding:0}::file-selector-button{font:inherit}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}iframe{border:0}summary{display:list-item;cursor:pointer}progress{vertical-align:baseline}[hidden]{display:none!important}
+/*# sourceMappingURL=bootstrap-reboot.rtl.min.css.map */