полная перестройка логики и тестов, зато работает

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/AgencyBusinessLogicContract.cs

@@ -18,15 +18,15 @@ public class AgencyBusinessLogicContract(IAgencyStorageContract agencyStorageCon
 {
     private readonly IAgencyStorageContract _agencyStorageContract = agencyStorageContract;
     private readonly ILogger _logger = logger;
-    public List<AgencyDataModel> GetAllAgencies()
+    public List<AgencyDataModel> GetAllComponents()
     {
-        _logger.LogInformation("GetAllTours");
+        _logger.LogInformation("GetAllComponents");
         return _agencyStorageContract.GetList() ?? throw new NullListException();
 
         return [];
     }
 
-    public AgencyDataModel GetAgencyByData(string data)
+    public AgencyDataModel GetComponentByData(string data)
     {
         _logger.LogInformation("Get element by data: {data}", data);
         if (data.IsEmpty())
@@ -42,23 +42,23 @@ public class AgencyBusinessLogicContract(IAgencyStorageContract agencyStorageCon
         return new("", TourType.None, 0, []);
     }
 
-    public void InsertAgency(AgencyDataModel AgencyDataModel)
+    public void InsertComponent(AgencyDataModel agencyDataModel)
     {
-        _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(AgencyDataModel));
+        _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(agencyDataModel));
-        ArgumentNullException.ThrowIfNull(AgencyDataModel);
+        ArgumentNullException.ThrowIfNull(agencyDataModel);
-        AgencyDataModel.Validate();
+        agencyDataModel.Validate();
-        _agencyStorageContract.AddElement(AgencyDataModel);
+        _agencyStorageContract.AddElement(agencyDataModel);
     }
 
-    public void UpdateAgency(AgencyDataModel AgencyDataModel)
+    public void UpdateComponent(AgencyDataModel agencyDataModel)
     {
-        _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(AgencyDataModel));
+        _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(agencyDataModel));
-        ArgumentNullException.ThrowIfNull(AgencyDataModel);
+        ArgumentNullException.ThrowIfNull(agencyDataModel);
-        AgencyDataModel.Validate();
+        agencyDataModel.Validate();
-        _agencyStorageContract.UpdElement(AgencyDataModel);
+        _agencyStorageContract.UpdElement(agencyDataModel);
     }
 
-    public void DeleteAgency(string id)
+    public void DeleteComponent(string id)
     {
         logger.LogInformation("Delete by id: {id}", id);
         if (id.IsEmpty())

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SuppliesBusinessLogicContract.cs

@@ -16,39 +16,20 @@ namespace MagicCarpetBusinessLogic.Implementations;
 
 public class SuppliesBusinessLogicContract(ISuppliesStorageContract suppliesStorageContract, ILogger logger) : ISuppliesBusinessLogicContract
 {
+    private readonly ISuppliesStorageContract _suppliesStorageContract = suppliesStorageContract;
     private readonly ILogger _logger = logger;
-    private readonly ISuppliesStorageContract _supplyStorageContract = suppliesStorageContract;
+
-    public List<SuppliesDataModel> GetAllSuppliesByPeriod(DateTime fromDate, DateTime toDate)
+    public List<SuppliesDataModel> GetAllComponents()
     {
-        _logger.LogInformation("GetAllSupplies params: {fromDate}, {toDate}", fromDate, toDate);
+        _logger.LogInformation("GetAllComponents");
-        if (fromDate.IsDateNotOlder(toDate))
+        return _suppliesStorageContract.GetList() ?? throw new NullListException();
-        {
+
-            throw new IncorrectDatesException(fromDate, toDate);
+        return [];
-        }
-        return _supplyStorageContract.GetList(fromDate, toDate) ?? throw new NullListException();
     }
 
-    public List<SuppliesDataModel> GetAllSuppliesByCocktailByPeriod(string tourId, DateTime fromDate, DateTime toDate)
+    public SuppliesDataModel GetComponentByData(string data)
     {
-        _logger.LogInformation("GetAllSupplies params: {cocktailId}, {fromDate}, {toDate}", tourId, fromDate, toDate);
+        _logger.LogInformation("Get element by data: {data}", data);
-        if (fromDate.IsDateNotOlder(toDate))
-        {
-            throw new IncorrectDatesException(fromDate, toDate);
-        }
-        if (tourId.IsEmpty())
-        {
-            throw new ArgumentNullException(nameof(tourId));
-        }
-        if (!tourId.IsGuid())
-        {
-            throw new ValidationException("The value in the field tourId is not a unique identifier.");
-        }
-        return _supplyStorageContract.GetList(fromDate, toDate, tourId: tourId) ?? throw new NullListException();
-    }
-
-    public SuppliesDataModel GetSupplyByData(string data)
-    {
-        _logger.LogInformation("Get supply by data: {data}", data);
         if (data.IsEmpty())
         {
             throw new ArgumentNullException(nameof(data));
@@ -57,22 +38,24 @@ public class SuppliesBusinessLogicContract(ISuppliesStorageContract suppliesStor
         {
             throw new ElementNotFoundException(data);
         }
-        return _supplyStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
+        return _suppliesStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
+
+        return new("", TourType.None, DateTime.UtcNow, 0, []);
     }
 
-    public void InsertSupply(SuppliesDataModel supplyDataModel)
+    public void InsertComponent(SuppliesDataModel suppliesDataModel)
     {
-        _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(supplyDataModel));
+        _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(suppliesDataModel));
-        ArgumentNullException.ThrowIfNull(supplyDataModel);
+        ArgumentNullException.ThrowIfNull(suppliesDataModel);
-        supplyDataModel.Validate();
+        suppliesDataModel.Validate();
-        _supplyStorageContract.AddElement(supplyDataModel);
+        _suppliesStorageContract.AddElement(suppliesDataModel);
     }
 
-    public void UpdateSupply(SuppliesDataModel supplyDataModel)
+    public void UpdateComponent(SuppliesDataModel suppliesDataModel)
     {
-        _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(supplyDataModel));
+        _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(suppliesDataModel));
-        ArgumentNullException.ThrowIfNull(supplyDataModel);
+        ArgumentNullException.ThrowIfNull(suppliesDataModel);
-        supplyDataModel.Validate();
+        suppliesDataModel.Validate();
-        _supplyStorageContract.UpdElement(supplyDataModel);
+        _suppliesStorageContract.UpdElement(suppliesDataModel);
     }
 }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/TourBusinessLogicContract.cs

@@ -13,10 +13,11 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class TourBusinessLogicContract(ITourStorageContract tourStorageContract, ILogger logger) : ITourBusinessLogicContract
+internal class TourBusinessLogicContract(ITourStorageContract tourStorageContract, IAgencyStorageContract agencyStorageContract,ILogger logger) : ITourBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly ITourStorageContract _tourStorageContract = tourStorageContract;
+    private readonly IAgencyStorageContract _agencyStorageContract = agencyStorageContract;
     public List<TourDataModel> GetAllTours()
     {
         _logger.LogInformation("GetAllTours");
@@ -56,7 +57,7 @@ internal class TourBusinessLogicContract(ITourStorageContract tourStorageContrac
         _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(tourDataModel));
         ArgumentNullException.ThrowIfNull(tourDataModel);
         tourDataModel.Validate();
-        if (_tourStorageContract.CheckComponents(tourDataModel))
+        if (!_agencyStorageContract.CheckComponents(tourDataModel))
         {
             throw new InsufficientException("Dont have tour in agency");
         }
@@ -68,9 +69,9 @@ internal class TourBusinessLogicContract(ITourStorageContract tourStorageContrac
         _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(tourDataModel));
         ArgumentNullException.ThrowIfNull(tourDataModel);
         tourDataModel.Validate();
-        if (_tourStorageContract.CheckComponents(tourDataModel))
+        if (!_agencyStorageContract.CheckComponents(tourDataModel))
         {
-            throw new InsufficientException("Dont have component in warehouse");
+            throw new InsufficientException("Dont have tour in agency");
         }
         _tourStorageContract.UpdElement(tourDataModel);
     }

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/IAgencyBusinessLogicContract.cs

@@ -9,9 +9,9 @@ namespace MagicCarpetContracts.BusinessLogicContracts;
 
 public interface IAgencyBusinessLogicContract
 {
-    List<AgencyDataModel> GetAllAgencies();
+    List<AgencyDataModel> GetAllComponents();
-    AgencyDataModel GetAgencyByData(string data);
+    AgencyDataModel GetComponentByData(string data);
-    void InsertAgency(AgencyDataModel agencyDataModel);
+    void InsertComponent(AgencyDataModel agencyDataModel);
-    void UpdateAgency(AgencyDataModel agencyDataModel);
+    void UpdateComponent(AgencyDataModel agencyDataModel);
-    void DeleteAgency(string id);
+    void DeleteComponent(string id);
 }

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/ISuppliesBusinessLogicContract.cs

@@ -9,13 +9,8 @@ namespace MagicCarpetContracts.BusinessLogicContracts;
 
 public interface ISuppliesBusinessLogicContract
 {
-    List<SuppliesDataModel> GetAllSuppliesByPeriod(DateTime fromDate, DateTime toDate);
+    List<SuppliesDataModel> GetAllComponents();
-
+    SuppliesDataModel GetComponentByData(string data);
-    List<SuppliesDataModel> GetAllSuppliesByCocktailByPeriod(string tourId, DateTime fromDate, DateTime toDate);
+    void InsertComponent(SuppliesDataModel componentDataModel);
-
+    void UpdateComponent(SuppliesDataModel componentDataModel);
-    SuppliesDataModel GetSupplyByData(string data);
-
-    void InsertSupply(SuppliesDataModel supplyDataModel);
-
-    void UpdateSupply(SuppliesDataModel supplyDataModel);
 }

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/IAgencyStorageContract.cs

@@ -10,9 +10,9 @@ namespace MagicCarpetContracts.StoragesContracts;
 public interface IAgencyStorageContract
 {
     List<AgencyDataModel> GetList();
-    AgencyDataModel? GetElementById(string id);
+    AgencyDataModel GetElementById(string id);
-    AgencyDataModel? GetElementByName(string name);
     void AddElement(AgencyDataModel agencyDataModel);
     void UpdElement(AgencyDataModel agencyDataModel);
     void DelElement(string id);
+    bool CheckComponents(TourDataModel tourDataModel);
 }

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/ISuppliesStorageContract.cs

@@ -9,7 +9,7 @@ namespace MagicCarpetContracts.StoragesContracts;
 
 public interface ISuppliesStorageContract
 {
-    List<SuppliesDataModel> GetList(DateTime? startDate = null, DateTime? endDate = null, string? tourId = null);
+    List<SuppliesDataModel> GetList(DateTime? startDate = null);
     SuppliesDataModel GetElementById(string id);
     void AddElement(SuppliesDataModel suppliesDataModel);
     void UpdElement(SuppliesDataModel suppliesDataModel);

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/ITourStorageContract.cs

@@ -16,5 +16,4 @@ public interface ITourStorageContract
     void AddElement(TourDataModel tourDataModel);
     void UpdElement(TourDataModel tourDataModel);
     void DelElement(string id);
-    bool CheckComponents(TourDataModel tourDataModel);
 }

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/AgencyBusinessLogicContractTests.cs

@@ -0,0 +1,296 @@
+using MagicCarpetBusinessLogic.Implementations;
+using MagicCarpetContracts.BusinessLogicContracts;
+using MagicCarpetContracts.DataModels;
+using MagicCarpetContracts.Enums;
+using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.StoragesContracts;
+using Microsoft.Extensions.Logging;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetTests.BusinessLogicContractsTests;
+
+[TestFixture]
+internal class AgencyBusinessLogicContractTests 
+{
+    private IAgencyBusinessLogicContract _warehouseBusinessLogicContract;
+    private Mock<IAgencyStorageContract> _warehouseStorageContract;
+
+    [OneTimeSetUp]
+    public void OneTimeSetUp()
+    {
+        _warehouseStorageContract = new Mock<IAgencyStorageContract>();
+        _warehouseBusinessLogicContract = new AgencyBusinessLogicContract(_warehouseStorageContract.Object, new Mock<ILogger>().Object);
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        _warehouseStorageContract.Reset();
+    }
+
+    public void GetAllSupplies_ReturnListOfRecords_Test()
+    {
+        // Arrange
+        var listOriginal = new List<AgencyDataModel>()
+        {
+            new(Guid.NewGuid().ToString(), TourType.Beach, 1, []),
+            new(Guid.NewGuid().ToString(), TourType.Beach, 1, []),
+            new(Guid.NewGuid().ToString(), TourType.Beach, 1, []),
+        };
+        _warehouseStorageContract.Setup(x => x.GetList()).Returns(listOriginal);
+        // Act
+        var list = _warehouseBusinessLogicContract.GetAllComponents();
+        // Assert
+        Assert.That(list, Is.Not.Null);
+        Assert.That(list, Is.EquivalentTo(listOriginal));
+    }
+
+    [Test]
+    public void GetAllSupplies_ReturnEmptyList_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.GetList()).Returns([]);
+        // Act
+        var list = _warehouseBusinessLogicContract.GetAllComponents();
+        // Assert
+        Assert.That(list, Is.Not.Null);
+        Assert.That(list, Has.Count.EqualTo(0));
+        _warehouseStorageContract.Verify(x => x.GetList(), Times.Once);
+    }
+
+    [Test]
+    public void GetAllSupplies_ReturnNull_ThrowException_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.GetList()).Returns((List<AgencyDataModel>)null);
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.GetAllComponents(), Throws.TypeOf<NullListException>());
+        _warehouseStorageContract.Verify(x => x.GetList(), Times.Once);
+    }
+
+    [Test]
+    public void GetAllSupplies_StorageThrowError_ThrowException_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.GetList()).Throws(new StorageException(new InvalidOperationException()));
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.GetAllComponents(), Throws.TypeOf<StorageException>());
+        _warehouseStorageContract.Verify(x => x.GetList(), Times.Once);
+    }
+
+    [Test]
+    public void GetSuppliesByData_GetById_ReturnRecord_Test()
+    {
+        // Arrange
+        var id = Guid.NewGuid().ToString();
+        var record = new AgencyDataModel(id, TourType.Beach, 1, []);
+        _warehouseStorageContract.Setup(x => x.GetElementById(id)).Returns(record);
+        // Act
+        var element = _warehouseBusinessLogicContract.GetComponentByData(id);
+        // Assert
+        Assert.That(element, Is.Not.Null);
+        Assert.That(element.Id, Is.EqualTo(id));
+        _warehouseStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Once);
+    }
+
+    [Test]
+    public void GetComponentsByData_EmptyData_ThrowException_Test()
+    {
+        //Act&Assert
+        Assert.That(() => _warehouseBusinessLogicContract.GetComponentByData(null), Throws.TypeOf<ArgumentNullException>());
+        Assert.That(() => _warehouseBusinessLogicContract.GetComponentByData(string.Empty), Throws.TypeOf<ArgumentNullException>());
+        _warehouseStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Never);
+    }
+
+    [Test]
+    public void GetSuppliesByData_GetById_NotFoundRecord_ThrowException_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.GetElementById(It.IsAny<string>())).Throws(new ElementNotFoundException(""));
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.GetComponentByData(Guid.NewGuid().ToString()), Throws.TypeOf<ElementNotFoundException>());
+        _warehouseStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Once);
+    }
+
+    [Test]
+    public void GetSuppliesByData_StorageThrowError_ThrowException_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.GetElementById(It.IsAny<string>())).Throws(new StorageException(new InvalidOperationException()));
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.GetComponentByData(Guid.NewGuid().ToString()), Throws.TypeOf<StorageException>());
+        _warehouseStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Once);
+    }
+
+    [Test]
+    public void InsertSupplies_CorrectRecord_Test()
+    {
+        // Arrange
+        var record = new AgencyDataModel(Guid.NewGuid().ToString(), TourType.Beach, 1,
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
+        _warehouseStorageContract.Setup(x => x.AddElement(It.IsAny<AgencyDataModel>()));
+        // Act
+        _warehouseBusinessLogicContract.InsertComponent(record);
+        // Assert
+        _warehouseStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Once);
+    }
+
+    [Test]
+    public void InsertSupplies_RecordWithExistsData_ThrowException_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.AddElement(It.IsAny<AgencyDataModel>())).Throws(new ElementExistsException("Data", "Data"));
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.InsertComponent(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementExistsException>());
+        _warehouseStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Once);
+    }
+
+    [Test]
+    public void InsertSupplies_NullRecord_ThrowException_Test()
+    {
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.InsertComponent(null), Throws.TypeOf<ArgumentNullException>());
+        _warehouseStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Never);
+    }
+
+    [Test]
+    public void InsertComponents_InvalidRecord_ThrowException_Test()
+    {
+        //Act&Assert
+        Assert.That(() => _warehouseBusinessLogicContract.InsertComponent(new AgencyDataModel("id", TourType.Beach, 1, [])), Throws.TypeOf<ValidationException>());
+        _warehouseStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Never);
+    }
+
+    [Test]
+    public void InsertSupplies_StorageThrowError_ThrowException_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.AddElement(It.IsAny<AgencyDataModel>())).Throws(new StorageException(new InvalidOperationException()));
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.InsertComponent(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
+        _warehouseStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Once);
+    }
+
+    [Test]
+    public void UpdateSupplies_CorrectRecord_Test()
+    {
+        // Arrange
+        var record = new AgencyDataModel(Guid.NewGuid().ToString(), TourType.Beach, 1,
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
+        _warehouseStorageContract.Setup(x => x.UpdElement(It.IsAny<AgencyDataModel>()));
+        // Act
+        _warehouseBusinessLogicContract.UpdateComponent(record);
+        // Assert
+        _warehouseStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Once);
+    }
+
+    [Test]
+    public void UpdateSupplies_RecordWithIncorrectData_ThrowException_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.UpdElement(It.IsAny<AgencyDataModel>())).Throws(new ElementNotFoundException(""));
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.UpdateComponent(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementNotFoundException>());
+        _warehouseStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Once);
+    }
+
+    [Test]
+    public void UpdateSupplies_RecordWithExistsData_ThrowException_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.UpdElement(It.IsAny<AgencyDataModel>())).Throws(new ElementExistsException("Data", "Data"));
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.UpdateComponent(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementExistsException>());
+        _warehouseStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Once);
+    }
+
+    [Test]
+    public void UpdateSupplies_NullRecord_ThrowException_Test()
+    {
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.UpdateComponent(null), Throws.TypeOf<ArgumentNullException>());
+        _warehouseStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Never);
+    }
+
+    [Test]
+    public void UpdateComponents_InvalidRecord_ThrowException_Test()
+    {
+        //Act&Assert
+        Assert.That(() => _warehouseBusinessLogicContract.UpdateComponent(new AgencyDataModel(Guid.NewGuid().ToString(), TourType.Beach, 1, [])), Throws.TypeOf<ValidationException>());
+        _warehouseStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Never);
+    }
+
+    [Test]
+    public void UpdateSupplies_StorageThrowError_ThrowException_Test()
+    {
+        // Arrange
+        _warehouseStorageContract.Setup(x => x.UpdElement(It.IsAny<AgencyDataModel>())).Throws(new StorageException(new InvalidOperationException()));
+        // Act & Assert
+        Assert.That(() => _warehouseBusinessLogicContract.UpdateComponent(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
+        _warehouseStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Once);
+    }
+
+    [Test]
+    public void DeleteComponents_CorrectRecord_Test()
+    {
+        //Arrange
+        var id = Guid.NewGuid().ToString();
+        var flag = false;
+        _warehouseStorageContract.Setup(x => x.DelElement(It.Is((string x) => x == id))).Callback(() => { flag = true; });
+        //Act
+        _warehouseBusinessLogicContract.DeleteComponent(id);
+        //Assert
+        _warehouseStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Once); Assert.That(flag);
+    }
+
+    [Test]
+    public void DeleteComponents_RecordWithIncorrectId_ThrowException_Test()
+    {
+        //Arrange
+        var id = Guid.NewGuid().ToString();
+        _warehouseStorageContract.Setup(x => x.DelElement(It.IsAny<string>())).Throws(new ElementNotFoundException(id));
+        //Act&Assert
+        Assert.That(() => _warehouseBusinessLogicContract.DeleteComponent(Guid.NewGuid().ToString()),
+        Throws.TypeOf<ElementNotFoundException>());
+        _warehouseStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Once);
+    }
+
+    [Test]
+    public void DeleteComponents_IdIsNullOrEmpty_ThrowException_Test()
+    {
+        //Act&Assert
+        Assert.That(() => _warehouseBusinessLogicContract.DeleteComponent(null), Throws.TypeOf<ArgumentNullException>());
+        Assert.That(() => _warehouseBusinessLogicContract.DeleteComponent(string.Empty), Throws.TypeOf<ArgumentNullException>());
+        _warehouseStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Never);
+    }
+
+    [Test]
+    public void DeleteComponents_IdIsNotGuid_ThrowException_Test()
+    {
+        //Act&Assert
+        Assert.That(() => _warehouseBusinessLogicContract.DeleteComponent("id"),
+        Throws.TypeOf<ValidationException>());
+        _warehouseStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Never);
+    }
+
+    [Test]
+    public void DeleteComponents_StorageThrowError_ThrowException_Test()
+    {
+        //Arrange
+        _warehouseStorageContract.Setup(x => x.DelElement(It.IsAny<string>())).Throws(new StorageException(new InvalidOperationException()));
+        //Act&Assert
+        Assert.That(() => _warehouseBusinessLogicContract.DeleteComponent(Guid.NewGuid().ToString()),
+        Throws.TypeOf<StorageException>());
+        _warehouseStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Once);
+    }
+}

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/AgnecyBusinessLogicContractTests.cs

@@ -1,296 +0,0 @@
-using MagicCarpetBusinessLogic.Implementations;
-using MagicCarpetContracts.BusinessLogicContracts;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Enums;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.StoragesContracts;
-using Microsoft.Extensions.Logging;
-using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.BusinessLogicContractsTests;
-
-[TestFixture]
-internal class AgnecyBusinessLogicContractTests 
-{
-    private IAgencyBusinessLogicContract _agencyBusinessLogicContract;
-    private Mock<IAgencyStorageContract> _agencyStorageContract;
-
-    [OneTimeSetUp]
-    public void OneTimeSetUp()
-    {
-        _agencyStorageContract = new Mock<IAgencyStorageContract>();
-        _agencyBusinessLogicContract = new AgencyBusinessLogicContract(_agencyStorageContract.Object, new Mock<ILogger>().Object);
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        _agencyStorageContract.Reset();
-    }
-
-    public void GetAllSupplies_ReturnListOfRecords_Test()
-    {
-        // Arrange
-        var listOriginal = new List<AgencyDataModel>()
-        {
-            new(Guid.NewGuid().ToString(), TourType.Beach, 1, []),
-            new(Guid.NewGuid().ToString(), TourType.Beach, 1, []),
-            new(Guid.NewGuid().ToString(), TourType.Beach, 1, []),
-        };
-        _agencyStorageContract.Setup(x => x.GetList()).Returns(listOriginal);
-        // Act
-        var list = _agencyBusinessLogicContract.GetAllTours();
-        // Assert
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Is.EquivalentTo(listOriginal));
-    }
-
-    [Test]
-    public void GetAllSupplies_ReturnEmptyList_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.GetList()).Returns([]);
-        // Act
-        var list = _agencyBusinessLogicContract.GetAllTours();
-        // Assert
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(0));
-        _agencyStorageContract.Verify(x => x.GetList(), Times.Once);
-    }
-
-    [Test]
-    public void GetAllSupplies_ReturnNull_ThrowException_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.GetList()).Returns((List<AgencyDataModel>)null);
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.GetAllTours(), Throws.TypeOf<NullListException>());
-        _agencyStorageContract.Verify(x => x.GetList(), Times.Once);
-    }
-
-    [Test]
-    public void GetAllSupplies_StorageThrowError_ThrowException_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.GetList()).Throws(new StorageException(new InvalidOperationException()));
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.GetAllTours(), Throws.TypeOf<StorageException>());
-        _agencyStorageContract.Verify(x => x.GetList(), Times.Once);
-    }
-
-    [Test]
-    public void GetSuppliesByData_GetById_ReturnRecord_Test()
-    {
-        // Arrange
-        var id = Guid.NewGuid().ToString();
-        var record = new AgencyDataModel(id, TourType.Beach, 1, []);
-        _agencyStorageContract.Setup(x => x.GetElementById(id)).Returns(record);
-        // Act
-        var element = _agencyBusinessLogicContract.GetTourByData(id);
-        // Assert
-        Assert.That(element, Is.Not.Null);
-        Assert.That(element.Id, Is.EqualTo(id));
-        _agencyStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Once);
-    }
-
-    [Test]
-    public void GetToursByData_EmptyData_ThrowException_Test()
-    {
-        //Act&Assert
-        Assert.That(() => _agencyBusinessLogicContract.GetTourByData(null), Throws.TypeOf<ArgumentNullException>());
-        Assert.That(() => _agencyBusinessLogicContract.GetTourByData(string.Empty), Throws.TypeOf<ArgumentNullException>());
-        _agencyStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Never);
-    }
-
-    [Test]
-    public void GetSuppliesByData_GetById_NotFoundRecord_ThrowException_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.GetElementById(It.IsAny<string>())).Throws(new ElementNotFoundException(""));
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.GetTourByData(Guid.NewGuid().ToString()), Throws.TypeOf<ElementNotFoundException>());
-        _agencyStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Once);
-    }
-
-    [Test]
-    public void GetSuppliesByData_StorageThrowError_ThrowException_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.GetElementById(It.IsAny<string>())).Throws(new StorageException(new InvalidOperationException()));
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.GetTourByData(Guid.NewGuid().ToString()), Throws.TypeOf<StorageException>());
-        _agencyStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Once);
-    }
-
-    [Test]
-    public void InsertSupplies_CorrectRecord_Test()
-    {
-        // Arrange
-        var record = new AgencyDataModel(Guid.NewGuid().ToString(), TourType.Beach, 1,
-            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
-        _agencyStorageContract.Setup(x => x.AddElement(It.IsAny<AgencyDataModel>()));
-        // Act
-        _agencyBusinessLogicContract.InsertTour(record);
-        // Assert
-        _agencyStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Once);
-    }
-
-    [Test]
-    public void InsertSupplies_RecordWithExistsData_ThrowException_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.AddElement(It.IsAny<AgencyDataModel>())).Throws(new ElementExistsException("Data", "Data"));
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.InsertTour(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
-            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementExistsException>());
-        _agencyStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Once);
-    }
-
-    [Test]
-    public void InsertSupplies_NullRecord_ThrowException_Test()
-    {
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.InsertTour(null), Throws.TypeOf<ArgumentNullException>());
-        _agencyStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Never);
-    }
-
-    [Test]
-    public void InsertTours_InvalidRecord_ThrowException_Test()
-    {
-        //Act&Assert
-        Assert.That(() => _agencyBusinessLogicContract.InsertTour(new AgencyDataModel("id", TourType.Beach, 1, [])), Throws.TypeOf<ValidationException>());
-        _agencyStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Never);
-    }
-
-    [Test]
-    public void InsertSupplies_StorageThrowError_ThrowException_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.AddElement(It.IsAny<AgencyDataModel>())).Throws(new StorageException(new InvalidOperationException()));
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.InsertTour(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
-            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
-        _agencyStorageContract.Verify(x => x.AddElement(It.IsAny<AgencyDataModel>()), Times.Once);
-    }
-
-    [Test]
-    public void UpdateSupplies_CorrectRecord_Test()
-    {
-        // Arrange
-        var record = new AgencyDataModel(Guid.NewGuid().ToString(), TourType.Beach, 1,
-            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
-        _agencyStorageContract.Setup(x => x.UpdElement(It.IsAny<AgencyDataModel>()));
-        // Act
-        _agencyBusinessLogicContract.UpdateTour(record);
-        // Assert
-        _agencyStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Once);
-    }
-
-    [Test]
-    public void UpdateSupplies_RecordWithIncorrectData_ThrowException_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.UpdElement(It.IsAny<AgencyDataModel>())).Throws(new ElementNotFoundException(""));
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
-            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementNotFoundException>());
-        _agencyStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Once);
-    }
-
-    [Test]
-    public void UpdateSupplies_RecordWithExistsData_ThrowException_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.UpdElement(It.IsAny<AgencyDataModel>())).Throws(new ElementExistsException("Data", "Data"));
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
-            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementExistsException>());
-        _agencyStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Once);
-    }
-
-    [Test]
-    public void UpdateSupplies_NullRecord_ThrowException_Test()
-    {
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.UpdateTour(null), Throws.TypeOf<ArgumentNullException>());
-        _agencyStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Never);
-    }
-
-    [Test]
-    public void UpdateTours_InvalidRecord_ThrowException_Test()
-    {
-        //Act&Assert
-        Assert.That(() => _agencyBusinessLogicContract.UpdateTour(new AgencyDataModel(Guid.NewGuid().ToString(), TourType.Beach, 1, [])), Throws.TypeOf<ValidationException>());
-        _agencyStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Never);
-    }
-
-    [Test]
-    public void UpdateSupplies_StorageThrowError_ThrowException_Test()
-    {
-        // Arrange
-        _agencyStorageContract.Setup(x => x.UpdElement(It.IsAny<AgencyDataModel>())).Throws(new StorageException(new InvalidOperationException()));
-        // Act & Assert
-        Assert.That(() => _agencyBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), TourType.Beach, 1,
-            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
-        _agencyStorageContract.Verify(x => x.UpdElement(It.IsAny<AgencyDataModel>()), Times.Once);
-    }
-
-    [Test]
-    public void DeleteTours_CorrectRecord_Test()
-    {
-        //Arrange
-        var id = Guid.NewGuid().ToString();
-        var flag = false;
-        _agencyStorageContract.Setup(x => x.DelElement(It.Is((string x) => x == id))).Callback(() => { flag = true; });
-        //Act
-        _agencyBusinessLogicContract.DeleteTour(id);
-        //Assert
-        _agencyStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Once); Assert.That(flag);
-    }
-
-    [Test]
-    public void DeleteTours_RecordWithIncorrectId_ThrowException_Test()
-    {
-        //Arrange
-        var id = Guid.NewGuid().ToString();
-        _agencyStorageContract.Setup(x => x.DelElement(It.IsAny<string>())).Throws(new ElementNotFoundException(id));
-        //Act&Assert
-        Assert.That(() => _agencyBusinessLogicContract.DeleteTour(Guid.NewGuid().ToString()),
-        Throws.TypeOf<ElementNotFoundException>());
-        _agencyStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Once);
-    }
-
-    [Test]
-    public void DeleteTours_IdIsNullOrEmpty_ThrowException_Test()
-    {
-        //Act&Assert
-        Assert.That(() => _agencyBusinessLogicContract.DeleteTour(null), Throws.TypeOf<ArgumentNullException>());
-        Assert.That(() => _agencyBusinessLogicContract.DeleteTour(string.Empty), Throws.TypeOf<ArgumentNullException>());
-        _agencyStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Never);
-    }
-
-    [Test]
-    public void DeleteTours_IdIsNotGuid_ThrowException_Test()
-    {
-        //Act&Assert
-        Assert.That(() => _agencyBusinessLogicContract.DeleteTour("id"),
-        Throws.TypeOf<ValidationException>());
-        _agencyStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Never);
-    }
-
-    [Test]
-    public void DeleteTours_StorageThrowError_ThrowException_Test()
-    {
-        //Arrange
-        _agencyStorageContract.Setup(x => x.DelElement(It.IsAny<string>())).Throws(new StorageException(new InvalidOperationException()));
-        //Act&Assert
-        Assert.That(() => _agencyBusinessLogicContract.DeleteTour(Guid.NewGuid().ToString()),
-        Throws.TypeOf<StorageException>());
-        _agencyStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Once);
-    }
-}

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/SuppliesBusinessLogicContractTests.cs

@@ -44,7 +44,7 @@ internal class SuppliesBusinessLogicContractTests
         };
         _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>())).Returns(listOriginal);
         // Act
-        var list = _suppliesBusinessLogicContract.GetAllTours();
+        var list = _suppliesBusinessLogicContract.GetAllComponents();
         // Assert
         Assert.That(list, Is.Not.Null);
         Assert.That(list, Is.EquivalentTo(listOriginal));
@@ -56,7 +56,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>())).Returns([]);
         // Act
-        var list = _suppliesBusinessLogicContract.GetAllTours();
+        var list = _suppliesBusinessLogicContract.GetAllComponents();
         // Assert
         Assert.That(list, Is.Not.Null);
         Assert.That(list, Has.Count.EqualTo(0));
@@ -69,7 +69,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>())).Returns((List<SuppliesDataModel>)null);
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.GetAllTours(), Throws.TypeOf<NullListException>());
+        Assert.That(() => _suppliesBusinessLogicContract.GetAllComponents(), Throws.TypeOf<NullListException>());
         _suppliesStorageContract.Verify(x => x.GetList(It.IsAny<DateTime?>()), Times.Once);
     }
 
@@ -79,7 +79,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>())).Throws(new StorageException(new InvalidOperationException()));
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.GetAllTours(), Throws.TypeOf<StorageException>());
+        Assert.That(() => _suppliesBusinessLogicContract.GetAllComponents(), Throws.TypeOf<StorageException>());
         _suppliesStorageContract.Verify(x => x.GetList(It.IsAny<DateTime?>()), Times.Once);
     }
 
@@ -91,7 +91,7 @@ internal class SuppliesBusinessLogicContractTests
         var record = new SuppliesDataModel(id,TourType.Beach, DateTime.Now, 1, []);
         _suppliesStorageContract.Setup(x => x.GetElementById(id)).Returns(record);
         // Act
-        var element = _suppliesBusinessLogicContract.GetTourByData(id);
+        var element = _suppliesBusinessLogicContract.GetComponentByData(id);
         // Assert
         Assert.That(element, Is.Not.Null);
         Assert.That(element.Id, Is.EqualTo(id));
@@ -99,11 +99,11 @@ internal class SuppliesBusinessLogicContractTests
     }
 
     [Test]
-    public void GetToursByData_EmptyData_ThrowException_Test()
+    public void GetComponentsByData_EmptyData_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _suppliesBusinessLogicContract.GetTourByData(null), Throws.TypeOf<ArgumentNullException>());
+        Assert.That(() => _suppliesBusinessLogicContract.GetComponentByData(null), Throws.TypeOf<ArgumentNullException>());
-        Assert.That(() => _suppliesBusinessLogicContract.GetTourByData(string.Empty), Throws.TypeOf<ArgumentNullException>());
+        Assert.That(() => _suppliesBusinessLogicContract.GetComponentByData(string.Empty), Throws.TypeOf<ArgumentNullException>());
         _suppliesStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Never);
     }
 
@@ -113,7 +113,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.GetElementById(It.IsAny<string>())).Throws(new ElementNotFoundException(""));
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.GetTourByData(Guid.NewGuid().ToString()), Throws.TypeOf<ElementNotFoundException>());
+        Assert.That(() => _suppliesBusinessLogicContract.GetComponentByData(Guid.NewGuid().ToString()), Throws.TypeOf<ElementNotFoundException>());
         _suppliesStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Once);
     }
 
@@ -123,7 +123,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.GetElementById(It.IsAny<string>())).Throws(new StorageException(new InvalidOperationException()));
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.GetTourByData(Guid.NewGuid().ToString()), Throws.TypeOf<StorageException>());
+        Assert.That(() => _suppliesBusinessLogicContract.GetComponentByData(Guid.NewGuid().ToString()), Throws.TypeOf<StorageException>());
         _suppliesStorageContract.Verify(x => x.GetElementById(It.IsAny<string>()), Times.Once);
     }
 
@@ -135,7 +135,7 @@ internal class SuppliesBusinessLogicContractTests
             [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
         _suppliesStorageContract.Setup(x => x.AddElement(It.IsAny<SuppliesDataModel>()));
         // Act
-        _suppliesBusinessLogicContract.InsertTour(record);
+        _suppliesBusinessLogicContract.InsertComponent(record);
         // Assert
         _suppliesStorageContract.Verify(x => x.AddElement(It.IsAny<SuppliesDataModel>()), Times.Once);
     }
@@ -146,7 +146,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.AddElement(It.IsAny<SuppliesDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.InsertTour(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
+        Assert.That(() => _suppliesBusinessLogicContract.InsertComponent(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
             [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementExistsException>());
         _suppliesStorageContract.Verify(x => x.AddElement(It.IsAny<SuppliesDataModel>()), Times.Once);
     }
@@ -155,15 +155,15 @@ internal class SuppliesBusinessLogicContractTests
     public void InsertSupplies_NullRecord_ThrowException_Test()
     {
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.InsertTour(null), Throws.TypeOf<ArgumentNullException>());
+        Assert.That(() => _suppliesBusinessLogicContract.InsertComponent(null), Throws.TypeOf<ArgumentNullException>());
         _suppliesStorageContract.Verify(x => x.AddElement(It.IsAny<SuppliesDataModel>()), Times.Never);
     }
 
     [Test]
-    public void InsertTours_InvalidRecord_ThrowException_Test()
+    public void InsertComponents_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _suppliesBusinessLogicContract.InsertTour(new SuppliesDataModel("id", TourType.Beach, DateTime.UtcNow, 1, [])), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _suppliesBusinessLogicContract.InsertComponent(new SuppliesDataModel("id", TourType.Beach, DateTime.UtcNow, 1, [])), Throws.TypeOf<ValidationException>());
         _suppliesStorageContract.Verify(x => x.AddElement(It.IsAny<SuppliesDataModel>()), Times.Never);
     }
 
@@ -173,7 +173,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.AddElement(It.IsAny<SuppliesDataModel>())).Throws(new StorageException(new InvalidOperationException()));
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.InsertTour(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
+        Assert.That(() => _suppliesBusinessLogicContract.InsertComponent(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
             [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
         _suppliesStorageContract.Verify(x => x.AddElement(It.IsAny<SuppliesDataModel>()), Times.Once);
     }
@@ -186,7 +186,7 @@ internal class SuppliesBusinessLogicContractTests
             [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
         _suppliesStorageContract.Setup(x => x.UpdElement(It.IsAny<SuppliesDataModel>()));
         // Act
-        _suppliesBusinessLogicContract.UpdateTour(record);
+        _suppliesBusinessLogicContract.UpdateComponent(record);
         // Assert
         _suppliesStorageContract.Verify(x => x.UpdElement(It.IsAny<SuppliesDataModel>()), Times.Once);
     }
@@ -197,7 +197,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.UpdElement(It.IsAny<SuppliesDataModel>())).Throws(new ElementNotFoundException(""));
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
+        Assert.That(() => _suppliesBusinessLogicContract.UpdateComponent(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
             [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementNotFoundException>());
         _suppliesStorageContract.Verify(x => x.UpdElement(It.IsAny<SuppliesDataModel>()), Times.Once);
     }
@@ -208,7 +208,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.UpdElement(It.IsAny<SuppliesDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
+        Assert.That(() => _suppliesBusinessLogicContract.UpdateComponent(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
             [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementExistsException>());
         _suppliesStorageContract.Verify(x => x.UpdElement(It.IsAny<SuppliesDataModel>()), Times.Once);
     }
@@ -217,15 +217,15 @@ internal class SuppliesBusinessLogicContractTests
     public void UpdateSupplies_NullRecord_ThrowException_Test()
     {
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.UpdateTour(null), Throws.TypeOf<ArgumentNullException>());
+        Assert.That(() => _suppliesBusinessLogicContract.UpdateComponent(null), Throws.TypeOf<ArgumentNullException>());
         _suppliesStorageContract.Verify(x => x.UpdElement(It.IsAny<SuppliesDataModel>()), Times.Never);
     }
 
     [Test]
-    public void UpdateTours_InvalidRecord_ThrowException_Test()
+    public void UpdateComponents_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _suppliesBusinessLogicContract.UpdateTour(new SuppliesDataModel(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1, [])), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _suppliesBusinessLogicContract.UpdateComponent(new SuppliesDataModel(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1, [])), Throws.TypeOf<ValidationException>());
         _suppliesStorageContract.Verify(x => x.UpdElement(It.IsAny<SuppliesDataModel>()), Times.Never);
     }
 
@@ -235,7 +235,7 @@ internal class SuppliesBusinessLogicContractTests
         // Arrange
         _suppliesStorageContract.Setup(x => x.UpdElement(It.IsAny<SuppliesDataModel>())).Throws(new StorageException(new InvalidOperationException()));
         // Act & Assert
-        Assert.That(() => _suppliesBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
+        Assert.That(() => _suppliesBusinessLogicContract.UpdateComponent(new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1,
             [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
         _suppliesStorageContract.Verify(x => x.UpdElement(It.IsAny<SuppliesDataModel>()), Times.Once);
     }

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/TourBusinessLogicContractTests.cs

@@ -3,6 +3,7 @@ using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Enums;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.StoragesContracts;
+using MagicCarpetTests.DataModelTests;
 using Microsoft.Extensions.Logging;
 using Moq;
 using System;
@@ -17,18 +18,22 @@ namespace MagicCarpetTests.BusinessLogicContractsTests;
 internal class TourBusinessLogicContractTests
 {
     private TourBusinessLogicContract _tourBusinessLogicContract;
+    private Mock<IAgencyStorageContract> _agencyStorageContract;
     private Mock<ITourStorageContract> _tourStorageContract;
 
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
         _tourStorageContract = new Mock<ITourStorageContract>();
-        _tourBusinessLogicContract = new TourBusinessLogicContract(_tourStorageContract.Object, new Mock<ILogger>().Object);
+        _agencyStorageContract = new Mock<IAgencyStorageContract>();
+        _tourBusinessLogicContract = new TourBusinessLogicContract(_tourStorageContract.Object,
+            _agencyStorageContract.Object, new Mock<ILogger>().Object);
     }
 
     [SetUp]
     public void SetUp()
     {
+        _agencyStorageContract.Reset();
         _tourStorageContract.Reset();
     }
 
@@ -38,9 +43,9 @@ internal class TourBusinessLogicContractTests
         //Arrange
         var listOriginal = new List<TourDataModel>()
         {
-            new(Guid.NewGuid().ToString(), "name 1", "country1", 15.5, TourType.Ski),
+            new(Guid.NewGuid().ToString(), "name 1", "country1", 15.5, TourType.Ski, [],[]),
-            new(Guid.NewGuid().ToString(), "name 2", "country2", 10.1, TourType.Sightseeing),
+            new(Guid.NewGuid().ToString(), "name 2", "country2", 10.1, TourType.Sightseeing,[],[]),
-            new(Guid.NewGuid().ToString(), "name 3", "country3", 13.9, TourType.Beach),
+            new(Guid.NewGuid().ToString(), "name 3", "country3", 13.9, TourType.Beach,[],[]),
         };
         _tourStorageContract.Setup(x => x.GetList()).Returns(listOriginal);
         //Act
@@ -154,7 +159,7 @@ internal class TourBusinessLogicContractTests
     {
         //Arrange
         var id = Guid.NewGuid().ToString();
-        var record = new TourDataModel(id, "name","country", 10, TourType.Ski);
+        var record = new TourDataModel(id, "name", "country", 10, TourType.Ski, [], []);
         _tourStorageContract.Setup(x => x.GetElementById(id)).Returns(record);
         //Act
         var element = _tourBusinessLogicContract.GetTourByData(id);
@@ -169,7 +174,7 @@ internal class TourBusinessLogicContractTests
     {
         //Arrange
         var name = "name";
-        var record = new TourDataModel(Guid.NewGuid().ToString(), name, "country", 10, TourType.Ski);
+        var record = new TourDataModel(Guid.NewGuid().ToString(), name, "country", 10, TourType.Ski, [], []);
         _tourStorageContract.Setup(x => x.GetElementByName(name)).Returns(record);
         //Act
         var element = _tourBusinessLogicContract.GetTourByData(name);
@@ -183,7 +188,7 @@ internal class TourBusinessLogicContractTests
     {
         //Arrange
         var country = "country";
-        var record = new TourDataModel(Guid.NewGuid().ToString(), "name", country, 10, TourType.Ski);
+        var record = new TourDataModel(Guid.NewGuid().ToString(), "name", country, 10, TourType.Ski, [], []);  
         _tourStorageContract.Setup(x => x.GetElementByName(country)).Returns(record);
         //Act
         var element = _tourBusinessLogicContract.GetTourByData(country);
@@ -244,7 +249,9 @@ internal class TourBusinessLogicContractTests
     {
         //Arrange
         var flag = false;
-        var record = new TourDataModel(Guid.NewGuid().ToString(), "name","country",10, TourType.Ski);
+        var record = new TourDataModel(Guid.NewGuid().ToString(), "name","country",10, TourType.Ski, [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)],
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
+        _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<TourDataModel>())).Returns(true);
         _tourStorageContract.Setup(x => x.AddElement(It.IsAny<TourDataModel>()))
             .Callback((TourDataModel x) =>
             {
@@ -254,6 +261,7 @@ internal class TourBusinessLogicContractTests
         //Act
         _tourBusinessLogicContract.InsertTour(record);
         //Assert
+        _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<TourDataModel>()), Times.Once);
         _tourStorageContract.Verify(x => x.AddElement(It.IsAny<TourDataModel>()), Times.Once);
         Assert.That(flag);
     }
@@ -262,9 +270,12 @@ internal class TourBusinessLogicContractTests
     public void InsertTour_RecordWithExistsData_ThrowException_Test()
     {
         //Arrange
+        _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<TourDataModel>())).Returns(true);
         _tourStorageContract.Setup(x => x.AddElement(It.IsAny<TourDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         //Act&Assert
-        Assert.That(() => _tourBusinessLogicContract.InsertTour(new(Guid.NewGuid().ToString(), "name","country",10, TourType.Ski)), Throws.TypeOf<ElementExistsException>());
+        Assert.That(() => _tourBusinessLogicContract.InsertTour(new(Guid.NewGuid().ToString(), "name","country",10, TourType.Ski, [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)],
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementExistsException>());
+        _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<TourDataModel>()), Times.Once);
         _tourStorageContract.Verify(x => x.AddElement(It.IsAny<TourDataModel>()), Times.Once);
     }
 
@@ -280,7 +291,7 @@ internal class TourBusinessLogicContractTests
     public void InsertTour_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _tourBusinessLogicContract.InsertTour(new TourDataModel("id", "name", "country", 10, TourType.Ski)), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _tourBusinessLogicContract.InsertTour(new TourDataModel("id", "name", "country", 10, TourType.Ski, [], [])), Throws.TypeOf<ValidationException>());
         _tourStorageContract.Verify(x => x.AddElement(It.IsAny<TourDataModel>()), Times.Never);
     }
 
@@ -288,10 +299,24 @@ internal class TourBusinessLogicContractTests
     public void InsertTour_StorageThrowError_ThrowException_Test()
     {
         //Arrange
-        _tourStorageContract.Setup(x => x.AddElement(It.IsAny<TourDataModel>())).Throws(new StorageException(new InvalidOperationException()));
+        _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<TourDataModel>())).Returns(false);
+        Assert.That(() => _tourBusinessLogicContract.InsertTour(new TourDataModel(Guid.NewGuid().ToString(), "name","country", 10, TourType.Ski,
+            [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)], [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<InsufficientException>());
         //Act&Assert
-        Assert.That(() => _tourBusinessLogicContract.InsertTour(new(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski)), Throws.TypeOf<StorageException>());
+        _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<TourDataModel>()), Times.Once);
-        _tourStorageContract.Verify(x => x.AddElement(It.IsAny<TourDataModel>()), Times.Once);
+        _tourStorageContract.Verify(x => x.UpdElement(It.IsAny<TourDataModel>()), Times.Never);
+    }
+
+    [Test]
+    public void InsertFurniture_InsufficientError_ThrowException_Test()
+    {
+        //Arrange
+        _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<TourDataModel>())).Returns(false);
+        Assert.That(() => _tourBusinessLogicContract.InsertTour(new TourDataModel(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski, [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)],
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])),Throws.TypeOf<InsufficientException>());
+        //Act&Assert
+        _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<TourDataModel>()), Times.Once);
+        _tourStorageContract.Verify(x => x.UpdElement(It.IsAny<TourDataModel>()), Times.Never);
     }
 
     [Test]
@@ -299,7 +324,9 @@ internal class TourBusinessLogicContractTests
     {
         //Arrange
         var flag = false;
-        var record = new TourDataModel(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski);
+        var record = new TourDataModel(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski, [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)],
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
+        _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<TourDataModel>())).Returns(true);
         _tourStorageContract.Setup(x => x.UpdElement(It.IsAny<TourDataModel>()))
             .Callback((TourDataModel x) =>
             {
@@ -309,6 +336,7 @@ internal class TourBusinessLogicContractTests
         //Act
         _tourBusinessLogicContract.UpdateTour(record);
         //Assert
+        _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<TourDataModel>()), Times.Once);
         _tourStorageContract.Verify(x => x.UpdElement(It.IsAny<TourDataModel>()), Times.Once);
         Assert.That(flag);
     }
@@ -317,9 +345,12 @@ internal class TourBusinessLogicContractTests
     public void UpdateTour_RecordWithIncorrectData_ThrowException_Test()
     {
         //Arrange
+        _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<TourDataModel>())).Returns(true);
         _tourStorageContract.Setup(x => x.UpdElement(It.IsAny<TourDataModel>())).Throws(new ElementNotFoundException(""));
         //Act&Assert
-        Assert.That(() => _tourBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski)), Throws.TypeOf<ElementNotFoundException>());
+        Assert.That(() => _tourBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski, [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)],
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementNotFoundException>());
+        _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<TourDataModel>()), Times.Once);
         _tourStorageContract.Verify(x => x.UpdElement(It.IsAny<TourDataModel>()), Times.Once);
     }
 
@@ -327,9 +358,12 @@ internal class TourBusinessLogicContractTests
     public void UpdateTour_RecordWithExistsData_ThrowException_Test()
     {
         //Arrange
+        _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<TourDataModel>())).Returns(true);
         _tourStorageContract.Setup(x => x.UpdElement(It.IsAny<TourDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         //Act&Assert
-        Assert.That(() => _tourBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski)), Throws.TypeOf<ElementExistsException>());
+        Assert.That(() => _tourBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski, [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)],
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf <ElementExistsException>());
+        _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<TourDataModel>()), Times.Once);
         _tourStorageContract.Verify(x => x.UpdElement(It.IsAny<TourDataModel>()), Times.Once);
     }
 
@@ -345,7 +379,8 @@ internal class TourBusinessLogicContractTests
     public void UpdateTour_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _tourBusinessLogicContract.UpdateTour(new TourDataModel("id", "name", "country", 10, TourType.Ski)), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _tourBusinessLogicContract.UpdateTour(new TourDataModel("id", "name", "country", 10, TourType.Ski, [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)],
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ValidationException>());
         _tourStorageContract.Verify(x => x.UpdElement(It.IsAny<TourDataModel>()), Times.Never);
     }
 
@@ -353,12 +388,27 @@ internal class TourBusinessLogicContractTests
     public void UpdateTour_StorageThrowError_ThrowException_Test()
     {
         //Arrange
+        _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<TourDataModel>())).Returns(true);
         _tourStorageContract.Setup(x => x.UpdElement(It.IsAny<TourDataModel>())).Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
-        Assert.That(() => _tourBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski)), Throws.TypeOf<StorageException>());
+        Assert.That(() => _tourBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski, [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)],
+            [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
+        _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<TourDataModel>()), Times.Once);
         _tourStorageContract.Verify(x => x.UpdElement(It.IsAny<TourDataModel>()), Times.Once);
     }
 
+    [Test]
+    public void UpdateFurniture_InsufficientError_ThrowException_Test()
+    {
+        //Arrange
+        _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<TourDataModel>())).Returns(false);
+        //Act&Assert
+        Assert.That(() => _tourBusinessLogicContract.UpdateTour(new(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski,
+            [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)], [new TourAgencyDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<InsufficientException>());
+        _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<TourDataModel>()), Times.Once);
+        _tourStorageContract.Verify(x => x.UpdElement(It.IsAny<TourDataModel>()), Times.Never);
+    }
+
     [Test]
     public void DeleteTour_CorrectRecord_Test()
     {