готовая усложненная

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/ClientBusinessLogicContract.cs

@@ -14,7 +14,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class ClientBusinessLogicContract(IClientStorageContract clientStorageContract, ILogger logger)  : IClientBusinessLogicContract
+public class ClientBusinessLogicContract(IClientStorageContract clientStorageContract, ILogger logger)  : IClientBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly IClientStorageContract _clientStorageContract = clientStorageContract;

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/EmployeeBusinessLogicContract.cs

@@ -14,7 +14,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeStorageContract, ILogger logger) : IEmployeeBusinessLogicContract
+public class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeStorageContract, ILogger logger) : IEmployeeBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly IEmployeeStorageContract _employeeStorageContract = employeeStorageContract;

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/PostBusinessLogicContract.cs

@@ -12,14 +12,14 @@ using System.Text.Json;
 using System.Threading.Tasks;
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class PostBusinessLogicContract(IPostStorageContract postStorageContract, ILogger logger) : IPostBusinessLogicContract
+public class PostBusinessLogicContract(IPostStorageContract postStorageContract, ILogger logger) : IPostBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly IPostStorageContract _postStorageContract = postStorageContract;
-    public List<PostDataModel> GetAllPosts(bool onlyActive = true)
+    public List<PostDataModel> GetAllPosts()
     {
-        _logger.LogInformation("GetAllPosts params: {onlyActive}", onlyActive);
-        return _postStorageContract.GetList(onlyActive) ?? throw new NullListException();
+        _logger.LogInformation("GetAllPosts");
+        return _postStorageContract.GetList() ?? throw new NullListException();
     }
 
     public List<PostDataModel> GetAllDataOfPost(string postId)

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SalaryBusinessLogicContract.cs

@@ -2,6 +2,8 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
+using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.Infrastructure.PostConfigurations;
 using MagicCarpetContracts.StoragesContracts;
 using Microsoft.Extensions.Logging;
 using System;
@@ -11,14 +13,16 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
-internal class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageContract,ISaleStorageContract saleStorageContract,
-    IPostStorageContract postStorageContract, IEmployeeStorageContract employeeStorageContract, ILogger logger) : ISalaryBusinessLogicContract
+public class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageContract,ISaleStorageContract saleStorageContract,
+    IPostStorageContract postStorageContract, IEmployeeStorageContract employeeStorageContract, ILogger logger, IConfigurationSalary сonfiguration) : ISalaryBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly ISalaryStorageContract _salaryStorageContract = salaryStorageContract;
     private readonly ISaleStorageContract _saleStorageContract = saleStorageContract;
     private readonly IPostStorageContract _postStorageContract = postStorageContract;
     private readonly IEmployeeStorageContract _employeeStorageContract = employeeStorageContract;
+    private readonly IConfigurationSalary _salaryConfiguration = сonfiguration;
+    private readonly Lock _lockObject = new();
     public List<SalaryDataModel> GetAllSalariesByPeriod(DateTime fromDate, DateTime toDate)
     {
         _logger.LogInformation("GetAllSalaries params: {fromDate}, {toDate}", fromDate, toDate);
@@ -55,13 +59,66 @@ internal class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageC
         var employees = _employeeStorageContract.GetList() ?? throw new NullListException();
         foreach (var employee in employees)
         {
-            var sales = _saleStorageContract.GetList(startDate, finishDate, employeeId: employee.Id)?.Sum(x => x.Sum) ??
-                throw new NullListException();
-            var post = _postStorageContract.GetElementById(employee.PostId) ??
-                throw new NullListException();
-            var salary = post.Salary + sales * 0.1;
+            var sales = _saleStorageContract.GetList(startDate, finishDate, employeeId: employee.Id) ?? throw new NullListException();
+            var post = _postStorageContract.GetElementById(employee.PostId) ?? throw new NullListException();
+            var salary = post.ConfigurationModel switch
+            {
+                null => 0,
+                TravelAgentPostConfiguration cpc => CalculateSalaryForTravelAgent(sales, startDate, finishDate, cpc),
+                ChiefPostConfiguration spc => CalculateSalaryForChief(startDate, finishDate, spc),
+                PostConfiguration pc => pc.Rate,
+            };
             _logger.LogDebug("The employee {employeeId} was paid a salary of {salary}", employee.Id, salary);
             _salaryStorageContract.AddElement(new SalaryDataModel(employee.Id, finishDate, salary));
         }
     }
+    private double CalculateSalaryForTravelAgent(List<SaleDataModel> sales, DateTime startDate, DateTime finishDate, TravelAgentPostConfiguration config)
+    {
+        var calcPercent = 0.0;
+        var dates = new List<DateTime>();
+        for (var date = startDate; date < finishDate; date = date.AddDays(1))
+        {
+            dates.Add(date);
+        }
+
+        var parallelOptions = new ParallelOptions
+        {
+            MaxDegreeOfParallelism = _salaryConfiguration.MaxConcurrentThreads
+        };
+
+        Parallel.ForEach(dates, parallelOptions, date =>
+        {
+            var salesInDay = sales.Where(x => x.SaleDate.Date == date.Date).ToArray();
+            if (salesInDay.Length > 0)
+            {
+                lock (_lockObject)
+                {
+                    calcPercent += (salesInDay.Sum(x => x.Sum) / salesInDay.Length) * config.SalePercent;
+                }
+            }
+        });
+
+        double calcBonusTask = 0;
+        try
+        {
+            calcBonusTask = sales.Where(x => x.Sum > _salaryConfiguration.ExtraSaleSum).Sum(x => x.Sum) * config.BonusForExtraSales;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error in bonus calculation");
+        }
+        return config.Rate + calcPercent + calcBonusTask;
+    }
+    private double CalculateSalaryForChief(DateTime startDate, DateTime finishDate, ChiefPostConfiguration config)
+    {
+        try
+        {
+            return config.Rate + config.PersonalCountTrendPremium * _employeeStorageContract.GetEmployeeTrend(startDate, finishDate);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error in the chief payroll process");
+            return 0;
+        }
+    }
 }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SaleBusinessLogicContract.cs

@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContract, IAgencyStorageContract agencyStorageContract, ILogger logger) : ISaleBusinessLogicContract
+public class SaleBusinessLogicContract(ISaleStorageContract saleStorageContract,IAgencyStorageContract agencyStorageContract, ILogger logger) : ISaleBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly ISaleStorageContract _saleStorageContract = saleStorageContract;
@@ -122,4 +122,35 @@ internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContrac
         }
         _saleStorageContract.DelElement(id);
     }
+    //третье требование
+    public double CalculateSaleRevenue(DateTime fromDate, DateTime toDate)
+    {
+        _logger.LogInformation("CalculateSaleRevenue params: {fromDate}, {toDate}", fromDate, toDate);
+        if (fromDate.IsDateNotOlder(toDate))
+        {
+            throw new IncorrectDatesException(fromDate, toDate);
+        }
+        var sales = GetAllSalesByPeriod(fromDate, toDate);
+        if (sales == null || !sales.Any())
+        {
+            return 0;
+        }
+
+        double totalRevenue = 0;
+        object lockObj = new object();
+
+        Parallel.ForEach(sales, sale =>
+        {
+            if (sale.IsCancel)
+                return;
+
+            lock (lockObj)
+            {
+                totalRevenue += sale.Sum;
+            }
+        });
+
+        _logger.LogInformation("Total revenue calculated: {totalRevenue}", totalRevenue);
+        return totalRevenue;
+    }
 }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SuppliesBusinessLogicContract.cs

@@ -23,8 +23,6 @@ public class SuppliesBusinessLogicContract(ISuppliesStorageContract suppliesStor
     {
         _logger.LogInformation("GetAllComponents");
         return _suppliesStorageContract.GetList() ?? throw new NullListException();
-
-        return [];
     }
 
     public SuppliesDataModel GetComponentByData(string data)
@@ -39,8 +37,6 @@ public class SuppliesBusinessLogicContract(ISuppliesStorageContract suppliesStor
             throw new ElementNotFoundException(data);
         }
         return _suppliesStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
-
-        return new("", TourType.None, DateTime.UtcNow, 0, []);
     }
 
     public void InsertComponent(SuppliesDataModel suppliesDataModel)
@@ -58,4 +54,24 @@ public class SuppliesBusinessLogicContract(ISuppliesStorageContract suppliesStor
         suppliesDataModel.Validate();
         _suppliesStorageContract.UpdElement(suppliesDataModel);
     }
+    //первое требование
+    public int CalculateTourSupplies(DateTime? startDate, DateTime? endDate)
+    {
+        var supplies = _suppliesStorageContract.GetList(startDate, endDate);
+        if (supplies == null || supplies.Count == 0)
+        {
+            return 0;
+        }
+        int count = 0;
+        var lockObject = new object();
+        Parallel.ForEach(supplies, supply =>
+        {
+            int supplyCount = supply.Tours.Sum(component => component.Count);
+            lock (lockObject)
+            {
+                count += supplyCount;
+            }
+        });
+        return count;
+    }
 }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/TourBusinessLogicContract.cs

@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class TourBusinessLogicContract(ITourStorageContract tourStorageContract, ILogger logger) : ITourBusinessLogicContract
+public class TourBusinessLogicContract(ITourStorageContract tourStorageContract, ILogger logger) : ITourBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly ITourStorageContract _tourStorageContract = tourStorageContract;

MagicCarpetProject/MagicCarpetBusinessLogic/MagicCarpetBusinessLogic.csproj

@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 	<ItemGroup>
 		<InternalsVisibleTo Include="MagicCarpetTests" />
+		<InternalsVisibleTo Include="MagicCarpetWebApi" />
 		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
 	</ItemGroup>
 	<ItemGroup>

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/IAgencyAdapter.cs

@@ -0,0 +1,18 @@
+using MagicCarpetContracts.AdapterContracts.OperationResponses;
+using MagicCarpetContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts;
+
+public interface IAgencyAdapter
+{
+    AgencyOperationResponse GetAllComponents();
+    AgencyOperationResponse GetComponentByData(string data);
+    AgencyOperationResponse InsertComponent(AgencyBindingModel warehouseDataModel);
+    AgencyOperationResponse UpdateComponent(AgencyBindingModel warehouseDataModel);
+    AgencyOperationResponse DeleteComponent(string id);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/IClientAdapter.cs

@@ -0,0 +1,22 @@
+using MagicCarpetContracts.AdapterContracts.OperationResponses;
+using MagicCarpetContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts;
+
+public interface IClientAdapter
+{
+    ClientOperationResponse GetList();
+
+    ClientOperationResponse GetElement(string data);
+
+    ClientOperationResponse RegisterClient(ClientBindingModel clientModel);
+
+    ClientOperationResponse ChangeClientInfo(ClientBindingModel clientModel);
+
+    ClientOperationResponse RemoveClient(string id);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/IEmployeeAdapter.cs

@@ -0,0 +1,28 @@
+using MagicCarpetContracts.AdapterContracts.OperationResponses;
+using MagicCarpetContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts;
+
+public interface IEmployeeAdapter
+{
+    EmployeeOperationResponse GetList(bool includeDeleted);
+
+    EmployeeOperationResponse GetPostList(string id, bool includeDeleted);
+
+    EmployeeOperationResponse GetListByBirthDate(DateTime fromDate, DateTime toDate, bool includeDeleted);
+
+    EmployeeOperationResponse GetListByEmploymentDate(DateTime fromDate, DateTime toDate, bool includeDeleted);
+
+    EmployeeOperationResponse GetElement(string data);
+
+    EmployeeOperationResponse RegisterEmployee(EmployeeBindingModel employeeModel);
+
+    EmployeeOperationResponse ChangeEmployeeInfo(EmployeeBindingModel employeeModel);
+
+    EmployeeOperationResponse RemoveEmployee(string id);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/IPostAdapter.cs

@@ -0,0 +1,26 @@
+using MagicCarpetContracts.AdapterContracts.OperationResponses;
+using MagicCarpetContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts;
+
+public interface IPostAdapter
+{
+    PostOperationResponse GetList();
+
+    PostOperationResponse GetHistory(string id);
+
+    PostOperationResponse GetElement(string data);
+
+    PostOperationResponse RegisterPost(PostBindingModel postModel);
+
+    PostOperationResponse ChangePostInfo(PostBindingModel postModel);
+
+    PostOperationResponse RemovePost(string id);
+
+    PostOperationResponse RestorePost(string id);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/ISalaryAdapter.cs

@@ -0,0 +1,15 @@
+using MagicCarpetContracts.AdapterContracts.OperationResponses;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts;
+
+public interface ISalaryAdapter
+{
+    SalaryOperationResponse GetListByPeriod(DateTime fromDate, DateTime toDate);
+    SalaryOperationResponse GetListByPeriodByEmployee(DateTime fromDate, DateTime toDate, string employeeId);
+    SalaryOperationResponse CalculateSalary(DateTime date);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/ISaleAdapter.cs

@@ -0,0 +1,26 @@
+using MagicCarpetContracts.AdapterContracts.OperationResponses;
+using MagicCarpetContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts;
+
+public interface ISaleAdapter
+{
+    SaleOperationResponse GetList(DateTime fromDate, DateTime toDate);
+
+    SaleOperationResponse GetEmployeeList(string id, DateTime fromDate, DateTime toDate);
+
+    SaleOperationResponse GetClientList(string id, DateTime fromDate, DateTime toDate);
+
+    SaleOperationResponse GetTourList(string id, DateTime fromDate, DateTime toDate);
+
+    SaleOperationResponse GetElement(string id);
+
+    SaleOperationResponse MakeSale(SaleBindingModel saleModel);
+
+    SaleOperationResponse CancelSale(string id);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/ISuppliesAdapter.cs

@@ -0,0 +1,17 @@
+using MagicCarpetContracts.AdapterContracts.OperationResponses;
+using MagicCarpetContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts;
+
+public interface ISuppliesAdapter
+{
+    SuppliesOperationResponse GetAllComponents();
+    SuppliesOperationResponse GetComponentByData(string data);
+    SuppliesOperationResponse InsertComponent(SuppliesBindingModel componentDataModel);
+    SuppliesOperationResponse UpdateComponent(SuppliesBindingModel componentDataModel);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/ITourAdapter.cs

@@ -0,0 +1,24 @@
+using MagicCarpetContracts.AdapterContracts.OperationResponses;
+using MagicCarpetContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts;
+
+public interface ITourAdapter
+{
+    TourOperationResponse GetList(bool includeDeleted);
+
+    TourOperationResponse GetHistory(string id);
+
+    TourOperationResponse GetElement(string data);
+
+    TourOperationResponse RegisterTour(TourBindingModel tourModel);
+
+    TourOperationResponse ChangeTourInfo(TourBindingModel tourModel);
+
+    TourOperationResponse RemoveTour(string id);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/AgencyOperationResponse .cs

@@ -0,0 +1,26 @@
+using MagicCarpetContracts.DataModels;
+using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts.OperationResponses;
+
+public class AgencyOperationResponse : OperationResponse
+{
+    public static AgencyOperationResponse OK(List<AgencyViewModel> data) => OK<AgencyOperationResponse, List<AgencyViewModel>>(data);
+
+    public static AgencyOperationResponse OK(AgencyViewModel data) => OK<AgencyOperationResponse, AgencyViewModel>(data);
+
+    public static AgencyOperationResponse NoContent() => NoContent<AgencyOperationResponse>();
+
+    public static AgencyOperationResponse NotFound(string message) => NotFound<AgencyOperationResponse>(message);
+
+    public static AgencyOperationResponse BadRequest(string message) => BadRequest<AgencyOperationResponse>(message);
+
+    public static AgencyOperationResponse InternalServerError(string message) => InternalServerError<AgencyOperationResponse>(message);
+}
+

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/ClientOperationResponse.cs

@@ -0,0 +1,24 @@
+using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts.OperationResponses;
+
+public class ClientOperationResponse : OperationResponse
+{
+    public static ClientOperationResponse OK(List<ClientViewModel> data) => OK<ClientOperationResponse, List<ClientViewModel>>(data);
+
+    public static ClientOperationResponse OK(ClientViewModel data) => OK<ClientOperationResponse, ClientViewModel>(data);
+
+    public static ClientOperationResponse NoContent() => NoContent<ClientOperationResponse>();
+
+    public static ClientOperationResponse BadRequest(string message) => BadRequest<ClientOperationResponse>(message);
+
+    public static ClientOperationResponse NotFound(string message) => NotFound<ClientOperationResponse>(message);
+
+    public static ClientOperationResponse InternalServerError(string message) => InternalServerError<ClientOperationResponse>(message);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/EmployeeOperationResponse.cs

@@ -0,0 +1,24 @@
+using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts.OperationResponses;
+
+public class EmployeeOperationResponse : OperationResponse
+{
+    public static EmployeeOperationResponse OK(List<EmployeeViewModel> data) => OK<EmployeeOperationResponse, List<EmployeeViewModel>>(data);
+
+    public static EmployeeOperationResponse OK(EmployeeViewModel data) => OK<EmployeeOperationResponse, EmployeeViewModel>(data);
+
+    public static EmployeeOperationResponse NoContent() => NoContent<EmployeeOperationResponse>();
+
+    public static EmployeeOperationResponse NotFound(string message) => NotFound<EmployeeOperationResponse>(message);
+
+    public static EmployeeOperationResponse BadRequest(string message) => BadRequest<EmployeeOperationResponse>(message);
+
+    public static EmployeeOperationResponse InternalServerError(string message) => InternalServerError<EmployeeOperationResponse>(message);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/PostOperationResponse.cs

@@ -0,0 +1,24 @@
+using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts.OperationResponses;
+
+public class PostOperationResponse : OperationResponse
+{
+    public static PostOperationResponse OK(List<PostViewModel> data) => OK<PostOperationResponse, List<PostViewModel>>(data);
+
+    public static PostOperationResponse OK(PostViewModel data) => OK<PostOperationResponse, PostViewModel>(data);
+
+    public static PostOperationResponse NoContent() => NoContent<PostOperationResponse>();
+
+    public static PostOperationResponse NotFound(string message) => NotFound<PostOperationResponse>(message);
+
+    public static PostOperationResponse BadRequest(string message) => BadRequest<PostOperationResponse>(message);
+
+    public static PostOperationResponse InternalServerError(string message) => InternalServerError<PostOperationResponse>(message);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/SalaryOperationResponse.cs

@@ -0,0 +1,18 @@
+using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts.OperationResponses;
+
+public class SalaryOperationResponse : OperationResponse
+{
+    public static SalaryOperationResponse OK(List<SalaryViewModel> data) => OK<SalaryOperationResponse, List<SalaryViewModel>>(data);
+    public static SalaryOperationResponse NoContent() => NoContent<SalaryOperationResponse>();
+    public static SalaryOperationResponse NotFound(string message) => NotFound<SalaryOperationResponse>(message);
+    public static SalaryOperationResponse BadRequest(string message) => BadRequest<SalaryOperationResponse>(message);
+    public static SalaryOperationResponse InternalServerError(string message) => InternalServerError<SalaryOperationResponse>(message);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/SaleOperationResponse.cs

@@ -0,0 +1,24 @@
+using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts.OperationResponses;
+
+public class SaleOperationResponse : OperationResponse
+{
+    public static SaleOperationResponse OK(List<SaleViewModel> data) => OK<SaleOperationResponse, List<SaleViewModel>>(data);
+
+    public static SaleOperationResponse OK(SaleViewModel data) => OK<SaleOperationResponse, SaleViewModel>(data);
+
+    public static SaleOperationResponse NoContent() => NoContent<SaleOperationResponse>();
+
+    public static SaleOperationResponse NotFound(string message) => NotFound<SaleOperationResponse>(message);
+
+    public static SaleOperationResponse BadRequest(string message) => BadRequest<SaleOperationResponse>(message);
+
+    public static SaleOperationResponse InternalServerError(string message) => InternalServerError<SaleOperationResponse>(message);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/SuppliesOperationResponse .cs

@@ -0,0 +1,24 @@
+using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts.OperationResponses;
+
+public class SuppliesOperationResponse : OperationResponse
+{
+    public static SuppliesOperationResponse OK(List<SuppliesViewModel> data) => OK<SuppliesOperationResponse, List<SuppliesViewModel>>(data);
+
+    public static SuppliesOperationResponse OK(SuppliesViewModel data) => OK<SuppliesOperationResponse, SuppliesViewModel>(data);
+
+    public static SuppliesOperationResponse NoContent() => NoContent<SuppliesOperationResponse>();
+
+    public static SuppliesOperationResponse NotFound(string message) => NotFound<SuppliesOperationResponse>(message);
+
+    public static SuppliesOperationResponse BadRequest(string message) => BadRequest<SuppliesOperationResponse>(message);
+
+    public static SuppliesOperationResponse InternalServerError(string message) => InternalServerError<SuppliesOperationResponse>(message);
+}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/TourOperationResponse.cs

@@ -0,0 +1,26 @@
+using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.AdapterContracts.OperationResponses;
+
+public class TourOperationResponse : OperationResponse
+{
+    public static TourOperationResponse OK(List<TourViewModel> data) => OK<TourOperationResponse, List<TourViewModel>>(data);
+
+    public static TourOperationResponse OK(List<TourHistoryViewModel> data) => OK<TourOperationResponse, List<TourHistoryViewModel>>(data);
+
+    public static TourOperationResponse OK(TourViewModel data) => OK<TourOperationResponse, TourViewModel>(data);
+
+    public static TourOperationResponse NoContent() => NoContent<TourOperationResponse>();
+
+    public static TourOperationResponse NotFound(string message) => NotFound<TourOperationResponse>(message);
+
+    public static TourOperationResponse BadRequest(string message) => BadRequest<TourOperationResponse>(message);
+
+    public static TourOperationResponse InternalServerError(string message) => InternalServerError<TourOperationResponse>(message);
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/AgencyBindingModel.cs

@@ -0,0 +1,16 @@
+using MagicCarpetContracts.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class AgencyBindingModel
+{
+    public string? Id { get; set; }
+    public TourType? TourType { get; set; }
+    public int Count { get; set; }
+    public List<TourAgencyBindingModel>? Tours { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/ClientBindingModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class ClientBindingModel
+{
+    public string? Id { get; set; }
+
+    public string? FIO { get; set; }
+
+    public string? PhoneNumber { get; set; }
+
+    public double DiscountSize { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/EmployeeBindingModel.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class EmployeeBindingModel
+{
+    public string? Id { get; set; }
+
+    public string? FIO { get; set; }
+
+    public string? Email { get; set; }
+
+    public string? PostId { get; set; }
+
+    public DateTime BirthDate { get; set; }
+
+    public DateTime EmploymentDate { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/PostBindingModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class PostBindingModel
+{
+    public string? Id { get; set; }
+
+    public string? PostId => Id;
+
+    public string? PostName { get; set; }
+
+    public string? PostType { get; set; }
+
+    public string? ConfigurationJson { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/SaleBindingModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class SaleBindingModel
+{
+    public string? Id { get; set; }
+
+    public string? EmployeeId { get; set; }
+
+    public string? ClientId { get; set; }
+
+    public int DiscountType { get; set; }
+
+    public List<SaleTourBindingModel>? Tours { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/SaleTourBindingModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class SaleTourBindingModel
+{
+    public string? SaleId { get; set; }
+
+    public string? TourId { get; set; }
+
+    public int Count { get; set; }
+
+    public double Price { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/SuppliesBindingModel.cs

@@ -0,0 +1,17 @@
+using MagicCarpetContracts.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class SuppliesBindingModel
+{
+    public string? Id { get; set; }
+    public TourType? TourType { get; set; }
+    public DateTime ProductuionDate { get; set; }
+    public int Count { get; set; }
+    public List<TourSuppliesBindingModel>? Tours { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/TourAgencyBindingModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class TourAgencyBindingModel
+{
+    public string? AgencyId { get; set; }
+    public string? TourId { get; set; }
+    public int Count { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/TourBindingModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class TourBindingModel
+{
+    public string? Id { get; set; }
+    public string? TourName { get; set; }
+    public string? TourCountry { get; set; }
+    public double Price { get; set; }
+    public string? TourType { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BindingModels/TourSuppliesBindingModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BindingModels;
+
+public class TourSuppliesBindingModel
+{
+    public string? SuppliesId { get; set; }
+    public string? TourId { get; set; }
+    public int Count { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/IPostBusinessLogicContract.cs

@@ -9,7 +9,7 @@ namespace MagicCarpetContracts.BuisnessLogicContracts;
 
 public interface IPostBusinessLogicContract
 {
-    List<PostDataModel> GetAllPosts(bool onlyActive);
+    List<PostDataModel> GetAllPosts();
 
     List<PostDataModel> GetAllDataOfPost(string postId);
 

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/ISaleBusinessLogicContract.cs

@@ -22,4 +22,6 @@ public interface ISaleBusinessLogicContract
     void InsertSale(SaleDataModel saleDataModel);
 
     void CancelSale(string id);
+
+    public double CalculateSaleRevenue(DateTime fromDate, DateTime toDate);
 }

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/ISuppliesBusinessLogicContract.cs

@@ -13,4 +13,5 @@ public interface ISuppliesBusinessLogicContract
     SuppliesDataModel GetComponentByData(string data);
     void InsertComponent(SuppliesDataModel componentDataModel);
     void UpdateComponent(SuppliesDataModel componentDataModel);
+    int CalculateTourSupplies(DateTime? startDate, DateTime? endDate);
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/AgencyDataModel.cs

@@ -13,7 +13,7 @@ namespace MagicCarpetContracts.DataModels;
 public class AgencyDataModel(string id, TourType tourType, int count, List<TourAgencyDataModel> tours) : IValidation
 {
     public string Id { get; private set; } = id;
-    public TourType Type { get; private set; } = tourType;
+    public TourType TourType { get; private set; } = tourType;
     public int Count { get; private set; } = count;
     public List<TourAgencyDataModel> Tours { get; private set; } = tours;
 
@@ -23,7 +23,7 @@ public class AgencyDataModel(string id, TourType tourType, int count, List<TourA
             throw new ValidationException("Field Id is empty");
         if (!Id.IsGuid())
             throw new ValidationException("The value in the field Id is not a unique identifier");
-        if (Type == TourType.None)
+        if (TourType == TourType.None)
             throw new ValidationException("Field Type is empty");
         if (Count <= 0)
             throw new ValidationException("Field Count is less than or equal to 0");

MagicCarpetProject/MagicCarpetContracts/DataModels/EmployeeDataModel.cs

@@ -1,6 +1,7 @@
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
 using MagicCarpetContracts.Infrastructure;
+using Microsoft.Extensions.Hosting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,6 +13,8 @@ namespace MagicCarpetContracts.DataModels;
 
 public class EmployeeDataModel(string id, string fio, string email, string postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) : IValidation
 {
+    private readonly PostDataModel? _post;
+
     public string Id { get; private set; } = id;
 
     public string FIO { get; private set; } = fio;
@@ -26,6 +29,17 @@ public class EmployeeDataModel(string id, string fio, string email, string postI
 
     public bool IsDeleted { get; private set; } = isDeleted;
 
+    public string PostName => _post?.PostName ?? string.Empty;
+
+    public EmployeeDataModel(string id, string fio, string email, string postId, DateTime birthDate, DateTime employmentDate, 
+        bool isDeleted, PostDataModel post) : this(id, fio, email, postId, birthDate, employmentDate, isDeleted)
+    {
+        _post = post;
+    }
+
+    public EmployeeDataModel(string id, string fio, string email, string postId, DateTime birthDate, 
+        DateTime employmentDate) : this(id, fio, email, postId, birthDate, employmentDate, false) { }
+
     public void Validate()
     {
         if (Id.IsEmpty())

MagicCarpetProject/MagicCarpetContracts/DataModels/PostDataModel.cs

@@ -2,6 +2,10 @@
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
 using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.Infrastructure.PostConfigurations;
+using Microsoft.Extensions.Configuration;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,14 +14,26 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.DataModels;
 
-public class PostDataModel(string id, string postName, PostType postType, double salary, bool isActual, DateTime changeDate) : IValidation
+public class PostDataModel(string postId, string postName, PostType postType, PostConfiguration configuration) : IValidation
 {
-    public string Id { get; private set; } = id;
+    public string Id { get; private set; } = postId;
     public string PostName { get; private set; } = postName;
     public PostType PostType { get; private set; } = postType;
-    public double Salary { get; private set; } = salary;
-    public bool IsActual { get; private set; } = isActual;
-    public DateTime ChangeDate { get; private set; } = changeDate;                                          
+    public PostConfiguration ConfigurationModel { get; private set; } = configuration;
+
+    public PostDataModel(string postId, string postName, PostType postType, string configurationJson) : this(postId, postName, postType, (PostConfiguration)null)
+    {
+        var obj = JToken.Parse(configurationJson);
+        if (obj is not null)
+        {
+            ConfigurationModel = obj.Value<string>("Type") switch
+            {
+                nameof(TravelAgentPostConfiguration) => JsonConvert.DeserializeObject<TravelAgentPostConfiguration>(configurationJson)!,
+                nameof(ChiefPostConfiguration) => JsonConvert.DeserializeObject<ChiefPostConfiguration>(configurationJson)!,
+                _ => JsonConvert.DeserializeObject<PostConfiguration>(configurationJson)!,
+            };
+        }
+    }
 
     public void Validate()
     {
@@ -29,7 +45,9 @@ public class PostDataModel(string id, string postName, PostType postType, double
             throw new ValidationException("Field PostName is empty");
         if (PostType == PostType.None)
             throw new ValidationException("Field PostType is empty");
-        if (Salary <= 0)
-            throw new ValidationException("Field Salary is empty");
+        if (ConfigurationModel is null)
+            throw new ValidationException("Field ConfigurationModel is not initialized");
+        if (ConfigurationModel!.Rate <= 0)
+            throw new ValidationException("Field Rate is less or equal zero");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/SalaryDataModel.cs

@@ -11,12 +11,20 @@ namespace MagicCarpetContracts.DataModels;
 
 public class SalaryDataModel(string employeeId, DateTime salaryDate, double employeeSalary) : IValidation
 {
+    private readonly EmployeeDataModel? _employee;
     public string EmployeeId { get; private set; } = employeeId;
 
     public DateTime SalaryDate { get; private set; } = salaryDate;
 
     public double Salary { get; private set; } = employeeSalary;
 
+    public string EmployeeFIO => _employee?.FIO ?? string.Empty;
+
+    public SalaryDataModel(string employeeId, DateTime salaryDate, double employeeSalary, EmployeeDataModel employee) : this(employeeId, salaryDate, employeeSalary)
+    {
+        _employee = employee;
+    }
+
     public void Validate()
     {
         if (EmployeeId.IsEmpty())

MagicCarpetProject/MagicCarpetContracts/DataModels/SaleDataModel.cs

@@ -10,25 +10,78 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.DataModels;
 
-public class SaleDataModel(string id, string employeeId, string? clientId, double sum, DiscountType discountType,
-    double discount, bool isCancel, List<SaleTourDataModel> saleTours) : IValidation
+public class SaleDataModel : IValidation
 {
-    public string Id { get; private set; } = id;
+    private readonly ClientDataModel? _client;
 
-    public string EmployeeId { get; private set; } = employeeId;
+    private readonly EmployeeDataModel? _employee;
 
-    public string? ClientId { get; private set; } = clientId;
+    public string Id { get; private set; }
+
+    public string EmployeeId { get; private set; }
+
+    public string? ClientId { get; private set; }
 
     public DateTime SaleDate { get; private set; } = DateTime.UtcNow;
-    public double Sum { get; private set; } = sum;
 
-    public DiscountType DiscountType { get; private set; } = discountType;
+    public double Sum { get; private set; }
 
-    public double Discount { get; private set; } = discount;
+    public DiscountType DiscountType { get; private set; }
 
-    public bool IsCancel { get; private set; } = isCancel;
+    public double Discount { get; private set; }
 
-    public List<SaleTourDataModel> Tours { get; private set; } = saleTours;
+    public bool IsCancel { get; private set; }
+
+    public List<SaleTourDataModel>? Tours { get; private set; }
+
+    public string ClientFIO => _client?.FIO ?? string.Empty;
+
+    public string EmployeeFIO => _employee?.FIO ?? string.Empty;
+
+    public SaleDataModel(string id, string employeeId, string? clientId, DiscountType discountType, bool isCancel, List<SaleTourDataModel> saleTours)
+    {
+        Id = id;
+        EmployeeId = employeeId;
+        ClientId = clientId;
+        DiscountType = discountType;
+        IsCancel = isCancel;
+        Tours = saleTours;
+        var percent = 0.0;
+        foreach (DiscountType elem in Enum.GetValues<DiscountType>())
+        {
+            if ((elem & discountType) != 0)
+            {
+                switch (elem)
+                {
+                    case DiscountType.None:
+                        break;
+                    case DiscountType.OnSale:
+                        percent += 0.1;
+                        break;
+                    case DiscountType.RegularCustomer:
+                        percent += 0.5;
+                        break;
+                    case DiscountType.Certificate:
+                        percent += 0.3;
+                        break;
+                }
+            }
+        }
+        Sum = Tours?.Sum(x => x.Price * x.Count) ?? 0;
+        Discount = Sum * percent;
+    }
+
+    public SaleDataModel(string id, string employeeId, string? clientId, double sum, DiscountType discountType, double discount, bool isCancel,
+        List<SaleTourDataModel> saleTours, EmployeeDataModel employee, ClientDataModel? client) : this(id, employeeId, clientId, discountType, isCancel, saleTours)
+    {
+        Sum = sum;
+        Discount = discount;
+        _employee = employee;
+        _client = client;
+    }
+
+    public SaleDataModel(string id, string employeeId, string? clientId, int discountType, 
+        List<SaleTourDataModel> tours) : this(id, employeeId, clientId, (DiscountType)discountType, false, tours) { }
 
     public void Validate()
     {

MagicCarpetProject/MagicCarpetContracts/DataModels/SaleTourDataModel.cs

@@ -3,20 +3,32 @@ using MagicCarpetContracts.Extensions;
 using MagicCarpetContracts.Infrastructure;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.DataModels;
 
-public class SaleTourDataModel(string saleId, string tourId, int count) : IValidation
+public class SaleTourDataModel(string saleId, string tourId, int count, double price) : IValidation
 {
+    private readonly TourDataModel? _tour;
+
     public string SaleId { get; private set; } = saleId;
 
     public string TourId { get; private set; } = tourId;
 
     public int Count { get; private set; } = count;
 
+    public double Price { get; private set; } = price;
+
+    public string TourName => _tour?.TourName ?? string.Empty;
+
+    public SaleTourDataModel(string saleId, string tourId, int count, double price, TourDataModel tour) : this(saleId, tourId, count, price)
+    {
+        _tour = tour;
+    }
+
     public void Validate()
     {
         if (SaleId.IsEmpty())
@@ -33,5 +45,8 @@ public class SaleTourDataModel(string saleId, string tourId, int count) : IValid
 
         if (Count <= 0)
             throw new ValidationException("Field Count is less than or equal to 0");
+
+        if (Price <= 0)
+            throw new ValidationException("Field Price is less than or equal to 0");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/SuppliesDataModel.cs

@@ -11,11 +11,11 @@ using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace MagicCarpetContracts.DataModels;
 
-public class SuppliesDataModel(string id, TourType tourType, DateTime date, int count, List<TourSuppliesDataModel> tours) : IValidation
+public class SuppliesDataModel(string id, TourType tourType, DateTime productuionDate, int count, List<TourSuppliesDataModel> tours) : IValidation
 {
     public string Id { get; private set; } = id;
-    public TourType Type { get; private set; } = tourType;
-    public DateTime ProductuionDate { get; private set; } = date;
+    public TourType TourType { get; private set; } = tourType;
+    public DateTime ProductuionDate { get; private set; } = productuionDate;
     public int Count { get; private set; } = count;
     public List<TourSuppliesDataModel> Tours { get; private set; } = tours;
 
@@ -25,7 +25,7 @@ public class SuppliesDataModel(string id, TourType tourType, DateTime date, int
             throw new ValidationException("Field Id is empty");
         if (!Id.IsGuid())
             throw new ValidationException("The value in the field Id is not a unique identifier");
-        if (Type == TourType.None)
+        if (TourType == TourType.None)
             throw new ValidationException("Field Type is empty");
         if (Count <= 0)
             throw new ValidationException("Field Count is less than or equal to 0");

MagicCarpetProject/MagicCarpetContracts/DataModels/TourHistoryDataModel.cs

@@ -11,12 +11,22 @@ namespace MagicCarpetContracts.DataModels;
 
 public class TourHistoryDataModel(string tourId, double oldPrice) : IValidation
 {
+    private readonly TourDataModel? _tour;
+
     public string TourId { get; private set; } = tourId;
 
     public double OldPrice { get; private set; } = oldPrice;
 
     public DateTime ChangeDate { get; private set; } = DateTime.UtcNow;
 
+    public string TourName => _tour?.TourName ?? string.Empty;
+
+    public TourHistoryDataModel(string tourId, double oldPrice, DateTime changeDate, TourDataModel tour) : this(tourId, oldPrice)
+    {
+        ChangeDate = changeDate;
+        _tour = tour;
+    }
+
     public void Validate()
     {
         if (TourId.IsEmpty())

MagicCarpetProject/MagicCarpetContracts/Infrastructure/IConfigurationSalary.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.Infrastructure;
+
+public interface IConfigurationSalary
+{
+    double ExtraSaleSum { get; }
+
+    int MaxConcurrentThreads { get; }
+}

MagicCarpetProject/MagicCarpetContracts/Infrastructure/OperationResponse.cs

@@ -0,0 +1,47 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.Infrastructure;
+
+public class OperationResponse
+{
+    public HttpStatusCode StatusCode { get; set; }
+
+    public object? Result { get; set; }
+
+    public IActionResult GetResponse(HttpRequest request, HttpResponse response)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        ArgumentNullException.ThrowIfNull(response);
+
+        response.StatusCode = (int)StatusCode;
+
+        if (Result is null)
+        {
+            return new StatusCodeResult((int)StatusCode);
+        }
+
+        return new ObjectResult(Result);
+    }
+
+    protected static TResult OK<TResult, TData>(TData data) where TResult : OperationResponse,
+        new() => new() { StatusCode = HttpStatusCode.OK, Result = data };
+
+    protected static TResult NoContent<TResult>() where TResult : OperationResponse,
+        new() => new() { StatusCode = HttpStatusCode.NoContent };
+
+    protected static TResult BadRequest<TResult>(string? errorMessage = null) where TResult : OperationResponse,
+        new() => new() { StatusCode = HttpStatusCode.BadRequest, Result = errorMessage };
+
+    protected static TResult NotFound<TResult>(string? errorMessage = null) where TResult : OperationResponse,
+        new() => new() { StatusCode = HttpStatusCode.NotFound, Result = errorMessage };
+
+    protected static TResult InternalServerError<TResult>(string? errorMessage = null) where TResult : OperationResponse,
+        new() => new() { StatusCode = HttpStatusCode.InternalServerError, Result = errorMessage };
+}

MagicCarpetProject/MagicCarpetContracts/Infrastructure/PostConfigurations/ChiefPostConfiguration.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.Infrastructure.PostConfigurations;
+
+public class ChiefPostConfiguration : PostConfiguration
+{
+    public override string Type => nameof(ChiefPostConfiguration);
+    public double PersonalCountTrendPremium { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/Infrastructure/PostConfigurations/PostConfiguration.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.Infrastructure.PostConfigurations;
+
+public class PostConfiguration
+{
+    public virtual string Type => nameof(PostConfiguration);
+    public double Rate { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/Infrastructure/PostConfigurations/TravelAgentPostConfiguration.cs

@@ -0,0 +1,15 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.Infrastructure.PostConfigurations;
+
+public class TravelAgentPostConfiguration : PostConfiguration
+{
+    public override string Type => nameof(TravelAgentPostConfiguration);
+    public double SalePercent { get; set; }
+    public double BonusForExtraSales { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/MagicCarpetContracts.csproj

@@ -6,4 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
+  </ItemGroup>
+
 </Project>

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/IEmployeeStorageContract.cs

@@ -23,4 +23,6 @@ public interface IEmployeeStorageContract
     void UpdElement(EmployeeDataModel employeeDataModel);
 
     void DelElement(string id);
+
+    int GetEmployeeTrend(DateTime fromPeriod, DateTime toPeriod);
 }

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/IPostStorageContract.cs

@@ -9,7 +9,7 @@ namespace MagicCarpetContracts.StoragesContracts;
 
 public interface IPostStorageContract
 {
-    List<PostDataModel> GetList(bool onlyActual = true);
+    List<PostDataModel> GetList();
     List<PostDataModel> GetPostWithHistory(string postId);
     PostDataModel? GetElementById(string id);
     PostDataModel? GetElementByName(string name);

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/ISalaryStorageContract.cs

@@ -9,7 +9,7 @@ namespace MagicCarpetContracts.StoragesContracts;
 
 public interface ISalaryStorageContract
 {
-    List<SalaryDataModel> GetList(DateTime startDate, DateTime endDate, string? employeeId = null);
+    List<SalaryDataModel> GetList(DateTime? startDate, DateTime? endDate, string? employeeId = null);
 
     void AddElement(SalaryDataModel salaryDataModel);
 }

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/ISuppliesStorageContract.cs

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

MagicCarpetProject/MagicCarpetContracts/ViewModels/AgencyViewModel.cs

@@ -0,0 +1,16 @@
+using MagicCarpetContracts.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class AgencyViewModel
+{
+    public required string Id { get; set; }
+    public required TourType TourType { get; set; }
+    public required int Count { get; set; }
+    public required List<TourAgencyViewModel> Tours { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/ClientViewModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class ClientViewModel
+{
+    public required string Id { get; set; }
+
+    public required string FIO { get; set; }
+
+    public required string PhoneNumber { get; set; }
+
+    public double DiscountSize { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/EmployeeViewModel.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class EmployeeViewModel
+{
+    public required string Id { get; set; }
+
+    public required string FIO { get; set; }
+
+    public string Email { get; set; }
+
+    public required string PostId { get; set; }
+
+    public required string PostName { get; set; }
+
+    public bool IsDeleted { get; set; }
+
+    public DateTime BirthDate { get; set; }
+
+    public DateTime EmploymentDate { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/PostViewModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class PostViewModel
+{
+    public required string Id { get; set; }
+
+    public required string PostName { get; set; }
+
+    public required string PostType { get; set; }
+
+    public required string Configuration { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/SalaryViewModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class SalaryViewModel
+{
+    public required string EmployeeId { get; set; }
+    public required string EmployeeFIO { get; set; }
+    public DateTime SalaryDate { get; set; }
+    public double Salary { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/SaleTourViewModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class SaleTourViewModel
+{
+    public required string TourId { get; set; }
+
+    public required string TourName { get; set; }
+
+    public int Count { get; set; }
+
+    public double Price { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/SaleViewModel.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class SaleViewModel
+{
+    public required string Id { get; set; }
+
+    public required string EmployeeId { get; set; }
+
+    public required string EmployeeFIO { get; set; }
+
+    public string? ClientId { get; set; }
+
+    public string? ClientFIO { get; set; }
+
+    public DateTime SaleDate { get; set; }
+
+    public double Sum { get; set; }
+
+    public required string DiscountType { get; set; }
+
+    public double Discount { get; set; }
+
+    public bool IsCancel { get; set; }
+
+    public required List<SaleTourViewModel> Tours { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/SuppliesViewModel.cs

@@ -0,0 +1,17 @@
+using MagicCarpetContracts.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class SuppliesViewModel
+{
+    public required string Id { get; set; }
+    public required TourType TourType { get; set; }
+    public DateTime ProductuionDate { get; set; }
+    public int Count { get; set; }
+    public required List<TourSuppliesViewModel> Tours { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/TourAgencyViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class TourAgencyViewModel
+{
+    public required string AgencyId { get; set; }
+    public required string TourId { get; set; }
+    public int Count { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/TourHistoryViewModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class TourHistoryViewModel
+{
+    public required string TourName { get; set; }
+
+    public double OldPrice { get; set; }
+
+    public DateTime ChangeDate { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/TourSuppliesViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class TourSuppliesViewModel
+{
+    public required string SuppliesId { get; set; }
+    public required string TourId { get; set; }
+    public int Count { get; set; }
+}

MagicCarpetProject/MagicCarpetContracts/ViewModels/TourViewModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.ViewModels;
+
+public class TourViewModel
+{
+    public required string Id { get; set; }
+
+    public required string TourName { get; set; }
+
+    public required string TourType { get; set; }
+
+    public string? TourCountry { get; set; }
+
+    public double Price { get; set; }
+}

MagicCarpetProject/MagicCarpetDatabase/DefaultConfigurationDatabase.cs

@@ -0,0 +1,8 @@
+using MagicCarpetContracts.Infrastructure;
+
+namespace MagicCarpetDatabase;
+
+class DefaultConfigurationDatabase : IConfigurationDatabase
+{
+    public string ConnectionString => "";
+}

MagicCarpetProject/MagicCarpetDatabase/Implementations/AgencyStorageContract.cs

@@ -3,6 +3,7 @@ using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.StoragesContracts;
 using MagicCarpetDatabase.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,16 +22,8 @@ public class AgencyStorageContract : IAgencyStorageContract
         _dbContext = dbContext;
         var config = new MapperConfiguration(cfg =>
         {
-            cfg.CreateMap<Agency, AgencyDataModel>()
-       .ConstructUsing(src => new AgencyDataModel(
-           src.Id,
-           src.Type,
-           src.Count,
-           _mapper.Map<List<TourAgencyDataModel>>(src.Tours)
-       ));
-
-            cfg.CreateMap<AgencyDataModel, Agency>();
-            cfg.CreateMap<TourAgencyDataModel, TourAgency>().ReverseMap();
+            cfg.AddMaps(typeof(TourAgency));
+            cfg.AddMaps(typeof(Agency));
         });
         _mapper = new Mapper(config);
     }
@@ -114,30 +107,37 @@ public class AgencyStorageContract : IAgencyStorageContract
             throw new StorageException(ex);
         }
     }
-
+    //второе требование 
     public bool CheckComponents(SaleDataModel saleDataModel)
     {
         using (var transaction = _dbContext.Database.BeginTransaction())
         {
-            foreach (SaleTourDataModel sale_tour in saleDataModel.Tours)
+            var componentTasks = saleDataModel.Tours
+                .AsParallel()
+                .Select(async saleComponent =>
                 {
-                var tour = _dbContext.Tours.FirstOrDefault(x => x.Id == sale_tour.TourId);
-                var agency = _dbContext.Agencies.FirstOrDefault(x => x.Type == tour.TourType && x.Count >= sale_tour.Count);
-
+                    var component = await _dbContext.Tours.FirstOrDefaultAsync(x => x.Id == saleComponent.TourId);
+                    var agency = await _dbContext.Agencies.FirstOrDefaultAsync(x => x.TourType == component.TourType && x.Count >= saleComponent.Count);
                     if (agency == null)
                     {
                         transaction.Rollback();
                         return false;
                     }
-                if (agency.Count - sale_tour.Count == 0)
+                    if (agency.Count - saleComponent.Count == 0)
                     {
                         DelElement(agency.Id);
                     }
                     else
                     {
-                    agency.Count -= sale_tour.Count;
-                }
+                        agency.Count -= saleComponent.Count;
+                        _dbContext.Agencies.Update(agency);
                     }
+
+                    return true;
+                })
+                .ToList();
+
+            Task.WaitAll(componentTasks.ToArray());
             transaction.Commit();
             _dbContext.SaveChanges();
             return true;

MagicCarpetProject/MagicCarpetDatabase/Implementations/ClientStorageContract.cs

@@ -13,11 +13,11 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class ClientStorageContarct : IClientStorageContract
+public class ClientStorageContract : IClientStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
-    public ClientStorageContarct(MagicCarpetDbContext magicCarpetDbContext)
+    public ClientStorageContract(MagicCarpetDbContext magicCarpetDbContext)
     {
         _dbContext = magicCarpetDbContext;
         var config = new MapperConfiguration(cfg =>

MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class EmployeeStorageContract : IEmployeeStorageContract
+public class EmployeeStorageContract : IEmployeeStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
@@ -21,10 +21,14 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         _dbContext = dbContext;
         var config = new MapperConfiguration(cfg =>
         {
-            cfg.AddMaps(typeof(MagicCarpetDbContext).Assembly);
+            cfg.CreateMap<Post, PostDataModel>()
+                .ForMember(x => x.Id, x => x.MapFrom(src => src.PostId));
+            cfg.CreateMap<Employee, EmployeeDataModel>();
+            cfg.CreateMap<EmployeeDataModel, Employee>();
         });
         _mapper = new Mapper(config);
     }
+
     public List<EmployeeDataModel> GetList(bool onlyActive = true, string? postId = null, DateTime? fromBirthDate = null, DateTime? toBirthDate = null, DateTime? fromEmploymentDate = null, DateTime? toEmploymentDate = null)
     {
         try
@@ -40,13 +44,13 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
             }
             if (fromBirthDate is not null && toBirthDate is not null)
             {
-                query = query.Where(x => x.BirthDate >= fromBirthDate && x.BirthDate <= toBirthDate);
+                query = query.Where(x => x.BirthDate >= DateTime.SpecifyKind(fromBirthDate ?? DateTime.UtcNow, DateTimeKind.Utc) && x.BirthDate <= DateTime.SpecifyKind(toBirthDate ?? DateTime.UtcNow, DateTimeKind.Utc));
             }
             if (fromEmploymentDate is not null && toEmploymentDate is not null)
             {
-                query = query.Where(x => x.EmploymentDate >= fromEmploymentDate && x.EmploymentDate <= toEmploymentDate);
+                query = query.Where(x => x.EmploymentDate >= DateTime.SpecifyKind(fromEmploymentDate ?? DateTime.UtcNow, DateTimeKind.Utc) && x.EmploymentDate <= DateTime.SpecifyKind(toEmploymentDate ?? DateTime.UtcNow, DateTimeKind.Utc));
             }
-            return [.. query.Select(x => _mapper.Map<EmployeeDataModel>(x))];
+            return [.. JoinPost(query).Select(x => _mapper.Map<EmployeeDataModel>(x))];
         }
         catch (Exception ex)
         {
@@ -72,7 +76,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
     {
         try
         {
-            return _mapper.Map<EmployeeDataModel>(_dbContext.Employees.FirstOrDefault(x => x.FIO == fio));
+            return _mapper.Map<EmployeeDataModel>(AddPost(_dbContext.Employees.FirstOrDefault(x => x.FIO == fio && !x.IsDeleted)));
         }
         catch (Exception ex)
         {
@@ -80,11 +84,12 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
             throw new StorageException(ex);
         }
     }
+
     public EmployeeDataModel? GetElementByEmail(string email)
     {
         try
         {
-            return _mapper.Map<EmployeeDataModel>(_dbContext.Employees.FirstOrDefault(x => x.Email == email));
+            return _mapper.Map<EmployeeDataModel>(AddPost(_dbContext.Employees.FirstOrDefault(x => x.Email == email && !x.IsDeleted)));
         }
         catch (Exception ex)
         {
@@ -152,5 +157,27 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         }
     }
 
-    private Employee? GetEmployeeById(string id) => _dbContext.Employees.FirstOrDefault(x => x.Id == id && !x.IsDeleted);   
+    public int GetEmployeeTrend(DateTime fromPeriod, DateTime toPeriod)
+    {
+        try
+        {
+            var countWorkersOnBegining = _dbContext.Employees.Count(x => x.EmploymentDate < fromPeriod && (!x.IsDeleted || x.DateOfDelete > fromPeriod));
+            var countWorkersOnEnding = _dbContext.Employees.Count(x => x.EmploymentDate < toPeriod && (!x.IsDeleted || x.DateOfDelete > toPeriod));
+            return countWorkersOnEnding - countWorkersOnBegining;
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    private Employee? GetEmployeeById(string id) => AddPost(_dbContext.Employees.FirstOrDefault(x => x.Id == id && !x.IsDeleted));
+
+    private IQueryable<Employee> JoinPost(IQueryable<Employee> query)
+        => query.GroupJoin(_dbContext.Posts.Where(x => x.IsActual), x => x.PostId, y => y.PostId, (x, y) => new { Employee = x, Post = y })
+                .SelectMany(xy => xy.Post.DefaultIfEmpty(), (x, y) => x.Employee.AddPost(y));
+
+    private Employee? AddPost(Employee? employee)
+        => employee?.AddPost(_dbContext.Posts.FirstOrDefault(x => x.PostId == employee.PostId && x.IsActual));
 }

MagicCarpetProject/MagicCarpetDatabase/Implementations/PostStorageContract.cs

@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class PostStorageContract : IPostStorageContract
+public class PostStorageContract : IPostStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
@@ -29,21 +29,18 @@ internal class PostStorageContract : IPostStorageContract
                 .ForMember(x => x.Id, x => x.Ignore())
                 .ForMember(x => x.PostId, x => x.MapFrom(src => src.Id))
                 .ForMember(x => x.IsActual, x => x.MapFrom(src => true))
-                .ForMember(x => x.ChangeDate, x => x.MapFrom(src => DateTime.UtcNow));
+                .ForMember(x => x.ChangeDate, x => x.MapFrom(src => DateTime.UtcNow))
+                .ForMember(x => x.Configuration, x => x.MapFrom(src =>
+                    src.ConfigurationModel));
         });
         _mapper = new Mapper(config);
     }
 
-    public List<PostDataModel> GetList(bool onlyActual = true)
+    public List<PostDataModel> GetList()
     {
         try
         {
-            var query = _dbContext.Posts.AsQueryable();
-            if (onlyActual)
-            {
-                query = query.Where(x => x.IsActual);
-            }
-            return [.. query.Select(x => _mapper.Map<PostDataModel>(x))];
+            return [.. _dbContext.Posts.Select(x => _mapper.Map<PostDataModel>(x))];
         }
         catch (Exception ex)
         {

MagicCarpetProject/MagicCarpetDatabase/Implementations/SalaryStorageContract.cs

@@ -3,6 +3,7 @@ using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.StoragesContracts;
 using MagicCarpetDatabase.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,7 +12,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class SalaryStorageContract : ISalaryStorageContract
+public class SalaryStorageContract : ISalaryStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
@@ -21,6 +22,7 @@ internal class SalaryStorageContract : ISalaryStorageContract
         _dbContext = dbContext;
         var config = new MapperConfiguration(cfg =>
         {
+            cfg.CreateMap<Employee, EmployeeDataModel>();
             cfg.CreateMap<Salary, SalaryDataModel>();
             cfg.CreateMap<SalaryDataModel, Salary>()
                 .ForMember(dest => dest.EmployeeSalary, opt => opt.MapFrom(src => src.Salary));
@@ -28,15 +30,17 @@ internal class SalaryStorageContract : ISalaryStorageContract
         _mapper = new Mapper(config);
     }
 
-    public List<SalaryDataModel> GetList(DateTime startDate, DateTime endDate, string? employeeId = null)
+    public List<SalaryDataModel> GetList(DateTime? startDate, DateTime? endDate, string? employeeId = null)
     {
         try
         {
-            var query = _dbContext.Salaries.Where(x => x.SalaryDate >= startDate && x.SalaryDate <= endDate);
-            if (employeeId is not null)
-            {
+            var query = _dbContext.Salaries.Include(d => d.Employee).AsQueryable();
+            if (startDate.HasValue)
+                query = query.Where(x => x.SalaryDate >= DateTime.SpecifyKind(startDate ?? DateTime.UtcNow, DateTimeKind.Utc));
+            if (endDate.HasValue)
+                query = query.Where(x => x.SalaryDate <= DateTime.SpecifyKind(endDate ?? DateTime.UtcNow, DateTimeKind.Utc));
+            if (employeeId != null)
                 query = query.Where(x => x.EmployeeId == employeeId);
-            }
             return [.. query.Select(x => _mapper.Map<SalaryDataModel>(x))];
         }
         catch (Exception ex)

MagicCarpetProject/MagicCarpetDatabase/Implementations/SaleStorageContract.cs

@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class SaleStorageContract : ISaleStorageContract
+public class SaleStorageContract : ISaleStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
@@ -22,12 +22,18 @@ internal class SaleStorageContract : ISaleStorageContract
         _dbContext = dbContext;
         var config = new MapperConfiguration(cfg =>
         {
+            cfg.CreateMap<Client, ClientDataModel>();
+            cfg.CreateMap<Tour, TourDataModel>();
+            cfg.CreateMap<Employee, EmployeeDataModel>();
             cfg.CreateMap<SaleTour, SaleTourDataModel>();
-            cfg.CreateMap<SaleTourDataModel, SaleTour>();
+            cfg.CreateMap<SaleTourDataModel, SaleTour>()
+                    .ForMember(x => x.Tour, x => x.Ignore());
             cfg.CreateMap<Sale, SaleDataModel>();
             cfg.CreateMap<SaleDataModel, Sale>()
                 .ForMember(x => x.IsCancel, x => x.MapFrom(src => false))
-                .ForMember(x => x.SaleTours, x => x.MapFrom(src => src.Tours));
+                .ForMember(x => x.SaleTours, x => x.MapFrom(src => src.Tours))
+                .ForMember(x => x.Employee, x => x.Ignore())
+                .ForMember(x => x.Client, x => x.Ignore());
         });
         _mapper = new Mapper(config);
     }
@@ -36,23 +42,23 @@ internal class SaleStorageContract : ISaleStorageContract
     {
         try
         {
-            var query = _dbContext.Sales.Include(x => x.SaleTours).AsQueryable();
-            if (startDate is not null && endDate is not null)
-            {
-                query = query.Where(x => x.SaleDate >= startDate && x.SaleDate < endDate);
-            }
-            if (employeeId is not null)
-            {
+            var query = _dbContext.Sales
+                .Include(r => r.Employee)
+                .Include(r => r.Client)
+                .Include(r => r.SaleTours)!
+                .ThenInclude(d => d.Tour)
+                .AsQueryable();
+            if (startDate.HasValue)
+                query = query.Where(x => x.SaleDate >= DateTime.SpecifyKind(startDate ?? DateTime.UtcNow, DateTimeKind.Utc));
+            if (endDate.HasValue)
+                query = query.Where(x => x.SaleDate <= DateTime.SpecifyKind(endDate ?? DateTime.UtcNow, DateTimeKind.Utc));
+            if (employeeId != null)
                 query = query.Where(x => x.EmployeeId == employeeId);
-            }
-            if (clientId is not null)
-            {
+            if (clientId != null)
                 query = query.Where(x => x.ClientId == clientId);
-            }
-            if (tourId is not null)
-            {
+            if (tourId != null)
                 query = query.Where(x => x.SaleTours!.Any(y => y.TourId == tourId));
-            }
+            var s = query.ToList();
             return [.. query.Select(x => _mapper.Map<SaleDataModel>(x))];
         }
         catch (Exception ex)
@@ -113,5 +119,5 @@ internal class SaleStorageContract : ISaleStorageContract
         }
     }
 
-    private Sale? GetSaleById(string id) => _dbContext.Sales.FirstOrDefault(x => x.Id == id);
+    private Sale? GetSaleById(string id) => _dbContext.Sales.Include(x => x.Client).Include(x => x.Employee).Include(x => x.SaleTours)!.ThenInclude(x => x.Tour).FirstOrDefault(x => x.Id == id);
 }

MagicCarpetProject/MagicCarpetDatabase/Implementations/SuppliesStorageContract.cs

@@ -36,11 +36,16 @@ public class SuppliesStorageContract : ISuppliesStorageContract
         _mapper = new Mapper(config);
     }
 
-    public List<SuppliesDataModel> GetList(DateTime? startDate = null)
+    public List<SuppliesDataModel> GetList(DateTime? startDate = null, DateTime? endDate = null)
     {
         try
         {
-            return [.. _dbContext.Supplieses.Select(x => _mapper.Map<SuppliesDataModel>(x))];
+            var query = _dbContext.Supplieses.AsQueryable();
+            if (startDate is not null && endDate is not null)
+            {
+                query = query.Where(x => x.ProductuionDate >= startDate && x.ProductuionDate < endDate);
+            }
+            return [.. query.Select(x => _mapper.Map<SuppliesDataModel>(x))];
         }
         catch (Exception ex)
         {

MagicCarpetProject/MagicCarpetDatabase/Implementations/TourStorageContract.cs

@@ -14,7 +14,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class TourStorageContract : ITourStorageContract
+public class TourStorageContract : ITourStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
@@ -30,6 +30,7 @@ internal class TourStorageContract : ITourStorageContract
         });
         _mapper = new Mapper(config);
     }
+
     public List<TourDataModel> GetList()
     {
         try
@@ -47,7 +48,7 @@ internal class TourStorageContract : ITourStorageContract
     {
         try
         {
-            return [.. _dbContext.TourHistories.Where(x => x.TourId == tourId).OrderByDescending(x => x.ChangeDate).Select(x => _mapper.Map<TourHistoryDataModel>(x))];
+            return [.. _dbContext.TourHistories.Include(x => x.Tour).Where(x => x.TourId == tourId).OrderByDescending(x => x.ChangeDate).Select(x => _mapper.Map<TourHistoryDataModel>(x))];
         }
         catch (Exception ex)
         {
@@ -108,22 +109,37 @@ internal class TourStorageContract : ITourStorageContract
 
     public void UpdElement(TourDataModel tourDataModel)
     {
+        try
+        {
+            var transaction = _dbContext.Database.BeginTransaction();
             try
             {
                 var element = GetTourById(tourDataModel.Id) ?? throw new ElementNotFoundException(tourDataModel.Id);
-            _dbContext.Tours.Update(_mapper.Map(tourDataModel, element));
+                if (element.Price != tourDataModel.Price)
+                {
+                    _dbContext.TourHistories.Add(new TourHistory() { TourId = element.Id, OldPrice = element.Price });
                     _dbContext.SaveChanges();
                 }
-        catch (ElementNotFoundException)
+                _dbContext.Tours.Update(_mapper.Map(tourDataModel, element));
+                _dbContext.SaveChanges();
+                transaction.Commit();
+            }
+            catch
             {
-            _dbContext.ChangeTracker.Clear();
+                transaction.Rollback();
                 throw;
             }
+        }
         catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Tours_TourName" })
         {
             _dbContext.ChangeTracker.Clear();
             throw new ElementExistsException("TourName", tourDataModel.TourName);
         }
+        catch (Exception ex) when (ex is ElementDeletedException || ex is ElementNotFoundException)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw;
+        }
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();

MagicCarpetProject/MagicCarpetDatabase/MagicCarpetDatabase.csproj

@@ -8,16 +8,18 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="14.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MagicCarpetContracts\MagicCarpetContracts.csproj" />
   </ItemGroup>
-	<ItemGroup>
-		<InternalsVisibleTo Include="MagicCarpetTests" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
+
 
 </Project>

MagicCarpetProject/MagicCarpetDatabase/MagicCarpetDbContext.cs

@@ -1,6 +1,9 @@
 using MagicCarpetContracts.Infrastructure;
+using MagicCarpetContracts.Infrastructure.PostConfigurations;
 using MagicCarpetDatabase.Models;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -25,6 +28,11 @@ public class MagicCarpetDbContext(IConfigurationDatabase configurationDatabase)
 
         modelBuilder.Entity<Client>().HasIndex(x => x.PhoneNumber).IsUnique();
 
+        modelBuilder.Entity<Sale>()
+            .HasOne(e => e.Client)
+            .WithMany(e => e.Sales)
+            .OnDelete(DeleteBehavior.SetNull);
+
         modelBuilder.Entity<Tour>().HasIndex(x => x.TourName).IsUnique();
 
         modelBuilder.Entity<Post>()
@@ -42,6 +50,13 @@ public class MagicCarpetDbContext(IConfigurationDatabase configurationDatabase)
         modelBuilder.Entity<TourSupplies>().HasKey(x => new { x.SuppliesId, x.TourId });
 
         modelBuilder.Entity<TourAgency>().HasKey(x => new { x.AgencyId, x.TourId });
+
+        modelBuilder.Entity<Post>()
+           .Property(x => x.Configuration)
+           .HasColumnType("jsonb")
+           .HasConversion(
+           x => SerializePostConfiguration(x),
+           x => DeserialzePostConfiguration(x));
     }
 
     public DbSet<Client> Clients { get; set; }
@@ -63,4 +78,12 @@ public class MagicCarpetDbContext(IConfigurationDatabase configurationDatabase)
     public DbSet<Agency> Agencies { get; set; }
     public DbSet<TourSupplies> TourSupplieses { get; set; }
     public DbSet<TourAgency> TourAgensies { get; set; }
+
+    private static string SerializePostConfiguration(PostConfiguration postConfiguration) => JsonConvert.SerializeObject(postConfiguration);
+    private static PostConfiguration DeserialzePostConfiguration(string jsonString) => JToken.Parse(jsonString).Value<string>("Type") switch
+    {
+        nameof(TravelAgentPostConfiguration) => JsonConvert.DeserializeObject<TravelAgentPostConfiguration>(jsonString)!,
+        nameof(ChiefPostConfiguration) => JsonConvert.DeserializeObject<ChiefPostConfiguration>(jsonString)!,
+        _ => JsonConvert.DeserializeObject<PostConfiguration>(jsonString)!,
+    };
 }

MagicCarpetProject/MagicCarpetDatabase/Migrations/20250408110058_FirstMigration.Designer.cs

@@ -0,0 +1,333 @@
+// <auto-generated />
+using System;
+using MagicCarpetDatabase;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MagicCarpetDatabase.Migrations
+{
+    [DbContext(typeof(MagicCarpetDbContext))]
+    [Migration("20250408110058_FirstMigration")]
+    partial class FirstMigration
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Client", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<double>("DiscountSize")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("FIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PhoneNumber")
+                        .IsUnique();
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Employee", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("BirthDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("EmploymentDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("FIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Post", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("ChangeDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsActual")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PostType")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Salary")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PostId", "IsActual")
+                        .IsUnique()
+                        .HasFilter("\"IsActual\" = TRUE");
+
+                    b.HasIndex("PostName", "IsActual")
+                        .IsUnique()
+                        .HasFilter("\"IsActual\" = TRUE");
+
+                    b.ToTable("Posts");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Salary", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmployeeId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("EmployeeSalary")
+                        .HasColumnType("double precision");
+
+                    b.Property<DateTime>("SalaryDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("Salaries");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Sale", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientId")
+                        .HasColumnType("text");
+
+                    b.Property<double>("Discount")
+                        .HasColumnType("double precision");
+
+                    b.Property<int>("DiscountType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("EmployeeId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsCancel")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("SaleDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("Sales");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.SaleTour", b =>
+                {
+                    b.Property<string>("SaleId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TourId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("SaleId", "TourId");
+
+                    b.HasIndex("TourId");
+
+                    b.ToTable("SaleTours");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Tour", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("TourCountry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TourName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("TourType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TourName")
+                        .IsUnique();
+
+                    b.ToTable("Tours");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.TourHistory", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("ChangeDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double>("OldPrice")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("TourId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TourId");
+
+                    b.ToTable("TourHistories");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Salary", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Employee", "Employee")
+                        .WithMany("Salaries")
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Sale", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Client", "Client")
+                        .WithMany("Sales")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("MagicCarpetDatabase.Models.Employee", "Employee")
+                        .WithMany("Sales")
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.SaleTour", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Sale", "Sale")
+                        .WithMany("SaleTours")
+                        .HasForeignKey("SaleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MagicCarpetDatabase.Models.Tour", "Tour")
+                        .WithMany("SaleTours")
+                        .HasForeignKey("TourId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Sale");
+
+                    b.Navigation("Tour");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.TourHistory", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Tour", "Tour")
+                        .WithMany("TourHistories")
+                        .HasForeignKey("TourId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tour");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Client", b =>
+                {
+                    b.Navigation("Sales");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Employee", b =>
+                {
+                    b.Navigation("Salaries");
+
+                    b.Navigation("Sales");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Sale", b =>
+                {
+                    b.Navigation("SaleTours");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Tour", b =>
+                {
+                    b.Navigation("SaleTours");
+
+                    b.Navigation("TourHistories");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

MagicCarpetProject/MagicCarpetDatabase/Migrations/20250408110058_FirstMigration.cs

@@ -0,0 +1,253 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace MagicCarpetDatabase.Migrations
+{
+    /// <inheritdoc />
+    public partial class FirstMigration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Clients",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    FIO = table.Column<string>(type: "text", nullable: false),
+                    PhoneNumber = table.Column<string>(type: "text", nullable: false),
+                    DiscountSize = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Clients", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Employees",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    FIO = table.Column<string>(type: "text", nullable: false),
+                    Email = table.Column<string>(type: "text", nullable: false),
+                    PostId = table.Column<string>(type: "text", nullable: false),
+                    BirthDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    EmploymentDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    IsDeleted = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Employees", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Posts",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    PostId = table.Column<string>(type: "text", nullable: false),
+                    PostName = table.Column<string>(type: "text", nullable: false),
+                    PostType = table.Column<int>(type: "integer", nullable: false),
+                    Salary = table.Column<double>(type: "double precision", nullable: false),
+                    IsActual = table.Column<bool>(type: "boolean", nullable: false),
+                    ChangeDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Posts", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Tours",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    TourName = table.Column<string>(type: "text", nullable: false),
+                    TourCountry = table.Column<string>(type: "text", nullable: true),
+                    Price = table.Column<double>(type: "double precision", nullable: false),
+                    TourType = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Tours", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Salaries",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    EmployeeId = table.Column<string>(type: "text", nullable: false),
+                    SalaryDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    EmployeeSalary = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Salaries", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Salaries_Employees_EmployeeId",
+                        column: x => x.EmployeeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Sales",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    EmployeeId = table.Column<string>(type: "text", nullable: false),
+                    ClientId = table.Column<string>(type: "text", nullable: true),
+                    SaleDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    Sum = table.Column<double>(type: "double precision", nullable: false),
+                    DiscountType = table.Column<int>(type: "integer", nullable: false),
+                    Discount = table.Column<double>(type: "double precision", nullable: false),
+                    IsCancel = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Sales", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Sales_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.SetNull);
+                    table.ForeignKey(
+                        name: "FK_Sales_Employees_EmployeeId",
+                        column: x => x.EmployeeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "TourHistories",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    TourId = table.Column<string>(type: "text", nullable: false),
+                    OldPrice = table.Column<double>(type: "double precision", nullable: false),
+                    ChangeDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TourHistories", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_TourHistories_Tours_TourId",
+                        column: x => x.TourId,
+                        principalTable: "Tours",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "SaleTours",
+                columns: table => new
+                {
+                    SaleId = table.Column<string>(type: "text", nullable: false),
+                    TourId = table.Column<string>(type: "text", nullable: false),
+                    Count = table.Column<int>(type: "integer", nullable: false),
+                    Price = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SaleTours", x => new { x.SaleId, x.TourId });
+                    table.ForeignKey(
+                        name: "FK_SaleTours_Sales_SaleId",
+                        column: x => x.SaleId,
+                        principalTable: "Sales",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_SaleTours_Tours_TourId",
+                        column: x => x.TourId,
+                        principalTable: "Tours",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Clients_PhoneNumber",
+                table: "Clients",
+                column: "PhoneNumber",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Posts_PostId_IsActual",
+                table: "Posts",
+                columns: new[] { "PostId", "IsActual" },
+                unique: true,
+                filter: "\"IsActual\" = TRUE");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Posts_PostName_IsActual",
+                table: "Posts",
+                columns: new[] { "PostName", "IsActual" },
+                unique: true,
+                filter: "\"IsActual\" = TRUE");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Salaries_EmployeeId",
+                table: "Salaries",
+                column: "EmployeeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Sales_ClientId",
+                table: "Sales",
+                column: "ClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Sales_EmployeeId",
+                table: "Sales",
+                column: "EmployeeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SaleTours_TourId",
+                table: "SaleTours",
+                column: "TourId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TourHistories_TourId",
+                table: "TourHistories",
+                column: "TourId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Tours_TourName",
+                table: "Tours",
+                column: "TourName",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Posts");
+
+            migrationBuilder.DropTable(
+                name: "Salaries");
+
+            migrationBuilder.DropTable(
+                name: "SaleTours");
+
+            migrationBuilder.DropTable(
+                name: "TourHistories");
+
+            migrationBuilder.DropTable(
+                name: "Sales");
+
+            migrationBuilder.DropTable(
+                name: "Tours");
+
+            migrationBuilder.DropTable(
+                name: "Clients");
+
+            migrationBuilder.DropTable(
+                name: "Employees");
+        }
+    }
+}

MagicCarpetProject/MagicCarpetDatabase/Migrations/20250410053313_ChangeEmployeeAndPost.Designer.cs

@@ -0,0 +1,337 @@
+// <auto-generated />
+using System;
+using MagicCarpetDatabase;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MagicCarpetDatabase.Migrations
+{
+    [DbContext(typeof(MagicCarpetDbContext))]
+    [Migration("20250410053313_ChangeEmployeeAndPost")]
+    partial class ChangeEmployeeAndPost
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Client", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<double>("DiscountSize")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("FIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PhoneNumber")
+                        .IsUnique();
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Employee", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("BirthDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DateOfDelete")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("EmploymentDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("FIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Post", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("ChangeDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Configuration")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<bool>("IsActual")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PostType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PostId", "IsActual")
+                        .IsUnique()
+                        .HasFilter("\"IsActual\" = TRUE");
+
+                    b.HasIndex("PostName", "IsActual")
+                        .IsUnique()
+                        .HasFilter("\"IsActual\" = TRUE");
+
+                    b.ToTable("Posts");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Salary", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmployeeId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("EmployeeSalary")
+                        .HasColumnType("double precision");
+
+                    b.Property<DateTime>("SalaryDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("Salaries");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Sale", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientId")
+                        .HasColumnType("text");
+
+                    b.Property<double>("Discount")
+                        .HasColumnType("double precision");
+
+                    b.Property<int>("DiscountType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("EmployeeId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsCancel")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("SaleDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("Sales");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.SaleTour", b =>
+                {
+                    b.Property<string>("SaleId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TourId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("SaleId", "TourId");
+
+                    b.HasIndex("TourId");
+
+                    b.ToTable("SaleTours");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Tour", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("TourCountry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TourName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("TourType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TourName")
+                        .IsUnique();
+
+                    b.ToTable("Tours");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.TourHistory", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("ChangeDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double>("OldPrice")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("TourId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TourId");
+
+                    b.ToTable("TourHistories");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Salary", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Employee", "Employee")
+                        .WithMany("Salaries")
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Sale", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Client", "Client")
+                        .WithMany("Sales")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("MagicCarpetDatabase.Models.Employee", "Employee")
+                        .WithMany("Sales")
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.SaleTour", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Sale", "Sale")
+                        .WithMany("SaleTours")
+                        .HasForeignKey("SaleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MagicCarpetDatabase.Models.Tour", "Tour")
+                        .WithMany("SaleTours")
+                        .HasForeignKey("TourId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Sale");
+
+                    b.Navigation("Tour");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.TourHistory", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Tour", "Tour")
+                        .WithMany("TourHistories")
+                        .HasForeignKey("TourId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tour");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Client", b =>
+                {
+                    b.Navigation("Sales");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Employee", b =>
+                {
+                    b.Navigation("Salaries");
+
+                    b.Navigation("Sales");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Sale", b =>
+                {
+                    b.Navigation("SaleTours");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Tour", b =>
+                {
+                    b.Navigation("SaleTours");
+
+                    b.Navigation("TourHistories");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

MagicCarpetProject/MagicCarpetDatabase/Migrations/20250410053313_ChangeEmployeeAndPost.cs

@@ -0,0 +1,51 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace MagicCarpetDatabase.Migrations
+{
+    /// <inheritdoc />
+    public partial class ChangeEmployeeAndPost : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Salary",
+                table: "Posts");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Configuration",
+                table: "Posts",
+                type: "jsonb",
+                nullable: false,
+                defaultValue: "{\"Rate\": 0, \"Type\": \"PostConfiguration\"}");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "DateOfDelete",
+                table: "Employees",
+                type: "timestamp with time zone",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Configuration",
+                table: "Posts");
+
+            migrationBuilder.DropColumn(
+                name: "DateOfDelete",
+                table: "Employees");
+
+            migrationBuilder.AddColumn<double>(
+                name: "Salary",
+                table: "Posts",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+        }
+    }
+}

MagicCarpetProject/MagicCarpetDatabase/Migrations/MagicCarpetDbContextModelSnapshot.cs

@@ -0,0 +1,334 @@
+// <auto-generated />
+using System;
+using MagicCarpetDatabase;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MagicCarpetDatabase.Migrations
+{
+    [DbContext(typeof(MagicCarpetDbContext))]
+    partial class MagicCarpetDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Client", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<double>("DiscountSize")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("FIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PhoneNumber")
+                        .IsUnique();
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Employee", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("BirthDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DateOfDelete")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("EmploymentDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("FIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Post", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("ChangeDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Configuration")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<bool>("IsActual")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PostType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PostId", "IsActual")
+                        .IsUnique()
+                        .HasFilter("\"IsActual\" = TRUE");
+
+                    b.HasIndex("PostName", "IsActual")
+                        .IsUnique()
+                        .HasFilter("\"IsActual\" = TRUE");
+
+                    b.ToTable("Posts");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Salary", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmployeeId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("EmployeeSalary")
+                        .HasColumnType("double precision");
+
+                    b.Property<DateTime>("SalaryDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("Salaries");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Sale", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientId")
+                        .HasColumnType("text");
+
+                    b.Property<double>("Discount")
+                        .HasColumnType("double precision");
+
+                    b.Property<int>("DiscountType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("EmployeeId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsCancel")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("SaleDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("Sales");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.SaleTour", b =>
+                {
+                    b.Property<string>("SaleId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TourId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("SaleId", "TourId");
+
+                    b.HasIndex("TourId");
+
+                    b.ToTable("SaleTours");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Tour", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("TourCountry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TourName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("TourType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TourName")
+                        .IsUnique();
+
+                    b.ToTable("Tours");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.TourHistory", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("ChangeDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double>("OldPrice")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("TourId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TourId");
+
+                    b.ToTable("TourHistories");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Salary", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Employee", "Employee")
+                        .WithMany("Salaries")
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Sale", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Client", "Client")
+                        .WithMany("Sales")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("MagicCarpetDatabase.Models.Employee", "Employee")
+                        .WithMany("Sales")
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.SaleTour", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Sale", "Sale")
+                        .WithMany("SaleTours")
+                        .HasForeignKey("SaleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MagicCarpetDatabase.Models.Tour", "Tour")
+                        .WithMany("SaleTours")
+                        .HasForeignKey("TourId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Sale");
+
+                    b.Navigation("Tour");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.TourHistory", b =>
+                {
+                    b.HasOne("MagicCarpetDatabase.Models.Tour", "Tour")
+                        .WithMany("TourHistories")
+                        .HasForeignKey("TourId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tour");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Client", b =>
+                {
+                    b.Navigation("Sales");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Employee", b =>
+                {
+                    b.Navigation("Salaries");
+
+                    b.Navigation("Sales");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Sale", b =>
+                {
+                    b.Navigation("SaleTours");
+                });
+
+            modelBuilder.Entity("MagicCarpetDatabase.Models.Tour", b =>
+                {
+                    b.Navigation("SaleTours");
+
+                    b.Navigation("TourHistories");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

MagicCarpetProject/MagicCarpetDatabase/Models/Agency.cs

@@ -10,10 +10,11 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Models;
 
+[AutoMap(typeof(AgencyDataModel), ReverseMap = true)] 
 public class Agency
 {
     public required string Id { get; set; }
-    public required TourType Type { get; set; }
+    public required TourType TourType { get; set; }
     public required int Count { get; set; }
 
     [ForeignKey("AgencyId")]

MagicCarpetProject/MagicCarpetDatabase/Models/Employee.cs

@@ -18,15 +18,24 @@ public class Employee
 
     public string Email { get; set; }
 
-    public string PostId { get; set; }
+    public required string PostId { get; set; }
 
     public DateTime BirthDate { get; set; }
 
     public DateTime EmploymentDate { get; set; }
 
     public bool IsDeleted { get; set; }
+
+    public DateTime? DateOfDelete { get; set; }
+    [NotMapped]
+    public Post? Post { get; set; }
     [ForeignKey("EmployeeId")]
     public List<Salary>? Salaries { get; set; }
     [ForeignKey("EmployeeId")]
     public List<Sale>? Sales { get; set; }
+    public Employee AddPost(Post? post)
+    {
+        Post = post;
+        return this;
+    }
 }

MagicCarpetProject/MagicCarpetDatabase/Models/Post.cs

@@ -1,4 +1,5 @@
 using MagicCarpetContracts.Enums;
+using MagicCarpetContracts.Infrastructure.PostConfigurations;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -14,7 +15,7 @@ public class Post
     public required string PostId { get; set; }
     public required string PostName { get; set; }
     public PostType PostType { get; set; }
-    public double Salary { get; set; }
+    public required PostConfiguration Configuration { get; set; }
     public bool IsActual { get; set; }
     public DateTime ChangeDate { get; set; }
 }

MagicCarpetProject/MagicCarpetDatabase/Models/SaleTour.cs

@@ -13,4 +13,10 @@ public class SaleTour
     public required string TourId { get; set; } 
 
     public int Count { get; set; }
+
+    public double Price { get; set; }
+
+    public Sale? Sale { get; set; }
+
+    public Tour? Tour { get; set; }
 }

MagicCarpetProject/MagicCarpetDatabase/Models/TourAgency.cs

@@ -1,4 +1,6 @@
-using System;
+using AutoMapper;
+using MagicCarpetContracts.DataModels;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,6 +8,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Models;
 
+[AutoMap(typeof(TourAgencyDataModel), ReverseMap = true)]
 public class TourAgency
 {
     public required string AgencyId { get; set; }

MagicCarpetProject/MagicCarpetDatabase/SampleContextFactory.cs

@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore.Design;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetDatabase;
+
+public class SampleContextFactory : IDesignTimeDbContextFactory<MagicCarpetDbContext>
+{
+    public MagicCarpetDbContext CreateDbContext(string[] args)
+    {
+        return new MagicCarpetDbContext(new DefaultConfigurationDatabase());
+    }
+}

MagicCarpetProject/MagicCarpetProject.sln

@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicCarpetBusinessLogic",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicCarpetDatabase", "MagicCarpetDatabase\MagicCarpetDatabase.csproj", "{C69B43B2-8680-42D7-A111-306E2E8225FE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicCarpetWebApi", "MagicCarpetWebApi\MagicCarpetWebApi.csproj", "{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{C69B43B2-8680-42D7-A111-306E2E8225FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C69B43B2-8680-42D7-A111-306E2E8225FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C69B43B2-8680-42D7-A111-306E2E8225FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/PostBusinessLogicContractTests.cs

@@ -2,6 +2,7 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Enums;
 using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.Infrastructure.PostConfigurations;
 using MagicCarpetContracts.StoragesContracts;
 using Microsoft.Extensions.Logging;
 using Moq;
@@ -38,61 +39,53 @@ internal class PostBusinessLogicContractTests
         //Arrange
         var listOriginal = new List<PostDataModel>()
         {
-            new(Guid.NewGuid().ToString(),"name 1", PostType.Manager, 10, true, DateTime.UtcNow),
-            new(Guid.NewGuid().ToString(), "name 2", PostType.Manager, 10, false, DateTime.UtcNow),
-            new(Guid.NewGuid().ToString(), "name 3", PostType.Manager, 10, true, DateTime.UtcNow),
+            new(Guid.NewGuid().ToString(),"name 1", PostType.TravelAgent, new PostConfiguration() { Rate = 10 }),
+            new(Guid.NewGuid().ToString(), "name 2", PostType.TravelAgent, new PostConfiguration() { Rate = 10 }),
+            new(Guid.NewGuid().ToString(), "name 3", PostType.TravelAgent, new PostConfiguration() { Rate = 10 }),
         };
-        _postStorageContract.Setup(x => x.GetList(It.IsAny<bool>())).Returns(listOriginal);
+        _postStorageContract.Setup(x => x.GetList()).Returns(listOriginal);
         //Act
-        var listOnlyActive = _postBusinessLogicContract.GetAllPosts(true);
-        var listAll = _postBusinessLogicContract.GetAllPosts(false);
+        var list = _postBusinessLogicContract.GetAllPosts();
         //Assert
         Assert.Multiple(() =>
         {
-            Assert.That(listOnlyActive, Is.Not.Null);
-            Assert.That(listAll, Is.Not.Null);
-            Assert.That(listOnlyActive, Is.EquivalentTo(listOriginal));
-            Assert.That(listAll, Is.EquivalentTo(listOriginal));
+            Assert.That(list, Is.Not.Null);
+            Assert.That(list, Is.EquivalentTo(listOriginal));
         });
-        _postStorageContract.Verify(x => x.GetList(true), Times.Once);
-        _postStorageContract.Verify(x => x.GetList(false), Times.Once);
+        _postStorageContract.Verify(x => x.GetList(), Times.Once);
     }
 
     [Test]
     public void GetAllPosts_ReturnEmptyList_Test()
     {
         //Arrange
-        _postStorageContract.Setup(x => x.GetList(It.IsAny<bool>())).Returns([]);
+        _postStorageContract.Setup(x => x.GetList()).Returns([]);
         //Act
-        var listOnlyActive = _postBusinessLogicContract.GetAllPosts(true);
-        var listAll = _postBusinessLogicContract.GetAllPosts(false);
+        var list = _postBusinessLogicContract.GetAllPosts();
         //Assert
         Assert.Multiple(() =>
         {
-            Assert.That(listOnlyActive, Is.Not.Null);
-            Assert.That(listAll, Is.Not.Null);
-            Assert.That(listOnlyActive, Has.Count.EqualTo(0));
-            Assert.That(listAll, Has.Count.EqualTo(0));
+            Assert.That(list, Is.Not.Null);
+            Assert.That(list, Has.Count.EqualTo(0));
         });
-        _postStorageContract.Verify(x => x.GetList(It.IsAny<bool>()), Times.Exactly(2));
     }
 
     [Test]
     public void GetAllPosts_ReturnNull_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.GetAllPosts(It.IsAny<bool>()), Throws.TypeOf<NullListException>());
-        _postStorageContract.Verify(x => x.GetList(It.IsAny<bool>()), Times.Once);
+        Assert.That(() => _postBusinessLogicContract.GetAllPosts(), Throws.TypeOf<NullListException>());
+        _postStorageContract.Verify(x => x.GetList(), Times.Once);
     }
 
     [Test]
     public void GetAllPosts_StorageThrowError_ThrowException_Test()
     {
         //Arrange
-        _postStorageContract.Setup(x => x.GetList(It.IsAny<bool>())).Throws(new StorageException(new InvalidOperationException()));
+        _postStorageContract.Setup(x => x.GetList()).Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.GetAllPosts(It.IsAny<bool>()), Throws.TypeOf<StorageException>());
-        _postStorageContract.Verify(x => x.GetList(It.IsAny<bool>()), Times.Once);
+        Assert.That(() => _postBusinessLogicContract.GetAllPosts(), Throws.TypeOf<StorageException>());
+        _postStorageContract.Verify(x => x.GetList(), Times.Once);
     }
 
     [Test]
@@ -102,8 +95,8 @@ internal class PostBusinessLogicContractTests
         var postId = Guid.NewGuid().ToString();
         var listOriginal = new List<PostDataModel>()
         {
-            new(postId, "name 1", PostType.Manager, 10, true, DateTime.UtcNow),
-            new(postId, "name 2", PostType.Manager, 10, false, DateTime.UtcNow)
+            new(postId, "name 1", PostType.TravelAgent, new PostConfiguration() { Rate = 10 }),
+            new(postId, "name 2", PostType.TravelAgent, new PostConfiguration() { Rate = 10 })
         };
         _postStorageContract.Setup(x => x.GetPostWithHistory(It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -167,7 +160,7 @@ internal class PostBusinessLogicContractTests
     {
         //Arrange
         var id = Guid.NewGuid().ToString();
-        var record = new PostDataModel(id, "name", PostType.Manager, 10, true, DateTime.UtcNow);
+        var record = new PostDataModel(id, "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 });
         _postStorageContract.Setup(x => x.GetElementById(id)).Returns(record);
         //Act
         var element = _postBusinessLogicContract.GetPostByData(id);
@@ -182,7 +175,7 @@ internal class PostBusinessLogicContractTests
     {
         //Arrange
         var postName = "name";
-        var record = new PostDataModel(Guid.NewGuid().ToString(), postName, PostType.Manager, 10, true, DateTime.UtcNow);
+        var record = new PostDataModel(Guid.NewGuid().ToString(), postName, PostType.TravelAgent, new PostConfiguration() { Rate = 10 });
         _postStorageContract.Setup(x => x.GetElementByName(postName)).Returns(record);
         //Act
         var element = _postBusinessLogicContract.GetPostByData(postName);
@@ -238,12 +231,11 @@ internal class PostBusinessLogicContractTests
     {
         //Arrange
         var flag = false;
-        var record = new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow.AddDays(-1));
+        var record = new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 });
         _postStorageContract.Setup(x => x.AddElement(It.IsAny<PostDataModel>()))
             .Callback((PostDataModel x) =>
             {
-                flag = x.Id == record.Id && x.PostName == record.PostName && x.PostType == record.PostType && x.Salary == record.Salary &&
-                    x.ChangeDate == record.ChangeDate;
+                flag = x.Id == record.Id && x.PostName == record.PostName && x.PostType == record.PostType && x.ConfigurationModel.Rate == record.ConfigurationModel.Rate;
             });
         //Act
         _postBusinessLogicContract.InsertPost(record);
@@ -258,7 +250,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.AddElement(It.IsAny<PostDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.InsertPost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ElementExistsException>());
+        Assert.That(() => _postBusinessLogicContract.InsertPost(new(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 })), Throws.TypeOf<ElementExistsException>());
         _postStorageContract.Verify(x => x.AddElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 
@@ -274,7 +266,7 @@ internal class PostBusinessLogicContractTests
     public void InsertPost_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.InsertPost(new PostDataModel("id", "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _postBusinessLogicContract.InsertPost(new PostDataModel("id", "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 })), Throws.TypeOf<ValidationException>());
         _postStorageContract.Verify(x => x.AddElement(It.IsAny<PostDataModel>()), Times.Never);
     }
 
@@ -284,7 +276,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.AddElement(It.IsAny<PostDataModel>())).Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.InsertPost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<StorageException>());
+        Assert.That(() => _postBusinessLogicContract.InsertPost(new(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 })), Throws.TypeOf<StorageException>());
         _postStorageContract.Verify(x => x.AddElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 
@@ -293,12 +285,11 @@ internal class PostBusinessLogicContractTests
     {
         //Arrange
         var flag = false;
-        var record = new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow.AddDays(-1));
+        var record = new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 });
         _postStorageContract.Setup(x => x.UpdElement(It.IsAny<PostDataModel>()))
             .Callback((PostDataModel x) =>
             {
-                flag = x.Id == record.Id && x.PostName == record.PostName && x.PostType == record.PostType && x.Salary == record.Salary &&
-                    x.ChangeDate == record.ChangeDate;
+                flag = x.Id == record.Id && x.PostName == record.PostName && x.PostType == record.PostType && x.ConfigurationModel.Rate == record.ConfigurationModel.Rate;
             });
         //Act
         _postBusinessLogicContract.UpdatePost(record);
@@ -313,7 +304,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.UpdElement(It.IsAny<PostDataModel>())).Throws(new ElementNotFoundException(""));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ElementNotFoundException>());
+        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 })), Throws.TypeOf<ElementNotFoundException>());
         _postStorageContract.Verify(x => x.UpdElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 
@@ -323,7 +314,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.UpdElement(It.IsAny<PostDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "anme", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ElementExistsException>());
+        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "anme", PostType.TravelAgent, new PostConfiguration() { Rate = 10 })), Throws.TypeOf<ElementExistsException>());
         _postStorageContract.Verify(x => x.UpdElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 
@@ -339,7 +330,7 @@ internal class PostBusinessLogicContractTests
     public void UpdatePost_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.UpdatePost(new PostDataModel("id", "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _postBusinessLogicContract.UpdatePost(new PostDataModel("id", "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 })), Throws.TypeOf<ValidationException>());
         _postStorageContract.Verify(x => x.UpdElement(It.IsAny<PostDataModel>()), Times.Never);
     }
 
@@ -349,7 +340,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.UpdElement(It.IsAny<PostDataModel>())).Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<StorageException>());
+        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 })), Throws.TypeOf<StorageException>());
         _postStorageContract.Verify(x => x.UpdElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/SalaryBusinessLogicContractTests.cs

@@ -2,7 +2,9 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Enums;
 using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.Infrastructure.PostConfigurations;
 using MagicCarpetContracts.StoragesContracts;
+using MagicCarpetTests.Infrastructure;
 using Microsoft.Extensions.Logging;
 using Moq;
 using System;
@@ -10,6 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace MagicCarpetTests.BusinessLogicContractsTests;
 
@@ -21,6 +24,7 @@ internal class SalaryBusinessLogicContractTests
     private Mock<ISaleStorageContract> _saleStorageContract;
     private Mock<IPostStorageContract> _postStorageContract;
     private Mock<IEmployeeStorageContract> _employeeStorageContract;
+    private readonly ConfigurationSalaryTest _salaryConfigurationTest = new();
 
     [OneTimeSetUp]
     public void OneTimeSetUp()
@@ -30,7 +34,7 @@ internal class SalaryBusinessLogicContractTests
         _postStorageContract = new Mock<IPostStorageContract>();
         _employeeStorageContract = new Mock<IEmployeeStorageContract>();
         _salaryBusinessLogicContract = new SalaryBusinessLogicContract(_salaryStorageContract.Object,
-            _saleStorageContract.Object, _postStorageContract.Object, _employeeStorageContract.Object, new Mock<ILogger>().Object);
+            _saleStorageContract.Object, _postStorageContract.Object, _employeeStorageContract.Object, new Mock<ILogger>().Object, _salaryConfigurationTest);
     }
 
     [TearDown]
@@ -164,7 +168,7 @@ internal class SalaryBusinessLogicContractTests
     public void GetAllSalariesByEmployee_EmployeeIdIsNotGuid_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _salaryBusinessLogicContract.GetAllSalariesByPeriodByEmployee(DateTime.UtcNow, DateTime.UtcNow.AddDays(1), "workerId"), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _salaryBusinessLogicContract.GetAllSalariesByPeriodByEmployee(DateTime.UtcNow, DateTime.UtcNow.AddDays(1), "employeeId"), Throws.TypeOf<ValidationException>());
         _salaryStorageContract.Verify(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>()), Times.Never);
     }
 
@@ -191,16 +195,14 @@ internal class SalaryBusinessLogicContractTests
     {
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
-        var saleSum = 200.0;
-        var postSalary = 2000.0;
+        var rate = 2000.0;
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, saleSum, DiscountType.None, 0, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, postSalary, true, DateTime.UtcNow));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = rate }));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
-            .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
+            .Returns([new EmployeeDataModel(employeeId, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         var sum = 0.0;
-        var expectedSum = postSalary + saleSum * 0.1;
         _salaryStorageContract.Setup(x => x.AddElement(It.IsAny<SalaryDataModel>()))
             .Callback((SalaryDataModel x) =>
             {
@@ -209,29 +211,29 @@ internal class SalaryBusinessLogicContractTests
         //Act
         _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow);
         //Assert
-        Assert.That(sum, Is.EqualTo(expectedSum));
+        Assert.That(sum, Is.EqualTo(rate));
     }
 
     [Test]
-    public void CalculateSalaryByMounth_WithSeveralWorkers_Test()
+    public void CalculateSalaryByMounth_WithSeveralEmployees_Test()
     {
         //Arrange
         var employee1Id = Guid.NewGuid().ToString();
         var employee2Id = Guid.NewGuid().ToString();
         var employee3Id = Guid.NewGuid().ToString();
         var list = new List<EmployeeDataModel>() {
-            new(employee1Id, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false),
-            new(employee2Id, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false),
-            new(employee3Id, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)
+            new(employee1Id, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false),
+            new(employee2Id, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false),
+            new(employee3Id, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employee1Id, null, 1, DiscountType.None, 0, false, []),
-            new SaleDataModel(Guid.NewGuid().ToString(), employee1Id, null, 1, DiscountType.None, 0, false, []),
-            new SaleDataModel(Guid.NewGuid().ToString(), employee2Id, null, 1, DiscountType.None, 0, false, []),
-            new SaleDataModel(Guid.NewGuid().ToString(), employee3Id, null, 1, DiscountType.None, 0, false, []),
-            new SaleDataModel(Guid.NewGuid().ToString(), employee3Id, null, 1, DiscountType.None, 0, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employee1Id, null, DiscountType.None, false, []),
+            new SaleDataModel(Guid.NewGuid().ToString(), employee1Id, null, DiscountType.None, false, []),
+            new SaleDataModel(Guid.NewGuid().ToString(), employee2Id, null, DiscountType.None, false, []),
+            new SaleDataModel(Guid.NewGuid().ToString(), employee3Id, null, DiscountType.None, false, []),
+            new SaleDataModel(Guid.NewGuid().ToString(), employee3Id, null, DiscountType.None, false, [])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 100 }));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
             .Returns(list);
         //Act
@@ -241,19 +243,18 @@ internal class SalaryBusinessLogicContractTests
     }
 
     [Test]
-    public void CalculateSalaryByMounth_WithoutSalesByWorker_Test()
+    public void CalculateSalaryByMounth_WithoutSalesByEmployee_Test()
     {
         //Arrange
-        var postSalary = 2000.0;
+        var rate = 2000.0;
         var employeeId = Guid.NewGuid().ToString();
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
             .Returns([]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, postSalary, true, DateTime.UtcNow));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = rate }));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
-            .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
+            .Returns([new EmployeeDataModel(employeeId, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         var sum = 0.0;
-        var expectedSum = postSalary;
         _salaryStorageContract.Setup(x => x.AddElement(It.IsAny<SalaryDataModel>()))
             .Callback((SalaryDataModel x) =>
             {
@@ -262,7 +263,7 @@ internal class SalaryBusinessLogicContractTests
         //Act
         _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow);
         //Assert
-        Assert.That(sum, Is.EqualTo(expectedSum));
+        Assert.That(sum, Is.EqualTo(rate));
     }
 
     [Test]
@@ -271,9 +272,9 @@ internal class SalaryBusinessLogicContractTests
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 100 }));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
-            .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
+            .Returns([new EmployeeDataModel(employeeId, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         //Act&Assert
         Assert.That(() => _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow), Throws.TypeOf<NullListException>());
     }
@@ -284,22 +285,22 @@ internal class SalaryBusinessLogicContractTests
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, 200, DiscountType.None, 0, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [])]);
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
-            .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
+            .Returns([new EmployeeDataModel(employeeId, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         //Act&Assert
         Assert.That(() => _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow), Throws.TypeOf<NullListException>());
     }
 
     [Test]
-    public void CalculateSalaryByMounth_WorkerStorageReturnNull_ThrowException_Test()
+    public void CalculateSalaryByMounth_EmployeeStorageReturnNull_ThrowException_Test()
     {
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, 200, DiscountType.None, 0, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 100 }));
         //Act&Assert
         Assert.That(() => _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow), Throws.TypeOf<NullListException>());
     }
@@ -312,9 +313,9 @@ internal class SalaryBusinessLogicContractTests
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
             .Throws(new StorageException(new InvalidOperationException()));
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 100 }));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
-            .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
+            .Returns([new EmployeeDataModel(employeeId, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         //Act&Assert
         Assert.That(() => _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow), Throws.TypeOf<StorageException>());
     }
@@ -325,27 +326,88 @@ internal class SalaryBusinessLogicContractTests
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, 200, DiscountType.None, 0, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
             .Throws(new StorageException(new InvalidOperationException()));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
-            .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
+            .Returns([new EmployeeDataModel(employeeId, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         //Act&Assert
         Assert.That(() => _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow), Throws.TypeOf<StorageException>());
     }
 
     [Test]
-    public void CalculateSalaryByMounth_WorkerStorageThrowException_ThrowException_Test()
+    public void CalculateSalaryByMounth_EmployeeStorageThrowException_ThrowException_Test()
     {
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, 200, DiscountType.None, 0, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 100 }));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
             .Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
         Assert.That(() => _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow), Throws.TypeOf<StorageException>());
     }
+    [Test]
+    public void CalculateSalaryByMountht_WithTravelAgentPostConfiguration_CalculateSalary_Test()
+    {
+        //Arrange
+        var employeeId = Guid.NewGuid().ToString();
+        var rate = 2000.0;
+        var percent = 0.1;
+        var bonus = 0.5;
+        var sales = new List<SaleDataModel>()
+        {
+            new(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
+            new(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
+            new(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5000, 12)])
+        };
+        _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+            .Returns(sales);
+        _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new TravelAgentPostConfiguration() { Rate = rate, SalePercent = percent, BonusForExtraSales = bonus }));
+        _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
+            .Returns([new EmployeeDataModel(employeeId, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
+        var sum = 0.0;
+        var expectedSum = rate + percent * (sales.Sum(x => x.Sum) / sales.Count) + sales.Where(x => x.Sum > _salaryConfigurationTest.ExtraSaleSum).Sum(x => x.Sum) * bonus;
+        _salaryStorageContract.Setup(x => x.AddElement(It.IsAny<SalaryDataModel>()))
+            .Callback((SalaryDataModel x) =>
+            {
+                sum = x.Salary;
+            });
+        //Act
+        _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow);
+        //Assert
+        Assert.That(sum, Is.EqualTo(expectedSum));
+    }
+
+    [Test]
+    public void CalculateSalaryByMountht_WithChiefPostConfiguration_CalculateSalary_Test()
+    {
+        //Arrange
+        var employeeId = Guid.NewGuid().ToString();
+        var rate = 2000.0;
+        var trend = 3;
+        var bonus = 100;
+        _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)])]);
+        _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new ChiefPostConfiguration() { Rate = rate, PersonalCountTrendPremium = bonus }));
+        _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
+            .Returns([new EmployeeDataModel(employeeId, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
+        _employeeStorageContract.Setup(x => x.GetEmployeeTrend(It.IsAny<DateTime>(), It.IsAny<DateTime>()))
+            .Returns(trend);
+        var sum = 0.0;
+        var expectedSum = rate + trend * bonus;
+        _salaryStorageContract.Setup(x => x.AddElement(It.IsAny<SalaryDataModel>()))
+            .Callback((SalaryDataModel x) =>
+            {
+                sum = x.Salary;
+            });
+        //Act
+        _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow);
+        //Assert
+        Assert.That(sum, Is.EqualTo(expectedSum));
+    }
 }

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/SaleBusinessLogicContractTests.cs

@@ -43,10 +43,10 @@ internal class SaleBusinessLogicContractTests
         var date = DateTime.UtcNow;
         var listOriginal = new List<SaleDataModel>()
         {
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -107,10 +107,10 @@ internal class SaleBusinessLogicContractTests
         var employeeId = Guid.NewGuid().ToString();
         var listOriginal = new List<SaleDataModel>()
         {
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -188,10 +188,10 @@ internal class SaleBusinessLogicContractTests
         var clientId = Guid.NewGuid().ToString();
         var listOriginal = new List<SaleDataModel>()
         {
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -269,10 +269,10 @@ internal class SaleBusinessLogicContractTests
         var cocktailId = Guid.NewGuid().ToString();
         var listOriginal = new List<SaleDataModel>()
         {
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -347,8 +347,8 @@ internal class SaleBusinessLogicContractTests
     {
         //Arrange
         var id = Guid.NewGuid().ToString();
-        var record = new SaleDataModel(id, Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
+        var record = new SaleDataModel(id, Guid.NewGuid().ToString(), null, DiscountType.None, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]);
         _saleStorageContract.Setup(x => x.GetElementById(id)).Returns(record);
         //Act
         var element = _saleBusinessLogicContract.GetSaleByData(id);
@@ -398,8 +398,8 @@ internal class SaleBusinessLogicContractTests
     {
         //Arrange
         var flag = false;
-        var record = new SaleDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, DiscountType.None, 10,
-            false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
+        var record = new SaleDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DiscountType.None,
+            false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]);
         _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<SaleDataModel>())).Returns(true);
         _saleStorageContract.Setup(x => x.AddElement(It.IsAny<SaleDataModel>()))
             .Callback((SaleDataModel x) =>
@@ -427,7 +427,7 @@ internal class SaleBusinessLogicContractTests
         _saleStorageContract.Setup(x => x.AddElement(It.IsAny<SaleDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         //Act&Assert
         Assert.That(() => _saleBusinessLogicContract.InsertSale(new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(),
-            Guid.NewGuid().ToString(), 10, DiscountType.None, 10, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementExistsException>());
+            Guid.NewGuid().ToString(), DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)])), Throws.TypeOf<ElementExistsException>());
         _saleStorageContract.Verify(x => x.AddElement(It.IsAny<SaleDataModel>()), Times.Once);
         _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<SaleDataModel>()), Times.Once);
     }
@@ -444,7 +444,7 @@ internal class SaleBusinessLogicContractTests
     public void InsertSale_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _saleBusinessLogicContract.InsertSale(new SaleDataModel("id", Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, DiscountType.None, 10, false, [])), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _saleBusinessLogicContract.InsertSale(new SaleDataModel("id", Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DiscountType.None, false, [])), Throws.TypeOf<ValidationException>());
         _saleStorageContract.Verify(x => x.AddElement(It.IsAny<SaleDataModel>()), Times.Never);
     }
 
@@ -456,7 +456,7 @@ internal class SaleBusinessLogicContractTests
         _saleStorageContract.Setup(x => x.AddElement(It.IsAny<SaleDataModel>())).Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
         Assert.That(() => _saleBusinessLogicContract.InsertSale(new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(),
-            Guid.NewGuid().ToString(), 10, DiscountType.None, 10, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
+            Guid.NewGuid().ToString(), DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)])), Throws.TypeOf<StorageException>());
         _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<SaleDataModel>()), Times.Once);
         _saleStorageContract.Verify(x => x.AddElement(It.IsAny<SaleDataModel>()), Times.Once);
     }
@@ -466,9 +466,8 @@ internal class SaleBusinessLogicContractTests
     {
         //Arrange
         _agencyStorageContract.Setup(x => x.CheckComponents(It.IsAny<SaleDataModel>())).Returns(false);
-        Assert.That(() => _saleBusinessLogicContract.InsertSale(new SaleDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(),
-            Guid.NewGuid().ToString(), 10, DiscountType.None, 10, false,
-            [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<InsufficientException>());
+        Assert.That(() => _saleBusinessLogicContract.InsertSale(new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(),
+            Guid.NewGuid().ToString(), DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)])), Throws.TypeOf<InsufficientException>());
         //Act&Assert
         _agencyStorageContract.Verify(x => x.CheckComponents(It.IsAny<SaleDataModel>()), Times.Once);
     }
@@ -524,4 +523,37 @@ internal class SaleBusinessLogicContractTests
         Assert.That(() => _saleBusinessLogicContract.CancelSale(Guid.NewGuid().ToString()), Throws.TypeOf<StorageException>());
         _saleStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Once);
     }
+
+    [Test]
+    public void CalculateSaleRevenue_ReturnsCorrectSum_Test()
+    {
+        // Arrange
+        var fromDate = DateTime.Now.AddDays(-10);
+        var toDate = DateTime.Now;
+        var listOriginal = new List<SaleDataModel>()
+        {
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+        };
+        _saleStorageContract.Setup(x => x.GetList(fromDate, toDate, It.IsAny<string>(), It.IsAny<string>(),It.IsAny<string>())).Returns(listOriginal);
+        // Act
+        var result = _saleBusinessLogicContract.CalculateSaleRevenue(fromDate, toDate);
+        // Assert
+        Assert.That(result, Is.EqualTo(6.0));
+    }
+
+    [Test]
+    public void CalculateSaleRevenue_NoSales_ReturnsZero()
+    {
+        // Arrange
+        var fromDate = DateTime.Now.AddDays(-10);
+        var toDate = DateTime.Now;
+        _saleStorageContract.Setup(x => x.GetList(fromDate, toDate, null, null, null)).Returns([]);
+        // Act
+        double revenue = _saleBusinessLogicContract.CalculateSaleRevenue(fromDate, toDate);
+        // Assert
+        Assert.That(revenue, Is.EqualTo(0));
+    }
 }

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/SuppliesBusinessLogicContractTests.cs

@@ -42,7 +42,7 @@ internal class SuppliesBusinessLogicContractTests
             new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1, []),
             new(Guid.NewGuid().ToString(), TourType.Beach, DateTime.Now, 1, []),
         };
-        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>())).Returns(listOriginal);
+        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>())).Returns(listOriginal);
         // Act
         var list = _suppliesBusinessLogicContract.GetAllComponents();
         // Assert
@@ -54,33 +54,33 @@ internal class SuppliesBusinessLogicContractTests
     public void GetAllSupplies_ReturnEmptyList_Test()
     {
         // Arrange
-        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>())).Returns([]);
+        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>())).Returns([]);
         // Act
         var list = _suppliesBusinessLogicContract.GetAllComponents();
         // Assert
         Assert.That(list, Is.Not.Null);
         Assert.That(list, Has.Count.EqualTo(0));
-        _suppliesStorageContract.Verify(x => x.GetList(It.IsAny<DateTime?>()), Times.Once);
+        _suppliesStorageContract.Verify(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>()), Times.Once);
     }
 
     [Test]
     public void GetAllSupplies_ReturnNull_ThrowException_Test()
     {
         // Arrange
-        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>())).Returns((List<SuppliesDataModel>)null);
+        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>())).Returns((List<SuppliesDataModel>)null);
         // Act & Assert
         Assert.That(() => _suppliesBusinessLogicContract.GetAllComponents(), Throws.TypeOf<NullListException>());
-        _suppliesStorageContract.Verify(x => x.GetList(It.IsAny<DateTime?>()), Times.Once);
+        _suppliesStorageContract.Verify(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>()), Times.Once);
     }
 
     [Test]
     public void GetAllSupplies_StorageThrowError_ThrowException_Test()
     {
         // Arrange
-        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>())).Throws(new StorageException(new InvalidOperationException()));
+        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>())).Throws(new StorageException(new InvalidOperationException()));
         // Act & Assert
         Assert.That(() => _suppliesBusinessLogicContract.GetAllComponents(), Throws.TypeOf<StorageException>());
-        _suppliesStorageContract.Verify(x => x.GetList(It.IsAny<DateTime?>()), Times.Once);
+        _suppliesStorageContract.Verify(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>()), Times.Once);
     }
 
     [Test]
@@ -239,4 +239,48 @@ internal class SuppliesBusinessLogicContractTests
             [new TourSuppliesDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
         _suppliesStorageContract.Verify(x => x.UpdElement(It.IsAny<SuppliesDataModel>()), Times.Once);
     }
+
+    [Test]
+    public void CalculateTour_ReturnInt_Test()
+    {
+        // Arrange
+        string id = Guid.NewGuid().ToString();
+        var listOriginal = new List<SuppliesDataModel>()
+        {
+            new(id, TourType.Beach, DateTime.UtcNow, 1, new List<TourSuppliesDataModel> { new TourSuppliesDataModel(id, Guid.NewGuid().ToString(), 5), new TourSuppliesDataModel(id, Guid.NewGuid().ToString(), 6) })
+        };
+        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>())).Returns(listOriginal);
+        // Act
+        var count = _suppliesBusinessLogicContract.CalculateTourSupplies(DateTime.UtcNow.AddDays(-5), DateTime.UtcNow.AddDays(5));
+        // Assert
+        Assert.That(count, Is.EqualTo(11));
+    }
+
+    [Test]
+    public void CalculateTour_ReturnIntZero_Test()
+    {
+        // Arrange
+        string id1 = Guid.NewGuid().ToString();
+        string id2 = Guid.NewGuid().ToString();
+        string id3 = Guid.NewGuid().ToString();
+        var listOriginal = new List<SuppliesDataModel>()
+        {
+            new(id1, TourType.Beach, DateTime.UtcNow, 1, [])
+        };
+        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>())).Returns(listOriginal);
+        // Act
+        var count = _suppliesBusinessLogicContract.CalculateTourSupplies(DateTime.UtcNow.AddDays(-5), DateTime.UtcNow.AddDays(5));
+        // Assert
+        Assert.That(count, Is.EqualTo(0));
+    }
+
+    [Test]
+    public void CalculateTour_StorageThrowError_ThrowException_Test()
+    {
+        // Arrange
+        _suppliesStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>())).Throws(new StorageException(new InvalidOperationException()));
+        // Act & Assert
+        Assert.That(() => _suppliesBusinessLogicContract.CalculateTourSupplies(DateTime.UtcNow.AddDays(-5), DateTime.UtcNow.AddDays(5)), Throws.TypeOf<StorageException>());
+        _suppliesStorageContract.Verify(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>()), Times.Once);
+    }
 }

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/TourBusinessLogicContractTests.cs

@@ -295,7 +295,7 @@ internal class TourBusinessLogicContractTests
     }
 
     [Test]
-    public void InsertFurniture_InsufficientError_ThrowException_Test()
+    public void InsertTour_InsufficientError_ThrowException_Test()
     {
         //Arrange
         Assert.That(() => _tourBusinessLogicContract.InsertTour(new TourDataModel(Guid.NewGuid().ToString(), "name", "country", 10, TourType.Ski)),Throws.TypeOf<InsufficientException>());

MagicCarpetProject/MagicCarpetTests/DataModelTests/AgencyDataModelTests.cs

@@ -66,7 +66,7 @@ internal class AgencyDataModelTests
         Assert.Multiple(() =>
         {
             Assert.That(model.Id, Is.EqualTo(id));
-            Assert.That(model.Type, Is.EqualTo(type));
+            Assert.That(model.TourType, Is.EqualTo(type));
             Assert.That(model.Count, Is.EqualTo(count));
             Assert.That(model.Tours, Is.EqualTo(tours));
         });

MagicCarpetProject/MagicCarpetTests/DataModelTests/PostDataModelTests.cs

@@ -1,6 +1,7 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Enums;
 using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.Infrastructure.PostConfigurations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,41 +15,48 @@ internal class PostDataModelTests
     [Test]
     public void IdIsNullOrEmptyTest()
     {
-        var post = CreateDataModel(null, "name", PostType.Manager, 10, true, DateTime.UtcNow);
+        var post = CreateDataModel(null, "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 });
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
-        post = CreateDataModel(string.Empty, "name", PostType.Manager, 10, true, DateTime.UtcNow);
+        post = CreateDataModel(string.Empty, "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 });
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void IdIsNotGuidTest()
     {
-        var post = CreateDataModel("id", "name", PostType.Manager, 10, true, DateTime.UtcNow);
+        var post = CreateDataModel("id", "name", PostType.TravelAgent, new PostConfiguration() { Rate = 10 });
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void PostNameIsEmptyTest()
     {
-        var manufacturer = CreateDataModel(Guid.NewGuid().ToString(),  null, PostType.Manager, 10, true, DateTime.UtcNow);
+        var manufacturer = CreateDataModel(Guid.NewGuid().ToString(), null, PostType.TravelAgent, new PostConfiguration() { Rate = 10 });
         Assert.That(() => manufacturer.Validate(), Throws.TypeOf<ValidationException>());
-        manufacturer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, PostType.Manager, 10, true, DateTime.UtcNow);
+        manufacturer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, PostType.TravelAgent, new PostConfiguration() { Rate = 10 });
         Assert.That(() => manufacturer.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void PostTypeIsNoneTest()
     {
-        var post = CreateDataModel(Guid.NewGuid().ToString(),  "name", PostType.None, 10, true, DateTime.UtcNow);
+        var post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.None, new PostConfiguration() { Rate = 10 });
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
-    public void SalaryIsLessOrZeroTest()
+    public void ConfigurationModelIsNullTest()
     {
-        var post = CreateDataModel(Guid.NewGuid().ToString(),  "name", PostType.Manager, 0, true, DateTime.UtcNow);
+        var post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, null);
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
-        post = CreateDataModel(Guid.NewGuid().ToString(),  "name", PostType.Manager, -10, true, DateTime.UtcNow);
+    }
+
+    [Test]
+    public void RateIsLessOrZeroTest()
+    {
+        var post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = 0 });
+        Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
+        post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.TravelAgent, new PostConfiguration() { Rate = -10 });
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
     }
 
@@ -56,25 +64,20 @@ internal class PostDataModelTests
     public void AllFieldsIsCorrectTest()
     {
         var postId = Guid.NewGuid().ToString();
-        var postPostId = Guid.NewGuid().ToString();
         var postName = "name";
         var postType = PostType.Manager;
-        var salary = 10;
-        var isActual = false;
-        var changeDate = DateTime.UtcNow.AddDays(-1);
-        var post = CreateDataModel(postId, postName, postType, salary, isActual, changeDate);
+        var configuration = new PostConfiguration() { Rate = 10 };
+        var post = CreateDataModel(postId, postName, postType, configuration);
         Assert.That(() => post.Validate(), Throws.Nothing);
         Assert.Multiple(() =>
         {
             Assert.That(post.Id, Is.EqualTo(postId));
             Assert.That(post.PostName, Is.EqualTo(postName));
             Assert.That(post.PostType, Is.EqualTo(postType));
-            Assert.That(post.Salary, Is.EqualTo(salary));
-            Assert.That(post.IsActual, Is.EqualTo(isActual));
-            Assert.That(post.ChangeDate, Is.EqualTo(changeDate));
+            Assert.That(post.ConfigurationModel.Rate, Is.EqualTo(configuration.Rate));
         });
     }
 
-    private static PostDataModel CreateDataModel(string? id, string? postName, PostType postType, double salary, bool isActual, DateTime changeDate) =>
-        new(id, postName, postType, salary, isActual, changeDate);
+    private static PostDataModel CreateDataModel(string? id, string? postName, PostType postType, PostConfiguration configuration) =>
+        new(id, postName, postType, configuration);
 }

MagicCarpetProject/MagicCarpetTests/DataModelTests/SaleDataModelTests.cs

@@ -15,89 +15,120 @@ internal class SaleDataModelTests
     [Test]
     public void IdIsNullOrEmptyTest()
     {
-        var sale = CreateDataModel(null, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, DiscountType.OnSale, 10, false, CreateSubDataModel());
+        var sale = CreateDataModel(null, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DiscountType.OnSale, false, CreateSubDataModel());
         Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
-        sale = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, DiscountType.OnSale, 10, false, CreateSubDataModel());
+        sale = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DiscountType.OnSale, false, CreateSubDataModel());
         Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void IdIsNotGuidTest()
     {
-        var sale = CreateDataModel("id", Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, DiscountType.OnSale, 10, false, CreateSubDataModel());
+        var sale = CreateDataModel("id", Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DiscountType.OnSale, false, CreateSubDataModel());
         Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
     }
     [Test]
     public void EmployeeIdIsNullOrEmptyTest()
     {
-        var sale = CreateDataModel(Guid.NewGuid().ToString(), null, Guid.NewGuid().ToString(), 10, DiscountType.OnSale, 10, false, CreateSubDataModel());
+        var sale = CreateDataModel(Guid.NewGuid().ToString(), null, Guid.NewGuid().ToString(), DiscountType.OnSale, false, CreateSubDataModel());
         Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
-        sale = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, Guid.NewGuid().ToString(), 10, DiscountType.OnSale, 10, false, CreateSubDataModel());
+        sale = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, Guid.NewGuid().ToString(), DiscountType.OnSale, false, CreateSubDataModel());
         Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void EmployeeIdIsNotGuidTest()
     {
-        var sale = CreateDataModel(Guid.NewGuid().ToString(), "employeeId", Guid.NewGuid().ToString(), 10, DiscountType.OnSale, 10, false, CreateSubDataModel());
+        var sale = CreateDataModel(Guid.NewGuid().ToString(), "employeeId", Guid.NewGuid().ToString(), DiscountType.OnSale, false, CreateSubDataModel());
         Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void ClientIdIsNotGuidTest()
     {
-        var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "clientId", 10, DiscountType.OnSale, 10, false, CreateSubDataModel());
-        Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
-    }
-
-    [Test]
-    public void SumIsLessOrZeroTest()
-    {
-        var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 0, DiscountType.OnSale, 10, false, CreateSubDataModel());
-        Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
-        sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), -10, DiscountType.OnSale, 10, false, CreateSubDataModel());
+        var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "clientId", DiscountType.OnSale, false, CreateSubDataModel());
         Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void ToursIsNullOrEmptyTest()
     {
-        var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, DiscountType.OnSale, 10, false, null);
+        var sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DiscountType.OnSale, false, null);
         Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
-        sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, DiscountType.OnSale, 10, false, []);
+        sale = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DiscountType.OnSale, false, []);
         Assert.That(() => sale.Validate(), Throws.TypeOf<ValidationException>());
     }
 
+    [Test]
+    public void CalcSumAndDiscountTest()
+    {
+        var saleId = Guid.NewGuid().ToString();
+        var employeeId = Guid.NewGuid().ToString();
+        var clientId = Guid.NewGuid().ToString();
+        var tours = new List<SaleTourDataModel>()
+        {
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 2, 1.1),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 1, 1.3)
+        };
+        var isCancel = false;
+        var totalSum = tours.Sum(x => x.Price * x.Count);
+        var saleNone = CreateDataModel(saleId, employeeId, clientId, DiscountType.None, isCancel, tours);
+        Assert.Multiple(() =>
+        {
+            Assert.That(saleNone.Sum, Is.EqualTo(totalSum));
+            Assert.That(saleNone.Discount, Is.EqualTo(0));
+        });
+        var saleOnSale = CreateDataModel(saleId, employeeId, clientId, DiscountType.OnSale, isCancel, tours);
+        Assert.Multiple(() =>
+        {
+            Assert.That(saleOnSale.Sum, Is.EqualTo(totalSum));
+            Assert.That(saleOnSale.Discount, Is.EqualTo(totalSum * 0.1));
+        });
+        var saleRegularCustomer = CreateDataModel(saleId, employeeId, clientId, DiscountType.RegularCustomer, isCancel, tours);
+        Assert.Multiple(() =>
+        {
+            Assert.That(saleRegularCustomer.Sum, Is.EqualTo(totalSum));
+            Assert.That(saleRegularCustomer.Discount, Is.EqualTo(totalSum * 0.5));
+        });
+        var saleCertificate = CreateDataModel(saleId, employeeId, clientId, DiscountType.Certificate, isCancel, tours);
+        Assert.Multiple(() =>
+        {
+            Assert.That(saleCertificate.Sum, Is.EqualTo(totalSum));
+            Assert.That(saleCertificate.Discount, Is.EqualTo(totalSum * 0.3));
+        });
+        var saleMulty = CreateDataModel(saleId, employeeId, clientId, DiscountType.Certificate | DiscountType.RegularCustomer, isCancel, tours);
+        Assert.Multiple(() =>
+        {
+            Assert.That(saleMulty.Sum, Is.EqualTo(totalSum));
+            Assert.That(saleMulty.Discount, Is.EqualTo(totalSum * 0.8));
+        });
+    }
+
     [Test]
     public void AllFieldsIsCorrectTest()
     {
         var saleId = Guid.NewGuid().ToString();
         var employeeId = Guid.NewGuid().ToString();
         var clientId = Guid.NewGuid().ToString();
-        var sum = 10;
         var discountType = DiscountType.Certificate;
-        var discount = 1;
         var isCancel = true;
         var tours = CreateSubDataModel();
-        var sale = CreateDataModel(saleId, employeeId, clientId, sum, discountType, discount, isCancel, tours);
+        var sale = CreateDataModel(saleId, employeeId, clientId, discountType, isCancel, tours);
         Assert.That(() => sale.Validate(), Throws.Nothing);
         Assert.Multiple(() =>
         {
             Assert.That(sale.Id, Is.EqualTo(saleId));
             Assert.That(sale.EmployeeId, Is.EqualTo(employeeId));
             Assert.That(sale.ClientId, Is.EqualTo(clientId));
-            Assert.That(sale.Sum, Is.EqualTo(sum));
             Assert.That(sale.DiscountType, Is.EqualTo(discountType));
-            Assert.That(sale.Discount, Is.EqualTo(discount));
             Assert.That(sale.IsCancel, Is.EqualTo(isCancel));
             Assert.That(sale.Tours, Is.EquivalentTo(tours));
         });
     }
 
-    private static SaleDataModel CreateDataModel(string? id, string? employeeId, string? clientId, double sum, DiscountType discountType, 
-        double discount, bool isCancel, List<SaleTourDataModel>? tours) =>
-        new(id, employeeId, clientId, sum, discountType, discount, isCancel, tours);
+    private static SaleDataModel CreateDataModel(string? id, string? employeeId, string? clientId, DiscountType discountType, bool isCancel, List<SaleTourDataModel>? tours) =>
+        new(id, employeeId, clientId, discountType, isCancel, tours);
 
     private static List<SaleTourDataModel> CreateSubDataModel()
-        => [new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 1)];
+        => [new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 1, 1.1)];
 }

MagicCarpetProject/MagicCarpetTests/DataModelTests/SaleTourDataModelTests.cs

@@ -14,41 +14,50 @@ internal class SaleTourDataModelTests
     [Test]
     public void SaleIdIsNullOrEmptyTest()
     {
-        var saleTour = CreateDataModel(null, Guid.NewGuid().ToString(), 10);
+        var saleTour = CreateDataModel(null, Guid.NewGuid().ToString(), 10, 1.1);
         Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
-        saleTour = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), 10);
+        saleTour = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), 10, 1.1);
         Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void SaleIdIsNotGuidTest()
     {
-        var saleTour = CreateDataModel("saleId", Guid.NewGuid().ToString(), 10);
+        var saleTour = CreateDataModel("saleId", Guid.NewGuid().ToString(), 10, 1.1);
         Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
-    public void CocktailIdIsNullOrEmptyTest()
+    public void TourIdIsNullOrEmptyTest()
     {
-        var saleTour = CreateDataModel(Guid.NewGuid().ToString(), null, 10);
+        var saleTour = CreateDataModel(Guid.NewGuid().ToString(), null, 10, 1.1);
         Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
-        saleTour = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), 10);
+        saleTour = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), 10, 1.1);
         Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
-    public void ProductIdIsNotGuidTest()
+    public void TourIdIsNotGuidTest()
     {
-        var saleTour = CreateDataModel(Guid.NewGuid().ToString(), "productId", 10);
+        var saleTour = CreateDataModel(Guid.NewGuid().ToString(), "tourId", 10, 1.1);
         Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void CountIsLessOrZeroTest()
     {
-        var saleTour = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 0);
+        var saleTour = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 0, 1.1);
         Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
-        saleTour = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), -10);
+        saleTour = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), -10, 1.1);
+        Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
+    }
+
+    [Test]
+    public void PriceIsLessOrZeroTest()
+    {
+        var saleTour = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 1, 0);
+        Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
+        saleTour = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 1, -10);
         Assert.That(() => saleTour.Validate(), Throws.TypeOf<ValidationException>());
     }
 
@@ -58,16 +67,18 @@ internal class SaleTourDataModelTests
         var saleId = Guid.NewGuid().ToString();
         var tourId = Guid.NewGuid().ToString();
         var count = 10;
-        var saleCocktail = CreateDataModel(saleId, tourId, count);
-        Assert.That(() => saleCocktail.Validate(), Throws.Nothing);
+        var price = 1.2;
+        var saleTour = CreateDataModel(saleId, tourId, count, price);
+        Assert.That(() => saleTour.Validate(), Throws.Nothing);
         Assert.Multiple(() =>
         {
-            Assert.That(saleCocktail.SaleId, Is.EqualTo(saleId));
-            Assert.That(saleCocktail.TourId, Is.EqualTo(tourId));
-            Assert.That(saleCocktail.Count, Is.EqualTo(count));
+            Assert.That(saleTour.SaleId, Is.EqualTo(saleId));
+            Assert.That(saleTour.TourId, Is.EqualTo(tourId));
+            Assert.That(saleTour.Count, Is.EqualTo(count));
+            Assert.That(saleTour.Price, Is.EqualTo(price));
         });
     }
 
-    private static SaleTourDataModel CreateDataModel(string? saleId, string? tourId, int count) =>
-        new(saleId, tourId, count);
+    private static SaleTourDataModel CreateDataModel(string? saleId, string? tourId, int count, double price) =>
+        new(saleId, tourId, count, price);
 }

MagicCarpetProject/MagicCarpetTests/DataModelTests/SuppliesDataModelTests.cs

@@ -66,7 +66,7 @@ internal class SuppliesDataModelTests
         Assert.Multiple(() =>
         {
             Assert.That(model.Id, Is.EqualTo(id));
-            Assert.That(model.Type, Is.EqualTo(type));
+            Assert.That(model.TourType, Is.EqualTo(type));
             Assert.That(model.ProductuionDate, Is.EqualTo(date));
             Assert.That(model.Count, Is.EqualTo(count));
             Assert.That(model.Tours, Is.EqualTo(tours));