глибокий вдох и моральная подготовка к куче изменений

SushiBar/SushiBarBusinessLogic_/ShopLogic.cs

@@ -1,160 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarContracts.BusinessLogicsContracts;
-
-namespace SushiBarBusinessLogic.BusinessLogics
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        private readonly ISushiStorage _sushiStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, ISushiStorage sushiStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-            _sushiStorage = sushiStorage;
-        }
-
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, 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.ShopName, 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);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            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;
-        }
-
-        public bool MakeSupply(SupplyBindingModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Количество изделий должно быть больше 0");
-            }
-            var shop = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Id = model.ShopId
-            });
-            if (shop == null)
-            {
-                throw new ArgumentException("Магазина не существует");
-            }
-            if (shop.ShopSushis.ContainsKey(model.SushiId))
-            {
-                var oldValue = shop.ShopSushis[model.SushiId];
-                oldValue.Item2 += model.Count;
-                shop.ShopSushis[model.SushiId] = oldValue;
-            }
-            else
-            {
-                var sushi = _sushiStorage.GetElement(new SushiSearchModel
-                {
-                    Id = model.SushiId
-                });
-                if (sushi == null)
-                {
-                    throw new ArgumentException($"Поставка: Товар с id:{model.SushiId} не найденн");
-                }
-                shop.ShopSushis.Add(model.SushiId, (sushi, model.Count));
-            }
-            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.Adress))
-            {
-                throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Adress));
-            }
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName));
-            }
-            _logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = model.ShopName
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-    }
-}

SushiBar/SushiBarBusinessLogic_/SushiLogic.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.SearchModels;
 using SushiBarContracts.StoragesContracts;
 using SushiBarContracts.ViewModels;

SushiBar/SushiBarView/Program.cs

@@ -8,7 +8,6 @@ using SushiBarContracts.StoragesContracts;
 using SushiBarView;
 using NLog.Extensions.Logging;
 
-
 namespace SushiBarView
 {
     internal static class Program

SushiBar/SushiBarView/SushiBarView.csproj

@@ -28,6 +28,7 @@
   <ItemGroup>
     <ProjectReference Include="..\SushiBarBusinessLogic_\SushiBarBusinessLogic.csproj" />
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarFileImplement\SushiBarFileImplement.csproj" />
     <ProjectReference Include="..\SushiBarListImplement_\SushiBarListImplement.csproj" />
   </ItemGroup>