начало 6 базовой

IceCreamShop/IceCreamBusinessLogic/BusinessLogics/ImplementerLogic.cs

@@ -0,0 +1,123 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.BusinessLogicsContracts;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.StoragesContracts;
+using IceCreamShopContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+
+namespace IceCreamBusinessLogic.BusinessLogics
+{
+    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("Исполнитель с таким фио уже есть");
+            }
+        }
+    }
+}

IceCreamShop/IceCreamShop/Program.cs

@@ -40,10 +40,12 @@ namespace IceCreamShop
             });
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
+			services.AddTransient<IImplementerStorage, ImplementerStorage>();
             services.AddTransient<IIceCreamStorage, IceCreamStorage>();
             services.AddTransient<IClientStorage, ClientStorage>();
 
 			services.AddTransient<IClientLogic, ClientLogic>();
+			services.AddTransient<IImplementerLogic, ImplementerLogic>();
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IIceCreamLogic, IceCreamLogic>();

IceCreamShop/IceCreamShopContracts/BindingModels/ImplementerBindingModel.cs

@@ -0,0 +1,17 @@
+using AbstractIceCreamShopDataModels.Models;
+
+namespace IceCreamShopContracts.BindingModels
+{
+    public class ImplementerBindingModel : IImplementerModel
+    {
+        public int Id { get; set; }
+
+        public string ImplementerFIO { get; set; } = string.Empty;
+
+        public string Password { get; set; } = string.Empty;
+
+        public int WorkExperience { get; set; }
+
+        public int Qualification { get; set; }
+    }
+}

IceCreamShop/IceCreamShopContracts/BindingModels/OrderBindingModel.cs

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

IceCreamShop/IceCreamShopContracts/BusinessLogicsContracts/IImplementerLogic.cs

@@ -0,0 +1,19 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.ViewModels;
+
+namespace IceCreamShopContracts.BusinessLogicsContracts
+{
+    public interface IImplementerLogic
+    {
+        List<ImplementerViewModel>? ReadList(ImplementerSearchModel? model);
+
+        ImplementerViewModel? ReadElement(ImplementerSearchModel model);
+
+        bool Create(ImplementerBindingModel model);
+
+        bool Update(ImplementerBindingModel model);
+
+        bool Delete(ImplementerBindingModel model);
+    }
+}

IceCreamShop/IceCreamShopContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -12,6 +12,7 @@ namespace IceCreamShopContracts.BusinessLogicsContracts
     public interface IOrderLogic
     {
         List<OrderViewModel>? ReadList(OrderSearchModel? model);
+        OrderViewModel? ReadElement(OrderSearchModel model);
         bool CreateOrder(OrderBindingModel model);
         bool TakeOrderInWork(OrderBindingModel model);
         bool FinishOrder(OrderBindingModel model);

IceCreamShop/IceCreamShopContracts/SearchModels/ImplementerSearchModel.cs

@@ -0,0 +1,11 @@
+namespace IceCreamShopContracts.SearchModels
+{
+    public class ImplementerSearchModel
+    {
+        public int? Id { get; set; }
+
+        public string? ImplementerFIO { get; set; }
+
+        public string? Password { get; set; }
+    }
+}

IceCreamShop/IceCreamShopContracts/SearchModels/OrderSearchModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AbstractIceCreamShopDataModels.Enums;
 
 namespace IceCreamShopContracts.SearchModels
 {
@@ -10,9 +11,9 @@ namespace IceCreamShopContracts.SearchModels
     {
         public int? Id { get; set; }
         public int? ClientId { get; set; }
-
+        public int? ImplementerId { get; set; }
         public DateTime? DateFrom { get; set; }
-
         public DateTime? DateTo { get; set; }
+        public List<OrderStatus>? Statusses { get; set; }
     }
 }

IceCreamShop/IceCreamShopContracts/StoragesContracts/IImplementerStorage.cs

@@ -0,0 +1,21 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.ViewModels;
+
+namespace IceCreamShopContracts.StoragesContracts
+{
+    public interface IImplementerStorage
+    {
+        List<ImplementerViewModel> GetFullList();
+
+        List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model);
+
+        ImplementerViewModel? GetElement(ImplementerSearchModel model);
+
+        ImplementerViewModel? Insert(ImplementerBindingModel model);
+
+        ImplementerViewModel? Update(ImplementerBindingModel model);
+
+        ImplementerViewModel? Delete(ImplementerBindingModel model);
+    }
+}

IceCreamShop/IceCreamShopContracts/ViewModels/ImplementerViewModel.cs

@@ -0,0 +1,22 @@
+using AbstractIceCreamShopDataModels.Models;
+using System.ComponentModel;
+
+namespace IceCreamShopContracts.ViewModels
+{
+    public class ImplementerViewModel : IImplementerModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("ФИО исполнителя")]
+        public string ImplementerFIO { get; set; } = string.Empty;
+
+        [DisplayName("Пароль")]
+        public string Password { get; set; } = string.Empty;
+
+        [DisplayName("Стаж работы")]
+        public int WorkExperience { get; set; }
+
+        [DisplayName("Квалификация")]
+        public int Qualification { get; set; }
+    }
+}

IceCreamShop/IceCreamShopContracts/ViewModels/OrderViewModel.cs

@@ -24,6 +24,10 @@ namespace IceCreamShopContracts.ViewModels
         [DisplayName("ФИО клиента")]
         public string ClientFIO { get; set; } = string.Empty;
 
+		public int? ImplementerId { get; set; }
+        [DisplayName("Фамилия исполнителя")]
+        public string ImplementerFIO { get; set; } = string.Empty;
+
         [DisplayName("Количество")]
         public int Count { get; set; }
 

IceCreamShop/IceCreamShopDataModels/Models/IImplementerModel.cs

@@ -0,0 +1,13 @@
+namespace AbstractIceCreamShopDataModels.Models
+{
+    public interface IImplementerModel : IId
+    {
+        string ImplementerFIO { get; }
+
+        string Password { get; }
+
+        int WorkExperience { get; }
+
+        int Qualification { get; }
+    }
+}

IceCreamShop/IceCreamShopDataModels/Models/IOrderModel.cs

@@ -12,6 +12,7 @@ namespace AbstractIceCreamShopDataModels.Models
         int IceCreamId { get; }
         int ClientId { get; }
         int Count { get; }
+        int? ImplementerId { get; }
         double Sum { get; }
         OrderStatus Status { get; }
         DateTime DateCreate { get; }

IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabase.cs

@@ -21,6 +21,9 @@ namespace IceCreamShopDatabaseImplement
         public virtual DbSet<IceCreamComponent> IceCreamComponents { set; get; }
 
         public virtual DbSet<Order> Orders { set; get; }
+
         public virtual DbSet<Client> Clients { set; get; }
+
+        public virtual DbSet<Implementer> Implementers { set; get; }
     }
 }

IceCreamShop/IceCreamShopDatabaseImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,90 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.StoragesContracts;
+using IceCreamShopContracts.ViewModels;
+using IceCreamShopDatabaseImplement.Models;
+
+namespace IceCreamShopDatabaseImplement.Implements
+{
+    public class ImplementerStorage : IImplementerStorage
+    {
+        public ImplementerViewModel? Delete(ImplementerBindingModel model)
+        {
+            using var context = new IceCreamShopDatabase();
+            var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
+            if (res != null)
+            {
+                context.Implementers.Remove(res);
+                context.SaveChanges();
+            }
+            return res?.GetViewModel;
+        }
+
+        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+        {
+            using var context = new IceCreamShopDatabase();
+            if (model.Id.HasValue)
+                return context.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+            if (model.ImplementerFIO != null && model.Password != null)
+                return context.Implementers
+                    .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)
+                                      && x.Password.Equals(model.Password))
+                    ?.GetViewModel;
+            if (model.ImplementerFIO != null)
+                return context.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) // На случай если фио не будет уникальным (по заданию оно уникально)
+            {
+                using var context = new IceCreamShopDatabase();
+                return context.Implementers
+                    .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+            return new();
+        }
+
+        public List<ImplementerViewModel> GetFullList()
+        {
+            using var context = new IceCreamShopDatabase();
+            return context.Implementers.Select(x => x.GetViewModel).ToList();
+        }
+
+        public ImplementerViewModel? Insert(ImplementerBindingModel model)
+        {
+            using var context = new IceCreamShopDatabase();
+            var res = Implementer.Create(model);
+            if (res != null)
+            {
+                context.Implementers.Add(res);
+                context.SaveChanges();
+            }
+            return res?.GetViewModel;
+        }
+
+        public ImplementerViewModel? Update(ImplementerBindingModel model)
+        {
+            using var context = new IceCreamShopDatabase();
+            var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
+            if (res != null)
+            {
+                res.Update(model);
+                context.SaveChanges();
+            }
+            return res?.GetViewModel;
+        }
+    }
+}

IceCreamShop/IceCreamShopDatabaseImplement/Implements/OrderStorage.cs

@@ -12,9 +12,10 @@ namespace IceCreamShopDatabaseImplement.Implements
         public OrderViewModel? Delete(OrderBindingModel model)
         {
             using var context = new IceCreamShopDatabase();
-
+            var element = context.Orders
-            var element = context.Orders.Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id);
+                .Include(x => x.Client)
-
+                .Include(x => x.Implementer)
+                .FirstOrDefault(x => x.Id == model.Id);
             if (element != null)
             {
                 context.Orders.Remove(element);
@@ -28,15 +29,15 @@ namespace IceCreamShopDatabaseImplement.Implements
 
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-
             using var context = new IceCreamShopDatabase();
             return context.Orders
                     .Include(x => x.Client)
-                .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
+                    .Include(x => x.Implementer)
+                    .FirstOrDefault(x =>
+                        (model.Statusses == null || model.Statusses != null && model.Statusses.Contains(x.Status)) &&
+                        model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
+                        model.Id.HasValue && x.Id == model.Id
+                    )
                     ?.GetViewModel;
         }
 
@@ -47,31 +48,41 @@ namespace IceCreamShopDatabaseImplement.Implements
                 var result = GetElement(model);
                 return result != null ? new() { result } : new();
             }
+
             using var context = new IceCreamShopDatabase();
+            IQueryable<Order>? queryWhere = null;
+
             if (model.DateFrom.HasValue && model.DateTo.HasValue) 
             {
-                return context.Orders
+                queryWhere = context.Orders
-                    .Where(x => model.DateFrom <= x.DateCreate.Date && x.DateCreate <= model.DateTo)
+                    .Where(x => model.DateFrom <= x.DateCreate.Date &&
-                    .Include(x => x.Client)
+                                                  x.DateCreate.Date <= model.DateTo);
-                    .Select(x => x.GetViewModel)
-                    .ToList();
             }
-            if (model.ClientId.HasValue)
+            else if (model.Statusses != null)
             {
-                return context.Orders
+                queryWhere = context.Orders.Where(x => model.Statusses.Contains(x.Status));
-                    .Where(x => x.Client.Id == model.ClientId)
+            }
+            else if (model.ClientId.HasValue)
+            {
+                queryWhere = context.Orders.Where(x => x.ClientId == model.ClientId);
+            }
+            else
+            {
+                return new();
+            }
+            return queryWhere
                     .Include(x => x.Client)
+                    .Include(x => x.Implementer)
                     .Select(x => x.GetViewModel)
                     .ToList();
         }
-            return new();
-        }
 
         public List<OrderViewModel> GetFullList()
         {
             using var context = new IceCreamShopDatabase();
             return context.Orders
                 .Include(x => x.Client)
+                .Include(x => x.Implementer)
                 .Select(x => x.GetViewModel)
                 .ToList();
         }
@@ -99,6 +110,7 @@ namespace IceCreamShopDatabaseImplement.Implements
 
             var order = context.Orders
                 .Include(x => x.Client)
+                .Include(x => x.Implementer)
                 .FirstOrDefault(x => x.Id == model.Id);
 
             if (order == null)

IceCreamShop/IceCreamShopDatabaseImplement/Models/Implementer.cs

@@ -0,0 +1,60 @@
+using AbstractIceCreamShopDataModels.Models;
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.ViewModels;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace IceCreamShopDatabaseImplement.Models
+{
+    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; }
+
+        [ForeignKey("ImplementerId")]
+        public virtual List<Order> Orders { get; private set; } = new();
+
+        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,
+            WorkExperience = WorkExperience,
+        };
+    }
+}

IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs

@@ -13,6 +13,7 @@ namespace IceCreamShopDatabaseImplement.Models
         public int IceCreamId { get; set; }
         [Required]
         public int ClientId { get; private set; }
+        public int? ImplementerId { get; private set; }
         [Required]
         public int Count { get; set; }
         [Required]
@@ -27,6 +28,7 @@ namespace IceCreamShopDatabaseImplement.Models
         public int Id { get; set; }
         public virtual IceCream IceCream{ get; set; }
         public virtual Client Client { get; set; }
+        public Implementer? Implementer { get; private set; }
         public static Order? Create(OrderBindingModel? model)
         {
             if (model == null)
@@ -37,6 +39,7 @@ namespace IceCreamShopDatabaseImplement.Models
             {
                 IceCreamId = model.IceCreamId,
                 ClientId = model.ClientId,
+                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -66,13 +69,15 @@ namespace IceCreamShopDatabaseImplement.Models
                     IceCreamId = IceCreamId,
                     ClientId = ClientId,
                     Count = Count,
+                    ImplementerId = ImplementerId,
                     Sum = Sum,
                     Status = Status,
                     DateCreate = DateCreate,
                     DateImplement = DateImplement,
                     Id = Id,
                     IceCreamName = context.IceCreams.FirstOrDefault(x => x.Id == IceCreamId)?.IceCreamName ?? string.Empty,
-                    ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty
+                    ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
+                    ClientFIO = Client?.ClientFIO ?? string.Empty,
                 };
             }
         }

IceCreamShop/IceCreamShopFileImplement/DataFileSingleton.cs

@@ -15,10 +15,12 @@ namespace IceCreamShopFileImplement
         private readonly string OrderFileName = "Order.xml";
         private readonly string IceCreamFileName = "IceCream.xml";
         private readonly string ClientFileName = "Client.xml";
+        private readonly string ImplementerFileName = "Implementer.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<IceCream> IceCreams { get; private set; }
         public List<Client> Clients { get; private set; }
+        public List<Implementer> Implementers { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -31,12 +33,14 @@ namespace IceCreamShopFileImplement
         public void SaveIceCreams() => SaveData(IceCreams, IceCreamFileName, "IceCreams", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, OrderFileName, "Clients", x => x.GetXElement);
+        public void SaveImplementers() => SaveData(Orders, ImplementerFileName, "Implementers", x => x.GetXElement);
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
             IceCreams = LoadData(IceCreamFileName, "IceCream", x => IceCream.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
+            Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

IceCreamShop/IceCreamShopFileImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,91 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.StoragesContracts;
+using IceCreamShopContracts.ViewModels;
+using IceCreamShopFileImplement.Models;
+
+namespace IceCreamShopFileImplement.Implements
+{
+	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;
+		}
+	}
+}

IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs

@@ -14,45 +14,75 @@ namespace IceCreamShopFileImplement.Implements
     public class OrderStorage : IOrderStorage
     {
         private readonly DataFileSingleton source;
-
         public OrderStorage()
         {
             source = DataFileSingleton.GetInstance();
         }
 
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
+            var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+            if (element != null)
+            {
+                source.Orders.Remove(element);
+                source.SaveOrders();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
+            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 GetViewModel(source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id)));
+            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)
+            if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue) // если не ищем по айдишнику, значит ищем по диапазону дат
             {
-                return new();
+                return source.Orders
+                    .Where(x => model.DateFrom <= x.DateCreate.Date && x.DateCreate <= model.DateTo)
+                    .Select(x => x.GetViewModel)
+                    .ToList();
             }
-
+            if (!model.Id.HasValue && model.ClientId.HasValue)
-            if (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 => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
+                    .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)
@@ -77,36 +107,7 @@ namespace IceCreamShopFileImplement.Implements
             }
             order.Update(model);
             source.SaveOrders();
-            return GetViewModel(order);
+            return order.GetViewModel;
-        }
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            order.Update(model);
-            source.SaveOrders();
-            return GetViewModel(order);
-        }
-
-        private OrderViewModel GetViewModel(Order order)
-        {
-            var viewModel = order.GetViewModel;
-            var icecream = source.IceCreams.FirstOrDefault(x => x.Id == order.IceCreamId);
-            if (icecream != null)
-            {
-                viewModel.IceCreamName = icecream.IceCreamName;
-            }
-
-            var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId);
-            if (client != null)
-            {
-                viewModel.ClientFIO = client.ClientFIO;
-            }
-
-            return viewModel;
         }
     }
 }

IceCreamShop/IceCreamShopFileImplement/Models/Implementer.cs

@@ -0,0 +1,80 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.ViewModels;
+using AbstractIceCreamShopDataModels.Models;
+using System.Xml.Linq;
+
+namespace IceCreamShopFileImplement.Models
+{
+	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)
+			);
+	}
+}

IceCreamShop/IceCreamShopFileImplement/Models/Order.cs

@@ -18,6 +18,8 @@ namespace IceCreamShopFileImplement.Models
 
         public int IceCreamId { get; private set; }
 
+        public int? ImplementerId { get; set; }
+
         public int ClientId { get; set; }
 
         public int Count { get; private set; }
@@ -40,6 +42,7 @@ namespace IceCreamShopFileImplement.Models
                 Id = model.Id,
                 IceCreamId = model.IceCreamId,
                 ClientId = model.ClientId,
+                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -58,6 +61,7 @@ namespace IceCreamShopFileImplement.Models
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 IceCreamId = Convert.ToInt32(element.Element("IceCreamId")!.Value),
                 ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
+                ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
                 Count = Convert.ToInt32(element.Element("Count")!.Value),
                 Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
@@ -76,6 +80,9 @@ namespace IceCreamShopFileImplement.Models
         }
         public OrderViewModel GetViewModel => new()
         {
+            ImplementerFIO = DataFileSingleton.GetInstance().Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO ?? string.Empty,
+            IceCreamName = DataFileSingleton.GetInstance().IceCreams.FirstOrDefault(x => x.Id == IceCreamId)?.IceCreamName ?? string.Empty,
+            ClientFIO = DataFileSingleton.GetInstance().Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
             Id = Id,
             IceCreamId = IceCreamId,
             ClientId = ClientId,
@@ -90,6 +97,7 @@ namespace IceCreamShopFileImplement.Models
                  new XAttribute("Id", Id),
                  new XElement("IceCreamId", IceCreamId.ToString()),
                  new XElement("ClientId", ClientId),
+                 new XElement("ImplementerId", ImplementerId),
                  new XElement("Count", Count.ToString()),
                  new XElement("Sum", Sum.ToString()),
                  new XElement("Status", Status.ToString()),

IceCreamShop/IceCreamShopListImplement/DataListSingleton.cs

@@ -1,9 +1,4 @@
-using System;
+using IceCreamShopListImplement.Models;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using IceCreamShopListImplement.Models;
 
 namespace IceCreamShopListImplement
 {
@@ -14,12 +9,15 @@ namespace IceCreamShopListImplement
         public List<Order> Orders { get; set; }
         public List<IceCream> iceCreams { get; set; }
         public List<Client> Clients { get; set; }
+        public List<Implementer> Implementers { get; set; }
+
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             iceCreams = new List<IceCream>();
             Clients = new List<Client>();
+            Implementers = new List<Implementer>();
         }
         public static DataListSingleton GetInstance()
         {

IceCreamShop/IceCreamShopListImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,114 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.StoragesContracts;
+using IceCreamShopContracts.ViewModels;
+using IceCreamShopListImplement.Models;
+
+namespace IceCreamShopListImplement.Implements
+{
+	public class ImplementerStorage : IImplementerStorage
+	{
+		private readonly DataListSingleton _source;
+		public ImplementerStorage()
+		{
+			_source = DataListSingleton.GetInstance();
+		}
+
+		public ImplementerViewModel? Delete(ImplementerBindingModel model)
+		{
+			for (int i = 0; i < _source.Implementers.Count; ++i)
+			{
+				if (_source.Implementers[i].Id == model.Id)
+				{
+					var element = _source.Implementers[i];
+					_source.Implementers.RemoveAt(i);
+					return element.GetViewModel;
+				}
+			}
+			return null;
+		}
+
+		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+		{
+			foreach (var x in _source.Implementers)
+			{
+				if (model.Id.HasValue && x.Id == model.Id)
+					return x.GetViewModel;
+				if (model.ImplementerFIO != null && model.Password != null &&
+					x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password))
+					return x.GetViewModel;
+				if (model.ImplementerFIO != null && x.ImplementerFIO.Equals(model.ImplementerFIO))
+					return x.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();
+			}
+			// На случай если при расширении проекта фио не будет уникальным
+			// (по заданию оно уникально)
+			List<ImplementerViewModel> result = new();
+			if (model.ImplementerFIO != null) 
+			{
+				foreach (var implementer in _source.Implementers)
+				{
+					if (implementer.ImplementerFIO.Equals(model.ImplementerFIO))
+					{
+						result.Add(implementer.GetViewModel);
+					}
+				}
+			}
+			return result;
+		}
+
+		public List<ImplementerViewModel> GetFullList()
+		{
+			var result = new List<ImplementerViewModel>();
+			foreach (var implementer in _source.Implementers)
+			{
+				result.Add(implementer.GetViewModel);
+			}
+			return result;
+		}
+
+		public ImplementerViewModel? Insert(ImplementerBindingModel model)
+		{
+			model.Id = 1;
+			foreach (var implementer in _source.Implementers)
+			{
+				if (model.Id <= implementer.Id)
+				{
+					model.Id = implementer.Id + 1;
+				}
+			}
+			var res = Implementer.Create(model);
+			if (res != null)
+			{
+				_source.Implementers.Add(res);
+			}
+			return res?.GetViewModel;
+		}
+
+		public ImplementerViewModel? Update(ImplementerBindingModel model)
+		{
+			foreach (var implementer in _source.Implementers)
+			{
+				if (implementer.Id == model.Id)
+				{
+					implementer.Update(model);
+					return implementer.GetViewModel;
+				}
+			}
+			return null;
+		}
+	}
+}

IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs

@@ -27,7 +27,7 @@ namespace IceCreamShopListImplement.Implements
                 {
                     var element = _source.Orders[i];
                     _source.Orders.RemoveAt(i);
-                    return GetViewModel(element);
+                    return element.GetViewModel;
                 }
             }
             return null;
@@ -35,36 +35,60 @@ namespace IceCreamShopListImplement.Implements
 
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
-            if (!model.Id.HasValue) return null;
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
             foreach (var order in _source.Orders)
             {
-                if (order.Id == model.Id)
+                if (model.Id.HasValue && order.Id == model.Id)
+                {
                     return GetViewModel(order);
                 }
+
+                else if (model.ImplementerId.HasValue && model.Statusses != null &&
+                    order.ImplementerId == model.ImplementerId && model.Statusses.Contains(order.Status))
+                {
+                    return GetViewModel(order);
+                }
+
+                else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId)
+                {
+                    return GetViewModel(order);
+                }
+            }
             return null;
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             var result = new List<OrderViewModel>();
-            if (model.DateFrom.HasValue && model.DateTo.HasValue)
-            {
             foreach (var order in _source.Orders)
             {
-                    if (order.Id == model.Id || model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo)
+                if (order.Id == model.Id)
+                {
+                    return new() { GetViewModel(order) };
+                }
+
+                else if (model.DateFrom.HasValue && model.DateTo.HasValue &&
+                    model.DateFrom <= order.DateCreate.Date && order.DateCreate.Date <= model.DateTo)
                 {
                     result.Add(GetViewModel(order));
                 }
-                }
+
-            }
+                else if (model.ClientId.HasValue && order.ClientId == model.ClientId)
-            if (model.ClientId.HasValue)
-            {
-                foreach (var order in _source.Orders)
-                {
-                    if (order.ClientId == model.ClientId)
                 {
                     result.Add(GetViewModel(order));
                 }
+
+                else if (model.ImplementerId.HasValue && order.ImplementerId == model.ImplementerId)
+                {
+                    result.Add(GetViewModel(order));
+                }
+
+                else if (model.Statusses != null && model.Statusses.Contains(order.Status))
+                {
+                    result.Add(GetViewModel(order));
                 }
             }
             return result;
@@ -96,7 +120,7 @@ namespace IceCreamShopListImplement.Implements
                 return null;
             }
             _source.Orders.Add(newOrder);
-            return GetViewModel(newOrder);
+            return newOrder.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -106,7 +130,7 @@ namespace IceCreamShopListImplement.Implements
                 if (order.Id == model.Id)
                 {
                     order.Update(model);
-                    return GetViewModel(order);
+                    return order.GetViewModel;
                 }
             }
             return null;

IceCreamShop/IceCreamShopListImplement/Models/Implementer.cs

@@ -0,0 +1,55 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.ViewModels;
+using AbstractIceCreamShopDataModels.Models;
+
+namespace IceCreamShopListImplement.Models
+{
+	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(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,
+		};
+	}
+}

IceCreamShop/IceCreamShopListImplement/Models/Order.cs

@@ -20,6 +20,8 @@ namespace IceCreamShopListImplement.Models
 
         public int ClientId { get; private set; }
 
+        public int? ImplementerId { get; private set; }
+
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -38,6 +40,7 @@ namespace IceCreamShopListImplement.Models
                 Id = model.Id,
                 IceCreamId = model.IceCreamId,
                 ClientId = model.ClientId,
+                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -58,6 +61,8 @@ namespace IceCreamShopListImplement.Models
             Id = Id,
             IceCreamId = IceCreamId,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
+			ImplementerFIO = DataListSingleton.GetInstance().Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO ?? string.Empty,
             Count = Count,
             Sum = Sum,
             Status = Status,

IceCreamShop/IceCreamShopRestApi/Controllers/ImplementerController.cs

@@ -0,0 +1,106 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.BusinessLogicsContracts;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.ViewModels;
+using Microsoft.AspNetCore.Mvc;
+
+namespace IceCreamShopRestApi.Controllers
+{
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class ImplementerController : Controller
+    {
+        private readonly ILogger _logger;
+
+        private readonly IOrderLogic _order;
+
+        private readonly IImplementerLogic _logic;
+
+        public ImplementerController(IOrderLogic order, IImplementerLogic logic, ILogger<ImplementerController> logger)
+        {
+            _logger = logger;
+            _order = order;
+            _logic = logic;
+        }
+
+        [HttpGet]
+        public ImplementerViewModel? Login(string login, string password)
+        {
+            try
+            {
+                return _logic.ReadElement(new ImplementerSearchModel
+                {
+                    ImplementerFIO = login,
+                    Password = password
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка авторизации сотрудника");
+                throw;
+            }
+        }
+
+        [HttpGet]
+        public List<OrderViewModel>? GetNewOrders()
+        {
+            try
+            {
+                return _order.ReadList(new OrderSearchModel
+                {
+                    //Status = OrderStatus.Принят
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения новых заказов");
+                throw;
+            }
+        }
+
+        [HttpGet]
+        public OrderViewModel? GetImplementerOrder(int implementerId)
+        {
+            try
+            {
+                return _order.ReadElement(new OrderSearchModel
+                {
+                    //ImplementerId = implementerId
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения текущего заказа исполнителя");
+                throw;
+            }
+        }
+
+        [HttpPost]
+        public void TakeOrderInWork(OrderBindingModel model)
+        {
+            try
+            {
+                _order.TakeOrderInWork(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу", model.Id);
+                throw;
+            }
+        }
+
+        [HttpPost]
+        public void FinishOrder(OrderBindingModel model)
+        {
+            try
+            {
+                _order.FinishOrder(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка отметки о готовности заказа с №{Id}", model.Id);
+                throw;
+            }
+        }
+    }
+}

IceCreamShop/IceCreamShopRestApi/Program.cs

@@ -10,10 +10,12 @@ builder.Logging.SetMinimumLevel(LogLevel.Trace);
 builder.Logging.AddLog4Net("log4net.config");
 
 // Add services to the container.
+builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
 builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IIceCreamStorage, IceCreamStorage>();
 
+builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IIceCreamLogic, IceCreamLogic>();