мелкие исправления

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/AgencyBusinessLogicContract.cs

@@ -0,0 +1,74 @@
+using MagicCarpetContracts.BusinessLogicContracts;
+using MagicCarpetContracts.DataModels;
+using MagicCarpetContracts.Enums;
+using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.Extensions;
+using MagicCarpetContracts.StoragesContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace MagicCarpetBusinessLogic.Implementations;
+
+public class AgencyBusinessLogicContract(IAgencyStorageContract agencyStorageContract, ILogger logger) : IAgencyBusinessLogicContract
+{
+    private readonly IAgencyStorageContract _agencyStorageContract = agencyStorageContract;
+    private readonly ILogger _logger = logger;
+    public List<AgencyDataModel> GetAllComponents()
+    {
+        _logger.LogInformation("GetAllComponents");
+        return _agencyStorageContract.GetList() ?? throw new NullListException();
+
+        return [];
+    }
+
+    public AgencyDataModel GetComponentByData(string data)
+    {
+        _logger.LogInformation("Get element by data: {data}", data);
+        if (data.IsEmpty())
+        {
+            throw new ArgumentNullException(nameof(data));
+        }
+        if (!data.IsGuid())
+        {
+            throw new ElementNotFoundException(data);
+        }
+        return _agencyStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
+
+        return new("", TourType.None, 0, []);
+    }
+
+    public void InsertComponent(AgencyDataModel agencyDataModel)
+    {
+        _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(agencyDataModel));
+        ArgumentNullException.ThrowIfNull(agencyDataModel);
+        agencyDataModel.Validate();
+        _agencyStorageContract.AddElement(agencyDataModel);
+    }
+
+    public void UpdateComponent(AgencyDataModel agencyDataModel)
+    {
+        _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(agencyDataModel));
+        ArgumentNullException.ThrowIfNull(agencyDataModel);
+        agencyDataModel.Validate();
+        _agencyStorageContract.UpdElement(agencyDataModel);
+    }
+
+    public void DeleteComponent(string id)
+    {
+        logger.LogInformation("Delete by id: {id}", id);
+        if (id.IsEmpty())
+        {
+            throw new ArgumentNullException(nameof(id));
+        }
+        if (!id.IsGuid())
+        {
+            throw new ValidationException("Id is not a unique identifier");
+        }
+        _agencyStorageContract.DelElement(id);
+    }
+}

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/ClientBusinessLogicContract.cs

@@ -2,9 +2,7 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -16,16 +14,15 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class ClientBusinessLogicContract(IClientStorageContract clientStorageContract, IStringLocalizer<Messages> localizer, ILogger logger)  : IClientBusinessLogicContract
+public class ClientBusinessLogicContract(IClientStorageContract clientStorageContract, ILogger logger)  : IClientBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly IClientStorageContract _clientStorageContract = clientStorageContract;
-    private readonly IStringLocalizer<Messages> _localizer = localizer;
 
     public List<ClientDataModel> GetAllClients()
     {
         _logger.LogInformation("GetAllClients");
-        return _clientStorageContract.GetList();
+        return _clientStorageContract.GetList() ?? throw new NullListException();
     }
 
     public ClientDataModel GetClientByData(string data)
@@ -37,20 +34,20 @@ internal class ClientBusinessLogicContract(IClientStorageContract clientStorageC
         }
         if (data.IsGuid())
         {
-            return _clientStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data, _localizer);
+            return _clientStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
         }
         if (Regex.IsMatch(data, @"^((8|\+7)[\- ]?)?(\(?\d{3}\)?[\- ]?)?[\d\- ]{7,10}$"))
         {
-            return _clientStorageContract.GetElementByPhoneNumber(data) ?? throw new ElementNotFoundException(data, _localizer);
+            return _clientStorageContract.GetElementByPhoneNumber(data) ?? throw new ElementNotFoundException(data);
         }
-        return _clientStorageContract.GetElementByFIO(data) ?? throw new ElementNotFoundException(data, _localizer);
+        return _clientStorageContract.GetElementByFIO(data) ?? throw new ElementNotFoundException(data);
     }
 
     public void InsertClient(ClientDataModel clientDataModel)
     {
         _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(clientDataModel));
         ArgumentNullException.ThrowIfNull(clientDataModel);
-        clientDataModel.Validate(_localizer);
+        clientDataModel.Validate();
         _clientStorageContract.AddElement(clientDataModel);
     }
 
@@ -58,7 +55,7 @@ internal class ClientBusinessLogicContract(IClientStorageContract clientStorageC
     {
         _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(clientDataModel));
         ArgumentNullException.ThrowIfNull(clientDataModel);
-        clientDataModel.Validate(_localizer);
+        clientDataModel.Validate();
         _clientStorageContract.UpdElement(clientDataModel);
     }
 
@@ -71,7 +68,7 @@ internal class ClientBusinessLogicContract(IClientStorageContract clientStorageC
         }
         if (!id.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("Id is not a unique identifier");
         }
         _clientStorageContract.DelElement(id);
     }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/EmployeeBusinessLogicContract.cs

@@ -2,9 +2,7 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -16,16 +14,15 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeStorageContract, IStringLocalizer<Messages> localizer, ILogger logger) : IEmployeeBusinessLogicContract
+public class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeStorageContract, ILogger logger) : IEmployeeBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly IEmployeeStorageContract _employeeStorageContract = employeeStorageContract;
-    private readonly IStringLocalizer<Messages> _localizer = localizer;
 
     public List<EmployeeDataModel> GetAllEmployees(bool onlyActive = true)
     {
         _logger.LogInformation("GetAllEmployees params: {onlyActive}", onlyActive);
-        return _employeeStorageContract.GetList(onlyActive);
+        return _employeeStorageContract.GetList(onlyActive) ?? throw new NullListException();
     }
 
     public List<EmployeeDataModel> GetAllEmployeesByPost(string postId, bool onlyActive = true)
@@ -37,9 +34,9 @@ internal class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeSt
         }
         if (!postId.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "PostId"));
+            throw new ValidationException("The value in the field postId is not a unique identifier.");
         }
-        return _employeeStorageContract.GetList(onlyActive, postId);
+        return _employeeStorageContract.GetList(onlyActive, postId) ?? throw new NullListException();
     }
 
     public List<EmployeeDataModel> GetAllEmployeesByBirthDate(DateTime fromDate, DateTime toDate, bool onlyActive = true)
@@ -47,9 +44,9 @@ internal class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeSt
         _logger.LogInformation("GetAllEmployees params: {onlyActive}, {fromDate}, {toDate}", onlyActive, fromDate, toDate);
         if (fromDate.IsDateNotOlder(toDate))
         {
-            throw new IncorrectDatesException(fromDate, toDate, _localizer);
+            throw new IncorrectDatesException(fromDate, toDate);
         }
-        return _employeeStorageContract.GetList(onlyActive, fromBirthDate: fromDate, toBirthDate: toDate);
+        return _employeeStorageContract.GetList(onlyActive, fromBirthDate: fromDate, toBirthDate: toDate) ?? throw new NullListException();
     }
 
     public List<EmployeeDataModel> GetAllEmployeesByEmploymentDate(DateTime fromDate, DateTime toDate, bool onlyActive = true)
@@ -57,9 +54,9 @@ internal class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeSt
         _logger.LogInformation("GetAllEmployees params: {onlyActive}, {fromDate}, {toDate}", onlyActive, fromDate, toDate);
         if (fromDate.IsDateNotOlder(toDate))
         {
-            throw new IncorrectDatesException(fromDate, toDate, _localizer);
+            throw new IncorrectDatesException(fromDate, toDate);
         }
-        return _employeeStorageContract.GetList(onlyActive, fromEmploymentDate: fromDate, toEmploymentDate: toDate);
+        return _employeeStorageContract.GetList(onlyActive, fromEmploymentDate: fromDate, toEmploymentDate: toDate) ?? throw new NullListException();
     }
 
     public EmployeeDataModel GetEmployeeByData(string data)
@@ -71,20 +68,20 @@ internal class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeSt
         }
         if (data.IsGuid())
         {
-            return _employeeStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data, _localizer);
+            return _employeeStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
         }
         if (Regex.IsMatch(data, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
         {
-            return _employeeStorageContract.GetElementByEmail(data) ?? throw new ElementNotFoundException(data, _localizer);
+            return _employeeStorageContract.GetElementByEmail(data) ?? throw new ElementNotFoundException(data);
         }
-        return _employeeStorageContract.GetElementByFIO(data) ?? throw new ElementNotFoundException(data, _localizer);
+        return _employeeStorageContract.GetElementByFIO(data) ?? throw new ElementNotFoundException(data);
     }
 
     public void InsertEmployee(EmployeeDataModel employeeDataModel)
     {
         _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(employeeDataModel));
         ArgumentNullException.ThrowIfNull(employeeDataModel);
-        employeeDataModel.Validate(_localizer);
+        employeeDataModel.Validate();
         _employeeStorageContract.AddElement(employeeDataModel);
     }
 
@@ -92,7 +89,7 @@ internal class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeSt
     {
         _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(employeeDataModel));
         ArgumentNullException.ThrowIfNull(employeeDataModel);
-        employeeDataModel.Validate(_localizer);
+        employeeDataModel.Validate();
         _employeeStorageContract.UpdElement(employeeDataModel);
     }
 
@@ -105,7 +102,7 @@ internal class EmployeeBusinessLogicContract(IEmployeeStorageContract employeeSt
         }
         if (!id.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("Id is not a unique identifier");
         }
         _employeeStorageContract.DelElement(id);
     }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/PostBusinessLogicContract.cs

@@ -2,9 +2,7 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -14,15 +12,14 @@ using System.Text.Json;
 using System.Threading.Tasks;
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class PostBusinessLogicContract(IPostStorageContract postStorageContract, IStringLocalizer<Messages> localizer, ILogger logger) : IPostBusinessLogicContract
+public class PostBusinessLogicContract(IPostStorageContract postStorageContract, ILogger logger) : IPostBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly IPostStorageContract _postStorageContract = postStorageContract;
-    private readonly IStringLocalizer<Messages> _localizer = localizer;
     public List<PostDataModel> GetAllPosts()
     {
         _logger.LogInformation("GetAllPosts");
-        return _postStorageContract.GetList();
+        return _postStorageContract.GetList() ?? throw new NullListException();
     }
 
     public List<PostDataModel> GetAllDataOfPost(string postId)
@@ -34,9 +31,9 @@ internal class PostBusinessLogicContract(IPostStorageContract postStorageContrac
         }
         if (!postId.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "PostId"));
+            throw new ValidationException("The value in the field postId is not a unique identifier.");
         }
-        return _postStorageContract.GetPostWithHistory(postId);
+        return _postStorageContract.GetPostWithHistory(postId) ?? throw new NullListException();
     }
 
     public PostDataModel GetPostByData(string data)
@@ -48,16 +45,16 @@ internal class PostBusinessLogicContract(IPostStorageContract postStorageContrac
         }
         if (data.IsGuid())
         {
-            return _postStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data, _localizer);
+            return _postStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
         }
-        return _postStorageContract.GetElementByName(data) ?? throw new ElementNotFoundException(data, _localizer);
+        return _postStorageContract.GetElementByName(data) ?? throw new ElementNotFoundException(data);
     }
 
     public void InsertPost(PostDataModel postDataModel)
     {
         _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(postDataModel));
         ArgumentNullException.ThrowIfNull(postDataModel);
-        postDataModel.Validate(_localizer);
+        postDataModel.Validate();
         _postStorageContract.AddElement(postDataModel);
     }
 
@@ -65,7 +62,7 @@ internal class PostBusinessLogicContract(IPostStorageContract postStorageContrac
     {
         _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(postDataModel));
         ArgumentNullException.ThrowIfNull(postDataModel);
-        postDataModel.Validate(_localizer);
+        postDataModel.Validate();
         _postStorageContract.UpdElement(postDataModel);
     }
 
@@ -78,7 +75,7 @@ internal class PostBusinessLogicContract(IPostStorageContract postStorageContrac
         }
         if (!id.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("Id is not a unique identifier");
         }
         _postStorageContract.DelElement(id);
     }
@@ -92,7 +89,7 @@ internal class PostBusinessLogicContract(IPostStorageContract postStorageContrac
         }
         if (!id.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("Id is not a unique identifier");
         }
         _postStorageContract.ResElement(id);
     }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/ReportContract.cs

@@ -1,179 +0,0 @@
-using DocumentFormat.OpenXml.Wordprocessing;
-using MagicCarpetBusinessLogic.OfficePackage;
-using MagicCarpetContracts.BusinessLogicContracts;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.Extensions;
-using MagicCarpetContracts.Resources;
-using MagicCarpetContracts.StoragesContracts;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-namespace MagicCarpetBusinessLogic.Implementations;
-
-internal class ReportContract : IReportContract
-{
-    private readonly ITourStorageContract _tourStorageContract;
-    private readonly ISalaryStorageContract _salaryStorageContract;
-    private readonly ISaleStorageContract _saleStorageContract;
-    private readonly BaseWordBuilder _baseWordBuilder;
-    private readonly BaseExcelBuilder _baseExcelBuilder;
-    private readonly BasePdfBuilder _basePdfBuilder;
-    private readonly ILogger _logger;
-    private readonly IStringLocalizer<Messages> _localizer;
-
-    internal readonly string[] _documentHeader;
-    internal readonly string[] _tableHeader;
-
-    public ReportContract(ITourStorageContract tourStorageContract, ISalaryStorageContract salaryStorageContract, 
-        ISaleStorageContract saleStorageContract, BaseWordBuilder baseWordBuilder, BaseExcelBuilder baseExcelBuilder, 
-        BasePdfBuilder basePdfBuilder, ILogger logger, IStringLocalizer<Messages> localizer)
-    {
-        _tourStorageContract = tourStorageContract;
-        _saleStorageContract = saleStorageContract;
-        _salaryStorageContract = salaryStorageContract;
-        _baseWordBuilder = baseWordBuilder;
-        _baseExcelBuilder = baseExcelBuilder;
-        _basePdfBuilder = basePdfBuilder;
-        _logger = logger;
-        _localizer = localizer;
-
-        _documentHeader = [_localizer["DocumentDocCaptionTour"], _localizer["DocumentDocCaptionPreviousNames"], _localizer["DocumentDocCaptionData"]];
-        _tableHeader = [_localizer["DocumentExcelCaptionDate"], _localizer["DocumentExcelCaptionSum"], _localizer["DocumentExcelCaptionDiscount"], _localizer["DocumentExcelCaptionTour"], _localizer["DocumentExcelCaptionCount"]];
-    }
-
-
-    public Task<List<TourAndTourHistoryDataModel>> GetDataToursHistoryAsync(CancellationToken ct)
-    {
-        _logger.LogInformation("Get data PostHistory");
-        return GetToursHistoriesAsync(ct);
-    }
-
-    public async Task<Stream> CreateDocumentToursHistoryAsync(CancellationToken ct)
-    {
-        _logger.LogInformation("Create report TourHistory");
-        var data = await GetToursHistoriesAsync(ct) ?? throw new InvalidOperationException(_localizer["NotFoundDataMessage"]);
-
-        return _baseWordBuilder
-            .AddHeader(_localizer["DocumentDocHeader"])
-            .AddParagraph(string.Format(_localizer["DocumentDocSubHeader"], DateTime.Now))
-            .AddTable(
-                new[] { 3000, 3000, 3000 },
-                new List<string[]> { _documentHeader }
-                    .Concat(data.SelectMany(x =>
-                        new[] { new[] { x.TourName, "", "" } }
-                            .Concat(x.Histories.Zip(x.Data, (price, date) => new[] { "", price, date }))
-                    ))
-                    .ToList())
-            .Build();
-    }
-
-    private async Task<List<TourAndTourHistoryDataModel>> GetToursHistoriesAsync(CancellationToken ct) =>
-        [.. (await _tourStorageContract.GetHistoriesListAsync(ct)).GroupBy(x => x.TourName).Select(x => new TourAndTourHistoryDataModel {
-            TourName = x.Key, Histories = [.. x.Select(y => y.OldPrice.ToString())], Data = [.. x.Select(y => y.ChangeDate.ToString())] })];
-
-    public async Task<Stream> CreateDocumentSalesByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct)
-    {
-        var tableHeader1 = new string[]
-        {
-            _localizer["DocumentExcelHeaderEmployee"],
-            _localizer["DocumentExcelCaptionDate"],
-            _localizer["DocumentExcelCaptionSum"],
-            _localizer["DocumentExcelCaptionDiscount"],
-            _localizer["DocumentExcelCaptionCocktail"],
-            _localizer["DocumentExcelCaptionCount"]
-        };
-
-        _logger.LogInformation("Create report SalesByPeriod from {dateStart} to {dateFinish}", dateStart, dateFinish);
-        var data = await GetDataBySalesAsync(dateStart, dateFinish, ct) ?? throw new InvalidOperationException(_localizer["NotFoundDataMessage"]);
-
-        var tableRows = new List<string[]>
-        {
-            tableHeader1
-        };
-
-        foreach (var sale in data)
-        {
-            tableRows.Add(new string[]
-            {
-            sale.EmployeeFIO ?? "",
-            sale.SaleDate.ToShortDateString(),
-            sale.Sum.ToString("N2"),
-            sale.Discount.ToString("N2"),
-            "", ""
-            });
-
-            foreach (var cocktail in sale.Tours ?? Enumerable.Empty<SaleTourDataModel>())
-            {
-                tableRows.Add(new string[]
-                {
-                "", "", "", "", cocktail.TourName, cocktail.Count.ToString("N2")
-                });
-            }
-        }
-
-        tableRows.Add(new string[]
-        {
-        _localizer["DocumentExcelCaptionTotal"], "", data.Sum(x => x.Sum).ToString("N2"), data.Sum(x => x.Discount).ToString("N2"), "", ""
-        });
-
-        return _baseExcelBuilder
-            .AddHeader(_localizer["DocumentExcelHeader"], 0, 6)
-            .AddParagraph(string.Format(_localizer["DocumentExcelSubHeader"], dateStart.ToLocalTime().ToShortDateString(), dateFinish.ToLocalTime().ToShortDateString()), 2)
-            .AddTable([15, 15, 10, 10, 25, 10], tableRows)
-            .Build();
-    }
-
-    public async Task<List<SaleDataModel>> GetDataBySalesAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct)
-    {
-        if (dateStart.IsDateNotOlder(dateFinish))
-        {
-            throw new IncorrectDatesException(dateStart, dateFinish, _localizer);
-        }
-        return [.. (await _saleStorageContract.GetListAsync(dateStart,
-            dateFinish, ct)).OrderBy(x => x.SaleDate)];
-    }
-    public Task<List<SaleDataModel>> GetDataSaleByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct)
-    {
-        _logger.LogInformation("Get data SalesByPeriod from {dateStart} to {dateFinish}", dateStart, dateFinish);
-        return GetDataBySalesAsync(dateStart, dateFinish, ct);
-    }
-
-    public Task<List<EmployeeSalaryByPeriodDataModel>> GetDataSalaryByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct)
-    {
-        _logger.LogInformation("Get data SalaryByPeriod from {dateStart} to { dateFinish}", dateStart, dateFinish);
-        return GetDataBySalaryAsync(dateStart, dateFinish, ct);
-    }
-
-    private async Task<List<EmployeeSalaryByPeriodDataModel>> GetDataBySalaryAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct)
-    {
-        if (dateStart.IsDateNotOlder(dateFinish))
-        {
-            throw new IncorrectDatesException(dateStart, dateFinish, _localizer);
-        }
-        return [.. (await _salaryStorageContract.GetListAsync(dateStart, dateFinish, ct))
-            .GroupBy(x => x.EmployeeId)
-            .Select(x => new EmployeeSalaryByPeriodDataModel {
-                EmployeeFIO = x.First().EmployeeFIO,
-                TotalSalary = x.Sum(y => y.Salary),
-                FromPeriod = x.Min(y => y.SalaryDate),
-                ToPeriod = x.Max(y => y.SalaryDate)
-            })
-            .OrderBy(x => x.EmployeeFIO)];
-    }
-
-    public async Task<Stream> CreateDocumentSalaryByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct)
-    {
-        _logger.LogInformation("Create report SalaryByPeriod from {dateStart} to {dateFinish}", dateStart, dateFinish);
-        var data = await GetDataBySalaryAsync(dateStart, dateFinish, ct) ?? throw new InvalidOperationException("No found data");
-        return _basePdfBuilder
-            .AddHeader("Зарплатная ведомость")
-            .AddParagraph($"за период с {dateStart.ToShortDateString()} по {dateFinish.ToShortDateString()}")
-            .AddPieChart("Начисления", [.. data.Select(x => (x.EmployeeFIO, x.TotalSalary))])
-            .Build();
-    }
-}

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SalaryBusinessLogicContract.cs

@@ -2,11 +2,7 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
-using MagicCarpetContracts.Infrastructure;
-using MagicCarpetContracts.Infrastructure.PostConfigurations;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -15,32 +11,29 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
-internal class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageContract,ISaleStorageContract saleStorageContract,
-    IPostStorageContract postStorageContract, IEmployeeStorageContract employeeStorageContract, IStringLocalizer<Messages> localizer, ILogger logger, IConfigurationSalary сonfiguration) : ISalaryBusinessLogicContract
+public class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageContract,ISaleStorageContract saleStorageContract,
+    IPostStorageContract postStorageContract, IEmployeeStorageContract employeeStorageContract, ILogger logger) : 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 IStringLocalizer<Messages> _localizer = localizer;
-    private readonly Lock _lockObject = new();
     public List<SalaryDataModel> GetAllSalariesByPeriod(DateTime fromDate, DateTime toDate)
     {
         _logger.LogInformation("GetAllSalaries params: {fromDate}, {toDate}", fromDate, toDate);
         if (fromDate.IsDateNotOlder(toDate))
         {
-            throw new IncorrectDatesException(fromDate, toDate, _localizer);
+            throw new IncorrectDatesException(fromDate, toDate);
         }
-        return _salaryStorageContract.GetList(fromDate, toDate);
+        return _salaryStorageContract.GetList(fromDate, toDate) ?? throw new NullListException();
     }
 
     public List<SalaryDataModel> GetAllSalariesByPeriodByEmployee(DateTime fromDate, DateTime toDate, string employeeId)
     {
         if (fromDate.IsDateNotOlder(toDate))
         {
-            throw new IncorrectDatesException(fromDate, toDate, _localizer);
+            throw new IncorrectDatesException(fromDate, toDate);
         }
         if (employeeId.IsEmpty())
         {
@@ -48,10 +41,10 @@ internal class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageC
         }
         if (!employeeId.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "EmployeeId"));
+            throw new ValidationException("The value in the field employeeId is not a unique identifier.");
         }
         _logger.LogInformation("GetAllSalaries params: {fromDate}, {toDate}, {employeeId}", fromDate, toDate, employeeId);
-        return _salaryStorageContract.GetList(fromDate, toDate, employeeId);
+        return _salaryStorageContract.GetList(fromDate, toDate, employeeId) ?? throw new NullListException();
     }
 
     public void CalculateSalaryByMounth(DateTime date)
@@ -59,69 +52,16 @@ internal class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageC
         _logger.LogInformation("CalculateSalaryByMounth: {date}", date);
         var startDate = new DateTime(date.Year, date.Month, 1);
         var finishDate = new DateTime(date.Year, date.Month, DateTime.DaysInMonth(date.Year, date.Month));
-        var employees = _employeeStorageContract.GetList();
+        var employees = _employeeStorageContract.GetList() ?? throw new NullListException();
         foreach (var employee in employees)
         {
-            var sales = _saleStorageContract.GetList(startDate, finishDate, employeeId: employee.Id);
-            var post = _postStorageContract.GetElementById(employee.PostId);
-            var salary = post.ConfigurationModel switch
-            {
-                null => 0,
-                TravelAgentPostConfiguration cpc => CalculateSalaryForTravelAgent(sales, startDate, finishDate, cpc),
-                ChiefPostConfiguration spc => CalculateSalaryForChief(startDate, finishDate, spc),
-                PostConfiguration pc => pc.Rate,
-            };
+            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;
             _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;
+            _salaryStorageContract.AddElement(new SalaryDataModel(employee.Id, DateTime.SpecifyKind(finishDate, DateTimeKind.Utc), salary));
         }
     }
 }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SaleBusinessLogicContract.cs

@@ -2,9 +2,7 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -15,20 +13,20 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContract, IStringLocalizer<Messages> localizer, ILogger logger) : ISaleBusinessLogicContract
+public class SaleBusinessLogicContract(ISaleStorageContract saleStorageContract,IAgencyStorageContract agencyStorageContract, ILogger logger) : ISaleBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly ISaleStorageContract _saleStorageContract = saleStorageContract;
-    private readonly IStringLocalizer<Messages> _localizer = localizer;
+    private readonly IAgencyStorageContract _agencyStorageContract = agencyStorageContract;
 
     public List<SaleDataModel> GetAllSalesByPeriod(DateTime fromDate, DateTime toDate)
     {
         _logger.LogInformation("GetAllSales params: {fromDate}, {toDate}", fromDate, toDate);
         if (fromDate.IsDateNotOlder(toDate))
         {
-            throw new IncorrectDatesException(fromDate, toDate, _localizer);
+            throw new IncorrectDatesException(fromDate, toDate);
         }
-        return _saleStorageContract.GetList(fromDate, toDate);
+        return _saleStorageContract.GetList(fromDate, toDate) ?? throw new NullListException();
     }
 
     public List<SaleDataModel> GetAllSalesByEmployeeByPeriod(string employeeId, DateTime fromDate, DateTime toDate)
@@ -36,7 +34,7 @@ internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContrac
         _logger.LogInformation("GetAllSales params: {employeeId}, {fromDate}, {toDate}", employeeId, fromDate, toDate);
         if (fromDate.IsDateNotOlder(toDate))
         {
-            throw new IncorrectDatesException(fromDate, toDate, _localizer);
+            throw new IncorrectDatesException(fromDate, toDate);
         }
         if (employeeId.IsEmpty())
         {
@@ -46,7 +44,7 @@ internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContrac
         {
             throw new ValidationException("The value in the field employeeId is not a unique identifier.");
         }
-        return _saleStorageContract.GetList(fromDate, toDate, employeeId: employeeId);
+        return _saleStorageContract.GetList(fromDate, toDate, employeeId: employeeId) ?? throw new NullListException();
     }
 
     public List<SaleDataModel> GetAllSalesByClientByPeriod(string clientId, DateTime fromDate, DateTime toDate)
@@ -54,7 +52,7 @@ internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContrac
         _logger.LogInformation("GetAllSales params: {buyerId}, {fromDate}, {toDate}", clientId, fromDate, toDate);
         if (fromDate.IsDateNotOlder(toDate))
         {
-            throw new IncorrectDatesException(fromDate, toDate, _localizer);
+            throw new IncorrectDatesException(fromDate, toDate);
         }
         if (clientId.IsEmpty())
         {
@@ -62,9 +60,9 @@ internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContrac
         }
         if (!clientId.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "ClientId"));
+            throw new ValidationException("The value in the field clientId is not a unique identifier.");
         }
-        return _saleStorageContract.GetList(fromDate, toDate, clientId: clientId);
+        return _saleStorageContract.GetList(fromDate, toDate, clientId: clientId) ?? throw new NullListException();
     }
 
     public List<SaleDataModel> GetAllSalesByTourByPeriod(string tourId, DateTime fromDate, DateTime toDate)
@@ -72,7 +70,7 @@ internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContrac
         _logger.LogInformation("GetAllSales params: {tourId}, {fromDate}, {toDate}", tourId, fromDate, toDate);
         if (fromDate.IsDateNotOlder(toDate))
         {
-            throw new IncorrectDatesException(fromDate, toDate, _localizer);
+            throw new IncorrectDatesException(fromDate, toDate);
         }
         if (tourId.IsEmpty())
         {
@@ -80,9 +78,9 @@ internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContrac
         }
         if (!tourId.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "TourId"));
+            throw new ValidationException("The value in the field tourId is not a unique identifier.");
         }
-        return _saleStorageContract.GetList(fromDate, toDate, tourId: tourId);
+        return _saleStorageContract.GetList(fromDate, toDate, tourId: tourId) ?? throw new NullListException();
     }
 
     public SaleDataModel GetSaleByData(string data)
@@ -94,16 +92,20 @@ internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContrac
         }
         if (!data.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("Id is not a unique identifier");
         }
-        return _saleStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data,_localizer);
+        return _saleStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
     }
 
     public void InsertSale(SaleDataModel saleDataModel)
     {
         _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(saleDataModel));
         ArgumentNullException.ThrowIfNull(saleDataModel);
-        saleDataModel.Validate(_localizer);
+        saleDataModel.Validate();
+        if (!_agencyStorageContract.CheckComponents(saleDataModel))
+        {
+            throw new InsufficientException("Dont have tour in agency");
+        }
         _saleStorageContract.AddElement(saleDataModel);
     }
 
@@ -116,7 +118,7 @@ internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContrac
         }
         if (!id.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("Id is not a unique identifier");
         }
         _saleStorageContract.DelElement(id);
     }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SuppliesBusinessLogicContract.cs

@@ -0,0 +1,61 @@
+using MagicCarpetContracts.BusinessLogicContracts;
+using MagicCarpetContracts.DataModels;
+using MagicCarpetContracts.Enums;
+using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.Extensions;
+using MagicCarpetContracts.StoragesContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace MagicCarpetBusinessLogic.Implementations;
+
+public class SuppliesBusinessLogicContract(ISuppliesStorageContract suppliesStorageContract, ILogger logger) : ISuppliesBusinessLogicContract
+{
+    private readonly ISuppliesStorageContract _suppliesStorageContract = suppliesStorageContract;
+    private readonly ILogger _logger = logger;
+
+    public List<SuppliesDataModel> GetAllComponents()
+    {
+        _logger.LogInformation("GetAllComponents");
+        return _suppliesStorageContract.GetList() ?? throw new NullListException();
+
+        return [];
+    }
+
+    public SuppliesDataModel GetComponentByData(string data)
+    {
+        _logger.LogInformation("Get element by data: {data}", data);
+        if (data.IsEmpty())
+        {
+            throw new ArgumentNullException(nameof(data));
+        }
+        if (!data.IsGuid())
+        {
+            throw new ElementNotFoundException(data);
+        }
+        return _suppliesStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
+
+        return new("", TourType.None, DateTime.UtcNow, 0, []);
+    }
+
+    public void InsertComponent(SuppliesDataModel suppliesDataModel)
+    {
+        _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(suppliesDataModel));
+        ArgumentNullException.ThrowIfNull(suppliesDataModel);
+        suppliesDataModel.Validate();
+        _suppliesStorageContract.AddElement(suppliesDataModel);
+    }
+
+    public void UpdateComponent(SuppliesDataModel suppliesDataModel)
+    {
+        _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(suppliesDataModel));
+        ArgumentNullException.ThrowIfNull(suppliesDataModel);
+        suppliesDataModel.Validate();
+        _suppliesStorageContract.UpdElement(suppliesDataModel);
+    }
+}

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/TourBusinessLogicContract.cs

@@ -2,9 +2,7 @@
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -15,15 +13,14 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-internal class TourBusinessLogicContract(ITourStorageContract tourStorageContract, IStringLocalizer<Messages> localizer, ILogger logger) : ITourBusinessLogicContract
+public class TourBusinessLogicContract(ITourStorageContract tourStorageContract, ILogger logger) : ITourBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly ITourStorageContract _tourStorageContract = tourStorageContract;
-    private readonly IStringLocalizer<Messages> _localizer = localizer;
     public List<TourDataModel> GetAllTours()
     {
         _logger.LogInformation("GetAllTours");
-        return _tourStorageContract.GetList();
+        return _tourStorageContract.GetList() ?? throw new NullListException();
     }
 
     public List<TourHistoryDataModel> GetTourHistoryByTour(string tourId)
@@ -35,9 +32,9 @@ internal class TourBusinessLogicContract(ITourStorageContract tourStorageContrac
         }
         if (!tourId.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "TourId"));
+            throw new ValidationException("The value in the field tourId is not a unique identifier.");
         }
-        return _tourStorageContract.GetHistoryByTourId(tourId);
+        return _tourStorageContract.GetHistoryByTourId(tourId) ?? throw new NullListException();
     }
 
     public TourDataModel GetTourByData(string data)
@@ -49,25 +46,23 @@ internal class TourBusinessLogicContract(ITourStorageContract tourStorageContrac
         }
         if (data.IsGuid())
         {
-            return _tourStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data, _localizer);
+            return _tourStorageContract.GetElementById(data) ?? throw new ElementNotFoundException(data);
         }
-        return _tourStorageContract.GetElementByName(data) ?? throw new ElementNotFoundException(data, _localizer);
+        return _tourStorageContract.GetElementByName(data) ?? throw new ElementNotFoundException(data);
     }
 
     public void InsertTour(TourDataModel tourDataModel)
     {
         _logger.LogInformation("New data: {json}", JsonSerializer.Serialize(tourDataModel));
         ArgumentNullException.ThrowIfNull(tourDataModel);
-        tourDataModel.Validate(_localizer);
-        _tourStorageContract.AddElement(tourDataModel);
+        tourDataModel.Validate();
     }
 
     public void UpdateTour(TourDataModel tourDataModel)
     {
         _logger.LogInformation("Update data: {json}", JsonSerializer.Serialize(tourDataModel));
         ArgumentNullException.ThrowIfNull(tourDataModel);
-        tourDataModel.Validate(_localizer);
-        _tourStorageContract.UpdElement(tourDataModel);
+        tourDataModel.Validate();
     }
 
     public void DeleteTour(string id)
@@ -79,7 +74,7 @@ internal class TourBusinessLogicContract(ITourStorageContract tourStorageContrac
         }
         if (!id.IsGuid())
         {
-            throw new ValidationException(string.Format(_localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("Id is not a unique identifier");
         }
         _tourStorageContract.DelElement(id);
     }

MagicCarpetProject/MagicCarpetBusinessLogic/MagicCarpetBusinessLogic.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,9 +11,7 @@
 		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
-		<PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
 	</ItemGroup>
 
   <ItemGroup>

MagicCarpetProject/MagicCarpetBusinessLogic/OfficePackage/BaseExcelBuilder.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetBusinessLogic.OfficePackage;
-
-public abstract class BaseExcelBuilder
-{
-    public abstract BaseExcelBuilder AddHeader(string header, int startIndex, int count);
-    public abstract BaseExcelBuilder AddParagraph(string text, int columnIndex);
-    public abstract BaseExcelBuilder AddTable(int[] columnsWidths, List<string[]> data);
-    public abstract Stream Build();
-}

MagicCarpetProject/MagicCarpetBusinessLogic/OfficePackage/BasePdfBuilder.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetBusinessLogic.OfficePackage;
-
-public abstract class BasePdfBuilder
-{
-    public abstract BasePdfBuilder AddHeader(string header);
-    public abstract BasePdfBuilder AddParagraph(string text);
-    public abstract BasePdfBuilder AddPieChart(string title, List<(string Caption, double Value)> data);
-    public abstract Stream Build();
-}

MagicCarpetProject/MagicCarpetBusinessLogic/OfficePackage/BaseWordBuilder.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetBusinessLogic.OfficePackage;
-
-public abstract class BaseWordBuilder
-{
-    public abstract BaseWordBuilder AddHeader(string header);
-    public abstract BaseWordBuilder AddParagraph(string text);
-    public abstract BaseWordBuilder AddTable(int[] widths, List<string[]> data);
-    public abstract Stream Build();
-}

MagicCarpetProject/MagicCarpetBusinessLogic/OfficePackage/MigraDocPdfBuilder.cs

@@ -1,89 +0,0 @@
-using MigraDoc.DocumentObjectModel;
-using MigraDoc.DocumentObjectModel.Shapes.Charts;
-using MigraDoc.Rendering;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetBusinessLogic.OfficePackage;
-
-public class MigraDocPdfBuilder : BasePdfBuilder
-{
-    private readonly Document _document;
-
-    public MigraDocPdfBuilder()
-    {
-        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-        _document = new Document();
-        DefineStyles();
-    }
-
-    public override BasePdfBuilder AddHeader(string header)
-    {
-        _document.AddSection().AddParagraph(header, "NormalBold");
-        return this;
-    }
-
-    public override BasePdfBuilder AddParagraph(string text)
-    {
-        _document.LastSection.AddParagraph(text, "Normal");
-        return this;
-    }
-
-    public override BasePdfBuilder AddPieChart(string title, List<(string Caption, double Value)> data)
-    {
-        if (data == null || data.Count == 0)
-        {
-            return this;
-        }
-
-        var chart = new Chart(ChartType.Pie2D);
-        var series = chart.SeriesCollection.AddSeries();
-        series.Add(data.Select(x => x.Value).ToArray());
-
-        var xseries = chart.XValues.AddXSeries();
-        xseries.Add(data.Select(x => x.Caption).ToArray());
-
-        chart.DataLabel.Type = DataLabelType.Percent;
-        chart.DataLabel.Position = DataLabelPosition.OutsideEnd;
-
-        chart.Width = Unit.FromCentimeter(16);
-        chart.Height = Unit.FromCentimeter(12);
-
-        chart.TopArea.AddParagraph(title);
-
-        chart.XAxis.MajorTickMark = TickMarkType.Outside;
-
-        chart.YAxis.MajorTickMark = TickMarkType.Outside;
-        chart.YAxis.HasMajorGridlines = true;
-
-        chart.PlotArea.LineFormat.Width = 1;
-        chart.PlotArea.LineFormat.Visible = true;
-
-        chart.TopArea.AddLegend();
-
-        _document.LastSection.Add(chart);
-
-        return this;
-    }
-
-    public override Stream Build()
-    {
-        var stream = new MemoryStream();
-        var renderer = new PdfDocumentRenderer(true)
-        {
-            Document = _document
-        };
-        renderer.RenderDocument();
-        renderer.PdfDocument.Save(stream);
-        return stream;
-    }
-
-    private void DefineStyles()
-    {
-        var style = _document.Styles.AddStyle("NormalBold", "Normal");
-        style.Font.Bold = true;
-    }
-}

MagicCarpetProject/MagicCarpetBusinessLogic/OfficePackage/OpenXmlExcelBuilder.cs

@@ -1,308 +0,0 @@
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetBusinessLogic.OfficePackage;
-
-public class OpenXmlExcelBuilder : BaseExcelBuilder
-{
-    private readonly SheetData _sheetData;
-
-    private readonly MergeCells _mergeCells;
-
-    private readonly Columns _columns;
-
-    private uint _rowIndex = 0;
-
-    public OpenXmlExcelBuilder()
-    {
-        _sheetData = new SheetData();
-        _mergeCells = new MergeCells();
-        _columns = new Columns();
-        _rowIndex = 1;
-    }
-
-    public override BaseExcelBuilder AddHeader(string header, int startIndex, int count)
-    {
-        CreateCell(startIndex, _rowIndex, header, StyleIndex.BoldTextWithoutBorder);
-        for (int i = startIndex + 1; i < startIndex + count; ++i)
-        {
-            CreateCell(i, _rowIndex, "", StyleIndex.SimpleTextWithoutBorder);
-        }
-
-        _mergeCells.Append(new MergeCell()
-        {
-            Reference =
-            new StringValue($"{GetExcelColumnName(startIndex)}{_rowIndex}:{GetExcelColumnName(startIndex + count - 1)}{_rowIndex}")
-        });
-
-        _rowIndex++;
-        return this;
-    }
-
-    public override BaseExcelBuilder AddParagraph(string text, int columnIndex)
-    {
-        CreateCell(columnIndex, _rowIndex++, text, StyleIndex.SimpleTextWithoutBorder);
-        return this;
-    }
-
-    public override BaseExcelBuilder AddTable(int[] columnsWidths, List<string[]> data)
-    {
-        if (columnsWidths == null || columnsWidths.Length == 0)
-        {
-            throw new ArgumentNullException(nameof(columnsWidths));
-        }
-
-        if (data == null || data.Count == 0)
-        {
-            throw new ArgumentNullException(nameof(data));
-        }
-
-        if (data.Any(x => x.Length != columnsWidths.Length))
-        {
-            throw new InvalidOperationException("widths.Length != data.Length");
-        }
-
-        uint counter = 1;
-        int coef = 2;
-        _columns.Append(columnsWidths.Select(x => new Column
-        {
-            Min = counter,
-            Max = counter++,
-            Width = x * coef,
-            CustomWidth = true
-        }));
-
-        for (var j = 0; j < data.First().Length; ++j)
-        {
-            CreateCell(j, _rowIndex, data.First()[j], StyleIndex.BoldTextWithBorder);
-        }
-
-        _rowIndex++;
-        for (var i = 1; i < data.Count - 1; ++i)
-        {
-            for (var j = 0; j < data[i].Length; ++j)
-            {
-                CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithBorder);
-            }
-
-            _rowIndex++;
-        }
-
-        for (var j = 0; j < data.Last().Length; ++j)
-        {
-            CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.BoldTextWithBorder);
-        }
-
-        _rowIndex++;
-        return this;
-    }
-
-    public override Stream Build()
-    {
-        var stream = new MemoryStream();
-        using var spreadsheetDocument = SpreadsheetDocument.Create(stream, SpreadsheetDocumentType.Workbook);
-        var workbookpart = spreadsheetDocument.AddWorkbookPart();
-        GenerateStyle(workbookpart);
-        workbookpart.Workbook = new Workbook();
-        var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
-        worksheetPart.Worksheet = new Worksheet();
-        if (_columns.HasChildren)
-        {
-            worksheetPart.Worksheet.Append(_columns);
-        }
-
-        worksheetPart.Worksheet.Append(_sheetData);
-        var sheets = spreadsheetDocument.WorkbookPart!.Workbook.AppendChild(new Sheets());
-        var sheet = new Sheet()
-        {
-            Id = spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
-            SheetId = 1,
-            Name = "Лист 1"
-        };
-
-        sheets.Append(sheet);
-        if (_mergeCells.HasChildren)
-        {
-            worksheetPart.Worksheet.InsertAfter(_mergeCells, worksheetPart.Worksheet.Elements<SheetData>().First());
-        }
-        return stream;
-    }
-
-    private static void GenerateStyle(WorkbookPart workbookPart)
-    {
-        var workbookStylesPart = workbookPart.AddNewPart<WorkbookStylesPart>();
-        workbookStylesPart.Stylesheet = new Stylesheet();
-
-        var fonts = new Fonts() { Count = 2, KnownFonts = BooleanValue.FromBoolean(true) };
-        fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
-        {
-            FontSize = new FontSize() { Val = 11 },
-            FontName = new FontName() { Val = "Calibri" },
-            FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
-            FontScheme = new FontScheme() { Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor) }
-        });
-        fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
-        {
-            FontSize = new FontSize() { Val = 11 },
-            FontName = new FontName() { Val = "Calibri" },
-            FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
-            FontScheme = new FontScheme() { Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor) },
-            Bold = new Bold()
-        });
-        workbookStylesPart.Stylesheet.Append(fonts);
-
-        // Default Fill
-        var fills = new Fills() { Count = 1 };
-        fills.Append(new Fill
-        {
-            PatternFill = new PatternFill() { PatternType = new EnumValue<PatternValues>(PatternValues.None) }
-        });
-        workbookStylesPart.Stylesheet.Append(fills);
-
-        // Default Border
-        var borders = new Borders() { Count = 2 };
-        borders.Append(new Border
-        {
-            LeftBorder = new LeftBorder(),
-            RightBorder = new RightBorder(),
-            TopBorder = new TopBorder(),
-            BottomBorder = new BottomBorder(),
-            DiagonalBorder = new DiagonalBorder()
-        });
-        borders.Append(new Border
-        {
-            LeftBorder = new LeftBorder() { Style = BorderStyleValues.Thin },
-            RightBorder = new RightBorder() { Style = BorderStyleValues.Thin },
-            TopBorder = new TopBorder() { Style = BorderStyleValues.Thin },
-            BottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin }
-        });
-        workbookStylesPart.Stylesheet.Append(borders);
-
-        // Default cell format and a date cell format
-        var cellFormats = new CellFormats() { Count = 4 };
-        cellFormats.Append(new CellFormat
-        {
-            NumberFormatId = 0,
-            FormatId = 0,
-            FontId = 0,
-            BorderId = 0,
-            FillId = 0,
-            Alignment = new Alignment()
-            {
-                Horizontal = HorizontalAlignmentValues.Left,
-                Vertical = VerticalAlignmentValues.Center,
-                WrapText = true
-            }
-        });
-        cellFormats.Append(new CellFormat
-        {
-            NumberFormatId = 0,
-            FormatId = 0,
-            FontId = 0,
-            BorderId = 1,
-            FillId = 0,
-            Alignment = new Alignment()
-            {
-                Horizontal = HorizontalAlignmentValues.Left,
-                Vertical = VerticalAlignmentValues.Center,
-                WrapText = true
-            }
-        });
-        cellFormats.Append(new CellFormat
-        {
-            NumberFormatId = 0,
-            FormatId = 0,
-            FontId = 1,
-            BorderId = 0,
-            FillId = 0,
-            Alignment = new Alignment()
-            {
-                Horizontal = HorizontalAlignmentValues.Center,
-                Vertical = VerticalAlignmentValues.Center,
-                WrapText = true
-            }
-        });
-        cellFormats.Append(new CellFormat
-        {
-            NumberFormatId = 0,
-            FormatId = 0,
-            FontId = 1,
-            BorderId = 1,
-            FillId = 0,
-            Alignment = new Alignment()
-            {
-                Horizontal = HorizontalAlignmentValues.Center,
-                Vertical = VerticalAlignmentValues.Center,
-                WrapText = true
-            }
-        });
-        workbookStylesPart.Stylesheet.Append(cellFormats);
-    }
-
-    private enum StyleIndex
-    {
-        SimpleTextWithoutBorder = 0,
-        SimpleTextWithBorder = 1,
-        BoldTextWithoutBorder = 2,
-        BoldTextWithBorder = 3
-    }
-
-    private void CreateCell(int columnIndex, uint rowIndex, string text, StyleIndex styleIndex)
-    {
-        var columnName = GetExcelColumnName(columnIndex);
-        var cellReference = columnName + rowIndex;
-        var row = _sheetData.Elements<Row>().FirstOrDefault(r => r.RowIndex! == rowIndex);
-        if (row == null)
-        {
-            row = new Row() { RowIndex = rowIndex };
-            _sheetData.Append(row);
-        }
-
-        var newCell = row.Elements<Cell>()
-            .FirstOrDefault(c => c.CellReference != null && c.CellReference.Value == columnName + rowIndex);
-        if (newCell == null)
-        {
-            Cell? refCell = null;
-            foreach (Cell cell in row.Elements<Cell>())
-            {
-                if (cell.CellReference?.Value != null && cell.CellReference.Value.Length == cellReference.Length)
-                {
-                    if (string.Compare(cell.CellReference.Value, cellReference, true) > 0)
-                    {
-                        refCell = cell;
-                        break;
-                    }
-                }
-            }
-            newCell = new Cell() { CellReference = cellReference };
-            row.InsertBefore(newCell, refCell);
-        }
-
-        newCell.CellValue = new CellValue(text);
-        newCell.DataType = CellValues.String;
-        newCell.StyleIndex = (uint)styleIndex;
-    }
-
-    private static string GetExcelColumnName(int columnNumber)
-    {
-        columnNumber += 1;
-        int dividend = columnNumber;
-        string columnName = string.Empty;
-        int modulo;
-
-        while (dividend > 0)
-        {
-            modulo = (dividend - 1) % 26;
-            columnName = Convert.ToChar(65 + modulo).ToString() + columnName;
-            dividend = (dividend - modulo) / 26;
-        }
-
-        return columnName;
-    }
-}

MagicCarpetProject/MagicCarpetBusinessLogic/OfficePackage/OpenXmlWordBuilder.cs

@@ -1,99 +0,0 @@
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetBusinessLogic.OfficePackage;
-
-public class OpenXmlWordBuilder : BaseWordBuilder
-{
-    private readonly Document _document;
-
-    private readonly Body _body;
-
-    public OpenXmlWordBuilder()
-    {
-        _document = new Document();
-        _body = _document.AppendChild(new Body());
-    }
-
-    public override BaseWordBuilder AddHeader(string header)
-    {
-        var paragraph = _body.AppendChild(new Paragraph());
-        var run = paragraph.AppendChild(new Run());
-        run.AppendChild(new RunProperties(new Bold()));
-        run.AppendChild(new Text(header));
-
-        return this;
-    }
-
-    public override BaseWordBuilder AddParagraph(string text)
-    {
-        var paragraph = _body.AppendChild(new Paragraph());
-        var run = paragraph.AppendChild(new Run());
-        run.AppendChild(new Text(text));
-
-        return this;
-    }
-
-    public override BaseWordBuilder AddTable(int[] widths, List<string[]> data)
-    {
-        if (widths == null || widths.Length == 0)
-        {
-            throw new ArgumentNullException(nameof(widths));
-        }
-
-        if (data == null || data.Count == 0)
-        {
-            throw new ArgumentNullException(nameof(data));
-        }
-
-        if (data.Any(x => x.Length != widths.Length))
-        {
-            throw new InvalidOperationException("widths.Length != data.Length");
-        }
-
-        var table = new Table();
-        table.AppendChild(new TableProperties(
-            new TableBorders(
-                new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
-                new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
-                new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
-                new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
-                new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
-                new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 }
-            )
-        ));
-
-        // Заголовок
-        var tr = new TableRow();
-        for (var j = 0; j < widths.Length; ++j)
-        {
-            tr.Append(new TableCell(
-                new TableCellProperties(new TableCellWidth() { Width = widths[j].ToString() }),
-                new Paragraph(new Run(new RunProperties(new Bold()), new Text(data.First()[j])))));
-        }
-        table.Append(tr);
-
-        // Данные
-        table.Append(data.Skip(1).Select(x =>
-            new TableRow(x.Select(y => new TableCell(new Paragraph(new Run(new Text(y))))))));
-
-        _body.Append(table);
-
-        return this;
-    }
-
-    public override Stream Build()
-    {
-        var stream = new MemoryStream();
-        using var wordDocument = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-        var mainPart = wordDocument.AddMainDocumentPart();
-        mainPart.Document = _document;
-        return stream;
-    }
-}

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/IReportAdapter.cs

@@ -1,18 +0,0 @@
-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 IReportAdapter
-{
-    Task<ReportOperationResponse> GetDataToursHistoryAsync(CancellationToken ct);
-    Task<ReportOperationResponse> GetDataBySalesByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct);
-    Task<ReportOperationResponse> GetDataSalaryByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct);
-    Task<ReportOperationResponse> CreateDocumentToursHistoryAsync(CancellationToken ct);
-    Task<ReportOperationResponse> CreateDocumentSalesByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct);
-    Task<ReportOperationResponse> CreateDocumentSalaryByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct);
-}

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/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/ReportOperationResponse.cs

@@ -1,24 +0,0 @@
-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 ReportOperationResponse : OperationResponse
-{
-    public static ReportOperationResponse OK(List<TourAndTourHistoryViewModel> data) => OK<ReportOperationResponse, List<TourAndTourHistoryViewModel>>(data);
-
-    public static ReportOperationResponse OK(List<SaleViewModel> data) => OK<ReportOperationResponse, List<SaleViewModel>>(data);
-
-    public static ReportOperationResponse OK(List<EmployeeSalaryByPeriodViewModel> data) => OK<ReportOperationResponse, List<EmployeeSalaryByPeriodViewModel>>(data);
-
-    public static ReportOperationResponse OK(Stream data, string fileName) => OK<ReportOperationResponse, Stream>(data, fileName);
-
-    public static ReportOperationResponse BadRequest(string message) => BadRequest<ReportOperationResponse>(message);
-
-    public static ReportOperationResponse InternalServerError(string message) => InternalServerError<ReportOperationResponse>(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/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/PostBindingModel.cs

@@ -16,5 +16,5 @@ public class PostBindingModel
 
     public string? PostType { get; set; }
 
-    public string? ConfigurationJson { get; set; }
+    public double Salary { 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/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/IAgencyBusinessLogicContract.cs

@@ -0,0 +1,17 @@
+using MagicCarpetContracts.DataModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BusinessLogicContracts;
+
+public interface IAgencyBusinessLogicContract
+{
+    List<AgencyDataModel> GetAllComponents();
+    AgencyDataModel GetComponentByData(string data);
+    void InsertComponent(AgencyDataModel agencyDataModel);
+    void UpdateComponent(AgencyDataModel agencyDataModel);
+    void DeleteComponent(string id);
+}

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/IClientBusinessLogicContract.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.BuisnessLogicContracts;
 
-internal interface IClientBusinessLogicContract
+public interface IClientBusinessLogicContract
 {
     List<ClientDataModel> GetAllClients();
 

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/IEmployeeBusinessLogicContract.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.BuisnessLogicContracts;
 
-internal interface IEmployeeBusinessLogicContract
+public interface IEmployeeBusinessLogicContract
 {
     List<EmployeeDataModel> GetAllEmployees(bool onlyActive = true);
 

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/IPostBusinessLogicContract.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.BuisnessLogicContracts;
 
-internal interface IPostBusinessLogicContract
+public interface IPostBusinessLogicContract
 {
     List<PostDataModel> GetAllPosts();
 

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/IReportContract.cs

@@ -1,18 +0,0 @@
-using MagicCarpetContracts.DataModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetContracts.BusinessLogicContracts;
-
-internal interface IReportContract
-{
-    Task<List<TourAndTourHistoryDataModel>> GetDataToursHistoryAsync(CancellationToken ct);
-    Task<Stream> CreateDocumentToursHistoryAsync(CancellationToken ct);
-    Task<List<SaleDataModel>> GetDataBySalesAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct);
-    Task<Stream> CreateDocumentSalesByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct);
-    Task<List<EmployeeSalaryByPeriodDataModel>> GetDataSalaryByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct);
-    Task<Stream> CreateDocumentSalaryByPeriodAsync(DateTime dateStart, DateTime dateFinish, CancellationToken ct);
-}

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/ISalaryBusinessLogicContract.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.BuisnessLogicContracts;
 
-internal interface ISalaryBusinessLogicContract
+public interface ISalaryBusinessLogicContract
 {
     List<SalaryDataModel> GetAllSalariesByPeriod(DateTime fromDate, DateTime toDate);
 

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/ISaleBusinessLogicContract.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.BuisnessLogicContracts;
 
-internal interface ISaleBusinessLogicContract
+public interface ISaleBusinessLogicContract
 {
     List<SaleDataModel> GetAllSalesByPeriod(DateTime fromDate, DateTime toDate);
 

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/ISuppliesBusinessLogicContract.cs

@@ -0,0 +1,16 @@
+using MagicCarpetContracts.DataModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.BusinessLogicContracts;
+
+public interface ISuppliesBusinessLogicContract
+{
+    List<SuppliesDataModel> GetAllComponents();
+    SuppliesDataModel GetComponentByData(string data);
+    void InsertComponent(SuppliesDataModel componentDataModel);
+    void UpdateComponent(SuppliesDataModel componentDataModel);
+}

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/ITourBusinessLogicContract.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.BuisnessLogicContracts;
 
-internal interface ITourBusinessLogicContract
+public interface ITourBusinessLogicContract
 {
     List<TourDataModel> GetAllTours();
 

MagicCarpetProject/MagicCarpetContracts/DataModels/AgencyDataModel.cs

@@ -0,0 +1,33 @@
+using MagicCarpetContracts.Enums;
+using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.Extensions;
+using MagicCarpetContracts.Infrastructure;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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 TourType { get; private set; } = tourType;
+    public int Count { get; private set; } = count;
+    public List<TourAgencyDataModel> Tours { get; private set; } = tours;
+
+    public void Validate()
+    {
+        if (Id.IsEmpty())
+            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 (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");
+        if ((Tours?.Count ?? 0) == 0)
+            throw new ValidationException("The sale must include tours");
+    }
+}

MagicCarpetProject/MagicCarpetContracts/DataModels/ClientDataModel.cs

@@ -9,12 +9,10 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using ValidationException = MagicCarpetContracts.Exceptions.ValidationException;
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
 
 namespace MagicCarpetContracts.DataModels;
 
-internal class ClientDataModel(string id, string fIO, string phoneNumber, double discountSize) : IValidation
+public class ClientDataModel(string id, string fIO, string phoneNumber, double discountSize) : IValidation
 {
     public string Id { get; private set; } = id;
 
@@ -24,21 +22,21 @@ internal class ClientDataModel(string id, string fIO, string phoneNumber, double
 
     public double DiscountSize { get; private set; } = discountSize;
 
-    public void Validate(IStringLocalizer<Messages> localizer)
+    public void Validate()
     {
         if (Id.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "Id"));
+            throw new ValidationException("Field Id is empty");
 
         if (!Id.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("The value in the field Id is not a unique identifier");
 
         if (FIO.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "FIO"));
+            throw new ValidationException("Field FIO is empty");
 
         if (PhoneNumber.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "PhoneNumber"));
+            throw new ValidationException("Field PhoneNumber is empty");
 
         if (!Regex.IsMatch(PhoneNumber, @"^((8|\+7)[\- ]?)?(\(?\d{3}\)?[\- ]?)?[\d\- ]{7,10}$"))
-            throw new ValidationException(localizer["ValidationExceptionIncorrectPhoneNumber"]);
+            throw new ValidationException("Field PhoneNumber is not a phone number");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/EmployeeDataModel.cs

@@ -1,9 +1,7 @@
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
 using MagicCarpetContracts.Infrastructure;
-using MagicCarpetContracts.Resources;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.DataModels;
 
-internal class EmployeeDataModel(string id, string fio, string email, string postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) : IValidation
+public class EmployeeDataModel(string id, string fio, string email, string postId, DateTime birthDate, DateTime employmentDate, bool isDeleted) : IValidation
 {
     private readonly PostDataModel? _post;
 
@@ -25,9 +23,9 @@ internal class EmployeeDataModel(string id, string fio, string email, string pos
 
     public string PostId { get; private set; } = postId;
 
-    public DateTime BirthDate { get; private set; } = birthDate.ToUniversalTime();
+    public DateTime BirthDate { get; private set; } = birthDate;
 
-    public DateTime EmploymentDate { get; private set; } = employmentDate.ToUniversalTime();
+    public DateTime EmploymentDate { get; private set; } = employmentDate;
 
     public bool IsDeleted { get; private set; } = isDeleted;
 
@@ -42,38 +40,36 @@ internal class EmployeeDataModel(string id, string fio, string email, string pos
     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(IStringLocalizer<Messages> localizer)
+    public void Validate()
     {
         if (Id.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "Id"));
+            throw new ValidationException("Field Id is empty");
 
         if (!Id.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("The value in the field Id is not a unique identifier");
 
         if (FIO.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "FIO"));
+            throw new ValidationException("Field FIO is empty");
 
         if (Email.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "Email"));
+            throw new ValidationException("Field Email is empty");
 
         if (!Regex.IsMatch(Email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
-            throw new ValidationException(localizer["ValidationExceptionMessageIncorrectEmail"]);
+            throw new ValidationException("Field Email is not a valid email address");
 
         if (PostId.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "PostId"));
+            throw new ValidationException("Field PostId is empty");
 
         if (!PostId.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "PostId"));
+            throw new ValidationException("The value in the field PostId is not a unique identifier");
 
         if (BirthDate.Date > DateTime.Now.AddYears(-18).Date)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageMinorsBirthDate"], BirthDate.ToShortDateString()));
+            throw new ValidationException($"Only adults can be hired (BirthDate = {BirthDate.ToShortDateString()})");
 
         if (EmploymentDate.Date < BirthDate.Date)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmploymentDateAndBirthDate"],
-                EmploymentDate.ToShortDateString(), BirthDate.ToShortDateString()));
+            throw new ValidationException("The date of employment cannot be less than the date of birth");
 
-        if ((EmploymentDate - BirthDate).TotalDays / 365 < 18)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageMinorsEmploymentDate"],
-                EmploymentDate.ToShortDateString(), BirthDate.ToShortDateString()));
+        if ((EmploymentDate - BirthDate).TotalDays / 365 < 18) 
+            throw new ValidationException($"Only adults can be hired (EmploymentDate - {EmploymentDate.ToShortDateString()}, BirthDate - {BirthDate.ToShortDateString()})");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/EmployeeSalaryByPeriodDataModel.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetContracts.DataModels;
-
-public class EmployeeSalaryByPeriodDataModel
-{
-    public required string EmployeeFIO { get; set; }
-
-    public double TotalSalary { get; set; }
-
-    public DateTime FromPeriod { get; set; }
-
-    public DateTime ToPeriod { get; set; }
-}

MagicCarpetProject/MagicCarpetContracts/DataModels/PostDataModel.cs

@@ -2,59 +2,32 @@
 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;
 using System.Text;
 using System.Threading.Tasks;
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
 
 namespace MagicCarpetContracts.DataModels;
 
-internal class PostDataModel(string postId, string postName, PostType postType, PostConfiguration configuration) : IValidation
+public class PostDataModel(string postId, string postName, PostType postType, double salary) : IValidation
 {
     public string Id { get; private set; } = postId;
     public string PostName { get; private set; } = postName;
     public PostType PostType { get; private set; } = postType;
-    public PostConfiguration ConfigurationModel { get; private set; } = configuration;
+    public double Salary { get; private set; } = salary;                                
 
-    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(IStringLocalizer<Messages> localizer)
+    public void Validate()
     {
         if (Id.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "Id"));
-
+            throw new ValidationException("Field Id is empty");
         if (!Id.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "Id"));
-
+            throw new ValidationException("The value in the field Id is not a unique identifier");
         if (PostName.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "PostName"));
-
+            throw new ValidationException("Field PostName is empty");
         if (PostType == PostType.None)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "PostType"));
-
-        if (ConfigurationModel is null)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotInitialized"], "ConfigurationModel"));
-
-        if (ConfigurationModel!.Rate <= 0)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageLessOrEqualZero"], "Rate"));
+            throw new ValidationException("Field PostType is empty");
+        if (Salary <= 0)
+            throw new ValidationException("Field Salary is empty");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/SalaryDataModel.cs

@@ -1,8 +1,6 @@
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
 using MagicCarpetContracts.Infrastructure;
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,12 +9,12 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.DataModels;
 
-internal class SalaryDataModel(string employeeId, DateTime salaryDate, double employeeSalary) : IValidation
+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.ToUniversalTime();
+    public DateTime SalaryDate { get; private set; } = salaryDate;
 
     public double Salary { get; private set; } = employeeSalary;
 
@@ -27,15 +25,15 @@ internal class SalaryDataModel(string employeeId, DateTime salaryDate, double em
         _employee = employee;
     }
 
-    public void Validate(IStringLocalizer<Messages> localizer)
+    public void Validate()
     {
         if (EmployeeId.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "EmployeeId"));
+            throw new ValidationException("Field EmployeeId is empty");
 
         if (!EmployeeId.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "EmployeeId"));
+            throw new ValidationException("The value in the field EmployeeId is not a unique identifier");
 
         if (Salary <= 0)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageLessOrEqualZero"], "Salary"));
+            throw new ValidationException("Field Salary is less than or equal to 0");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/SaleDataModel.cs

@@ -2,8 +2,6 @@
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
 using MagicCarpetContracts.Infrastructure;
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.DataModels;
 
-internal class SaleDataModel : IValidation
+public class SaleDataModel : IValidation
 {
     private readonly ClientDataModel? _client;
 
@@ -85,32 +83,27 @@ internal class SaleDataModel : IValidation
     public SaleDataModel(string id, string employeeId, string? clientId, int discountType, 
         List<SaleTourDataModel> tours) : this(id, employeeId, clientId, (DiscountType)discountType, false, tours) { }
 
-    public void Validate(IStringLocalizer<Messages> localizer)
+    public void Validate()
     {
         if (Id.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "Id"));
+            throw new ValidationException("Field Id is empty");
 
         if (!Id.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("The value in the field Id is not a unique identifier");
 
         if (EmployeeId.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "WorkerId"));
+            throw new ValidationException("Field EmployeeId is empty");
 
         if (!EmployeeId.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "WorkerId"));
+            throw new ValidationException("The value in the field EmployeeId is not a unique identifier");
 
         if (!ClientId?.IsGuid() ?? !ClientId?.IsEmpty() ?? false)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "BuyerId"));
+            throw new ValidationException("The value in the field BuyerId is not a unique identifier");
 
         if (Sum <= 0)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageLessOrEqualZero"], "Sum"));
+            throw new ValidationException("Field Sum is less than or equal to 0");
 
-        if (Tours is null)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotInitialized"], "Tours"));
-
-        if (Tours.Count == 0)
-            throw new ValidationException(localizer["ValidationExceptionMessageNoProductsInSale"]);
-
-        Tours.ForEach(x => x.Validate(localizer));
+        if ((Tours?.Count ?? 0) == 0)
+            throw new ValidationException("The sale must include tours");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/SaleTourDataModel.cs

@@ -1,8 +1,6 @@
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
 using MagicCarpetContracts.Infrastructure;
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -12,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.DataModels;
 
-internal class SaleTourDataModel(string saleId, string tourId, int count, double price) : IValidation
+public class SaleTourDataModel(string saleId, string tourId, int count, double price) : IValidation
 {
     private readonly TourDataModel? _tour;
 
@@ -31,24 +29,24 @@ internal class SaleTourDataModel(string saleId, string tourId, int count, double
         _tour = tour;
     }
 
-    public void Validate(IStringLocalizer<Messages> localizer)
+    public void Validate()
     {
         if (SaleId.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "SaleId"));
+            throw new ValidationException("Field SaleId is empty");
 
         if (!SaleId.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "SaleId"));
+            throw new ValidationException("The value in the field SaleId is not a unique identifier");
 
         if (TourId.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "ITourIdd"));
+            throw new ValidationException("Field ProductId is empty");
 
         if (!TourId.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "TourId"));
+            throw new ValidationException("The value in the field ProductId is not a unique identifier");
 
         if (Count <= 0)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageLessOrEqualZero"], "Count"));
+            throw new ValidationException("Field Count is less than or equal to 0");
 
         if (Price <= 0)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageLessOrEqualZero"], "Price"));
+            throw new ValidationException("Field Price is less than or equal to 0");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/SuppliesDataModel.cs

@@ -0,0 +1,35 @@
+using MagicCarpetContracts.Enums;
+using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.Extensions;
+using MagicCarpetContracts.Infrastructure;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static System.Runtime.InteropServices.JavaScript.JSType;
+
+namespace MagicCarpetContracts.DataModels;
+
+public class SuppliesDataModel(string id, TourType tourType, DateTime productuionDate, int count, List<TourSuppliesDataModel> tours) : IValidation
+{
+    public string Id { get; private set; } = id;
+    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;
+
+    public void Validate()
+    {
+        if (Id.IsEmpty())
+            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 (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");
+        if ((Tours?.Count ?? 0) == 0)
+            throw new ValidationException("The sale must include tours");
+    }
+}

MagicCarpetProject/MagicCarpetContracts/DataModels/TourAgencyDataModel.cs

@@ -0,0 +1,32 @@
+using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.Extensions;
+using MagicCarpetContracts.Infrastructure;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.DataModels;
+
+public class TourAgencyDataModel(string agencyId, string tourId, int count) : IValidation
+{
+    public string AgencyId { get; private set; } = agencyId;
+    public string TourId { get; private set; } = tourId;
+    public int Count { get; private set; } = count;
+
+    public void Validate()
+    {
+        if (AgencyId.IsEmpty())
+            throw new ValidationException("Field AgencyId is empty");
+        if (!AgencyId.IsGuid())
+            throw new ValidationException("The value in the field AgencyId is not a unique identifier");
+        if (TourId.IsEmpty())
+            throw new ValidationException("Field TourId is empty");
+        if (!TourId.IsGuid())
+            throw new ValidationException("The value in the field TourId is not a unique identifier");
+        if (Count <= 0)
+            throw new ValidationException("Field Count is less than or equal to 0");
+    }
+}

MagicCarpetProject/MagicCarpetContracts/DataModels/TourAndTourHistoryDataModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetContracts.DataModels;
-
-public class TourAndTourHistoryDataModel
-{
-    public required string TourName { get; set; }
-    public required List<string> Histories { get; set; }
-    public required List<string> Data { get; set; }
-}

MagicCarpetProject/MagicCarpetContracts/DataModels/TourDataModel.cs

@@ -2,8 +2,6 @@
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
 using MagicCarpetContracts.Infrastructure;
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -14,7 +12,7 @@ using System.Xml.Linq;
 
 namespace MagicCarpetContracts.DataModels;
 
-internal class TourDataModel(string id, string tourName, string tourCountry, double price, TourType tourType) : IValidation
+public class TourDataModel(string id, string tourName, string tourCountry, double price, TourType tourType) : IValidation
 {
     public string Id { get; private set; } = id;
     public string TourName { get; private set; } = tourName;
@@ -22,19 +20,19 @@ internal class TourDataModel(string id, string tourName, string tourCountry, dou
     public double Price { get; private set; } = price;
     public TourType TourType { get; private set; } = tourType;
 
-    public void Validate(IStringLocalizer<Messages> localizer)
+    public void Validate()
     {
         if (Id.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "Id"));
+            throw new ValidationException("Field Id is empty");
         if (!Id.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "Id"));
+            throw new ValidationException("The value in the field Id is not a unique identifier");
         if (TourName.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "TourName"));
+            throw new ValidationException("Field TourName is empty");
         if (TourCountry.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "TourCountry"));
+            throw new ValidationException("Field TourCountry is empty");
         if (Price <= 0)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageLessOrEqualZero"], "Price"));
+            throw new ValidationException("Field Price is less than or equal to 0");
         if (TourType == TourType.None)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "TourType"));
+            throw new ValidationException("Field Type is empty");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/TourHistoryDataModel.cs

@@ -1,12 +1,15 @@
 using MagicCarpetContracts.Exceptions;
 using MagicCarpetContracts.Extensions;
 using MagicCarpetContracts.Infrastructure;
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.DataModels;
 
-internal class TourHistoryDataModel(string tourId, double oldPrice) : IValidation
+public class TourHistoryDataModel(string tourId, double oldPrice) : IValidation
 {
     private readonly TourDataModel? _tour;
 
@@ -24,15 +27,15 @@ internal class TourHistoryDataModel(string tourId, double oldPrice) : IValidatio
         _tour = tour;
     }
 
-    public void Validate(IStringLocalizer<Messages> localizer)
+    public void Validate()
     {
         if (TourId.IsEmpty())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageEmptyField"], "TourId"));
+            throw new ValidationException("Field TourId is empty");
 
         if (!TourId.IsGuid())
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageNotAId"], "TourId"));
+            throw new ValidationException("The value in the field TourId is not a unique identifier");
 
         if (OldPrice <= 0)
-            throw new ValidationException(string.Format(localizer["ValidationExceptionMessageLessOrEqualZero"], "OldPrice"));
+            throw new ValidationException("Field OldPrice is less than or equal to 0");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/TourSuppliesDataModel.cs

@@ -0,0 +1,32 @@
+using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.Extensions;
+using MagicCarpetContracts.Infrastructure;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.DataModels;
+
+public class TourSuppliesDataModel(string suppliesId, string tourId, int count) : IValidation
+{
+    public string SuppliesId { get; private set; } = suppliesId;
+    public string TourId { get; private set; } = tourId;
+    public int Count { get; private set; } = count;
+
+    public void Validate()
+    {
+        if (SuppliesId.IsEmpty())
+            throw new ValidationException("Field SuppliesId is empty");
+        if (!SuppliesId.IsGuid())
+            throw new ValidationException("The value in the field SuppliesId is not a unique identifier");
+        if (TourId.IsEmpty())
+            throw new ValidationException("Field TourId is empty");
+        if (!TourId.IsGuid())
+            throw new ValidationException("The value in the field BlandId is not a unique identifier");
+        if (Count <= 0)
+            throw new ValidationException("Field Count is less than or equal to 0");
+    }
+}

MagicCarpetProject/MagicCarpetContracts/Exceptions/ElementDeletedException.cs

@@ -1,6 +1,4 @@
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,6 +6,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.Exceptions;
 
-internal class ElementDeletedException(string id, IStringLocalizer<Messages> localizer) 
-    : Exception(string.Format(localizer["ElementDeletedExceptionMessage"], id))
-{ }
+public class ElementDeletedException : Exception
+{
+    public ElementDeletedException(string id) : base($"Cannot modify a deleted item (id: {id})") { }
+}

MagicCarpetProject/MagicCarpetContracts/Exceptions/ElementExistsException.cs

@@ -1,6 +1,4 @@
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,10 +6,15 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.Exceptions;
 
-internal class ElementExistsException(string paramName, string paramValue, IStringLocalizer<Messages> localizer) :
-    Exception(string.Format(localizer["ElementExistsExceptionMessage"], paramValue, paramName))
+public class ElementExistsException : Exception
 {
-    public string ParamName { get; private set; } = paramName;
+    public string ParamName { get; private set; }
 
-    public string ParamValue { get; private set; } = paramValue;
+    public string ParamValue { get; private set; }
+
+    public ElementExistsException(string paramName, string paramValue) : base($"There is already an element with value{paramValue} of parameter {paramName}")
+    {
+        ParamName = paramName;
+        ParamValue = paramValue;
+    }
 }

MagicCarpetProject/MagicCarpetContracts/Exceptions/ElementNotFoundException .cs

@@ -1,6 +1,4 @@
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,8 +6,12 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.Exceptions;
 
-internal class ElementNotFoundException(string value, IStringLocalizer<Messages> localizer) :
-    Exception(string.Format(localizer["ElementNotFoundExceptionMessage"], value))
+public class ElementNotFoundException : Exception
 {
-    public string Value { get; private set; } = value;
+    public string Value { get; private set; }
+
+    public ElementNotFoundException(string value) : base($"Element not found at value = {value}")
+    {
+        Value = value;
+    }
 }

MagicCarpetProject/MagicCarpetContracts/Exceptions/IncorrectDatesException .cs

@@ -1,6 +1,4 @@
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,6 +6,8 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.Exceptions;
 
-internal class IncorrectDatesException(DateTime start, DateTime end, IStringLocalizer<Messages> localizer) :
-    Exception(string.Format(localizer["IncorrectDatesExceptionMessage"], start.ToShortDateString(), end.ToShortDateString()))
-{ }
+public class IncorrectDatesException : Exception
+{
+    public IncorrectDatesException(DateTime start, DateTime end) : base($"The end date must be later than the start date.. StartDate: " +
+        $"{start:dd.MM.YYYY}. EndDate: {end:dd.MM.YYYY}") { }
+}

MagicCarpetProject/MagicCarpetContracts/Exceptions/InsufficientException.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.Exceptions;
+
+public class InsufficientException(string message) : Exception(message)
+{
+}

MagicCarpetProject/MagicCarpetContracts/Exceptions/NullListException.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.Exceptions;
+
+public class NullListException : Exception
+{
+    public NullListException() : base("The returned list is null") { }
+}

MagicCarpetProject/MagicCarpetContracts/Exceptions/StorageException .cs

@@ -1,6 +1,4 @@
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,5 +6,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.Exceptions;
 
-internal class StorageException(Exception ex, IStringLocalizer<Messages> localizer) : Exception(string.Format(localizer["StorageExceptionMessage"], ex.Message), ex)
-{ }
+public class StorageException : Exception
+{
+    public StorageException(Exception ex) : base($"Error while working in storage: {ex.Message}", ex) { }
+}

MagicCarpetProject/MagicCarpetContracts/Infrastructure/IConfigurationSalary.cs

@@ -1,14 +0,0 @@
-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/IValidation.cs

@@ -1,6 +1,4 @@
-using MagicCarpetContracts.Resources;
-using Microsoft.Extensions.Localization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,8 +6,8 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.Infrastructure;
 
-internal interface IValidation
+public interface IValidation
 {
-    void Validate(IStringLocalizer<Messages> localizer);
+    void Validate();
 }
 

MagicCarpetProject/MagicCarpetContracts/Infrastructure/OperationResponse.cs

@@ -11,41 +11,32 @@ namespace MagicCarpetContracts.Infrastructure;
 
 public class OperationResponse
 {
-    protected HttpStatusCode StatusCode { get; set; }
+    public HttpStatusCode StatusCode { get; set; }
 
-    protected object? Result { get; set; }
-
-    protected string? FileName { 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);
         }
-        if (Result is Stream stream)
-        {
-            return new FileStreamResult(stream, "application/octetstream")
-            {
-                FileDownloadName = FileName
-            };
-        }
+
         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 OK<TResult, TData>(TData data, string fileName) where TResult : OperationResponse,
-        new() => new() { StatusCode = HttpStatusCode.OK, Result = data, FileName = fileName };
-
-    protected static TResult NoContent<TResult>() where TResult : OperationResponse, 
+    protected static TResult NoContent<TResult>() where TResult : OperationResponse,
         new() => new() { StatusCode = HttpStatusCode.NoContent };
 
-    protected static TResult BadRequest<TResult>(string? errorMessage = null) where TResult : OperationResponse, 
+    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,

MagicCarpetProject/MagicCarpetContracts/Infrastructure/PostConfigurations/ChiefPostConfiguration.cs

@@ -1,13 +0,0 @@
-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

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-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; }
-    public string CultureName { get; set; } = CultureInfo.CurrentCulture.Name;
-}

MagicCarpetProject/MagicCarpetContracts/Infrastructure/PostConfigurations/TravelAgentPostConfiguration.cs

@@ -1,15 +0,0 @@
-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

@@ -10,14 +10,6 @@
     <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" />
-    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.4" />
   </ItemGroup>
-	<ItemGroup>
-		<InternalsVisibleTo Include="MagicCarpetDatabase" />
-		<InternalsVisibleTo Include="MagicCarpetTests" />
-		<InternalsVisibleTo Include="MagicCarpetBusinessLogic" />
-		<InternalsVisibleTo Include="MagicCarpetWebApi" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
 
 </Project>

MagicCarpetProject/MagicCarpetContracts/Resources/Messages.Designer.cs

@@ -1,225 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace MagicCarpetContracts.Resources {
-    using System;
-    
-    
-    /// <summary>
-    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
-    /// </summary>
-    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
-    // с помощью такого средства, как ResGen или Visual Studio.
-    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
-    // с параметром /str или перестройте свой проект VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Messages {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Messages() {
-        }
-        
-        /// <summary>
-        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MagicCarpetContracts.Resources.Messages", typeof(Messages).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
-        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Нельзя изменить удаленный элемент (идентификатор: {0}).
-        /// </summary>
-        internal static string ElementDeletedExceptionMessage {
-            get {
-                return ResourceManager.GetString("ElementDeletedExceptionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Уже существует элемент со значением {0} параметра {1}.
-        /// </summary>
-        internal static string ElementExistsExceptionMessage {
-            get {
-                return ResourceManager.GetString("ElementExistsExceptionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Элемент не найден по значению = {0}.
-        /// </summary>
-        internal static string ElementNotFoundExceptionMessage {
-            get {
-                return ResourceManager.GetString("ElementNotFoundExceptionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Дата окончания должна быть позже даты начала. Дата начала: {0}. ​​Дата окончания: {1}.
-        /// </summary>
-        internal static string IncorrectDatesExceptionMessage {
-            get {
-                return ResourceManager.GetString("IncorrectDatesExceptionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Недостаточно данных для обработки: {0}.
-        /// </summary>
-        internal static string NotEnoughDataToProcessExceptionMessage {
-            get {
-                return ResourceManager.GetString("NotEnoughDataToProcessExceptionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Не найдены данные.
-        /// </summary>
-        internal static string NotFoundDataMessage {
-            get {
-                return ResourceManager.GetString("NotFoundDataMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Ошибка при работе в хранилище: {0}.
-        /// </summary>
-        internal static string StorageExceptionMessage {
-            get {
-                return ResourceManager.GetString("StorageExceptionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Дата трудоустройства не может быть раньше даты рождения ({0}, {1}).
-        /// </summary>
-        internal static string ValidationExceptionMessageEmploymentDateAndBirthDate {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageEmploymentDateAndBirthDate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Значение в поле {0} пусто.
-        /// </summary>
-        internal static string ValidationExceptionMessageEmptyField {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageEmptyField", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Некорректный формат ФИО.
-        /// </summary>
-        internal static string ValidationExceptionMessageIncorrectFIO {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageIncorrectFIO", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Значение в поле Телефонный номер не является телефонным номером.
-        /// </summary>
-        internal static string ValidationExceptionMessageIncorrectPhoneNumber {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageIncorrectPhoneNumber", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Значение в поле {0} меньше или равно 0.
-        /// </summary>
-        internal static string ValidationExceptionMessageLessOrEqualZero {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageLessOrEqualZero", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Несовершеннолетние не могут быть приняты на работу (Дата рождения: {0}).
-        /// </summary>
-        internal static string ValidationExceptionMessageMinorsBirthDate {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageMinorsBirthDate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Несовершеннолетние не могут быть приняты на работу (Дата трудоустройства: {0}, Дата рождения: {1}).
-        /// </summary>
-        internal static string ValidationExceptionMessageMinorsEmploymentDate {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageMinorsEmploymentDate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Отсутствуют компоненты.
-        /// </summary>
-        internal static string ValidationExceptionMessageNoComponents {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageNoComponents", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на В продаже должен быть хотя бы один товар.
-        /// </summary>
-        internal static string ValidationExceptionMessageNoProductsInSale {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageNoProductsInSale", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Значение в поле {0} не является типом уникального идентификатора.
-        /// </summary>
-        internal static string ValidationExceptionMessageNotAId {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageNotAId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на Значение в поле {0} не проинициализировано.
-        /// </summary>
-        internal static string ValidationExceptionMessageNotInitialized {
-            get {
-                return ResourceManager.GetString("ValidationExceptionMessageNotInitialized", resourceCulture);
-            }
-        }
-    }
-}

MagicCarpetProject/MagicCarpetContracts/Resources/Messages.en-Us.resx

@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AdapterMessageElementDeletedException" xml:space="preserve">
-    <value>The item according to the data: {0} has been deleted</value>
-  </data>
-  <data name="AdapterMessageElementNotFoundException" xml:space="preserve">
-    <value>Not found element by data: {0}</value>
-  </data>
-  <data name="AdapterMessageEmptyDate" xml:space="preserve">
-    <value>Data is empty</value>
-  </data>
-  <data name="AdapterMessageIncorrectDatesException" xml:space="preserve">
-    <value>Incorrect dates: {0}</value>
-  </data>
-  <data name="AdapterMessageInvalidOperationException" xml:space="preserve">
-    <value>Error processing data: {0}</value>
-  </data>
-  <data name="AdapterMessageStorageException" xml:space="preserve">
-    <value>Error while working with data storage: {0}</value>
-  </data>
-  <data name="AdapterMessageValidationException" xml:space="preserve">
-    <value>Incorrect data transmitted: {0}</value>
-  </data>
-  <data name="DocumentDocCaptionData" xml:space="preserve">
-    <value>Date</value>
-  </data>
-  <data name="DocumentDocCaptionPreviousNames" xml:space="preserve">
-    <value>Previous names</value>
-  </data>
-  <data name="DocumentDocCaptionTour" xml:space="preserve">
-    <value>Tour</value>
-  </data>
-  <data name="DocumentDocHeader" xml:space="preserve">
-    <value>The history of tour changes</value>
-  </data>
-  <data name="DocumentDocSubHeader" xml:space="preserve">
-    <value>Make In Date {0}</value>
-  </data>
-  <data name="DocumentExcelCaptionCount" xml:space="preserve">
-    <value>Count</value>
-  </data>
-  <data name="DocumentExcelCaptionDate" xml:space="preserve">
-    <value>Date</value>
-  </data>
-  <data name="DocumentExcelCaptionDiscount" xml:space="preserve">
-    <value>Discount</value>
-  </data>
-  <data name="DocumentExcelCaptionSum" xml:space="preserve">
-    <value>Sum</value>
-  </data>
-  <data name="DocumentExcelCaptionTotal" xml:space="preserve">
-    <value>Total</value>
-  </data>
-  <data name="DocumentExcelCaptionTour" xml:space="preserve">
-    <value>Tour</value>
-  </data>
-  <data name="DocumentExcelHeader" xml:space="preserve">
-    <value>Sales for the period</value>
-  </data>
-  <data name="DocumentExcelHeaderEmployee" xml:space="preserve">
-    <value>Employee</value>
-  </data>
-  <data name="DocumentExcelSubHeader" xml:space="preserve">
-    <value>from {0} to {1}</value>
-  </data>
-  <data name="DocumentPdfDiagramCaption" xml:space="preserve">
-    <value>Accruals</value>
-  </data>
-  <data name="DocumentPdfHeader" xml:space="preserve">
-    <value>Payroll</value>
-  </data>
-  <data name="DocumentPdfSubHeader" xml:space="preserve">
-    <value>for the period from {0} to {1}</value>
-  </data>
-  <data name="ElementDeletedExceptionMessage" xml:space="preserve">
-    <value>Cannot modify a deleted item (id: {0})</value>
-  </data>
-  <data name="ElementExistsExceptionMessage" xml:space="preserve">
-    <value>There is already an element with value {0} of parameter {1}</value>
-  </data>
-  <data name="ElementNotFoundExceptionMessage" xml:space="preserve">
-    <value>Element not found at value = {0}</value>
-  </data>
-  <data name="IncorrectDatesExceptionMessage" xml:space="preserve">
-    <value>The end date must be later than the start date.. StartDate: {0}. EndDate: {1}</value>
-  </data>
-  <data name="NotEnoughDataToProcessExceptionMessage" xml:space="preserve">
-    <value>Not enough data to process: {0}</value>
-  </data>
-  <data name="NotFoundDataMessage" xml:space="preserve">
-    <value>No data found</value>
-  </data>
-  <data name="StorageExceptionMessage" xml:space="preserve">
-    <value>Error while working in storage: {0}</value>
-  </data>
-  <data name="ValidationExceptionMessageEmploymentDateAndBirthDate" xml:space="preserve">
-    <value>Date of employment cannot be earlier than date of birth ({0}, {1})</value>
-  </data>
-  <data name="ValidationExceptionMessageEmptyField" xml:space="preserve">
-    <value>The value in field {0} is empty</value>
-  </data>
-  <data name="ValidationExceptionMessageIncorrectFIO" xml:space="preserve">
-    <value>Fio is not correct</value>
-  </data>
-  <data name="ValidationExceptionMessageIncorrectPhoneNumber" xml:space="preserve">
-    <value>The value in the Phone Number field is not a phone number.</value>
-  </data>
-  <data name="ValidationExceptionMessageLessOrEqualZero" xml:space="preserve">
-    <value>The value in field {0} is less than or equal to 0</value>
-  </data>
-  <data name="ValidationExceptionMessageMinorsBirthDate" xml:space="preserve">
-    <value>Minors cannot be hired (BirthDate = {0})</value>
-  </data>
-  <data name="ValidationExceptionMessageMinorsEmploymentDate" xml:space="preserve">
-    <value>Minors cannot be hired (EmploymentDate: {0}, BirthDate {1})</value>
-  </data>
-  <data name="ValidationExceptionMessageNoProductsInSale" xml:space="preserve">
-    <value>There must be at least one product on sale.</value>
-  </data>
-  <data name="ValidationExceptionMessageNotAId" xml:space="preserve">
-    <value>The value in the {0} field is not a unique identifier type.</value>
-  </data>
-  <data name="ValidationExceptionMessageNotInitialized" xml:space="preserve">
-    <value>The value in field {0} is not initialized</value>
-  </data>
-</root>

MagicCarpetProject/MagicCarpetContracts/Resources/Messages.resx

@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AdapterMessageElementDeletedException" xml:space="preserve">
-    <value>Элемент по данным: {0} был удален</value>
-  </data>
-  <data name="AdapterMessageElementNotFoundException" xml:space="preserve">
-    <value>Не найден элемент по данным: {0}</value>
-  </data>
-  <data name="AdapterMessageEmptyDate" xml:space="preserve">
-    <value>Данные пусты</value>
-  </data>
-  <data name="AdapterMessageIncorrectDatesException" xml:space="preserve">
-    <value>Неправильные даты: {0}</value>
-  </data>
-  <data name="AdapterMessageInvalidOperationException" xml:space="preserve">
-    <value>Ошибка при обработке данных: {0}</value>
-  </data>
-  <data name="AdapterMessageStorageException" xml:space="preserve">
-    <value>Ошибка при работе с хранилищем данных: {0}</value>
-  </data>
-  <data name="AdapterMessageValidationException" xml:space="preserve">
-    <value>Переданы неверные данные: {0}</value>
-  </data>
-  <data name="DocumentDocCaptionData" xml:space="preserve">
-    <value>Дата</value>
-  </data>
-  <data name="DocumentDocCaptionPreviousNames" xml:space="preserve">
-    <value>Предыдущие названия</value>
-  </data>
-  <data name="DocumentDocCaptionTour" xml:space="preserve">
-    <value>Тур</value>
-  </data>
-  <data name="DocumentDocHeader" xml:space="preserve">
-    <value>История изменения коктелей</value>
-  </data>
-  <data name="DocumentDocSubHeader" xml:space="preserve">
-    <value>Сформировано на дату {0}</value>
-  </data>
-  <data name="DocumentExcelCaptionCount" xml:space="preserve">
-    <value>Кол-во</value>
-  </data>
-  <data name="DocumentExcelCaptionDate" xml:space="preserve">
-    <value>Дата</value>
-  </data>
-  <data name="DocumentExcelCaptionDiscount" xml:space="preserve">
-    <value>Скидка</value>
-  </data>
-  <data name="DocumentExcelCaptionSum" xml:space="preserve">
-    <value>Сумма</value>
-  </data>
-  <data name="DocumentExcelCaptionTotal" xml:space="preserve">
-    <value>Всего</value>
-  </data>
-  <data name="DocumentExcelCaptionTour" xml:space="preserve">
-    <value>Товар</value>
-  </data>
-  <data name="DocumentExcelHeader" xml:space="preserve">
-    <value>Продажи за период</value>
-  </data>
-  <data name="DocumentExcelHeaderEmployee" xml:space="preserve">
-    <value>Работник</value>
-  </data>
-  <data name="DocumentExcelSubHeader" xml:space="preserve">
-    <value>c {0} по {1}</value>
-  </data>
-  <data name="DocumentPdfDiagramCaption" xml:space="preserve">
-    <value>Начисления</value>
-  </data>
-  <data name="DocumentPdfHeader" xml:space="preserve">
-    <value>Зарплатная ведомость</value>
-  </data>
-  <data name="DocumentPdfSubHeader" xml:space="preserve">
-    <value>за период с {0} по {1}</value>
-  </data>
-  <data name="ElementDeletedExceptionMessage" xml:space="preserve">
-    <value>Нельзя изменить удаленный элемент (идентификатор: {0})</value>
-  </data>
-  <data name="ElementExistsExceptionMessage" xml:space="preserve">
-    <value>Уже существует элемент со значением {0} параметра {1}</value>
-  </data>
-  <data name="ElementNotFoundExceptionMessage" xml:space="preserve">
-    <value>Элемент не найден по значению = {0}</value>
-  </data>
-  <data name="IncorrectDatesExceptionMessage" xml:space="preserve">
-    <value>Дата окончания должна быть позже даты начала. Дата начала: {0}. ​​Дата окончания: {1}</value>
-  </data>
-  <data name="NotEnoughDataToProcessExceptionMessage" xml:space="preserve">
-    <value>Недостаточно данных для обработки: {0}</value>
-  </data>
-  <data name="NotFoundDataMessage" xml:space="preserve">
-    <value>Не найдены данные</value>
-  </data>
-  <data name="StorageExceptionMessage" xml:space="preserve">
-    <value>Ошибка при работе в хранилище: {0}</value>
-  </data>
-  <data name="ValidationExceptionMessageEmploymentDateAndBirthDate" xml:space="preserve">
-    <value>Дата трудоустройства не может быть раньше даты рождения ({0}, {1})</value>
-  </data>
-  <data name="ValidationExceptionMessageEmptyField" xml:space="preserve">
-    <value>Значение в поле {0} пусто</value>
-  </data>
-  <data name="ValidationExceptionMessageIncorrectFIO" xml:space="preserve">
-    <value>Некорректный формат ФИО</value>
-  </data>
-  <data name="ValidationExceptionMessageIncorrectPhoneNumber" xml:space="preserve">
-    <value>Значение в поле Телефонный номер не является телефонным номером</value>
-  </data>
-  <data name="ValidationExceptionMessageLessOrEqualZero" xml:space="preserve">
-    <value>Значение в поле {0} меньше или равно 0</value>
-  </data>
-  <data name="ValidationExceptionMessageMinorsBirthDate" xml:space="preserve">
-    <value>Несовершеннолетние не могут быть приняты на работу (Дата рождения: {0})</value>
-  </data>
-  <data name="ValidationExceptionMessageMinorsEmploymentDate" xml:space="preserve">
-    <value>Несовершеннолетние не могут быть приняты на работу (Дата трудоустройства: {0}, Дата рождения: {1})</value>
-  </data>
-  <data name="ValidationExceptionMessageNoProductsInSale" xml:space="preserve">
-    <value>В продаже должен быть хотя бы один товар</value>
-  </data>
-  <data name="ValidationExceptionMessageNotAId" xml:space="preserve">
-    <value>Значение в поле {0} не является типом уникального идентификатора</value>
-  </data>
-  <data name="ValidationExceptionMessageNotInitialized" xml:space="preserve">
-    <value>Значение в поле {0} не проинициализировано</value>
-  </data>
-</root>

MagicCarpetProject/MagicCarpetContracts/Resources/Messages.zh-CN.resx

@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AdapterMessageElementDeletedException" xml:space="preserve">
-    <value>根据数据的项目：{0}已被删除</value>
-  </data>
-  <data name="AdapterMessageElementNotFoundException" xml:space="preserve">
-    <value>未找到元素数据: {0}</value>
-  </data>
-  <data name="AdapterMessageEmptyDate" xml:space="preserve">
-    <value>数据为空</value>
-  </data>
-  <data name="AdapterMessageIncorrectDatesException" xml:space="preserve">
-    <value>不正确的日期：{0}</value>
-  </data>
-  <data name="AdapterMessageInvalidOperationException" xml:space="preserve">
-    <value>数据处理过程中的错误：{0}</value>
-  </data>
-  <data name="AdapterMessageStorageException" xml:space="preserve">
-    <value>使用数据仓库时出错：{0}</value>
-  </data>
-  <data name="AdapterMessageValidationException" xml:space="preserve">
-    <value>传递的数据不正确: {0}</value>
-  </data>
-  <data name="DocumentDocCaptionData" xml:space="preserve">
-    <value>日期</value>
-  </data>
-  <data name="DocumentDocCaptionPreviousNames" xml:space="preserve">
-    <value>以前的名字</value>
-  </data>
-  <data name="DocumentDocCaptionTour" xml:space="preserve">
-    <value>旅游</value>
-  </data>
-  <data name="DocumentDocHeader" xml:space="preserve">
-    <value>鸡尾酒变化的历史</value>
-  </data>
-  <data name="DocumentDocSubHeader" xml:space="preserve">
-    <value>在日期{0}生成</value>
-  </data>
-  <data name="DocumentExcelCaptionCount" xml:space="preserve">
-    <value>数量</value>
-  </data>
-  <data name="DocumentExcelCaptionDate" xml:space="preserve">
-    <value>日期</value>
-  </data>
-  <data name="DocumentExcelCaptionDiscount" xml:space="preserve">
-    <value>折扣优惠</value>
-  </data>
-  <data name="DocumentExcelCaptionSum" xml:space="preserve">
-    <value>金额</value>
-  </data>
-  <data name="DocumentExcelCaptionTotal" xml:space="preserve">
-    <value>总计</value>
-  </data>
-  <data name="DocumentExcelCaptionTour" xml:space="preserve">
-    <value>旅游</value>
-  </data>
-  <data name="DocumentExcelHeader" xml:space="preserve">
-    <value>期间的销售额</value>
-  </data>
-  <data name="DocumentExcelHeaderEmployee" xml:space="preserve">
-    <value>工人</value>
-  </data>
-  <data name="DocumentExcelSubHeader" xml:space="preserve">
-    <value>从{0}到{1}</value>
-  </data>
-  <data name="DocumentPdfDiagramCaption" xml:space="preserve">
-    <value>应计事项</value>
-  </data>
-  <data name="DocumentPdfHeader" xml:space="preserve">
-    <value>薪金表</value>
-  </data>
-  <data name="DocumentPdfSubHeader" xml:space="preserve">
-    <value>从{0}到{1}的期间</value>
-  </data>
-  <data name="ElementDeletedExceptionMessage" xml:space="preserve">
-    <value>无法更改已删除的项目(id:{0})</value>
-  </data>
-  <data name="ElementExistsExceptionMessage" xml:space="preserve">
-    <value>已经有一个具有参数{1}的值{0}的元素</value>
-  </data>
-  <data name="ElementNotFoundExceptionMessage" xml:space="preserve">
-    <value>值={0}未找到该元素</value>
-  </data>
-  <data name="IncorrectDatesExceptionMessage" xml:space="preserve">
-    <value>结束日期必须晚于开始日期。 开始日期：{0}。 ​​结束日期：{1}</value>
-  </data>
-  <data name="NotEnoughDataToProcessExceptionMessage" xml:space="preserve">
-    <value>处理数据不足：{0}</value>
-  </data>
-  <data name="NotFoundDataMessage" xml:space="preserve">
-    <value>未找到数据</value>
-  </data>
-  <data name="StorageExceptionMessage" xml:space="preserve">
-    <value>在存储中工作时出错：{0}</value>
-  </data>
-  <data name="ValidationExceptionMessageEmploymentDateAndBirthDate" xml:space="preserve">
-    <value>就业日期不能早于出生日期({0},{1})</value>
-  </data>
-  <data name="ValidationExceptionMessageEmptyField" xml:space="preserve">
-    <value>字段 {0} 的值为空</value>
-  </data>
-  <data name="ValidationExceptionMessageIncorrectFIO" xml:space="preserve">
-    <value>名称格式不正确</value>
-  </data>
-  <data name="ValidationExceptionMessageIncorrectPhoneNumber" xml:space="preserve">
-    <value>电话号码字段中的值不是电话号码</value>
-  </data>
-  <data name="ValidationExceptionMessageLessOrEqualZero" xml:space="preserve">
-    <value>{0}字段中的值小于或等于0</value>
-  </data>
-  <data name="ValidationExceptionMessageMinorsBirthDate" xml:space="preserve">
-    <value>未成年人不能就业（出生日期：{0})</value>
-  </data>
-  <data name="ValidationExceptionMessageMinorsEmploymentDate" xml:space="preserve">
-    <value>未成年人不能就业（就业日期：{0}，出生日期：{1})</value>
-  </data>
-  <data name="ValidationExceptionMessageNoProductsInSale" xml:space="preserve">
-    <value>必须至少有一种产品在售。</value>
-  </data>
-  <data name="ValidationExceptionMessageNotAId" xml:space="preserve">
-    <value>字段 {0} 的值不是唯一标识符类型</value>
-  </data>
-  <data name="ValidationExceptionMessageNotInitialized" xml:space="preserve">
-    <value>{0}字段中的值未初始化</value>
-  </data>
-</root>

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/IAgencyStorageContract.cs

@@ -0,0 +1,18 @@
+using MagicCarpetContracts.DataModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.StoragesContracts;
+
+public interface IAgencyStorageContract
+{
+    List<AgencyDataModel> GetList();
+    AgencyDataModel GetElementById(string id);
+    void AddElement(AgencyDataModel agencyDataModel);
+    void UpdElement(AgencyDataModel agencyDataModel);
+    void DelElement(string id);
+    bool CheckComponents(SaleDataModel saleDataModel);
+}

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/IClientStorageContract.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.StoragesContracts;
 
-internal interface IClientStorageContract
+public interface IClientStorageContract
 {
     List<ClientDataModel> GetList();
 

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/IEmployeeStorageContract.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.StoragesContracts;
 
-internal interface IEmployeeStorageContract
+public interface IEmployeeStorageContract
 {
     List<EmployeeDataModel> GetList(bool onlyActive = true, string? postId = null, DateTime? fromBirthDate = null,
         DateTime? toBirthDate = null, DateTime? fromEmploymentDate = null, DateTime? toEmploymentDate = null);
@@ -23,6 +23,4 @@ internal interface IEmployeeStorageContract
     void UpdElement(EmployeeDataModel employeeDataModel);
 
     void DelElement(string id);
-
-    int GetEmployeeTrend(DateTime fromPeriod, DateTime toPeriod);
 }

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/IPostStorageContract.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.StoragesContracts;
 
-internal interface IPostStorageContract
+public interface IPostStorageContract
 {
     List<PostDataModel> GetList();
     List<PostDataModel> GetPostWithHistory(string postId);

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/ISalaryStorageContract.cs

@@ -7,11 +7,9 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.StoragesContracts;
 
-internal interface ISalaryStorageContract
+public interface ISalaryStorageContract
 {
     List<SalaryDataModel> GetList(DateTime? startDate, DateTime? endDate, string? employeeId = null);
 
-    Task<List<SalaryDataModel>> GetListAsync(DateTime startDate, DateTime endDate, CancellationToken ct);
-
     void AddElement(SalaryDataModel salaryDataModel);
 }

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/ISaleStorageContract.cs

@@ -7,13 +7,11 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.StoragesContracts;
 
-internal interface ISaleStorageContract
+public interface ISaleStorageContract
 {
     List<SaleDataModel> GetList(DateTime? startDate = null, DateTime? endDate = null, string? employeeId = null, 
         string? clientId = null, string? tourId = null);
 
-    Task<List<SaleDataModel>> GetListAsync(DateTime startDate, DateTime endDate, CancellationToken ct);
-
     SaleDataModel? GetElementById(string id);
 
     void AddElement(SaleDataModel saleDataModel);

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/ISuppliesStorageContract.cs

@@ -0,0 +1,16 @@
+using MagicCarpetContracts.DataModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetContracts.StoragesContracts;
+
+public interface ISuppliesStorageContract
+{
+    List<SuppliesDataModel> GetList(DateTime? startDate = null);
+    SuppliesDataModel GetElementById(string id);
+    void AddElement(SuppliesDataModel suppliesDataModel);
+    void UpdElement(SuppliesDataModel suppliesDataModel);
+}

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/ITourStorageContract.cs

@@ -7,11 +7,10 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.StoragesContracts;
 
-internal interface ITourStorageContract
+public interface ITourStorageContract
 {
     List<TourDataModel> GetList();
     List<TourHistoryDataModel> GetHistoryByTourId(string tourId);
-    Task<List<TourHistoryDataModel>> GetHistoriesListAsync(CancellationToken ct);
     TourDataModel? GetElementById(string id);
     TourDataModel? GetElementByName(string name);
     void AddElement(TourDataModel tourDataModel);

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/EmployeeSalaryByPeriodViewModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetContracts.ViewModels;
-
-public class EmployeeSalaryByPeriodViewModel
-{
-    public required string EmployeeFIO { get; set; }
-    public double TotalSalary { get; set; }
-    public DateTime FromPeriod { get; set; }
-    public DateTime ToPeriod { get; set; }
-}

MagicCarpetProject/MagicCarpetContracts/ViewModels/PostViewModel.cs

@@ -14,5 +14,5 @@ public class PostViewModel
 
     public required string PostType { get; set; }
 
-    public required string Configuration { get; set; }
+    public double Salary { 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/TourAndTourHistoryViewModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetContracts.ViewModels;
-
-public class TourAndTourHistoryViewModel
-{
-    public required string TourName { get; set; }
-    public required List<string> Histories { get; set; }
-    public required List<string> Data { 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/MagicCarpetDatabase/DefaultConfigurationDatabase.cs

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

MagicCarpetProject/MagicCarpetDatabase/Implementations/AgencyStorageContract.cs

@@ -0,0 +1,140 @@
+using AutoMapper;
+using MagicCarpetContracts.DataModels;
+using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.StoragesContracts;
+using MagicCarpetDatabase.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetDatabase.Implementations;
+
+public class AgencyStorageContract : IAgencyStorageContract
+{
+    private readonly MagicCarpetDbContext _dbContext;
+    private readonly Mapper _mapper;
+
+    public AgencyStorageContract(MagicCarpetDbContext dbContext)
+    {
+        _dbContext = dbContext;
+        var config = new MapperConfiguration(cfg =>
+        {
+            cfg.AddMaps(typeof(TourAgency));
+            cfg.AddMaps(typeof(Agency));
+        });
+        _mapper = new Mapper(config);
+    }
+
+    public List<AgencyDataModel> GetList()
+    {
+        try
+        {
+            return [.. _dbContext.Agencies.Select(x => _mapper.Map<AgencyDataModel>(x))];
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    public AgencyDataModel GetElementById(string id)
+    {
+        try
+        {
+            return _mapper.Map<AgencyDataModel>(GetAgencyById(id));
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    public void AddElement(AgencyDataModel agencyDataModel)
+    {
+        try
+        {
+            _dbContext.Agencies.Add(_mapper.Map<Agency>(agencyDataModel));
+            _dbContext.SaveChanges();
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    public void UpdElement(AgencyDataModel agencyDataModel)
+    {
+        try
+        {
+            var element = GetAgencyById(agencyDataModel.Id) ?? throw new ElementNotFoundException(agencyDataModel.Id);
+            _dbContext.Agencies.Update(_mapper.Map(agencyDataModel, element));
+            _dbContext.SaveChanges();
+        }
+        catch (ElementNotFoundException)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    public void DelElement(string id)
+    {
+        try
+        {
+            var element = GetAgencyById(id) ?? throw new ElementNotFoundException(id);
+            _dbContext.Agencies.Remove(element);
+            _dbContext.SaveChanges();
+        }
+        catch (ElementNotFoundException)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    public bool CheckComponents(SaleDataModel saleDataModel)
+    {
+        using (var transaction = _dbContext.Database.BeginTransaction())
+        {
+            foreach (SaleTourDataModel sale_tour in saleDataModel.Tours)
+            {
+                var tour = _dbContext.Tours.FirstOrDefault(x => x.Id == sale_tour.TourId);
+                var agency = _dbContext.Agencies.FirstOrDefault(x => x.TourType == tour.TourType && x.Count >= sale_tour.Count);
+
+                if (agency == null)
+                {
+                    transaction.Rollback();
+                    return false;
+                }
+                if (agency.Count - sale_tour.Count == 0)
+                {
+                    DelElement(agency.Id);
+                }
+                else
+                {
+                    agency.Count -= sale_tour.Count;
+                }
+            }
+            transaction.Commit();
+            _dbContext.SaveChanges();
+            return true;
+        }
+    }
+
+    private Agency? GetAgencyById(string id) => _dbContext.Agencies.FirstOrDefault(x => x.Id == id);
+}

MagicCarpetProject/MagicCarpetDatabase/Implementations/ClientStorageContract.cs

@@ -1,11 +1,9 @@
 using AutoMapper;
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
 using MagicCarpetDatabase.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Localization;
 using Npgsql;
 using System;
 using System.Collections.Generic;
@@ -15,12 +13,11 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class ClientStorageContract : IClientStorageContract
+public class ClientStorageContract : IClientStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
-    private readonly IStringLocalizer<Messages> _localizer;
-    public ClientStorageContract(MagicCarpetDbContext magicCarpetDbContext, IStringLocalizer<Messages> localizer)
+    public ClientStorageContract(MagicCarpetDbContext magicCarpetDbContext)
     {
         _dbContext = magicCarpetDbContext;
         var config = new MapperConfiguration(cfg =>
@@ -28,7 +25,6 @@ internal class ClientStorageContract : IClientStorageContract
             cfg.AddMaps(typeof(MagicCarpetDbContext).Assembly);
         });
         _mapper = new Mapper(config);
-        _localizer = localizer;
     }
     public List<ClientDataModel> GetList()
     {
@@ -39,7 +35,7 @@ internal class ClientStorageContract : IClientStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
     public ClientDataModel? GetElementById(string id)
@@ -51,7 +47,7 @@ internal class ClientStorageContract : IClientStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
     public ClientDataModel? GetElementByFIO(string fio)
@@ -63,7 +59,7 @@ internal class ClientStorageContract : IClientStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
     public ClientDataModel? GetElementByPhoneNumber(string phoneNumber)
@@ -75,7 +71,7 @@ internal class ClientStorageContract : IClientStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
     public void AddElement(ClientDataModel clientDataModel)
@@ -88,24 +84,24 @@ internal class ClientStorageContract : IClientStorageContract
         catch (InvalidOperationException ex) when (ex.TargetSite?.Name == "ThrowIdentityConflict")
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("Id", clientDataModel.Id, _localizer);
+            throw new ElementExistsException("Id", clientDataModel.Id);
         }
         catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Clients_PhoneNumber" })
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("PhoneNumber", clientDataModel.PhoneNumber, _localizer);
+            throw new ElementExistsException("PhoneNumber", clientDataModel.PhoneNumber);
         }
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
     public void UpdElement(ClientDataModel clientDataModel)
     {
         try
         {
-            var element = GetClientById(clientDataModel.Id) ?? throw new ElementNotFoundException(clientDataModel.Id, _localizer);
+            var element = GetClientById(clientDataModel.Id) ?? throw new ElementNotFoundException(clientDataModel.Id);
             _dbContext.Clients.Update(_mapper.Map(clientDataModel, element));
             _dbContext.SaveChanges();
         }
@@ -117,19 +113,19 @@ internal class ClientStorageContract : IClientStorageContract
         catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Clients_PhoneNumber" })
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("PhoneNumber", clientDataModel.PhoneNumber, _localizer);
+            throw new ElementExistsException("PhoneNumber", clientDataModel.PhoneNumber);
         }
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
     public void DelElement(string id)
     {
         try
         {
-            var element = GetClientById(id) ?? throw new ElementNotFoundException(id, _localizer);
+            var element = GetClientById(id) ?? throw new ElementNotFoundException(id);
             _dbContext.Clients.Remove(element);
             _dbContext.SaveChanges();
         }
@@ -141,7 +137,7 @@ internal class ClientStorageContract : IClientStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
     private Client? GetClientById(string id) => _dbContext.Clients.FirstOrDefault(x => x.Id == id);

MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs

@@ -1,12 +1,8 @@
 using AutoMapper;
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
 using MagicCarpetDatabase.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Localization;
-using Npgsql;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,12 +11,12 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class EmployeeStorageContract : IEmployeeStorageContract
+public class EmployeeStorageContract : IEmployeeStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
-    private readonly IStringLocalizer<Messages> _localizer;
-    public EmployeeStorageContract(MagicCarpetDbContext dbContext, IStringLocalizer<Messages> localizer)
+
+    public EmployeeStorageContract(MagicCarpetDbContext dbContext)
     {
         _dbContext = dbContext;
         var config = new MapperConfiguration(cfg =>
@@ -31,7 +27,6 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
             cfg.CreateMap<EmployeeDataModel, Employee>();
         });
         _mapper = new Mapper(config);
-        _localizer = localizer;
     }
 
     public List<EmployeeDataModel> GetList(bool onlyActive = true, string? postId = null, DateTime? fromBirthDate = null, DateTime? toBirthDate = null, DateTime? fromEmploymentDate = null, DateTime? toEmploymentDate = null)
@@ -60,7 +55,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -73,7 +68,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -86,7 +81,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -99,7 +94,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -113,17 +108,12 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         catch (InvalidOperationException ex) when (ex.TargetSite?.Name == "ThrowIdentityConflict")
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("Id", employeeDataModel.Id, _localizer);
-        }
-        catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "PK_Employees" })
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("Id", employeeDataModel.Id, _localizer);
+            throw new ElementExistsException("Id", employeeDataModel.Id);
         }
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -131,7 +121,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
     {
         try
         {
-            var element = GetEmployeeById(employeeDataModel.Id) ?? throw new ElementNotFoundException(employeeDataModel.Id, _localizer);
+            var element = GetEmployeeById(employeeDataModel.Id) ?? throw new ElementNotFoundException(employeeDataModel.Id);
             _dbContext.Employees.Update(_mapper.Map(employeeDataModel, element));
             _dbContext.SaveChanges();
         }
@@ -143,7 +133,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -151,7 +141,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
     {
         try
         {
-            var element = GetEmployeeById(id) ?? throw new ElementNotFoundException(id, _localizer);
+            var element = GetEmployeeById(id) ?? throw new ElementNotFoundException(id);
             element.IsDeleted = true;
             _dbContext.SaveChanges();
         }
@@ -163,22 +153,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
-        }
-    }
-
-    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, _localizer);
+            throw new StorageException(ex);
         }
     }
 

MagicCarpetProject/MagicCarpetDatabase/Implementations/PostStorageContract.cs

@@ -1,11 +1,9 @@
 using AutoMapper;
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
 using MagicCarpetDatabase.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Localization;
 using Npgsql;
 using System;
 using System.Collections.Generic;
@@ -15,13 +13,12 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class PostStorageContract : IPostStorageContract
+public class PostStorageContract : IPostStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
-    private readonly IStringLocalizer<Messages> _localizer;
 
-    public PostStorageContract(MagicCarpetDbContext dbContext, IStringLocalizer<Messages> localizer)
+    public PostStorageContract(MagicCarpetDbContext dbContext)
     {
         _dbContext = dbContext;
         var config = new MapperConfiguration(cfg =>
@@ -32,12 +29,9 @@ 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.Configuration, x => x.MapFrom(src =>
-                    src.ConfigurationModel));
+                .ForMember(x => x.ChangeDate, x => x.MapFrom(src => DateTime.UtcNow));
         });
         _mapper = new Mapper(config);
-        _localizer = localizer;
     }
 
     public List<PostDataModel> GetList()
@@ -49,7 +43,7 @@ internal class PostStorageContract : IPostStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -62,7 +56,7 @@ internal class PostStorageContract : IPostStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -75,7 +69,7 @@ internal class PostStorageContract : IPostStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -88,7 +82,7 @@ internal class PostStorageContract : IPostStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -102,17 +96,17 @@ internal class PostStorageContract : IPostStorageContract
         catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Posts_PostName_IsActual" })
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("PostName", postDataModel.PostName, _localizer);
+            throw new ElementExistsException("PostName", postDataModel.PostName);
         }
         catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Posts_PostId_IsActual" })
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("PostId", postDataModel.Id, _localizer);
+            throw new ElementExistsException("PostId", postDataModel.Id);
         }
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -123,10 +117,10 @@ internal class PostStorageContract : IPostStorageContract
             var transaction = _dbContext.Database.BeginTransaction();
             try
             {
-                var element = GetPostById(postDataModel.Id) ?? throw new ElementNotFoundException(postDataModel.Id, _localizer);
+                var element = GetPostById(postDataModel.Id) ?? throw new ElementNotFoundException(postDataModel.Id);
                 if (!element.IsActual)
                 {
-                    throw new ElementDeletedException(postDataModel.Id, _localizer);
+                    throw new ElementDeletedException(postDataModel.Id);
                 }
                 element.IsActual = false;
                 _dbContext.SaveChanges();
@@ -144,7 +138,7 @@ internal class PostStorageContract : IPostStorageContract
         catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Posts_PostName_IsActual" })
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("PostName", postDataModel.PostName, _localizer);
+            throw new ElementExistsException("PostName", postDataModel.PostName);
         }
         catch (Exception ex) when (ex is ElementDeletedException || ex is ElementNotFoundException)
         {
@@ -154,7 +148,7 @@ internal class PostStorageContract : IPostStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -162,10 +156,10 @@ internal class PostStorageContract : IPostStorageContract
     {
         try
         {
-            var element = GetPostById(id) ?? throw new ElementNotFoundException(id, _localizer);
+            var element = GetPostById(id) ?? throw new ElementNotFoundException(id);
             if (!element.IsActual)
             {
-                throw new ElementDeletedException(id, _localizer);
+                throw new ElementDeletedException(id);
             }
             element.IsActual = false;
             _dbContext.SaveChanges();
@@ -181,7 +175,7 @@ internal class PostStorageContract : IPostStorageContract
     {
         try
         {
-            var element = GetPostById(id) ?? throw new ElementNotFoundException(id, _localizer);
+            var element = GetPostById(id) ?? throw new ElementNotFoundException(id);
             element.IsActual = true;
             _dbContext.SaveChanges();
         }

MagicCarpetProject/MagicCarpetDatabase/Implementations/SalaryStorageContract.cs

@@ -1,11 +1,9 @@
 using AutoMapper;
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
 using MagicCarpetDatabase.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,13 +12,12 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class SalaryStorageContract : ISalaryStorageContract
+public class SalaryStorageContract : ISalaryStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
-    private readonly IStringLocalizer<Messages> _localizer;
 
-    public SalaryStorageContract(MagicCarpetDbContext dbContext, IStringLocalizer<Messages> localizer)
+    public SalaryStorageContract(MagicCarpetDbContext dbContext)
     {
         _dbContext = dbContext;
         var config = new MapperConfiguration(cfg =>
@@ -31,7 +28,6 @@ internal class SalaryStorageContract : ISalaryStorageContract
                 .ForMember(dest => dest.EmployeeSalary, opt => opt.MapFrom(src => src.Salary));
         });
         _mapper = new Mapper(config);
-        _localizer = localizer;
     }
 
     public List<SalaryDataModel> GetList(DateTime? startDate, DateTime? endDate, string? employeeId = null)
@@ -50,23 +46,7 @@ internal class SalaryStorageContract : ISalaryStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
-        }
-    }
-
-    public async Task<List<SalaryDataModel>> GetListAsync(DateTime startDate, DateTime endDate, CancellationToken ct)
-    {
-        try
-        {
-            return [.. await _dbContext.Salaries.Include(x =>
-                x.Employee).Where(x => x.SalaryDate >= DateTime.SpecifyKind(startDate, DateTimeKind.Utc) &&
-                                      x.SalaryDate <= DateTime.SpecifyKind(endDate, DateTimeKind.Utc))
-                .Select(x => _mapper.Map<SalaryDataModel>(x)).ToListAsync(ct)];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -80,7 +60,7 @@ internal class SalaryStorageContract : ISalaryStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 }

MagicCarpetProject/MagicCarpetDatabase/Implementations/SaleStorageContract.cs

@@ -1,11 +1,9 @@
 using AutoMapper;
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
 using MagicCarpetDatabase.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,13 +12,12 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class SaleStorageContract : ISaleStorageContract
+public class SaleStorageContract : ISaleStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
-    private readonly IStringLocalizer<Messages> _localizer;
 
-    public SaleStorageContract(MagicCarpetDbContext dbContext, IStringLocalizer<Messages> localizer)
+    public SaleStorageContract(MagicCarpetDbContext dbContext)
     {
         _dbContext = dbContext;
         var config = new MapperConfiguration(cfg =>
@@ -39,7 +36,6 @@ internal class SaleStorageContract : ISaleStorageContract
                 .ForMember(x => x.Client, x => x.Ignore());
         });
         _mapper = new Mapper(config);
-        _localizer = localizer;
     }
 
     public List<SaleDataModel> GetList(DateTime? startDate = null, DateTime? endDate = null, string? employeeId = null, string? clientId = null, string? tourId = null)
@@ -68,28 +64,7 @@ internal class SaleStorageContract : ISaleStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
-        }
-    }
-
-    public async Task<List<SaleDataModel>> GetListAsync(DateTime startDate, DateTime endDate, CancellationToken ct)
-    {
-        try
-        {
-            return [.. await _dbContext.Sales
-                .Include(x => x.Employee)
-                .Include(x => x.Client)
-                .Include(x => x.SaleTours)!
-                    .ThenInclude(sc => sc.Tour)
-                .Where(x => x.SaleDate >= DateTime.SpecifyKind(startDate, DateTimeKind.Utc)
-                         && x.SaleDate < DateTime.SpecifyKind(endDate, DateTimeKind.Utc))
-                .Select(x => _mapper.Map<SaleDataModel>(x))
-                .ToListAsync(ct)];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -102,7 +77,7 @@ internal class SaleStorageContract : ISaleStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -116,7 +91,7 @@ internal class SaleStorageContract : ISaleStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -124,10 +99,10 @@ internal class SaleStorageContract : ISaleStorageContract
     {
         try
         {
-            var element = GetSaleById(id) ?? throw new ElementNotFoundException(id, _localizer);
+            var element = GetSaleById(id) ?? throw new ElementNotFoundException(id);
             if (element.IsCancel)
             {
-                throw new ElementDeletedException(id, _localizer);
+                throw new ElementDeletedException(id);
             }
             element.IsCancel = true;
             _dbContext.SaveChanges();
@@ -140,7 +115,7 @@ internal class SaleStorageContract : ISaleStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 

MagicCarpetProject/MagicCarpetDatabase/Implementations/SuppliesStorageContract.cs

@@ -0,0 +1,100 @@
+using AutoMapper;
+using MagicCarpetContracts.DataModels;
+using MagicCarpetContracts.Exceptions;
+using MagicCarpetContracts.StoragesContracts;
+using MagicCarpetDatabase.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetDatabase.Implementations;
+
+public class SuppliesStorageContract : ISuppliesStorageContract
+{
+    private readonly MagicCarpetDbContext _dbContext;
+    private readonly Mapper _mapper;
+
+    public SuppliesStorageContract(MagicCarpetDbContext dbContext)
+    {
+        _dbContext = dbContext;
+        var config = new MapperConfiguration(cfg =>
+        {
+            cfg.CreateMap<Supplies, SuppliesDataModel>()
+       .ConstructUsing(src => new SuppliesDataModel(
+           src.Id,
+           src.Type,
+           src.ProductuionDate,
+           src.Count,
+           _mapper.Map<List<TourSuppliesDataModel>>(src.Tours)
+       ));
+
+            cfg.CreateMap<SuppliesDataModel, Supplies>();
+            cfg.CreateMap<TourSuppliesDataModel, TourSupplies>().ReverseMap();
+        });
+        _mapper = new Mapper(config);
+    }
+
+    public List<SuppliesDataModel> GetList(DateTime? startDate = null)
+    {
+        try
+        {
+            return [.. _dbContext.Supplieses.Select(x => _mapper.Map<SuppliesDataModel>(x))];
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    public SuppliesDataModel GetElementById(string id)
+    {
+        try
+        {
+            return _mapper.Map<SuppliesDataModel>(GetSuppliesById(id));
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    public void AddElement(SuppliesDataModel suppliesDataModel)
+    {
+        try
+        {
+            _dbContext.Supplieses.Add(_mapper.Map<Supplies>(suppliesDataModel));
+            _dbContext.SaveChanges();
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    public void UpdElement(SuppliesDataModel suppliesDataModel)
+    {
+        try
+        {
+            var element = GetSuppliesById(suppliesDataModel.Id) ?? throw new ElementNotFoundException(suppliesDataModel.Id);
+            _dbContext.Supplieses.Update(_mapper.Map(suppliesDataModel, element));
+            _dbContext.SaveChanges();
+        }
+        catch (ElementNotFoundException)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _dbContext.ChangeTracker.Clear();
+            throw new StorageException(ex);
+        }
+    }
+
+    private Supplies? GetSuppliesById(string id) => _dbContext.Supplieses.FirstOrDefault(x => x.Id == id);
+}

MagicCarpetProject/MagicCarpetDatabase/Implementations/TourStorageContract.cs

@@ -1,37 +1,34 @@
 using AutoMapper;
 using MagicCarpetContracts.DataModels;
 using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.Resources;
 using MagicCarpetContracts.StoragesContracts;
 using MagicCarpetDatabase.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Localization;
 using Npgsql;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase.Implementations;
 
-internal class TourStorageContract : ITourStorageContract
+public class TourStorageContract : ITourStorageContract
 {
     private readonly MagicCarpetDbContext _dbContext;
     private readonly Mapper _mapper;
-    private readonly IStringLocalizer<Messages> _localizer;
 
-    public TourStorageContract(MagicCarpetDbContext dbContext, IStringLocalizer<Messages> localizer)
+    public TourStorageContract(MagicCarpetDbContext dbContext)
     {
         _dbContext = dbContext;
         var config = new MapperConfiguration(cfg =>
         {
             cfg.CreateMap<Tour, TourDataModel>();
             cfg.CreateMap<TourDataModel, Tour>();
-            cfg.CreateMap<TourHistory, TourHistoryDataModel>();
+            cfg.CreateMap<TourHistory, TourHistoryDataModel>(); ;
         });
         _mapper = new Mapper(config);
-        _localizer = localizer;
     }
 
     public List<TourDataModel> GetList()
@@ -43,7 +40,7 @@ internal class TourStorageContract : ITourStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -56,20 +53,7 @@ internal class TourStorageContract : ITourStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
-        }
-    }
-
-    public async Task<List<TourHistoryDataModel>> GetHistoriesListAsync(CancellationToken ct)
-    {
-        try
-        {
-            return [.. await _dbContext.TourHistories.Include(x => x.Tour).Select(x => _mapper.Map<TourHistoryDataModel>(x)).ToListAsync(ct)];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -82,7 +66,7 @@ internal class TourStorageContract : ITourStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -95,7 +79,7 @@ internal class TourStorageContract : ITourStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -109,17 +93,17 @@ internal class TourStorageContract : ITourStorageContract
         catch (InvalidOperationException ex) when (ex.TargetSite?.Name == "ThrowIdentityConflict")
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("Id", tourDataModel.Id, _localizer);
+            throw new ElementExistsException("Id", tourDataModel.Id);
         }
         catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Tours_TourName" })
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("TourName", tourDataModel.TourName, _localizer);
+            throw new ElementExistsException("TourName", tourDataModel.TourName);
         }
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -130,7 +114,7 @@ internal class TourStorageContract : ITourStorageContract
             var transaction = _dbContext.Database.BeginTransaction();
             try
             {
-                var element = GetTourById(tourDataModel.Id) ?? throw new ElementNotFoundException(tourDataModel.Id, _localizer);
+                var element = GetTourById(tourDataModel.Id) ?? throw new ElementNotFoundException(tourDataModel.Id);
                 if (element.Price != tourDataModel.Price)
                 {
                     _dbContext.TourHistories.Add(new TourHistory() { TourId = element.Id, OldPrice = element.Price });
@@ -149,7 +133,7 @@ internal class TourStorageContract : ITourStorageContract
         catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Tours_TourName" })
         {
             _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("TourName", tourDataModel.TourName, _localizer);
+            throw new ElementExistsException("TourName", tourDataModel.TourName);
         }
         catch (Exception ex) when (ex is ElementDeletedException || ex is ElementNotFoundException)
         {
@@ -159,7 +143,7 @@ internal class TourStorageContract : ITourStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -167,7 +151,7 @@ internal class TourStorageContract : ITourStorageContract
     {
         try
         {
-            var element = GetTourById(id) ?? throw new ElementNotFoundException(id, _localizer);
+            var element = GetTourById(id) ?? throw new ElementNotFoundException(id);
             _dbContext.Tours.Remove(element);
             _dbContext.SaveChanges();
         }
@@ -179,7 +163,7 @@ internal class TourStorageContract : ITourStorageContract
         catch (Exception ex)
         {
             _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex, _localizer);
+            throw new StorageException(ex);
         }
     }
 
@@ -187,7 +171,7 @@ internal class TourStorageContract : ITourStorageContract
     {
         try
         {
-            var element = GetTourById(id) ?? throw new ElementNotFoundException(id, _localizer);
+            var element = GetTourById(id) ?? throw new ElementNotFoundException(id);
             _dbContext.SaveChanges();
         }
         catch

MagicCarpetProject/MagicCarpetDatabase/MagicCarpetDatabase.csproj

@@ -8,22 +8,13 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="14.0.0" />
-    <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="Microsoft.EntityFrameworkCore" Version="9.0.2" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MagicCarpetContracts\MagicCarpetContracts.csproj" />
   </ItemGroup>
-	<ItemGroup>
-		<InternalsVisibleTo Include="MagicCarpetTests" />
-		<InternalsVisibleTo Include="MagicCarpetWebApi" />
-	</ItemGroup>
 
 
 </Project>

MagicCarpetProject/MagicCarpetDatabase/MagicCarpetDbContext.cs

@@ -1,9 +1,6 @@
 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;
@@ -12,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetDatabase;
 
-internal class MagicCarpetDbContext(IConfigurationDatabase configurationDatabase) : DbContext
+public class MagicCarpetDbContext(IConfigurationDatabase configurationDatabase) : DbContext
 {
     private readonly IConfigurationDatabase? _configurationDatabase = configurationDatabase;
 
@@ -47,12 +44,9 @@ internal class MagicCarpetDbContext(IConfigurationDatabase configurationDatabase
 
         modelBuilder.Entity<SaleTour>().HasKey(x => new { x.SaleId, x.TourId });
 
-        modelBuilder.Entity<Post>()
-           .Property(x => x.Configuration)
-           .HasColumnType("jsonb")
-           .HasConversion(
-           x => SerializePostConfiguration(x),
-           x => DeserialzePostConfiguration(x));
+        modelBuilder.Entity<TourSupplies>().HasKey(x => new { x.SuppliesId, x.TourId });
+
+        modelBuilder.Entity<TourAgency>().HasKey(x => new { x.AgencyId, x.TourId });
     }
 
     public DbSet<Client> Clients { get; set; }
@@ -70,12 +64,8 @@ internal class MagicCarpetDbContext(IConfigurationDatabase configurationDatabase
     public DbSet<SaleTour> SaleTours { get; set; }
 
     public DbSet<Employee> Employees { 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)!,
-    };
+    public DbSet<Supplies> Supplieses { get; set; }
+    public DbSet<Agency> Agencies { get; set; }
+    public DbSet<TourSupplies> TourSupplieses { get; set; }
+    public DbSet<TourAgency> TourAgensies { get; set; }
 }

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

@@ -1,333 +0,0 @@
-// <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

@@ -1,253 +0,0 @@
-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

@@ -1,337 +0,0 @@
-// <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

@@ -1,51 +0,0 @@
-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

@@ -1,334 +0,0 @@
-// <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

@@ -0,0 +1,22 @@
+using AutoMapper;
+using MagicCarpetContracts.DataModels;
+using MagicCarpetContracts.Enums;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MagicCarpetDatabase.Models;
+
+[AutoMap(typeof(AgencyDataModel), ReverseMap = true)] 
+public class Agency
+{
+    public required string Id { get; set; }
+    public required TourType TourType { get; set; }
+    public required int Count { get; set; }
+
+    [ForeignKey("AgencyId")]
+    public List<TourAgency>? Tours { get; set; }
+}