поправка

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/ClientBusinessLogicContract.cs

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

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/EmployeeBusinessLogicContract.cs

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

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/PostBusinessLogicContract.cs

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

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SalaryBusinessLogicContract.cs

@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
-public class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageContract,ISaleStorageContract saleStorageContract,
+internal class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageContract,ISaleStorageContract saleStorageContract,
     IPostStorageContract postStorageContract, IEmployeeStorageContract employeeStorageContract, ILogger logger) : ISalaryBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
@@ -61,7 +61,7 @@ public class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageCon
                 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, DateTime.SpecifyKind(finishDate, DateTimeKind.Utc), salary));
+            _salaryStorageContract.AddElement(new SalaryDataModel(employee.Id, finishDate, salary));
         }
     }
 }

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SaleBusinessLogicContract.cs

@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetBusinessLogic.Implementations;
 
-public class SaleBusinessLogicContract(ISaleStorageContract saleStorageContract, ILogger logger) : ISaleBusinessLogicContract
+internal class SaleBusinessLogicContract(ISaleStorageContract saleStorageContract, ILogger logger) : ISaleBusinessLogicContract
 {
     private readonly ILogger _logger = logger;
     private readonly ISaleStorageContract _saleStorageContract = saleStorageContract;

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/TourBusinessLogicContract.cs

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

MagicCarpetProject/MagicCarpetBusinessLogic/MagicCarpetBusinessLogic.csproj

@@ -7,7 +7,6 @@
   </PropertyGroup>
 	<ItemGroup>
 		<InternalsVisibleTo Include="MagicCarpetTests" />
-		<InternalsVisibleTo Include="MagicCarpetWebApi" />
 		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
 	</ItemGroup>
 	<ItemGroup>

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/IClientAdapter.cs

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

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/IEmployeeAdapter.cs

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

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/IPostAdapter.cs

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

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/ISalaryAdapter.cs

@@ -1,15 +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 ISalaryAdapter
-{
-    SalaryOperationResponse GetListByPeriod(DateTime fromDate, DateTime toDate);
-    SalaryOperationResponse GetListByPeriodByEmployee(DateTime fromDate, DateTime toDate, string employeeId);
-    SalaryOperationResponse CalculateSalary(DateTime date);
-}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/ISaleAdapter.cs

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

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/ITourAdapter.cs

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

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/ClientOperationResponse.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 ClientOperationResponse : OperationResponse
-{
-    public static ClientOperationResponse OK(List<ClientViewModel> data) => OK<ClientOperationResponse, List<ClientViewModel>>(data);
-
-    public static ClientOperationResponse OK(ClientViewModel data) => OK<ClientOperationResponse, ClientViewModel>(data);
-
-    public static ClientOperationResponse NoContent() => NoContent<ClientOperationResponse>();
-
-    public static ClientOperationResponse BadRequest(string message) => BadRequest<ClientOperationResponse>(message);
-
-    public static ClientOperationResponse NotFound(string message) => NotFound<ClientOperationResponse>(message);
-
-    public static ClientOperationResponse InternalServerError(string message) => InternalServerError<ClientOperationResponse>(message);
-}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/EmployeeOperationResponse.cs

@@ -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 EmployeeOperationResponse : OperationResponse
-{
-    public static EmployeeOperationResponse OK(List<EmployeeViewModel> data) => OK<EmployeeOperationResponse, List<EmployeeViewModel>>(data);
-
-    public static EmployeeOperationResponse OK(EmployeeViewModel data) => OK<EmployeeOperationResponse, EmployeeViewModel>(data);
-
-    public static EmployeeOperationResponse NoContent() => NoContent<EmployeeOperationResponse>();
-
-    public static EmployeeOperationResponse NotFound(string message) => NotFound<EmployeeOperationResponse>(message);
-
-    public static EmployeeOperationResponse BadRequest(string message) => BadRequest<EmployeeOperationResponse>(message);
-
-    public static EmployeeOperationResponse InternalServerError(string message) => InternalServerError<EmployeeOperationResponse>(message);
-}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/PostOperationResponse.cs

@@ -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 PostOperationResponse : OperationResponse
-{
-    public static PostOperationResponse OK(List<PostViewModel> data) => OK<PostOperationResponse, List<PostViewModel>>(data);
-
-    public static PostOperationResponse OK(PostViewModel data) => OK<PostOperationResponse, PostViewModel>(data);
-
-    public static PostOperationResponse NoContent() => NoContent<PostOperationResponse>();
-
-    public static PostOperationResponse NotFound(string message) => NotFound<PostOperationResponse>(message);
-
-    public static PostOperationResponse BadRequest(string message) => BadRequest<PostOperationResponse>(message);
-
-    public static PostOperationResponse InternalServerError(string message) => InternalServerError<PostOperationResponse>(message);
-}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/SalaryOperationResponse.cs

@@ -1,18 +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 SalaryOperationResponse : OperationResponse
-{
-    public static SalaryOperationResponse OK(List<SalaryViewModel> data) => OK<SalaryOperationResponse, List<SalaryViewModel>>(data);
-    public static SalaryOperationResponse NoContent() => NoContent<SalaryOperationResponse>();
-    public static SalaryOperationResponse NotFound(string message) => NotFound<SalaryOperationResponse>(message);
-    public static SalaryOperationResponse BadRequest(string message) => BadRequest<SalaryOperationResponse>(message);
-    public static SalaryOperationResponse InternalServerError(string message) => InternalServerError<SalaryOperationResponse>(message);
-}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/SaleOperationResponse.cs

@@ -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 SaleOperationResponse : OperationResponse
-{
-    public static SaleOperationResponse OK(List<SaleViewModel> data) => OK<SaleOperationResponse, List<SaleViewModel>>(data);
-
-    public static SaleOperationResponse OK(SaleViewModel data) => OK<SaleOperationResponse, SaleViewModel>(data);
-
-    public static SaleOperationResponse NoContent() => NoContent<SaleOperationResponse>();
-
-    public static SaleOperationResponse NotFound(string message) => NotFound<SaleOperationResponse>(message);
-
-    public static SaleOperationResponse BadRequest(string message) => BadRequest<SaleOperationResponse>(message);
-
-    public static SaleOperationResponse InternalServerError(string message) => InternalServerError<SaleOperationResponse>(message);
-}

MagicCarpetProject/MagicCarpetContracts/AdapterContracts/OperationResponses/TourOperationResponse.cs

@@ -1,26 +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 TourOperationResponse : OperationResponse
-{
-    public static TourOperationResponse OK(List<TourViewModel> data) => OK<TourOperationResponse, List<TourViewModel>>(data);
-
-    public static TourOperationResponse OK(List<TourHistoryViewModel> data) => OK<TourOperationResponse, List<TourHistoryViewModel>>(data);
-
-    public static TourOperationResponse OK(TourViewModel data) => OK<TourOperationResponse, TourViewModel>(data);
-
-    public static TourOperationResponse NoContent() => NoContent<TourOperationResponse>();
-
-    public static TourOperationResponse NotFound(string message) => NotFound<TourOperationResponse>(message);
-
-    public static TourOperationResponse BadRequest(string message) => BadRequest<TourOperationResponse>(message);
-
-    public static TourOperationResponse InternalServerError(string message) => InternalServerError<TourOperationResponse>(message);
-}

MagicCarpetProject/MagicCarpetContracts/BindingModels/ClientBindingModel.cs

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

MagicCarpetProject/MagicCarpetContracts/BindingModels/EmployeeBindingModel.cs

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

MagicCarpetProject/MagicCarpetContracts/BindingModels/PostBindingModel.cs

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

MagicCarpetProject/MagicCarpetContracts/BindingModels/SaleBindingModel.cs

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

MagicCarpetProject/MagicCarpetContracts/BindingModels/SaleTourBindingModel.cs

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

MagicCarpetProject/MagicCarpetContracts/BindingModels/TourBindingModel.cs

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

MagicCarpetProject/MagicCarpetContracts/BusinessLogicContracts/IPostBusinessLogicContract.cs

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

MagicCarpetProject/MagicCarpetContracts/DataModels/EmployeeDataModel.cs

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

MagicCarpetProject/MagicCarpetContracts/DataModels/PostDataModel.cs

@@ -10,12 +10,14 @@ using System.Threading.Tasks;
 
 namespace MagicCarpetContracts.DataModels;
 
-public class PostDataModel(string postId, string postName, PostType postType, double salary) : IValidation
+public class PostDataModel(string id, string postName, PostType postType, double salary, bool isActual, DateTime changeDate) : IValidation
 {
-    public string Id { get; private set; } = postId;
+    public string Id { get; private set; } = id;
     public string PostName { get; private set; } = postName;
     public PostType PostType { get; private set; } = postType;
-    public double Salary { get; private set; } = salary;                                
+    public double Salary { get; private set; } = salary;
+    public bool IsActual { get; private set; } = isActual;
+    public DateTime ChangeDate { get; private set; } = changeDate;                                          
 
     public void Validate()
     {

MagicCarpetProject/MagicCarpetContracts/DataModels/SalaryDataModel.cs

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

MagicCarpetProject/MagicCarpetContracts/DataModels/SaleDataModel.cs

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

MagicCarpetProject/MagicCarpetContracts/DataModels/SaleTourDataModel.cs

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

MagicCarpetProject/MagicCarpetContracts/DataModels/TourDataModel.cs

@@ -18,7 +18,7 @@ public class TourDataModel(string id, string tourName, string tourCountry, doubl
     public string TourName { get; private set; } = tourName;
     public string TourCountry { get; private set; } = tourCountry;
     public double Price { get; private set; } = price;
-    public TourType TourType { get; private set; } = tourType;
+    public TourType Type { get; private set; } = tourType;
 
     public void Validate()
     {
@@ -32,7 +32,7 @@ public class TourDataModel(string id, string tourName, string tourCountry, doubl
             throw new ValidationException("Field TourCountry is empty");
         if (Price <= 0)
             throw new ValidationException("Field Price is less than or equal to 0");
-        if (TourType == TourType.None)
+        if (Type == TourType.None)
             throw new ValidationException("Field Type is empty");
     }
 }

MagicCarpetProject/MagicCarpetContracts/DataModels/TourHistoryDataModel.cs

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

MagicCarpetProject/MagicCarpetContracts/Exceptions/ElementDeletedException.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetContracts.Exceptions;
-
-public class ElementDeletedException : Exception
-{
-    public ElementDeletedException(string id) : base($"Cannot modify a deleted item (id: {id})") { }
-}

MagicCarpetProject/MagicCarpetContracts/Infrastructure/IConfigurationDatabase.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetContracts.Infrastructure;
-
-public interface IConfigurationDatabase
-{
-    string ConnectionString { get; }
-}

MagicCarpetProject/MagicCarpetContracts/Infrastructure/OperationResponse.cs

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

MagicCarpetProject/MagicCarpetContracts/MagicCarpetContracts.csproj

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

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/IPostStorageContract.cs

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

MagicCarpetProject/MagicCarpetContracts/StoragesContracts/ISalaryStorageContract.cs

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

MagicCarpetProject/MagicCarpetContracts/ViewModels/ClientViewModel.cs

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

MagicCarpetProject/MagicCarpetContracts/ViewModels/EmployeeViewModel.cs

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

MagicCarpetProject/MagicCarpetContracts/ViewModels/PostViewModel.cs

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

MagicCarpetProject/MagicCarpetContracts/ViewModels/SalaryViewModel.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 SalaryViewModel
-{
-    public required string EmployeeId { get; set; }
-    public required string EmployeeFIO { get; set; }
-    public DateTime SalaryDate { get; set; }
-    public double Salary { get; set; }
-}

MagicCarpetProject/MagicCarpetContracts/ViewModels/SaleTourViewModel.cs

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

MagicCarpetProject/MagicCarpetContracts/ViewModels/SaleViewModel.cs

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

MagicCarpetProject/MagicCarpetContracts/ViewModels/TourHistoryViewModel.cs

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

MagicCarpetProject/MagicCarpetContracts/ViewModels/TourViewModel.cs

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

MagicCarpetProject/MagicCarpetDatabase/Implementations/ClientStorageContract.cs

@@ -1,144 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.StoragesContracts;
-using MagicCarpetDatabase.Models;
-using Microsoft.EntityFrameworkCore;
-using Npgsql;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase.Implementations;
-
-public class ClientStorageContract : IClientStorageContract
-{
-    private readonly MagicCarpetDbContext _dbContext;
-    private readonly Mapper _mapper;
-    public ClientStorageContract(MagicCarpetDbContext magicCarpetDbContext)
-    {
-        _dbContext = magicCarpetDbContext;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.AddMaps(typeof(MagicCarpetDbContext).Assembly);
-        });
-        _mapper = new Mapper(config);
-    }
-    public List<ClientDataModel> GetList()
-    {
-        try
-        {
-            return [.. _dbContext.Clients.Select(x => _mapper.Map<ClientDataModel>(x))];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-    public ClientDataModel? GetElementById(string id)
-    {
-        try
-        {
-            return _mapper.Map<ClientDataModel>(GetClientById(id));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-    public ClientDataModel? GetElementByFIO(string fio)
-    {
-        try
-        {
-            return _mapper.Map<ClientDataModel>(_dbContext.Clients.FirstOrDefault(x => x.FIO == fio));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-    public ClientDataModel? GetElementByPhoneNumber(string phoneNumber)
-    {
-        try
-        {
-            return _mapper.Map<ClientDataModel>(_dbContext.Clients.FirstOrDefault(x => x.PhoneNumber == phoneNumber));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-    public void AddElement(ClientDataModel clientDataModel)
-    {
-        try
-        {
-            _dbContext.Clients.Add(_mapper.Map<Client>(clientDataModel));
-            _dbContext.SaveChanges();
-        }
-        catch (InvalidOperationException ex) when (ex.TargetSite?.Name == "ThrowIdentityConflict")
-        {
-            _dbContext.ChangeTracker.Clear();
-            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);
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-    public void UpdElement(ClientDataModel clientDataModel)
-    {
-        try
-        {
-            var element = GetClientById(clientDataModel.Id) ?? throw new ElementNotFoundException(clientDataModel.Id);
-            _dbContext.Clients.Update(_mapper.Map(clientDataModel, element));
-            _dbContext.SaveChanges();
-        }
-        catch (ElementNotFoundException)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-        catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Clients_PhoneNumber" })
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("PhoneNumber", clientDataModel.PhoneNumber);
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-    public void DelElement(string id)
-    {
-        try
-        {
-            var element = GetClientById(id) ?? throw new ElementNotFoundException(id);
-            _dbContext.Clients.Remove(element);
-            _dbContext.SaveChanges();
-        }
-        catch (ElementNotFoundException)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-    private Client? GetClientById(string id) => _dbContext.Clients.FirstOrDefault(x => x.Id == id);
-}

MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs

@@ -1,168 +0,0 @@
-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 EmployeeStorageContract : IEmployeeStorageContract
-{
-    private readonly MagicCarpetDbContext _dbContext;
-    private readonly Mapper _mapper;
-
-    public EmployeeStorageContract(MagicCarpetDbContext dbContext)
-    {
-        _dbContext = dbContext;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<Post, PostDataModel>()
-                .ForMember(x => x.Id, x => x.MapFrom(src => src.PostId));
-            cfg.CreateMap<Employee, EmployeeDataModel>();
-            cfg.CreateMap<EmployeeDataModel, Employee>();
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public List<EmployeeDataModel> GetList(bool onlyActive = true, string? postId = null, DateTime? fromBirthDate = null, DateTime? toBirthDate = null, DateTime? fromEmploymentDate = null, DateTime? toEmploymentDate = null)
-    {
-        try
-        {
-            var query = _dbContext.Employees.AsQueryable();
-            if (onlyActive)
-            {
-                query = query.Where(x => !x.IsDeleted);
-            }
-            if (postId is not null)
-            {
-                query = query.Where(x => x.PostId == postId);
-            }
-            if (fromBirthDate is not null && toBirthDate is not null)
-            {
-                query = query.Where(x => x.BirthDate >= DateTime.SpecifyKind(fromBirthDate ?? DateTime.UtcNow, DateTimeKind.Utc) && x.BirthDate <= DateTime.SpecifyKind(toBirthDate ?? DateTime.UtcNow, DateTimeKind.Utc));
-            }
-            if (fromEmploymentDate is not null && toEmploymentDate is not null)
-            {
-                query = query.Where(x => x.EmploymentDate >= DateTime.SpecifyKind(fromEmploymentDate ?? DateTime.UtcNow, DateTimeKind.Utc) && x.EmploymentDate <= DateTime.SpecifyKind(toEmploymentDate ?? DateTime.UtcNow, DateTimeKind.Utc));
-            }
-            return [.. JoinPost(query).Select(x => _mapper.Map<EmployeeDataModel>(x))];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public EmployeeDataModel? GetElementById(string id)
-    {
-        try
-        {
-            return _mapper.Map<EmployeeDataModel>(GetEmployeeById(id));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public EmployeeDataModel? GetElementByFIO(string fio)
-    {
-        try
-        {
-            return _mapper.Map<EmployeeDataModel>(AddPost(_dbContext.Employees.FirstOrDefault(x => x.FIO == fio && !x.IsDeleted)));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public EmployeeDataModel? GetElementByEmail(string email)
-    {
-        try
-        {
-            return _mapper.Map<EmployeeDataModel>(AddPost(_dbContext.Employees.FirstOrDefault(x => x.Email == email && !x.IsDeleted)));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void AddElement(EmployeeDataModel employeeDataModel)
-    {
-        try
-        {
-            _dbContext.Employees.Add(_mapper.Map<Employee>(employeeDataModel));
-            _dbContext.SaveChanges();
-        }
-        catch (InvalidOperationException ex) when (ex.TargetSite?.Name == "ThrowIdentityConflict")
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("Id", employeeDataModel.Id);
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void UpdElement(EmployeeDataModel employeeDataModel)
-    {
-        try
-        {
-            var element = GetEmployeeById(employeeDataModel.Id) ?? throw new ElementNotFoundException(employeeDataModel.Id);
-            _dbContext.Employees.Update(_mapper.Map(employeeDataModel, 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 = GetEmployeeById(id) ?? throw new ElementNotFoundException(id);
-            element.IsDeleted = true;
-            _dbContext.SaveChanges();
-        }
-        catch (ElementNotFoundException)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    private Employee? GetEmployeeById(string id) => AddPost(_dbContext.Employees.FirstOrDefault(x => x.Id == id && !x.IsDeleted));
-
-    private IQueryable<Employee> JoinPost(IQueryable<Employee> query)
-        => query.GroupJoin(_dbContext.Posts.Where(x => x.IsActual), x => x.PostId, y => y.PostId, (x, y) => new { Employee = x, Post = y })
-                .SelectMany(xy => xy.Post.DefaultIfEmpty(), (x, y) => x.Employee.AddPost(y));
-
-    private Employee? AddPost(Employee? employee)
-        => employee?.AddPost(_dbContext.Posts.FirstOrDefault(x => x.PostId == employee.PostId && x.IsActual));
-}

MagicCarpetProject/MagicCarpetDatabase/Implementations/PostStorageContract.cs

@@ -1,191 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.StoragesContracts;
-using MagicCarpetDatabase.Models;
-using Microsoft.EntityFrameworkCore;
-using Npgsql;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase.Implementations;
-
-public class PostStorageContract : IPostStorageContract
-{
-    private readonly MagicCarpetDbContext _dbContext;
-    private readonly Mapper _mapper;
-
-    public PostStorageContract(MagicCarpetDbContext dbContext)
-    {
-        _dbContext = dbContext;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<Post, PostDataModel>()
-                .ForMember(x => x.Id, x => x.MapFrom(src => src.PostId));
-            cfg.CreateMap<PostDataModel, Post>()
-                .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));
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public List<PostDataModel> GetList()
-    {
-        try
-        {
-            return [.. _dbContext.Posts.Select(x => _mapper.Map<PostDataModel>(x))];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public List<PostDataModel> GetPostWithHistory(string postId)
-    {
-        try
-        {
-            return [.. _dbContext.Posts.Where(x => x.PostId == postId).Select(x => _mapper.Map<PostDataModel>(x))];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public PostDataModel? GetElementById(string id)
-    {
-        try
-        {
-            return _mapper.Map<PostDataModel>(_dbContext.Posts.FirstOrDefault(x => x.PostId == id && x.IsActual));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public PostDataModel? GetElementByName(string name)
-    {
-        try
-        {
-            return _mapper.Map<PostDataModel>(_dbContext.Posts.FirstOrDefault(x => x.PostName == name && x.IsActual));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void AddElement(PostDataModel postDataModel)
-    {
-        try
-        {
-            _dbContext.Posts.Add(_mapper.Map<Post>(postDataModel));
-            _dbContext.SaveChanges();
-        }
-        catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Posts_PostName_IsActual" })
-        {
-            _dbContext.ChangeTracker.Clear();
-            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);
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void UpdElement(PostDataModel postDataModel)
-    {
-        try
-        {
-            var transaction = _dbContext.Database.BeginTransaction();
-            try
-            {
-                var element = GetPostById(postDataModel.Id) ?? throw new ElementNotFoundException(postDataModel.Id);
-                if (!element.IsActual)
-                {
-                    throw new ElementDeletedException(postDataModel.Id);
-                }
-                element.IsActual = false;
-                _dbContext.SaveChanges();
-                var newElement = _mapper.Map<Post>(postDataModel);
-                _dbContext.Posts.Add(newElement);
-                _dbContext.SaveChanges();
-                transaction.Commit();
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-        catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Posts_PostName_IsActual" })
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("PostName", postDataModel.PostName);
-        }
-        catch (Exception ex) when (ex is ElementDeletedException || ex is ElementNotFoundException)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void DelElement(string id)
-    {
-        try
-        {
-            var element = GetPostById(id) ?? throw new ElementNotFoundException(id);
-            if (!element.IsActual)
-            {
-                throw new ElementDeletedException(id);
-            }
-            element.IsActual = false;
-            _dbContext.SaveChanges();
-        }
-        catch
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-    }
-
-    public void ResElement(string id)
-    {
-        try
-        {
-            var element = GetPostById(id) ?? throw new ElementNotFoundException(id);
-            element.IsActual = true;
-            _dbContext.SaveChanges();
-        }
-        catch
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-    }
-
-    private Post? GetPostById(string id) => _dbContext.Posts.Where(x => x.PostId == id)
-        .OrderByDescending(x => x.ChangeDate).FirstOrDefault();
-}

MagicCarpetProject/MagicCarpetDatabase/Implementations/SalaryStorageContract.cs

@@ -1,66 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.StoragesContracts;
-using MagicCarpetDatabase.Models;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase.Implementations;
-
-public class SalaryStorageContract : ISalaryStorageContract
-{
-    private readonly MagicCarpetDbContext _dbContext;
-    private readonly Mapper _mapper;
-
-    public SalaryStorageContract(MagicCarpetDbContext dbContext)
-    {
-        _dbContext = dbContext;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<Employee, EmployeeDataModel>();
-            cfg.CreateMap<Salary, SalaryDataModel>();
-            cfg.CreateMap<SalaryDataModel, Salary>()
-                .ForMember(dest => dest.EmployeeSalary, opt => opt.MapFrom(src => src.Salary));
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public List<SalaryDataModel> GetList(DateTime? startDate, DateTime? endDate, string? employeeId = null)
-    {
-        try
-        {
-            var query = _dbContext.Salaries.Include(d => d.Employee).AsQueryable();
-            if (startDate.HasValue)
-                query = query.Where(x => x.SalaryDate >= DateTime.SpecifyKind(startDate ?? DateTime.UtcNow, DateTimeKind.Utc));
-            if (endDate.HasValue)
-                query = query.Where(x => x.SalaryDate <= DateTime.SpecifyKind(endDate ?? DateTime.UtcNow, DateTimeKind.Utc));
-            if (employeeId != null)
-                query = query.Where(x => x.EmployeeId == employeeId);
-            return [.. query.Select(x => _mapper.Map<SalaryDataModel>(x))];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void AddElement(SalaryDataModel salaryDataModel)
-    {
-        try
-        {
-            _dbContext.Salaries.Add(_mapper.Map<Salary>(salaryDataModel));
-            _dbContext.SaveChanges();
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-}

MagicCarpetProject/MagicCarpetDatabase/Implementations/SaleStorageContract.cs

@@ -1,123 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.StoragesContracts;
-using MagicCarpetDatabase.Models;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase.Implementations;
-
-public class SaleStorageContract : ISaleStorageContract
-{
-    private readonly MagicCarpetDbContext _dbContext;
-    private readonly Mapper _mapper;
-
-    public SaleStorageContract(MagicCarpetDbContext dbContext)
-    {
-        _dbContext = dbContext;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<Client, ClientDataModel>();
-            cfg.CreateMap<Tour, TourDataModel>();
-            cfg.CreateMap<Employee, EmployeeDataModel>();
-            cfg.CreateMap<SaleTour, SaleTourDataModel>();
-            cfg.CreateMap<SaleTourDataModel, SaleTour>()
-                    .ForMember(x => x.Tour, x => x.Ignore());
-            cfg.CreateMap<Sale, SaleDataModel>();
-            cfg.CreateMap<SaleDataModel, Sale>()
-                .ForMember(x => x.IsCancel, x => x.MapFrom(src => false))
-                .ForMember(x => x.SaleTours, x => x.MapFrom(src => src.Tours))
-                .ForMember(x => x.Employee, x => x.Ignore())
-                .ForMember(x => x.Client, x => x.Ignore());
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public List<SaleDataModel> GetList(DateTime? startDate = null, DateTime? endDate = null, string? employeeId = null, string? clientId = null, string? tourId = null)
-    {
-        try
-        {
-            var query = _dbContext.Sales
-                .Include(r => r.Employee)
-                .Include(r => r.Client)
-                .Include(r => r.SaleTours)!
-                .ThenInclude(d => d.Tour)
-                .AsQueryable();
-            if (startDate.HasValue)
-                query = query.Where(x => x.SaleDate >= DateTime.SpecifyKind(startDate ?? DateTime.UtcNow, DateTimeKind.Utc));
-            if (endDate.HasValue)
-                query = query.Where(x => x.SaleDate <= DateTime.SpecifyKind(endDate ?? DateTime.UtcNow, DateTimeKind.Utc));
-            if (employeeId != null)
-                query = query.Where(x => x.EmployeeId == employeeId);
-            if (clientId != null)
-                query = query.Where(x => x.ClientId == clientId);
-            if (tourId != null)
-                query = query.Where(x => x.SaleTours!.Any(y => y.TourId == tourId));
-            var s = query.ToList();
-            return [.. query.Select(x => _mapper.Map<SaleDataModel>(x))];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public SaleDataModel? GetElementById(string id)
-    {
-        try
-        {
-            return _mapper.Map<SaleDataModel>(GetSaleById(id));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void AddElement(SaleDataModel saleDataModel)
-    {
-        try
-        {
-            _dbContext.Sales.Add(_mapper.Map<Sale>(saleDataModel));
-            _dbContext.SaveChanges();
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void DelElement(string id)
-    {
-        try
-        {
-            var element = GetSaleById(id) ?? throw new ElementNotFoundException(id);
-            if (element.IsCancel)
-            {
-                throw new ElementDeletedException(id);
-            }
-            element.IsCancel = true;
-            _dbContext.SaveChanges();
-        }
-        catch (Exception ex) when (ex is ElementDeletedException || ex is ElementNotFoundException)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    private Sale? GetSaleById(string id) => _dbContext.Sales.Include(x => x.Client).Include(x => x.Employee).Include(x => x.SaleTours)!.ThenInclude(x => x.Tour).FirstOrDefault(x => x.Id == id);
-}

MagicCarpetProject/MagicCarpetDatabase/Implementations/TourStorageContract.cs

@@ -1,184 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.StoragesContracts;
-using MagicCarpetDatabase.Models;
-using Microsoft.EntityFrameworkCore;
-using Npgsql;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase.Implementations;
-
-public class TourStorageContract : ITourStorageContract
-{
-    private readonly MagicCarpetDbContext _dbContext;
-    private readonly Mapper _mapper;
-
-    public TourStorageContract(MagicCarpetDbContext dbContext)
-    {
-        _dbContext = dbContext;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<Tour, TourDataModel>();
-            cfg.CreateMap<TourDataModel, Tour>();
-            cfg.CreateMap<TourHistory, TourHistoryDataModel>();
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public List<TourDataModel> GetList()
-    {
-        try
-        {
-            return [.. _dbContext.Tours.Select(x => _mapper.Map<TourDataModel>(x))];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public List<TourHistoryDataModel> GetHistoryByTourId(string tourId)
-    {
-        try
-        {
-            return [.. _dbContext.TourHistories.Include(x => x.Tour).Where(x => x.TourId == tourId).OrderByDescending(x => x.ChangeDate).Select(x => _mapper.Map<TourHistoryDataModel>(x))];
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public TourDataModel? GetElementById(string id)
-    {
-        try
-        {
-            return _mapper.Map<TourDataModel>(GetTourById(id));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public TourDataModel? GetElementByName(string name)
-    {
-        try
-        {
-            return _mapper.Map<TourDataModel>(_dbContext.Tours.FirstOrDefault(x => x.TourName == name));
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void AddElement(TourDataModel tourDataModel)
-    {
-        try
-        {
-            _dbContext.Tours.Add(_mapper.Map<Tour>(tourDataModel));
-            _dbContext.SaveChanges();
-        }
-        catch (InvalidOperationException ex) when (ex.TargetSite?.Name == "ThrowIdentityConflict")
-        {
-            _dbContext.ChangeTracker.Clear();
-            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);
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void UpdElement(TourDataModel tourDataModel)
-    {
-        try
-        {
-            var transaction = _dbContext.Database.BeginTransaction();
-            try
-            {
-                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 });
-                    _dbContext.SaveChanges();
-                }
-                _dbContext.Tours.Update(_mapper.Map(tourDataModel, element));
-                _dbContext.SaveChanges();
-                transaction.Commit();
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-        catch (DbUpdateException ex) when (ex.InnerException is PostgresException { ConstraintName: "IX_Tours_TourName" })
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new ElementExistsException("TourName", tourDataModel.TourName);
-        }
-        catch (Exception ex) when (ex is ElementDeletedException || ex is ElementNotFoundException)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void DelElement(string id)
-    {
-        try
-        {
-            var element = GetTourById(id) ?? throw new ElementNotFoundException(id);
-            _dbContext.Tours.Remove(element);
-            _dbContext.SaveChanges();
-        }
-        catch (ElementNotFoundException)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-        catch (Exception ex)
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw new StorageException(ex);
-        }
-    }
-
-    public void ResElement(string id)
-    {
-        try
-        {
-            var element = GetTourById(id) ?? throw new ElementNotFoundException(id);
-            _dbContext.SaveChanges();
-        }
-        catch
-        {
-            _dbContext.ChangeTracker.Clear();
-            throw;
-        }
-    }
-
-    private Tour? GetTourById(string id) => _dbContext.Tours.FirstOrDefault(x => x.Id == id);
-}

MagicCarpetProject/MagicCarpetDatabase/MagicCarpetDatabase.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="14.0.0" />
-    <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>
-
-
-</Project>

MagicCarpetProject/MagicCarpetDatabase/MagicCarpetDbContext.cs

@@ -1,63 +0,0 @@
-using MagicCarpetContracts.Infrastructure;
-using MagicCarpetDatabase.Models;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase;
-
-public class MagicCarpetDbContext(IConfigurationDatabase configurationDatabase) : DbContext
-{
-    private readonly IConfigurationDatabase? _configurationDatabase = configurationDatabase;
-
-    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-    {
-        optionsBuilder.UseNpgsql(_configurationDatabase?.ConnectionString, o => o.SetPostgresVersion(12, 2));
-        base.OnConfiguring(optionsBuilder);
-    }
-
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-        base.OnModelCreating(modelBuilder);
-
-        modelBuilder.Entity<Client>().HasIndex(x => x.PhoneNumber).IsUnique();
-
-        modelBuilder.Entity<Sale>()
-            .HasOne(e => e.Client)
-            .WithMany(e => e.Sales)
-            .OnDelete(DeleteBehavior.SetNull);
-
-        modelBuilder.Entity<Tour>().HasIndex(x => x.TourName).IsUnique();
-
-        modelBuilder.Entity<Post>()
-            .HasIndex(e => new { e.PostName, e.IsActual })
-            .IsUnique()
-            .HasFilter($"\"{nameof(Post.IsActual)}\" = TRUE");
-
-        modelBuilder.Entity<Post>()
-            .HasIndex(e => new { e.PostId, e.IsActual })
-            .IsUnique()
-            .HasFilter($"\"{nameof(Post.IsActual)}\" = TRUE");
-
-        modelBuilder.Entity<SaleTour>().HasKey(x => new { x.SaleId, x.TourId });
-    }
-
-    public DbSet<Client> Clients { get; set; }
-
-    public DbSet<Post> Posts { get; set; }
-
-    public DbSet<Tour> Tours { get; set; }
-
-    public DbSet<TourHistory> TourHistories { get; set; }
-
-    public DbSet<Salary> Salaries { get; set; }
-
-    public DbSet<Sale> Sales { get; set; }
-
-    public DbSet<SaleTour> SaleTours { get; set; }
-
-    public DbSet<Employee> Employees { get; set; }
-}

MagicCarpetProject/MagicCarpetDatabase/Models/Client.cs

@@ -1,24 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.DataModels;
-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(ClientDataModel), ReverseMap = true)]
-public class Client
-{
-    public required string Id { get; set; }
-
-    public required string FIO { get; set; } 
-
-    public required string PhoneNumber { get;  set; } 
-
-    public double DiscountSize { get;  set; }
-    [ForeignKey("ClientId")]
-    public List<Sale>? Sales { get; set; }
-}

MagicCarpetProject/MagicCarpetDatabase/Models/Employee.cs

@@ -1,39 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.DataModels;
-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(EmployeeDataModel), ReverseMap = true)]
-public class Employee
-{
-    public required string Id { get; set; }
-
-    public required string FIO { get; set; }
-
-    public string Email { get; set; }
-
-    public string PostId { get; set; }
-
-    public DateTime BirthDate { get; set; }
-
-    public DateTime EmploymentDate { get; set; }
-
-    public bool IsDeleted { get; set; }
-    [NotMapped]
-    public Post? Post { get; set; }
-    [ForeignKey("EmployeeId")]
-    public List<Salary>? Salaries { get; set; }
-    [ForeignKey("EmployeeId")]
-    public List<Sale>? Sales { get; set; }
-    public Employee AddPost(Post? post)
-    {
-        Post = post;
-        return this;
-    }
-}

MagicCarpetProject/MagicCarpetDatabase/Models/Post.cs

@@ -1,20 +0,0 @@
-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;
-
-public class Post
-{
-    public required string Id { get; set; } = Guid.NewGuid().ToString();
-    public required string PostId { get; set; }
-    public required string PostName { get; set; }
-    public PostType PostType { get; set; }
-    public double Salary { get; set; }
-    public bool IsActual { get; set; }
-    public DateTime ChangeDate { get; set; }
-}

MagicCarpetProject/MagicCarpetDatabase/Models/Salary.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase.Models;
-
-public class Salary
-{
-    public string Id { get; set; } = Guid.NewGuid().ToString();
-    public required string EmployeeId { get; set; }
-    public DateTime SalaryDate { get; set; } 
-    public double EmployeeSalary { get; set; }
-    public Employee? Employee { get; set; }
-}

MagicCarpetProject/MagicCarpetDatabase/Models/Sale.cs

@@ -1,32 +0,0 @@
-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;
-
-public class Sale
-{
-    public string Id { get; set; } = Guid.NewGuid().ToString();
-
-    public required string EmployeeId { get; set; } 
-     
-    public string? ClientId { get; set; } 
-
-    public DateTime SaleDate { get; set; } 
-    public double Sum { get; set; } 
-
-    public DiscountType DiscountType { get; set; } 
-
-    public double Discount { get; set; } 
-
-    public bool IsCancel { get; set; }
-    public Employee? Employee { get; set; }
-    public Client? Client { get; set; }
-    [ForeignKey("SaleId")]
-    public List<SaleTour>? SaleTours { get; set; }
-}

MagicCarpetProject/MagicCarpetDatabase/Models/SaleTour.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase.Models;
-
-public class SaleTour
-{
-    public required string SaleId { get; set; } 
-
-    public required string TourId { get; set; } 
-
-    public int Count { get; set; }
-
-    public double Price { get; set; }
-
-    public Sale? Sale { get; set; }
-
-    public Tour? Tour { get; set; }
-}

MagicCarpetProject/MagicCarpetDatabase/Models/Tour.cs

@@ -1,23 +0,0 @@
-using MagicCarpetContracts.Enums;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase.Models;
-
-public class Tour
-{
-    public required string Id { get; set; } 
-    public required string TourName { get; set; } 
-    public string? TourCountry { get; set; } 
-    public double Price { get; set; } 
-    public required TourType TourType { get; set; }
-    [ForeignKey("TourId")]
-    public List<SaleTour>? SaleTours { get; set; }
-    [ForeignKey("TourId")]
-    public List<TourHistory>? TourHistories { get; set; }
-}

MagicCarpetProject/MagicCarpetDatabase/Models/TourHistory.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetDatabase.Models;
-
-public class TourHistory
-{
-    public string Id { get; set; } = Guid.NewGuid().ToString();
-    public required string TourId { get; set; }
-    public double OldPrice { get;  set; } 
-    public DateTime ChangeDate { get; set; } 
-    public Tour? Tour { get; set; }
-}

MagicCarpetProject/MagicCarpetProject.sln

@@ -9,10 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicCarpetTests", "MagicCa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicCarpetBusinessLogic", "MagicCarpetBusinessLogic\MagicCarpetBusinessLogic.csproj", "{688F9182-851F-4CF8-97CD-9B6F1E43D758}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicCarpetDatabase", "MagicCarpetDatabase\MagicCarpetDatabase.csproj", "{C69B43B2-8680-42D7-A111-306E2E8225FE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicCarpetWebApi", "MagicCarpetWebApi\MagicCarpetWebApi.csproj", "{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,14 +27,6 @@ Global
 		{688F9182-851F-4CF8-97CD-9B6F1E43D758}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{688F9182-851F-4CF8-97CD-9B6F1E43D758}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{688F9182-851F-4CF8-97CD-9B6F1E43D758}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C69B43B2-8680-42D7-A111-306E2E8225FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C69B43B2-8680-42D7-A111-306E2E8225FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C69B43B2-8680-42D7-A111-306E2E8225FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C69B43B2-8680-42D7-A111-306E2E8225FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB1F990E-6604-4DE4-81A9-2D1D15E0240F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/PostBusinessLogicContractTests.cs

@@ -38,53 +38,61 @@ internal class PostBusinessLogicContractTests
         //Arrange
         var listOriginal = new List<PostDataModel>()
         {
-            new(Guid.NewGuid().ToString(),"name 1", PostType.Manager, 10),
-            new(Guid.NewGuid().ToString(), "name 2", PostType.Manager, 10),
-            new(Guid.NewGuid().ToString(), "name 3", PostType.Manager, 10),
+            new(Guid.NewGuid().ToString(),"name 1", PostType.Manager, 10, true, DateTime.UtcNow),
+            new(Guid.NewGuid().ToString(), "name 2", PostType.Manager, 10, false, DateTime.UtcNow),
+            new(Guid.NewGuid().ToString(), "name 3", PostType.Manager, 10, true, DateTime.UtcNow),
         };
-        _postStorageContract.Setup(x => x.GetList()).Returns(listOriginal);
+        _postStorageContract.Setup(x => x.GetList(It.IsAny<bool>())).Returns(listOriginal);
         //Act
-        var list = _postBusinessLogicContract.GetAllPosts();
+        var listOnlyActive = _postBusinessLogicContract.GetAllPosts(true);
+        var listAll = _postBusinessLogicContract.GetAllPosts(false);
         //Assert
         Assert.Multiple(() =>
         {
-            Assert.That(list, Is.Not.Null);
-            Assert.That(list, Is.EquivalentTo(listOriginal));
+            Assert.That(listOnlyActive, Is.Not.Null);
+            Assert.That(listAll, Is.Not.Null);
+            Assert.That(listOnlyActive, Is.EquivalentTo(listOriginal));
+            Assert.That(listAll, Is.EquivalentTo(listOriginal));
         });
-        _postStorageContract.Verify(x => x.GetList(), Times.Once);
+        _postStorageContract.Verify(x => x.GetList(true), Times.Once);
+        _postStorageContract.Verify(x => x.GetList(false), Times.Once);
     }
 
     [Test]
     public void GetAllPosts_ReturnEmptyList_Test()
     {
         //Arrange
-        _postStorageContract.Setup(x => x.GetList()).Returns([]);
+        _postStorageContract.Setup(x => x.GetList(It.IsAny<bool>())).Returns([]);
         //Act
-        var list = _postBusinessLogicContract.GetAllPosts();
+        var listOnlyActive = _postBusinessLogicContract.GetAllPosts(true);
+        var listAll = _postBusinessLogicContract.GetAllPosts(false);
         //Assert
         Assert.Multiple(() =>
         {
-            Assert.That(list, Is.Not.Null);
-            Assert.That(list, Has.Count.EqualTo(0));
+            Assert.That(listOnlyActive, Is.Not.Null);
+            Assert.That(listAll, Is.Not.Null);
+            Assert.That(listOnlyActive, Has.Count.EqualTo(0));
+            Assert.That(listAll, Has.Count.EqualTo(0));
         });
+        _postStorageContract.Verify(x => x.GetList(It.IsAny<bool>()), Times.Exactly(2));
     }
 
     [Test]
     public void GetAllPosts_ReturnNull_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.GetAllPosts(), Throws.TypeOf<NullListException>());
-        _postStorageContract.Verify(x => x.GetList(), Times.Once);
+        Assert.That(() => _postBusinessLogicContract.GetAllPosts(It.IsAny<bool>()), Throws.TypeOf<NullListException>());
+        _postStorageContract.Verify(x => x.GetList(It.IsAny<bool>()), Times.Once);
     }
 
     [Test]
     public void GetAllPosts_StorageThrowError_ThrowException_Test()
     {
         //Arrange
-        _postStorageContract.Setup(x => x.GetList()).Throws(new StorageException(new InvalidOperationException()));
+        _postStorageContract.Setup(x => x.GetList(It.IsAny<bool>())).Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.GetAllPosts(), Throws.TypeOf<StorageException>());
-        _postStorageContract.Verify(x => x.GetList(), Times.Once);
+        Assert.That(() => _postBusinessLogicContract.GetAllPosts(It.IsAny<bool>()), Throws.TypeOf<StorageException>());
+        _postStorageContract.Verify(x => x.GetList(It.IsAny<bool>()), Times.Once);
     }
 
     [Test]
@@ -94,8 +102,8 @@ internal class PostBusinessLogicContractTests
         var postId = Guid.NewGuid().ToString();
         var listOriginal = new List<PostDataModel>()
         {
-            new(postId, "name 1", PostType.Manager, 10),
-            new(postId, "name 2", PostType.Manager, 10)
+            new(postId, "name 1", PostType.Manager, 10, true, DateTime.UtcNow),
+            new(postId, "name 2", PostType.Manager, 10, false, DateTime.UtcNow)
         };
         _postStorageContract.Setup(x => x.GetPostWithHistory(It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -159,7 +167,7 @@ internal class PostBusinessLogicContractTests
     {
         //Arrange
         var id = Guid.NewGuid().ToString();
-        var record = new PostDataModel(id, "name", PostType.Manager, 10);
+        var record = new PostDataModel(id, "name", PostType.Manager, 10, true, DateTime.UtcNow);
         _postStorageContract.Setup(x => x.GetElementById(id)).Returns(record);
         //Act
         var element = _postBusinessLogicContract.GetPostByData(id);
@@ -174,7 +182,7 @@ internal class PostBusinessLogicContractTests
     {
         //Arrange
         var postName = "name";
-        var record = new PostDataModel(Guid.NewGuid().ToString(), postName, PostType.Manager, 10);
+        var record = new PostDataModel(Guid.NewGuid().ToString(), postName, PostType.Manager, 10, true, DateTime.UtcNow);
         _postStorageContract.Setup(x => x.GetElementByName(postName)).Returns(record);
         //Act
         var element = _postBusinessLogicContract.GetPostByData(postName);
@@ -230,11 +238,12 @@ internal class PostBusinessLogicContractTests
     {
         //Arrange
         var flag = false;
-        var record = new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 10);
+        var record = new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow.AddDays(-1));
         _postStorageContract.Setup(x => x.AddElement(It.IsAny<PostDataModel>()))
             .Callback((PostDataModel x) =>
             {
-                flag = x.Id == record.Id && x.PostName == record.PostName && x.PostType == record.PostType && x.Salary == record.Salary;
+                flag = x.Id == record.Id && x.PostName == record.PostName && x.PostType == record.PostType && x.Salary == record.Salary &&
+                    x.ChangeDate == record.ChangeDate;
             });
         //Act
         _postBusinessLogicContract.InsertPost(record);
@@ -249,7 +258,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.AddElement(It.IsAny<PostDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.InsertPost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10)), Throws.TypeOf<ElementExistsException>());
+        Assert.That(() => _postBusinessLogicContract.InsertPost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ElementExistsException>());
         _postStorageContract.Verify(x => x.AddElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 
@@ -265,7 +274,7 @@ internal class PostBusinessLogicContractTests
     public void InsertPost_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.InsertPost(new PostDataModel("id", "name", PostType.Manager, 10)), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _postBusinessLogicContract.InsertPost(new PostDataModel("id", "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ValidationException>());
         _postStorageContract.Verify(x => x.AddElement(It.IsAny<PostDataModel>()), Times.Never);
     }
 
@@ -275,7 +284,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.AddElement(It.IsAny<PostDataModel>())).Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.InsertPost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10)), Throws.TypeOf<StorageException>());
+        Assert.That(() => _postBusinessLogicContract.InsertPost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<StorageException>());
         _postStorageContract.Verify(x => x.AddElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 
@@ -284,11 +293,12 @@ internal class PostBusinessLogicContractTests
     {
         //Arrange
         var flag = false;
-        var record = new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 10);
+        var record = new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow.AddDays(-1));
         _postStorageContract.Setup(x => x.UpdElement(It.IsAny<PostDataModel>()))
             .Callback((PostDataModel x) =>
             {
-                flag = x.Id == record.Id && x.PostName == record.PostName && x.PostType == record.PostType && x.Salary == record.Salary;
+                flag = x.Id == record.Id && x.PostName == record.PostName && x.PostType == record.PostType && x.Salary == record.Salary &&
+                    x.ChangeDate == record.ChangeDate;
             });
         //Act
         _postBusinessLogicContract.UpdatePost(record);
@@ -303,7 +313,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.UpdElement(It.IsAny<PostDataModel>())).Throws(new ElementNotFoundException(""));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10)), Throws.TypeOf<ElementNotFoundException>());
+        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ElementNotFoundException>());
         _postStorageContract.Verify(x => x.UpdElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 
@@ -313,7 +323,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.UpdElement(It.IsAny<PostDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "anme", PostType.Manager, 10)), Throws.TypeOf<ElementExistsException>());
+        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "anme", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ElementExistsException>());
         _postStorageContract.Verify(x => x.UpdElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 
@@ -329,7 +339,7 @@ internal class PostBusinessLogicContractTests
     public void UpdatePost_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.UpdatePost(new PostDataModel("id", "name", PostType.Manager, 10)), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _postBusinessLogicContract.UpdatePost(new PostDataModel("id", "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<ValidationException>());
         _postStorageContract.Verify(x => x.UpdElement(It.IsAny<PostDataModel>()), Times.Never);
     }
 
@@ -339,7 +349,7 @@ internal class PostBusinessLogicContractTests
         //Arrange
         _postStorageContract.Setup(x => x.UpdElement(It.IsAny<PostDataModel>())).Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
-        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10)), Throws.TypeOf<StorageException>());
+        Assert.That(() => _postBusinessLogicContract.UpdatePost(new(Guid.NewGuid().ToString(), "name", PostType.Manager, 10, true, DateTime.UtcNow)), Throws.TypeOf<StorageException>());
         _postStorageContract.Verify(x => x.UpdElement(It.IsAny<PostDataModel>()), Times.Once);
     }
 

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/SalaryBusinessLogicContractTests.cs

@@ -164,7 +164,7 @@ internal class SalaryBusinessLogicContractTests
     public void GetAllSalariesByEmployee_EmployeeIdIsNotGuid_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _salaryBusinessLogicContract.GetAllSalariesByPeriodByEmployee(DateTime.UtcNow, DateTime.UtcNow.AddDays(1), "employeeId"), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _salaryBusinessLogicContract.GetAllSalariesByPeriodByEmployee(DateTime.UtcNow, DateTime.UtcNow.AddDays(1), "workerId"), Throws.TypeOf<ValidationException>());
         _salaryStorageContract.Verify(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>()), Times.Never);
     }
 
@@ -191,12 +191,12 @@ internal class SalaryBusinessLogicContractTests
     {
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
-        var saleSum = 1.2 * 5;
+        var saleSum = 200.0;
         var postSalary = 2000.0;
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, saleSum, DiscountType.None, 0, false, [])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, postSalary));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, postSalary, true, DateTime.UtcNow));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
             .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         var sum = 0.0;
@@ -213,7 +213,7 @@ internal class SalaryBusinessLogicContractTests
     }
 
     [Test]
-    public void CalculateSalaryByMounth_WithSeveralEmployees_Test()
+    public void CalculateSalaryByMounth_WithSeveralWorkers_Test()
     {
         //Arrange
         var employee1Id = Guid.NewGuid().ToString();
@@ -225,13 +225,13 @@ internal class SalaryBusinessLogicContractTests
             new(employee3Id, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employee1Id, null, DiscountType.None, false, []),
-            new SaleDataModel(Guid.NewGuid().ToString(), employee1Id, null, DiscountType.None, false, []),
-            new SaleDataModel(Guid.NewGuid().ToString(), employee2Id, null, DiscountType.None, false, []),
-            new SaleDataModel(Guid.NewGuid().ToString(), employee3Id, null, DiscountType.None, false, []),
-            new SaleDataModel(Guid.NewGuid().ToString(), employee3Id, null, DiscountType.None, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employee1Id, null, 1, DiscountType.None, 0, false, []),
+            new SaleDataModel(Guid.NewGuid().ToString(), employee1Id, null, 1, DiscountType.None, 0, false, []),
+            new SaleDataModel(Guid.NewGuid().ToString(), employee2Id, null, 1, DiscountType.None, 0, false, []),
+            new SaleDataModel(Guid.NewGuid().ToString(), employee3Id, null, 1, DiscountType.None, 0, false, []),
+            new SaleDataModel(Guid.NewGuid().ToString(), employee3Id, null, 1, DiscountType.None, 0, false, [])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
             .Returns(list);
         //Act
@@ -241,7 +241,7 @@ internal class SalaryBusinessLogicContractTests
     }
 
     [Test]
-    public void CalculateSalaryByMounth_WithoutSalesByEmployee_Test()
+    public void CalculateSalaryByMounth_WithoutSalesByWorker_Test()
     {
         //Arrange
         var postSalary = 2000.0;
@@ -249,7 +249,7 @@ internal class SalaryBusinessLogicContractTests
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
             .Returns([]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, postSalary));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, postSalary, true, DateTime.UtcNow));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
             .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         var sum = 0.0;
@@ -271,7 +271,7 @@ internal class SalaryBusinessLogicContractTests
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
             .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         //Act&Assert
@@ -284,22 +284,22 @@ internal class SalaryBusinessLogicContractTests
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, 200, DiscountType.None, 0, false, [])]);
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
-            .Returns([new EmployeeDataModel(employeeId, "Test", "abc@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
+            .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         //Act&Assert
         Assert.That(() => _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow), Throws.TypeOf<NullListException>());
     }
 
     [Test]
-    public void CalculateSalaryByMounth_EmployeeStorageReturnNull_ThrowException_Test()
+    public void CalculateSalaryByMounth_WorkerStorageReturnNull_ThrowException_Test()
     {
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, 200, DiscountType.None, 0, false, [])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
         //Act&Assert
         Assert.That(() => _salaryBusinessLogicContract.CalculateSalaryByMounth(DateTime.UtcNow), Throws.TypeOf<NullListException>());
     }
@@ -312,7 +312,7 @@ internal class SalaryBusinessLogicContractTests
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
             .Throws(new StorageException(new InvalidOperationException()));
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
             .Returns([new EmployeeDataModel(employeeId, "Test", "123@gmail.com", Guid.NewGuid().ToString(), DateTime.UtcNow, DateTime.UtcNow, false)]);
         //Act&Assert
@@ -325,7 +325,7 @@ internal class SalaryBusinessLogicContractTests
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, 200, DiscountType.None, 0, false, [])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
             .Throws(new StorageException(new InvalidOperationException()));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
@@ -335,14 +335,14 @@ internal class SalaryBusinessLogicContractTests
     }
 
     [Test]
-    public void CalculateSalaryByMounth_EmployeeStorageThrowException_ThrowException_Test()
+    public void CalculateSalaryByMounth_WorkerStorageThrowException_ThrowException_Test()
     {
         //Arrange
         var employeeId = Guid.NewGuid().ToString();
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, DiscountType.None, false, [])]);
+            .Returns([new SaleDataModel(Guid.NewGuid().ToString(), employeeId, null, 200, DiscountType.None, 0, false, [])]);
         _postStorageContract.Setup(x => x.GetElementById(It.IsAny<string>()))
-            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000));
+            .Returns(new PostDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 2000, true, DateTime.UtcNow));
         _employeeStorageContract.Setup(x => x.GetList(It.IsAny<bool>(), It.IsAny<string?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<DateTime?>()))
             .Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/SaleBusinessLogicContractTests.cs

@@ -39,10 +39,10 @@ internal class SaleBusinessLogicContractTests
         var date = DateTime.UtcNow;
         var listOriginal = new List<SaleDataModel>()
         {
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -103,10 +103,10 @@ internal class SaleBusinessLogicContractTests
         var employeeId = Guid.NewGuid().ToString();
         var listOriginal = new List<SaleDataModel>()
         {
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -184,10 +184,10 @@ internal class SaleBusinessLogicContractTests
         var clientId = Guid.NewGuid().ToString();
         var listOriginal = new List<SaleDataModel>()
         {
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -265,10 +265,10 @@ internal class SaleBusinessLogicContractTests
         var cocktailId = Guid.NewGuid().ToString();
         var listOriginal = new List<SaleDataModel>()
         {
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
-            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, DiscountType.None, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
+            new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false, []),
         };
         _saleStorageContract.Setup(x => x.GetList(It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(listOriginal);
         //Act
@@ -343,8 +343,8 @@ internal class SaleBusinessLogicContractTests
     {
         //Arrange
         var id = Guid.NewGuid().ToString();
-        var record = new SaleDataModel(id, Guid.NewGuid().ToString(), null, DiscountType.None, false,
-                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]);
+        var record = new SaleDataModel(id, Guid.NewGuid().ToString(), null, 10, DiscountType.None, 0, false,
+                [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
         _saleStorageContract.Setup(x => x.GetElementById(id)).Returns(record);
         //Act
         var element = _saleBusinessLogicContract.GetSaleByData(id);
@@ -394,8 +394,8 @@ internal class SaleBusinessLogicContractTests
     {
         //Arrange
         var flag = false;
-        var record = new SaleDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DiscountType.None,
-            false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)]);
+        var record = new SaleDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, DiscountType.None, 10,
+            false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)]);
         _saleStorageContract.Setup(x => x.AddElement(It.IsAny<SaleDataModel>()))
             .Callback((SaleDataModel x) =>
             {
@@ -420,7 +420,7 @@ internal class SaleBusinessLogicContractTests
         _saleStorageContract.Setup(x => x.AddElement(It.IsAny<SaleDataModel>())).Throws(new ElementExistsException("Data", "Data"));
         //Act&Assert
         Assert.That(() => _saleBusinessLogicContract.InsertSale(new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(),
-            Guid.NewGuid().ToString(), DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)])), Throws.TypeOf<ElementExistsException>());
+            Guid.NewGuid().ToString(), 10, DiscountType.None, 10, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<ElementExistsException>());
         _saleStorageContract.Verify(x => x.AddElement(It.IsAny<SaleDataModel>()), Times.Once);
     }
 
@@ -436,7 +436,7 @@ internal class SaleBusinessLogicContractTests
     public void InsertSale_InvalidRecord_ThrowException_Test()
     {
         //Act&Assert
-        Assert.That(() => _saleBusinessLogicContract.InsertSale(new SaleDataModel("id", Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DiscountType.None, false, [])), Throws.TypeOf<ValidationException>());
+        Assert.That(() => _saleBusinessLogicContract.InsertSale(new SaleDataModel("id", Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 10, DiscountType.None, 10, false, [])), Throws.TypeOf<ValidationException>());
         _saleStorageContract.Verify(x => x.AddElement(It.IsAny<SaleDataModel>()), Times.Never);
     }
 
@@ -447,7 +447,7 @@ internal class SaleBusinessLogicContractTests
         _saleStorageContract.Setup(x => x.AddElement(It.IsAny<SaleDataModel>())).Throws(new StorageException(new InvalidOperationException()));
         //Act&Assert
         Assert.That(() => _saleBusinessLogicContract.InsertSale(new(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(),
-            Guid.NewGuid().ToString(), DiscountType.None, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5, 1.2)])), Throws.TypeOf<StorageException>());
+            Guid.NewGuid().ToString(), 10, DiscountType.None, 10, false, [new SaleTourDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 5)])), Throws.TypeOf<StorageException>());
         _saleStorageContract.Verify(x => x.AddElement(It.IsAny<SaleDataModel>()), Times.Once);
     }
 

MagicCarpetProject/MagicCarpetTests/BusinessLogicContractsTests/TourBusinessLogicContractTests.cs

@@ -249,7 +249,7 @@ internal class TourBusinessLogicContractTests
             .Callback((TourDataModel x) =>
             {
                 flag = x.Id == record.Id && x.TourName == record.TourName && x.TourCountry == record.TourCountry 
-                    && x.Price == record.Price && x.TourType == record.TourType;
+                    && x.Price == record.Price && x.Type == record.Type;
             });
         //Act
         _tourBusinessLogicContract.InsertTour(record);
@@ -304,7 +304,7 @@ internal class TourBusinessLogicContractTests
             .Callback((TourDataModel x) =>
             {
                 flag = x.Id == record.Id && x.TourName == record.TourName && x.TourCountry == record.TourCountry
-                    && x.Price == record.Price && x.TourType == record.TourType;
+                    && x.Price == record.Price && x.Type == record.Type;
             });
         //Act
         _tourBusinessLogicContract.UpdateTour(record);

MagicCarpetProject/MagicCarpetTests/DataModelTests/PostDataModelTests.cs

@@ -14,41 +14,41 @@ internal class PostDataModelTests
     [Test]
     public void IdIsNullOrEmptyTest()
     {
-        var post = CreateDataModel(null, "name", PostType.Manager, 10);
+        var post = CreateDataModel(null, "name", PostType.Manager, 10, true, DateTime.UtcNow);
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
-        post = CreateDataModel(string.Empty, "name", PostType.Manager, 10);
+        post = CreateDataModel(string.Empty, "name", PostType.Manager, 10, true, DateTime.UtcNow);
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void IdIsNotGuidTest()
     {
-        var post = CreateDataModel("id", "name", PostType.Manager, 10);
+        var post = CreateDataModel("id", "name", PostType.Manager, 10, true, DateTime.UtcNow);
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void PostNameIsEmptyTest()
     {
-        var manufacturer = CreateDataModel(Guid.NewGuid().ToString(), null, PostType.Manager, 10);
+        var manufacturer = CreateDataModel(Guid.NewGuid().ToString(),  null, PostType.Manager, 10, true, DateTime.UtcNow);
         Assert.That(() => manufacturer.Validate(), Throws.TypeOf<ValidationException>());
-        manufacturer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, PostType.Manager, 10);
+        manufacturer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, PostType.Manager, 10, true, DateTime.UtcNow);
         Assert.That(() => manufacturer.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void PostTypeIsNoneTest()
     {
-        var post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.None, 10);
+        var post = CreateDataModel(Guid.NewGuid().ToString(),  "name", PostType.None, 10, true, DateTime.UtcNow);
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
     }
 
     [Test]
     public void SalaryIsLessOrZeroTest()
     {
-        var post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, 0);
+        var post = CreateDataModel(Guid.NewGuid().ToString(),  "name", PostType.Manager, 0, true, DateTime.UtcNow);
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
-        post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.Manager, -10);
+        post = CreateDataModel(Guid.NewGuid().ToString(),  "name", PostType.Manager, -10, true, DateTime.UtcNow);
         Assert.That(() => post.Validate(), Throws.TypeOf<ValidationException>());
     }
 
@@ -56,10 +56,13 @@ internal class PostDataModelTests
     public void AllFieldsIsCorrectTest()
     {
         var postId = Guid.NewGuid().ToString();
+        var postPostId = Guid.NewGuid().ToString();
         var postName = "name";
         var postType = PostType.Manager;
         var salary = 10;
-        var post = CreateDataModel(postId, postName, postType, salary);
+        var isActual = false;
+        var changeDate = DateTime.UtcNow.AddDays(-1);
+        var post = CreateDataModel(postId, postName, postType, salary, isActual, changeDate);
         Assert.That(() => post.Validate(), Throws.Nothing);
         Assert.Multiple(() =>
         {
@@ -67,9 +70,11 @@ internal class PostDataModelTests
             Assert.That(post.PostName, Is.EqualTo(postName));
             Assert.That(post.PostType, Is.EqualTo(postType));
             Assert.That(post.Salary, Is.EqualTo(salary));
+            Assert.That(post.IsActual, Is.EqualTo(isActual));
+            Assert.That(post.ChangeDate, Is.EqualTo(changeDate));
         });
     }
 
-    private static PostDataModel CreateDataModel(string? id, string? postName, PostType postType, double salary) =>
-        new(id, postName, postType, salary);
+    private static PostDataModel CreateDataModel(string? id, string? postName, PostType postType, double salary, bool isActual, DateTime changeDate) =>
+        new(id, postName, postType, salary, isActual, changeDate);
 }

MagicCarpetProject/MagicCarpetTests/DataModelTests/SaleDataModelTests.cs

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

MagicCarpetProject/MagicCarpetTests/DataModelTests/SaleTourDataModelTests.cs

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

MagicCarpetProject/MagicCarpetTests/DataModelTests/TourDataModelTests.cs

@@ -75,7 +75,7 @@ internal class TourDataModelTests
             Assert.That(tour.TourName, Is.EqualTo(tourName));
             Assert.That(tour.TourCountry, Is.EqualTo(tourCountry));
             Assert.That(tour.Price, Is.EqualTo(price));
-            Assert.That(tour.TourType, Is.EqualTo(tourType));
+            Assert.That(tour.Type, Is.EqualTo(tourType));
         });
     }
 

MagicCarpetProject/MagicCarpetTests/Infrastructure/ConfigurationDatabaseTest.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using MagicCarpetContracts.Infrastructure;
-
-namespace MagicCarpetTests.Infrastructure;
-
-internal class ConfigurationDatabaseTest : IConfigurationDatabase
-{
-    public string ConnectionString => "Host=127.0.0.1;Port=5432;Database=MagicCarpetTest;Username=postgres;Password=postgres;";
-}

MagicCarpetProject/MagicCarpetTests/Infrastructure/CustomWebApplicationFactory.cs

@@ -1,36 +0,0 @@
-using MagicCarpetContracts.Infrastructure;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.Infrastructure;
-
-internal class CustomWebApplicationFactory<TProgram> : WebApplicationFactory<TProgram>
-    where TProgram : class
-{
-    protected override void ConfigureWebHost(IWebHostBuilder builder)
-    {
-        builder.ConfigureServices(services =>
-        {
-            var databaseConfig = services.SingleOrDefault(x => x.ServiceType == typeof(IConfigurationDatabase));
-            if (databaseConfig is not null)
-                services.Remove(databaseConfig);
-
-            var loggerFactory = services.SingleOrDefault(x => x.ServiceType == typeof(LoggerFactory));
-            if (loggerFactory is not null)
-                services.Remove(loggerFactory);
-
-            services.AddSingleton<IConfigurationDatabase, ConfigurationDatabaseTest>();
-        });
-
-        builder.UseEnvironment("Development");
-
-        base.ConfigureWebHost(builder);
-    }
-}

MagicCarpetProject/MagicCarpetTests/Infrastructure/MagicCarpetDbContextExtensions.cs

@@ -1,107 +0,0 @@
-using MagicCarpetContracts.Enums;
-using MagicCarpetDatabase;
-using MagicCarpetDatabase.Models;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.Infrastructure;
-
-internal static class MagicCarpetDbContextExtensions
-{
-    public static Client InsertClientToDatabaseAndReturn(this MagicCarpetDbContext dbContext, string? id = null, string fio = "test", string phoneNumber = "+7-777-777-77-77", double discountSize = 10)
-    {
-        var client = new Client() { Id = id ?? Guid.NewGuid().ToString(), FIO = fio, PhoneNumber = phoneNumber, DiscountSize = discountSize };
-        dbContext.Clients.Add(client);
-        dbContext.SaveChanges();
-        return client;
-    }
-
-    public static Post InsertPostToDatabaseAndReturn(this MagicCarpetDbContext dbContext, string? id = null, string postName = "test", PostType postType = PostType.Manager, double salary = 10, bool isActual = true, DateTime? changeDate = null)
-    {
-        var post = new Post() { Id = Guid.NewGuid().ToString(), PostId = id ?? Guid.NewGuid().ToString(), PostName = postName, PostType = postType, Salary = salary, IsActual = isActual, ChangeDate = changeDate ?? DateTime.UtcNow };
-        dbContext.Posts.Add(post);
-        dbContext.SaveChanges();
-        return post;
-    }
-
-    public static Tour InsertTourToDatabaseAndReturn(this MagicCarpetDbContext dbContext, string? id = null, string tourName = "test", string tourCountry = "country", TourType tourType = TourType.Beach, double price = 1)
-    {
-        var tour = new Tour() { Id = id ?? Guid.NewGuid().ToString(), TourName = tourName, TourCountry = tourCountry, TourType = tourType, Price = price };
-        dbContext.Tours.Add(tour);
-        dbContext.SaveChanges();
-        return tour;
-    }
-
-    public static TourHistory InsertTourHistoryToDatabaseAndReturn(this MagicCarpetDbContext dbContext, string tourId, double price = 10, DateTime? changeDate = null)
-    {
-        var tourHistory = new TourHistory() { Id = Guid.NewGuid().ToString(), TourId = tourId, OldPrice = price, ChangeDate = changeDate ?? DateTime.UtcNow };
-        dbContext.TourHistories.Add(tourHistory);
-        dbContext.SaveChanges();
-        return tourHistory;
-    }
-
-    public static Salary InsertSalaryToDatabaseAndReturn(this MagicCarpetDbContext dbContext, string employeeId, double employeeSalary = 1, DateTime? salaryDate = null)
-    {
-        var salary = new Salary() { EmployeeId = employeeId, EmployeeSalary = employeeSalary, SalaryDate = salaryDate ?? DateTime.UtcNow };
-        dbContext.Salaries.Add(salary);
-        dbContext.SaveChanges();
-        return salary;
-    }
-
-    public static Sale InsertSaleToDatabaseAndReturn(this MagicCarpetDbContext dbContext, string employeeId, string? clientId = null, DateTime? saleDate = null, double sum = 1, DiscountType discountType = DiscountType.None, double discount = 0, bool isCancel = false, List<(string, int, double)>? tours = null)
-    {
-        var sale = new Sale() { EmployeeId = employeeId, ClientId = clientId, SaleDate = saleDate ?? DateTime.UtcNow, Sum = sum, DiscountType = discountType, Discount = discount, IsCancel = isCancel, SaleTours = [] };
-        if (tours is not null)
-        {
-            foreach (var elem in tours)
-            {
-                sale.SaleTours.Add(new SaleTour { TourId = elem.Item1, SaleId = sale.Id, Count = elem.Item2, Price = elem.Item3 });
-            }
-        }
-        dbContext.Sales.Add(sale);
-        dbContext.SaveChanges();
-        return sale;
-    }
-
-    public static Employee InsertEmployeeToDatabaseAndReturn(this MagicCarpetDbContext dbContext, string? id = null, string fio = "test", string email = "abc@gmail.com", string? postId = null, DateTime? birthDate = null, DateTime? employmentDate = null, bool isDeleted = false)
-    {
-        var employee = new Employee() { Id = id ?? Guid.NewGuid().ToString(), FIO = fio, Email = email, PostId = postId ?? Guid.NewGuid().ToString(), BirthDate = birthDate ?? DateTime.UtcNow.AddYears(-20), EmploymentDate = employmentDate ?? DateTime.UtcNow, IsDeleted = isDeleted };
-        dbContext.Employees.Add(employee);
-        dbContext.SaveChanges();
-        return employee;
-    }
-
-    public static Client? GetClientFromDatabase(this MagicCarpetDbContext dbContext, string id) => dbContext.Clients.FirstOrDefault(x => x.Id == id);
-
-    public static Post? GetPostFromDatabaseByPostId(this MagicCarpetDbContext dbContext, string id) => dbContext.Posts.FirstOrDefault(x => x.PostId == id && x.IsActual);
-
-    public static Post[] GetPostsFromDatabaseByPostId(this MagicCarpetDbContext dbContext, string id) => [.. dbContext.Posts.Where(x => x.PostId == id).OrderByDescending(x => x.ChangeDate)];
-
-    public static Tour? GetTourFromDatabaseById(this MagicCarpetDbContext dbContext, string id) => dbContext.Tours.FirstOrDefault(x => x.Id == id);
-
-    public static Salary[] GetSalariesFromDatabaseByEmployeeId(this MagicCarpetDbContext dbContext, string id) => [.. dbContext.Salaries.Where(x => x.EmployeeId == id)];
-
-    public static Sale? GetSaleFromDatabaseById(this MagicCarpetDbContext dbContext, string id) => dbContext.Sales.Include(x => x.SaleTours).FirstOrDefault(x => x.Id == id);
-
-    public static Sale[] GetSalesByClientId(this MagicCarpetDbContext dbContext, string? clientId) => [.. dbContext.Sales.Include(x => x.SaleTours).Where(x => x.ClientId == clientId)];
-
-    public static Employee? GetEmployeeFromDatabaseById(this MagicCarpetDbContext dbContext, string id) => dbContext.Employees.FirstOrDefault(x => x.Id == id);
-
-    public static void RemoveClientsFromDatabase(this MagicCarpetDbContext dbContext) => dbContext.ExecuteSqlRaw("TRUNCATE \"Clients\" CASCADE;");
-
-    public static void RemovePostsFromDatabase(this MagicCarpetDbContext dbContext) => dbContext.ExecuteSqlRaw("TRUNCATE \"Posts\" CASCADE;");
-
-    public static void RemoveToursFromDatabase(this MagicCarpetDbContext dbContext) => dbContext.ExecuteSqlRaw("TRUNCATE \"Tours\" CASCADE;");
-
-    public static void RemoveSalariesFromDatabase(this MagicCarpetDbContext dbContext) => dbContext.ExecuteSqlRaw("TRUNCATE \"Salaries\" CASCADE;");
-
-    public static void RemoveSalesFromDatabase(this MagicCarpetDbContext dbContext) => dbContext.ExecuteSqlRaw("TRUNCATE \"Sales\" CASCADE;");
-
-    public static void RemoveEmployeesFromDatabase(this MagicCarpetDbContext dbContext) => dbContext.ExecuteSqlRaw("TRUNCATE \"Employees\" CASCADE;");
-
-    private static void ExecuteSqlRaw(this MagicCarpetDbContext dbContext, string command) => dbContext.Database.ExecuteSqlRaw(command);
-}

MagicCarpetProject/MagicCarpetTests/MagicCarpetTests.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -9,30 +9,18 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Serilog" Version="4.2.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MagicCarpetBusinessLogic\MagicCarpetBusinessLogic.csproj" />
     <ProjectReference Include="..\MagicCarpetContracts\MagicCarpetContracts.csproj" />
-    <ProjectReference Include="..\MagicCarpetDatabase\MagicCarpetDatabase.csproj" />
-    <ProjectReference Include="..\MagicCarpetWebApi\MagicCarpetWebApi.csproj" />
   </ItemGroup>
 
   <ItemGroup>

MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/BaseStorageContractTest.cs

@@ -1,30 +0,0 @@
-using MagicCarpetTests.Infrastructure;
-using MagicCarpetDatabase;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.StoragesContracts;
-
-internal abstract class BaseStorageContractTest
-{
-    protected MagicCarpetDbContext MagicCarpetDbContext { get; private set; }
-
-    [OneTimeSetUp]
-    public void OneTimeSetUp()
-    {
-        MagicCarpetDbContext = new MagicCarpetDbContext(new ConfigurationDatabaseTest());
-
-        MagicCarpetDbContext.Database.EnsureDeleted();
-        MagicCarpetDbContext.Database.EnsureCreated();
-    }
-
-    [OneTimeTearDown]
-    public void OneTimeTearDown()
-    {
-        MagicCarpetDbContext.Database.EnsureDeleted();
-        MagicCarpetDbContext.Dispose();
-    }
-}

MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/ClientStorageContractTests.cs

@@ -1,215 +0,0 @@
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Enums;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.StoragesContracts;
-using MagicCarpetDatabase.Implementations;
-using MagicCarpetDatabase.Models;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.StoragesContracts;
-
-[TestFixture]
-internal class ClientStorageContractTests : BaseStorageContractTest
-{
-    private IClientStorageContract _clientStorageContract;
-
-    [SetUp]
-    public void SetUp() => _clientStorageContract = new ClientStorageContract(MagicCarpetDbContext);
-
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.Database.ExecuteSqlRaw("TRUNCATE \"Sales\" CASCADE;");
-        MagicCarpetDbContext.Database.ExecuteSqlRaw("TRUNCATE \"Employees\" CASCADE;");
-        MagicCarpetDbContext.Database.ExecuteSqlRaw("TRUNCATE \"Clients\" CASCADE;");
-    }
-
-    [Test]
-    public void Try_GetList_WhenHaveRecords_Test()
-    {
-        var client = InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString(), phoneNumber: "+5-555-555-55-55");
-        InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString(), phoneNumber: "+6-666-666-66-66");
-        InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString(), phoneNumber: "+7-777-777-77-77");
-        var list = _clientStorageContract.GetList();
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(3));
-        AssertElement(list.First(x => x.Id == client.Id), client);
-    }
-
-    [Test]
-    public void Try_GetList_WhenNoRecords_Test()
-    {
-        var list = _clientStorageContract.GetList();
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Is.Empty);
-    }
-
-    [Test]
-    public void Try_GetElementById_WhenHaveRecord_Test()
-    {
-        var client = InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString());
-        AssertElement(_clientStorageContract.GetElementById(client.Id), client);
-    }
-
-    [Test]
-    public void Try_GetElementById_WhenNoRecord_Test()
-    {
-        InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString());
-        Assert.That(() => _clientStorageContract.GetElementById(Guid.NewGuid().ToString()), Is.Null);
-    }
-
-    [Test]
-    public void Try_GetElementByFIO_WhenHaveRecord_Test()
-    {
-        var client = InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString());
-        AssertElement(_clientStorageContract.GetElementByFIO(client.FIO), client);
-    }
-
-    [Test]
-    public void Try_GetElementByFIO_WhenNoRecord_Test()
-    {
-        InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString());
-        Assert.That(() => _clientStorageContract.GetElementByFIO("New Fio"), Is.Null);
-    }
-
-    [Test]
-    public void Try_GetElementByPhoneNumber_WhenHaveRecord_Test()
-    {
-        var client = InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString());
-        AssertElement(_clientStorageContract.GetElementByPhoneNumber(client.PhoneNumber), client);
-    }
-
-    [Test]
-    public void Try_GetElementByPhoneNumber_WhenNoRecord_Test()
-    {
-        InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString());
-        Assert.That(() => _clientStorageContract.GetElementByPhoneNumber("+8-888-888-88-88"), Is.Null);
-    }
-
-    [Test]
-    public void Try_AddElement_Test()
-    {
-        var client = CreateModel(Guid.NewGuid().ToString());
-        _clientStorageContract.AddElement(client);
-        AssertElement(GetClientFromDatabase(client.Id), client);
-    }
-
-    [Test]
-    public void Try_AddElement_WhenHaveRecordWithSameId_Test()
-    {
-        var client = CreateModel(Guid.NewGuid().ToString(), "New Fio", "+5-555-555-55-55", 500);
-        InsertClientToDatabaseAndReturn(client.Id);
-        Assert.That(() => _clientStorageContract.AddElement(client), Throws.TypeOf<ElementExistsException>());
-    }
-
-    [Test]
-    public void Try_AddElement_WhenHaveRecordWithSamePhoneNumber_Test()
-    {
-        var client = CreateModel(Guid.NewGuid().ToString(), "New Fio", "+5-555-555-55-55", 500);
-        InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString(), phoneNumber: client.PhoneNumber);
-        Assert.That(() => _clientStorageContract.AddElement(client), Throws.TypeOf<ElementExistsException>());
-    }
-
-    [Test]
-    public void Try_UpdElement_Test()
-    {
-        var client = CreateModel(Guid.NewGuid().ToString(), "New Fio", "+5-555-555-55-55", 500);
-        InsertClientToDatabaseAndReturn(client.Id);
-        _clientStorageContract.UpdElement(client);
-        AssertElement(GetClientFromDatabase(client.Id), client);
-    }
-
-    [Test]
-    public void Try_UpdElement_WhenNoRecordWithThisId_Test()
-    {
-        Assert.That(() => _clientStorageContract.UpdElement(CreateModel(Guid.NewGuid().ToString())), Throws.TypeOf<ElementNotFoundException>());
-    }
-
-    [Test]
-    public void Try_UpdElement_WhenHaveRecordWithSamePhoneNumber_Test()
-    {
-        var client = CreateModel(Guid.NewGuid().ToString(), "New Fio", "+5-555-555-55-55", 500);
-        InsertClientToDatabaseAndReturn(client.Id, phoneNumber: "+7-777-777-77-77");
-        InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString(), phoneNumber: client.PhoneNumber);
-        Assert.That(() => _clientStorageContract.UpdElement(client), Throws.TypeOf<ElementExistsException>());
-    }
-
-    [Test]
-    public void Try_DelElement_Test()
-    {
-        var client = InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString());
-        _clientStorageContract.DelElement(client.Id);
-        var element = GetClientFromDatabase(client.Id);
-        Assert.That(element, Is.Null);
-    }
-
-    [Test]
-    public void Try_DelElement_WhenHaveSalesByThisBuyer_Test()
-    {
-        var client = InsertClientToDatabaseAndReturn(Guid.NewGuid().ToString());
-        var employeeId = Guid.NewGuid().ToString();
-        MagicCarpetDbContext.Employees.Add(new Employee() { Id = employeeId, FIO = "test", PostId = Guid.NewGuid().ToString(), Email = "abc@gmail.com" });
-        MagicCarpetDbContext.Sales.Add(new Sale() { Id = Guid.NewGuid().ToString(), EmployeeId = employeeId, ClientId = client.Id, Sum = 10, DiscountType = DiscountType.None, Discount = 0 });
-        MagicCarpetDbContext.Sales.Add(new Sale() { Id = Guid.NewGuid().ToString(), EmployeeId = employeeId, ClientId = client.Id, Sum = 10, DiscountType = DiscountType.None, Discount = 0 });
-        MagicCarpetDbContext.SaveChanges();
-        var salesBeforeDelete = MagicCarpetDbContext.Sales.Where(x => x.ClientId == client.Id).ToArray();
-        _clientStorageContract.DelElement(client.Id);
-        var element = GetClientFromDatabase(client.Id);
-        var salesAfterDelete = MagicCarpetDbContext.Sales.Where(x => x.ClientId == client.Id).ToArray();
-        Assert.Multiple(() =>
-        {
-            Assert.That(element, Is.Null);
-            Assert.That(salesBeforeDelete, Has.Length.EqualTo(2));
-            Assert.That(salesAfterDelete, Is.Empty);
-            Assert.That(MagicCarpetDbContext.Sales.Count(), Is.EqualTo(2));
-        });
-    }
-
-    [Test]
-    public void Try_DelElement_WhenNoRecordWithThisId_Test()
-    {
-        Assert.That(() => _clientStorageContract.DelElement(Guid.NewGuid().ToString()), Throws.TypeOf<ElementNotFoundException>());
-    }
-
-    private Client InsertClientToDatabaseAndReturn(string id, string fio = "test", string phoneNumber = "+7-777-777-77-77", double discountSize = 10)
-    {
-        var client = new Client() { Id = id, FIO = fio, PhoneNumber = phoneNumber, DiscountSize = discountSize };
-        MagicCarpetDbContext.Clients.Add(client);
-        MagicCarpetDbContext.SaveChanges();
-        return client;
-    }
-
-    private static void AssertElement(ClientDataModel? actual, Client expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.FIO, Is.EqualTo(expected.FIO));
-            Assert.That(actual.PhoneNumber, Is.EqualTo(expected.PhoneNumber));
-            Assert.That(actual.DiscountSize, Is.EqualTo(expected.DiscountSize));
-        });
-    }
-
-    private static ClientDataModel CreateModel(string id, string fio = "test", string phoneNumber = "+7-777-777-77-77", double discountSize = 10)
-        => new(id, fio, phoneNumber, discountSize);
-
-    private Client? GetClientFromDatabase(string id) => MagicCarpetDbContext.Clients.FirstOrDefault(x => x.Id == id);
-
-    private static void AssertElement(Client? actual, ClientDataModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.FIO, Is.EqualTo(expected.FIO));
-            Assert.That(actual.PhoneNumber, Is.EqualTo(expected.PhoneNumber));
-            Assert.That(actual.DiscountSize, Is.EqualTo(expected.DiscountSize));
-        });
-    }
-}

MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/EmployeeStorageContractTests.cs

@@ -1,223 +0,0 @@
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetDatabase.Implementations;
-using MagicCarpetDatabase.Models;
-using MagicCarpetTests.Infrastructure;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.StoragesContracts;
-
-[TestFixture]
-class EmployeeStorageContractTests : BaseStorageContractTest
-{
-    private EmployeeStorageContract _employeeStorageContract;
-
-    [SetUp]
-    public void SetUp()
-    {
-        _employeeStorageContract = new EmployeeStorageContract(MagicCarpetDbContext);
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemoveEmployeesFromDatabase();
-    }
-
-    [Test]
-    public void Try_GetList_WhenHaveRecords_Test()
-    {
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 1", "abc@gmail.com");
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 2", "abc@gmail.com");
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 3", "abc@gmail.com");
-        var list = _employeeStorageContract.GetList();
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(3));
-        AssertElement(list.First(x => x.Id == employee.Id), employee);
-    }
-
-    [Test]
-    public void Try_GetList_WhenNoRecords_Test()
-    {
-        var list = _employeeStorageContract.GetList();
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Is.Empty);
-    }
-
-    [Test]
-    public void Try_GetList_ByPostId_Test()
-    {
-        var postId = Guid.NewGuid().ToString();
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 1", "abc@gmail.com", postId);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 2", "abc@gmail.com", postId);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 3", "abc@gmail.com");
-        var list = _employeeStorageContract.GetList(postId: postId);
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(2));
-        Assert.That(list.All(x => x.PostId == postId));
-    }
-
-    [Test]
-    public void Try_GetList_ByBirthDate_Test()
-    {
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 1", "abc@gmail.com", birthDate: DateTime.UtcNow.AddYears(-25));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 2", "abc@gmail.com", birthDate: DateTime.UtcNow.AddYears(-21));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 3", "abc@gmail.com", birthDate: DateTime.UtcNow.AddYears(-20));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 4", "abc@gmail.com", birthDate: DateTime.UtcNow.AddYears(-19));
-        var list = _employeeStorageContract.GetList(fromBirthDate: DateTime.UtcNow.AddYears(-21).AddMinutes(-1), toBirthDate: DateTime.UtcNow.AddYears(-20).AddMinutes(1));
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(2));
-    }
-
-    [Test]
-    public void Try_GetList_ByEmploymentDate_Test()
-    {
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 1", "abc@gmail.com", employmentDate: DateTime.UtcNow.AddDays(-2));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 2", "abc@gmail.com", employmentDate: DateTime.UtcNow.AddDays(-1));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 3", "abc@gmail.com", employmentDate: DateTime.UtcNow.AddDays(1));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 4", "abc@gmail.com", employmentDate: DateTime.UtcNow.AddDays(2));
-        var list = _employeeStorageContract.GetList(fromEmploymentDate: DateTime.UtcNow.AddDays(-1).AddMinutes(-1), toEmploymentDate: DateTime.UtcNow.AddDays(1).AddMinutes(1));
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(2));
-    }
-
-    [Test]
-    public void Try_GetList_ByAllParameters_Test()
-    {
-        var postId = Guid.NewGuid().ToString();
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 1", "abc@gmail.com", postId, birthDate: DateTime.UtcNow.AddYears(-25), employmentDate: DateTime.UtcNow.AddDays(-2));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 2", "abc@gmail.com", postId, birthDate: DateTime.UtcNow.AddYears(-22), employmentDate: DateTime.UtcNow.AddDays(-1));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 3", "abc@gmail.com", postId, birthDate: DateTime.UtcNow.AddYears(-21), employmentDate: DateTime.UtcNow.AddDays(-1));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString(), "fio 4", "abc@gmail.com", birthDate: DateTime.UtcNow.AddYears(-20), employmentDate: DateTime.UtcNow.AddDays(1));
-        var list = _employeeStorageContract.GetList(postId: postId, fromBirthDate: DateTime.UtcNow.AddYears(-21).AddMinutes(-1), toBirthDate: DateTime.UtcNow.AddYears(-20).AddMinutes(1), fromEmploymentDate: DateTime.UtcNow.AddDays(-1).AddMinutes(-1), toEmploymentDate: DateTime.UtcNow.AddDays(1).AddMinutes(1));
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(1));
-    }
-
-    [Test]
-    public void Try_GetElementById_WhenHaveRecord_Test()
-    {
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString());
-        AssertElement(_employeeStorageContract.GetElementById(employee.Id), employee);
-    }
-
-    [Test]
-    public void Try_GetElementById_WhenNoRecord_Test()
-    {
-        Assert.That(() => _employeeStorageContract.GetElementById(Guid.NewGuid().ToString()), Is.Null);
-    }
-
-    [Test]
-    public void Try_GetElementByFIO_WhenHaveRecord_Test()
-    {
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString());
-        AssertElement(_employeeStorageContract.GetElementByFIO(employee.FIO), employee);
-    }
-
-    [Test]
-    public void Try_GetElementByFIO_WhenNoRecord_Test()
-    {
-        Assert.That(() => _employeeStorageContract.GetElementByFIO("New Fio"), Is.Null);
-    }
-
-    [Test]
-    public void Try_AddElement_Test()
-    {
-        var employee = CreateModel(Guid.NewGuid().ToString());
-        _employeeStorageContract.AddElement(employee);
-        AssertElement(MagicCarpetDbContext.GetEmployeeFromDatabaseById(employee.Id), employee);
-    }
-
-    [Test]
-    public void Try_AddElement_WhenHaveRecordWithSameId_Test()
-    {
-        var employee = CreateModel(Guid.NewGuid().ToString());
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(employee.Id);
-        Assert.That(() => _employeeStorageContract.AddElement(employee), Throws.TypeOf<ElementExistsException>());
-    }
-
-    [Test]
-    public void Try_UpdElement_Test()
-    {
-        var employee = CreateModel(Guid.NewGuid().ToString(), "New Fio");
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(employee.Id);
-        _employeeStorageContract.UpdElement(employee);
-        AssertElement(MagicCarpetDbContext.GetEmployeeFromDatabaseById(employee.Id), employee);
-    }
-
-    [Test]
-    public void Try_UpdElement_WhenNoRecordWithThisId_Test()
-    {
-        Assert.That(() => _employeeStorageContract.UpdElement(CreateModel(Guid.NewGuid().ToString())), Throws.TypeOf<ElementNotFoundException>());
-    }
-
-    [Test]
-    public void Try_UpdElement_WhenNoRecordWasDeleted_Test()
-    {
-        var employee = CreateModel(Guid.NewGuid().ToString());
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(employee.Id, isDeleted: true);
-        Assert.That(() => _employeeStorageContract.UpdElement(employee), Throws.TypeOf<ElementNotFoundException>());
-    }
-
-    [Test]
-    public void Try_DelElement_Test()
-    {
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(Guid.NewGuid().ToString());
-        _employeeStorageContract.DelElement(employee.Id);
-        var element = MagicCarpetDbContext.GetEmployeeFromDatabaseById(employee.Id);
-        Assert.That(element, Is.Not.Null);
-        Assert.That(element.IsDeleted);
-    }
-
-    [Test]
-    public void Try_DelElement_WhenNoRecordWithThisId_Test()
-    {
-        Assert.That(() => _employeeStorageContract.DelElement(Guid.NewGuid().ToString()), Throws.TypeOf<ElementNotFoundException>());
-    }
-
-    [Test]
-    public void Try_DelElement_WhenNoRecordWasDeleted_Test()
-    {
-        var employee = CreateModel(Guid.NewGuid().ToString());
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(employee.Id, isDeleted: true);
-        Assert.That(() => _employeeStorageContract.DelElement(employee.Id), Throws.TypeOf<ElementNotFoundException>());
-    }
-
-    private static void AssertElement(EmployeeDataModel? actual, Employee expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.PostId, Is.EqualTo(expected.PostId));
-            Assert.That(actual.FIO, Is.EqualTo(expected.FIO));
-            Assert.That(actual.Email, Is.EqualTo(expected.Email));
-            Assert.That(actual.BirthDate, Is.EqualTo(expected.BirthDate));
-            Assert.That(actual.EmploymentDate, Is.EqualTo(expected.EmploymentDate));
-            Assert.That(actual.IsDeleted, Is.EqualTo(expected.IsDeleted));
-        });
-    }
-
-    private static EmployeeDataModel CreateModel(string id, string fio = "fio", string email = "abc@mail.ru", string? postId = null, DateTime? birthDate = null, DateTime? employmentDate = null, bool isDeleted = false) =>
-        new(id, fio, email, postId ?? Guid.NewGuid().ToString(), birthDate ?? DateTime.UtcNow.AddYears(-20), employmentDate ?? DateTime.UtcNow, isDeleted);
-
-    private static void AssertElement(Employee? actual, EmployeeDataModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.PostId, Is.EqualTo(expected.PostId));
-            Assert.That(actual.FIO, Is.EqualTo(expected.FIO));
-            Assert.That(actual.Email, Is.EqualTo(expected.Email));
-            Assert.That(actual.BirthDate, Is.EqualTo(expected.BirthDate));
-            Assert.That(actual.EmploymentDate, Is.EqualTo(expected.EmploymentDate));
-            Assert.That(actual.IsDeleted, Is.EqualTo(expected.IsDeleted));
-        });
-    }
-}

MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SalaryStorageContractTests.cs

@@ -1,136 +0,0 @@
-using MagicCarpetContracts.DataModels;
-using MagicCarpetDatabase.Implementations;
-using MagicCarpetDatabase.Models;
-using MagicCarpetTests.Infrastructure;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.StoragesContracts;
-
-[TestFixture]
-internal class SalaryStorageContractTests : BaseStorageContractTest
-{
-    private SalaryStorageContract _salaryStorageContract;
-    private Employee _employee;
-
-    [SetUp]
-    public void SetUp()
-    {
-        _salaryStorageContract = new SalaryStorageContract(MagicCarpetDbContext);
-        _employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn();
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemoveSalariesFromDatabase();
-        MagicCarpetDbContext.RemoveEmployeesFromDatabase();
-    }
-
-    [Test]
-    public void Try_GetList_WhenHaveRecords_Test()
-    {
-        var salary = MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, employeeSalary: 100);
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id);
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id);
-        var list = _salaryStorageContract.GetList(DateTime.UtcNow.AddDays(-10), DateTime.UtcNow.AddDays(10));
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(3));
-        AssertElement(list.Single(x => x.Salary == salary.EmployeeSalary), salary);
-    }
-
-    [Test]
-    public void Try_GetList_WhenNoRecords_Test()
-    {
-        var list = _salaryStorageContract.GetList(DateTime.UtcNow.AddDays(-10), DateTime.UtcNow.AddDays(10));
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Is.Empty);
-    }
-
-    [Test]
-    public void Try_GetList_OnlyInDatePeriod_Test()
-    {
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(-2));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(-1).AddMinutes(-5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(-1).AddMinutes(5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(1).AddMinutes(-5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(1).AddMinutes(5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(-2));
-        var list = _salaryStorageContract.GetList(DateTime.UtcNow.AddDays(-1), DateTime.UtcNow.AddDays(1));
-        Assert.That(list, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(list, Has.Count.EqualTo(2));
-        });
-    }
-
-    [Test]
-    public void Try_GetList_ByEmployee_Test()
-    {
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn("name 2");
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id);
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id);
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id);
-        var list = _salaryStorageContract.GetList(DateTime.UtcNow.AddDays(-1), DateTime.UtcNow.AddDays(1), _employee.Id);
-        Assert.That(list, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(list, Has.Count.EqualTo(2));
-            Assert.That(list.All(x => x.EmployeeId == _employee.Id));
-        });
-    }
-
-    [Test]
-    public void Try_GetList_ByEmployeeOnlyInDatePeriod_Test()
-    {
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "name 2");
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(-2));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(-1).AddMinutes(5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id, salaryDate: DateTime.UtcNow.AddDays(-1).AddMinutes(5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(1).AddMinutes(-5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id, salaryDate: DateTime.UtcNow.AddDays(1).AddMinutes(-5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(_employee.Id, salaryDate: DateTime.UtcNow.AddDays(-2));
-        var list = _salaryStorageContract.GetList(DateTime.UtcNow.AddDays(-1), DateTime.UtcNow.AddDays(1), _employee.Id);
-        Assert.That(list, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(list, Has.Count.EqualTo(2));
-            Assert.That(list.All(x => x.EmployeeId == _employee.Id));
-        });
-    }
-
-    [Test]
-    public void Try_AddElement_Test()
-    {
-        var salary = CreateModel(_employee.Id);
-        _salaryStorageContract.AddElement(salary);
-        AssertElement(MagicCarpetDbContext.GetSalariesFromDatabaseByEmployeeId(_employee.Id).First(), salary);
-    }
-
-    private static void AssertElement(SalaryDataModel? actual, Salary expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.EmployeeId, Is.EqualTo(expected.EmployeeId));
-            Assert.That(actual.Salary, Is.EqualTo(expected.EmployeeSalary));
-        });
-    }
-
-    private static SalaryDataModel CreateModel(string employeeId, double employeeSalary = 1, DateTime? salaryDate = null)
-        => new(employeeId, salaryDate ?? DateTime.UtcNow, employeeSalary);
-
-    private static void AssertElement(Salary? actual, SalaryDataModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.EmployeeId, Is.EqualTo(expected.EmployeeId));
-            Assert.That(actual.EmployeeSalary, Is.EqualTo(expected.Salary));
-        });
-    }
-}

MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/SaleStorageContractTests.cs

@@ -1,267 +0,0 @@
- using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Enums;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetDatabase.Implementations;
-using MagicCarpetDatabase.Models;
-using MagicCarpetTests.Infrastructure;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static NUnit.Framework.Internal.OSPlatform;
-
-namespace MagicCarpetTests.StoragesContracts;
-
-[TestFixture]
-internal class SaleStorageContractTests : BaseStorageContractTest
-{
-    private SaleStorageContract _saletStorageContract;
-    private Client _client;
-    private Employee _employee;
-    private Tour _tour;
-
-    [SetUp]
-    public void SetUp()
-    {
-        _saletStorageContract = new SaleStorageContract(MagicCarpetDbContext);
-        _client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        _employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn();
-        _tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemoveSalesFromDatabase();
-        MagicCarpetDbContext.RemoveEmployeesFromDatabase();
-        MagicCarpetDbContext.RemoveClientsFromDatabase();
-        MagicCarpetDbContext.RemoveToursFromDatabase();
-    }
-
-    [Test]
-    public void Try_GetList_WhenHaveRecords_Test()
-    {
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 5, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, null, tours: [(_tour.Id, 10, 1.2)]);
-        var list = _saletStorageContract.GetList();
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(3));
-        AssertElement(list.First(x => x.Id == sale.Id), sale);
-    }
-
-    [Test]
-    public void Try_GetList_WhenNoRecords_Test()
-    {
-        var list = _saletStorageContract.GetList();
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Is.Empty);
-    }
-
-    [Test]
-    public void Try_GetList_ByPeriod_Test()
-    {
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, saleDate: DateTime.UtcNow.AddDays(-1).AddMinutes(-3), tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, saleDate: DateTime.UtcNow.AddDays(-1).AddMinutes(3), tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, null, saleDate: DateTime.UtcNow.AddDays(1).AddMinutes(-3), tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, null, saleDate: DateTime.UtcNow.AddDays(1).AddMinutes(3), tours: [(_tour.Id, 1, 1.2)]);
-        var list = _saletStorageContract.GetList(startDate: DateTime.UtcNow.AddDays(-1), endDate: DateTime.UtcNow.AddDays(1));
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(2));
-    }
-
-    [Test]
-    public void Try_GetList_ByEmployeeId_Test()
-    {
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Other employee");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, null, tours: [(_tour.Id, 1, 1.2)]);
-        var list = _saletStorageContract.GetList(employeeId: _employee.Id);
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(2));
-        Assert.That(list.All(x => x.EmployeeId == _employee.Id));
-    }
-
-    [Test]
-    public void Try_GetList_ByClientId_Test()
-    {
-        var client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn(fio: "Other fio", phoneNumber: "+8-888-888-88-88");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, client.Id, tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, null, tours: [(_tour.Id, 1, 1.2)]);
-        var list = _saletStorageContract.GetList(clientId: _client.Id);
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(2));
-        Assert.That(list.All(x => x.ClientId == _client.Id));
-    }
-
-    [Test]
-    public void Try_GetList_ByTourId_Test()
-    {
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: "Other name");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 5, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2), (tour.Id, 4, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, null, tours: [(tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, null, tours: [(tour.Id, 1, 1.2), (_tour.Id, 1, 1.2)]);
-        var list = _saletStorageContract.GetList(tourId: _tour.Id);
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(3));
-        Assert.That(list.All(x => x.Tours!.Any(y => y.TourId == _tour.Id)));
-    }
-
-    [Test]
-    public void Try_GetList_ByAllParameters_Test()
-    {
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Other employee");
-        var client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn(fio: "Other fio", phoneNumber: "+8-888-888-88-88");
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: "Other name");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, saleDate: DateTime.UtcNow.AddDays(-1).AddMinutes(-3), tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, null, saleDate: DateTime.UtcNow.AddDays(-1).AddMinutes(3), tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, _client.Id, saleDate: DateTime.UtcNow.AddDays(-1).AddMinutes(3), tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, _client.Id, saleDate: DateTime.UtcNow.AddDays(-1).AddMinutes(3), tours: [(tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, client.Id, saleDate: DateTime.UtcNow.AddDays(1).AddMinutes(-3), tours: [(_tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, saleDate: DateTime.UtcNow.AddDays(1).AddMinutes(-3), tours: [(tour.Id, 1, 1.2)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, null, saleDate: DateTime.UtcNow.AddDays(1).AddMinutes(-3), tours: [(_tour.Id, 1, 1.2)]);
-        var list = _saletStorageContract.GetList(startDate: DateTime.UtcNow.AddDays(-1), endDate: DateTime.UtcNow.AddDays(1), employeeId: _employee.Id, clientId: _client.Id, tourId: tour.Id);
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(1));
-    }
-
-    [Test]
-    public void Try_GetElementById_WhenHaveRecord_Test()
-    {
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)]);
-        AssertElement(_saletStorageContract.GetElementById(sale.Id), sale);
-    }
-
-    [Test]
-    public void Try_GetElementById_WhenNoRecord_Test()
-    {
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)]);
-        Assert.That(() => _saletStorageContract.GetElementById(Guid.NewGuid().ToString()), Is.Null);
-    }
-
-    [Test]
-    public void Try_GetElementById_WhenRecordHasCanceled_Test()
-    {
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)], isCancel: true);
-        AssertElement(_saletStorageContract.GetElementById(sale.Id), sale);
-    }
-
-    [Test]
-    public void Try_AddElement_Test()
-    {
-        var sale = CreateModel(Guid.NewGuid().ToString(), _employee.Id, _client.Id, DiscountType.RegularCustomer, false, [_tour.Id]);
-        _saletStorageContract.AddElement(sale);
-        AssertElement(MagicCarpetDbContext.GetSaleFromDatabaseById(sale.Id), sale);
-    }
-
-    [Test]
-    public void Try_AddElement_WhenIsDeletedIsTrue_Test()
-    {
-        var sale = CreateModel(Guid.NewGuid().ToString(), _employee.Id, _client.Id, DiscountType.RegularCustomer, true, [_tour.Id]);
-        Assert.That(() => _saletStorageContract.AddElement(sale), Throws.Nothing);
-        AssertElement(MagicCarpetDbContext.GetSaleFromDatabaseById(sale.Id), CreateModel(sale.Id, _employee.Id, _client.Id, DiscountType.RegularCustomer, false, [_tour.Id]));
-    }
-
-    [Test]
-    public void Try_DelElement_Test()
-    {
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)], isCancel: false);
-        _saletStorageContract.DelElement(sale.Id);
-        var element = MagicCarpetDbContext.GetSaleFromDatabaseById(sale.Id);
-        Assert.Multiple(() =>
-        {
-            Assert.That(element, Is.Not.Null);
-            Assert.That(element!.IsCancel);
-        });
-    }
-
-    [Test]
-    public void Try_DelElement_WhenNoRecordWithThisId_Test()
-    {
-        Assert.That(() => _saletStorageContract.DelElement(Guid.NewGuid().ToString()), Throws.TypeOf<ElementNotFoundException>());
-    }
-
-    [Test]
-    public void Try_DelElement_WhenRecordWasCanceled_Test()
-    {
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employee.Id, _client.Id, tours: [(_tour.Id, 1, 1.2)], isCancel: true);
-        Assert.That(() => _saletStorageContract.DelElement(sale.Id), Throws.TypeOf<ElementDeletedException>());
-    }
-
-    private static void AssertElement(SaleDataModel? actual, Sale expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.EmployeeId, Is.EqualTo(expected.EmployeeId));
-            Assert.That(actual.ClientId, Is.EqualTo(expected.ClientId));
-            Assert.That(actual.DiscountType, Is.EqualTo(expected.DiscountType));
-            Assert.That(actual.Discount, Is.EqualTo(expected.Discount));
-            Assert.That(actual.IsCancel, Is.EqualTo(expected.IsCancel));
-        });
-
-        if (expected.SaleTours is not null)
-        {
-            Assert.That(actual.Tours, Is.Not.Null);
-            Assert.That(actual.Tours, Has.Count.EqualTo(expected.SaleTours.Count));
-            for (int i = 0; i < actual.Tours.Count; ++i)
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(actual.Tours[i].TourId, Is.EqualTo(expected.SaleTours[i].TourId));
-                    Assert.That(actual.Tours[i].Count, Is.EqualTo(expected.SaleTours[i].Count));
-                });
-            }
-        }
-        else
-        {
-            Assert.That(actual.Tours, Is.Null);
-        }
-    }
-
-    private static SaleDataModel CreateModel(string id, string employeeId, string? clientId, DiscountType discountType, bool isCancel, List<string> tourIds)
-    {
-        var tours = tourIds.Select(x => new SaleTourDataModel(id, x, 1, 1.1)).ToList();
-        return new(id, employeeId, clientId, discountType, isCancel, tours);
-    }
-
-    private static void AssertElement(Sale? actual, SaleDataModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.EmployeeId, Is.EqualTo(expected.EmployeeId));
-            Assert.That(actual.ClientId, Is.EqualTo(expected.ClientId));
-            Assert.That(actual.DiscountType, Is.EqualTo(expected.DiscountType));
-            Assert.That(actual.Discount, Is.EqualTo(expected.Discount));
-            Assert.That(actual.IsCancel, Is.EqualTo(expected.IsCancel));
-        });
-
-        if (expected.Tours is not null)
-        {
-            Assert.That(actual.SaleTours, Is.Not.Null);
-            Assert.That(actual.SaleTours, Has.Count.EqualTo(expected.Tours.Count));
-            for (int i = 0; i < actual.SaleTours.Count; ++i)
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(actual.SaleTours[i].TourId, Is.EqualTo(expected.Tours[i].TourId));
-                    Assert.That(actual.SaleTours[i].Count, Is.EqualTo(expected.Tours[i].Count));
-                    Assert.That(actual.SaleTours[i].Price, Is.EqualTo(expected.Tours[i].Price));
-                });
-            }
-        }
-        else
-        {
-            Assert.That(actual.SaleTours, Is.Null);
-        }
-    }
-}

MagicCarpetProject/MagicCarpetTests/StoragesContractsTests/TourStorageContractTests.cs

@@ -1,197 +0,0 @@
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Enums;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetDatabase.Implementations;
-using MagicCarpetDatabase.Models;
-using MagicCarpetTests.Infrastructure;
-using Microsoft.EntityFrameworkCore;
-using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static NUnit.Framework.Internal.OSPlatform;
-
-namespace MagicCarpetTests.StoragesContracts;
-
-[TestFixture]
-internal class TourStorageContractTests : BaseStorageContractTest
-{
-    private TourStorageContract _tourStorageContract;
-
-    [SetUp]
-    public void SetUp()
-    {
-        _tourStorageContract = new TourStorageContract(MagicCarpetDbContext);
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemoveToursFromDatabase();
-    }
-
-    [Test]
-    public void Try_GetList_WhenHaveRecords_Test()
-    {
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString(), "name 1");
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString(), "name 2");
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString(), "name 3");
-        var list = _tourStorageContract.GetList();
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(3));
-        AssertElement(list.First(x => x.Id == tour.Id), tour);
-    }
-
-    [Test]
-    public void Try_GetList_WhenNoRecords_Test()
-    {
-        var list = _tourStorageContract.GetList();
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Is.Empty);
-    }
-
-    [Test]
-    public void Try_GetHistoryByTourId_WhenHaveRecords_Test()
-    {
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString(), "name 1");
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 20, DateTime.UtcNow.AddDays(-1));
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 30, DateTime.UtcNow.AddMinutes(-10));
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 40, DateTime.UtcNow.AddDays(1));
-        var list = _tourStorageContract.GetHistoryByTourId(tour.Id);
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(3));
-    }
-
-    [Test]
-    public void Try_GetHistoryByTourId_WhenNoRecords_Test()
-    {
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString(), "name 1");
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 20, DateTime.UtcNow.AddDays(-1));
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 30, DateTime.UtcNow.AddMinutes(-10));
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 40, DateTime.UtcNow.AddDays(1));
-        var list = _tourStorageContract.GetHistoryByTourId(Guid.NewGuid().ToString());
-        Assert.That(list, Is.Not.Null);
-        Assert.That(list, Has.Count.EqualTo(0));
-    }
-
-    [Test]
-    public void Try_GetElementById_WhenHaveRecord_Test()
-    {
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString());
-        AssertElement(_tourStorageContract.GetElementById(tour.Id), tour);
-    }
-
-    [Test]
-    public void Try_GetElementById_WhenNoRecord_Test()
-    {
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString());
-        Assert.That(() => _tourStorageContract.GetElementById(Guid.NewGuid().ToString()), Is.Null);
-    }
-
-    [Test]
-    public void Try_GetElementByName_WhenHaveRecord_Test()
-    {
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString());
-        AssertElement(_tourStorageContract.GetElementByName(tour.TourName), tour);
-    }
-
-    [Test]
-    public void Try_GetElementByName_WhenNoRecord_Test()
-    {
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString());
-        Assert.That(() => _tourStorageContract.GetElementByName("name"), Is.Null);
-    }
-
-    [Test]
-    public void Try_AddElement_Test()
-    {
-        var tour = CreateModel(Guid.NewGuid().ToString());
-        _tourStorageContract.AddElement(tour);
-        AssertElement(MagicCarpetDbContext.GetTourFromDatabaseById(tour.Id), tour);
-    }
-
-    [Test]
-    public void Try_AddElement_WhenHaveRecordWithSameId_Test()
-    {
-        var tour = CreateModel(Guid.NewGuid().ToString());
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tour.Id, tourName: "name unique");
-        Assert.That(() => _tourStorageContract.AddElement(tour), Throws.TypeOf<ElementExistsException>());
-    }
-
-    [Test]
-    public void Try_AddElement_WhenHaveRecordWithSameName_Test()
-    {
-        var tour = CreateModel(Guid.NewGuid().ToString(), "name unique");
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString(), tourName: tour.TourName);
-        Assert.That(() => _tourStorageContract.AddElement(tour), Throws.TypeOf<ElementExistsException>());
-    }
-
-    [Test]
-    public void Try_UpdElement_Test()
-    {
-        var tour = CreateModel(Guid.NewGuid().ToString(), "new name", tourType: TourType.Beach);
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tour.Id);
-        _tourStorageContract.UpdElement(tour);
-        AssertElement(MagicCarpetDbContext.GetTourFromDatabaseById(tour.Id), tour);
-    }
-
-    [Test]
-    public void Try_UpdElement_WhenNoRecordWithThisId_Test()
-    {
-        Assert.That(() => _tourStorageContract.UpdElement(CreateModel(Guid.NewGuid().ToString())), Throws.TypeOf<ElementNotFoundException>());
-    }
-
-    [Test]
-    public void Try_UpdElement_WhenHaveRecordWithSameName_Test()
-    {
-        var tour = CreateModel(Guid.NewGuid().ToString(), "name unique");
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tour.Id, tourName: "name");
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: tour.TourName);
-        Assert.That(() => _tourStorageContract.UpdElement(tour), Throws.TypeOf<ElementExistsException>());
-    }
-
-    [Test]
-    public void Try_DelElement_Test()
-    {
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(Guid.NewGuid().ToString());
-        _tourStorageContract.DelElement(tour.Id);
-        var element = MagicCarpetDbContext.GetTourFromDatabaseById(tour.Id);
-        Assert.That(element, Is.Null);
-    }
-
-    [Test]
-    public void Try_DelElement_WhenNoRecordWithThisId_Test()
-    {
-        Assert.That(() => _tourStorageContract.DelElement(Guid.NewGuid().ToString()), Throws.TypeOf<ElementNotFoundException>());
-    }
-    private static void AssertElement(TourDataModel? actual, Tour expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.TourName, Is.EqualTo(expected.TourName));
-            Assert.That(actual.TourCountry, Is.EqualTo(expected.TourCountry));
-            Assert.That(actual.TourType, Is.EqualTo(expected.TourType));
-            Assert.That(actual.Price, Is.EqualTo(expected.Price));
-        });
-    }
-
-    private static TourDataModel CreateModel(string id, string tourName = "test", string tourCountry = "country", TourType tourType = TourType.Ski, double price = 1)
-        => new(id, tourName,tourCountry, price, tourType);
-
-    private static void AssertElement(Tour? actual, TourDataModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.TourName, Is.EqualTo(expected.TourName));
-            Assert.That(actual.TourCountry, Is.EqualTo(expected.TourCountry));
-            Assert.That(actual.TourType, Is.EqualTo(expected.TourType));
-            Assert.That(actual.Price, Is.EqualTo(expected.Price));
-        });
-    }
-}

MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/BaseWebApiControllerTest.cs

@@ -1,72 +0,0 @@
-using MagicCarpetDatabase;
-using MagicCarpetTests.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.WebApiControllersTests;
-
-internal class BaseWebApiControllerTest
-{
-    private WebApplicationFactory<Program> _webApplication;
-
-    protected HttpClient HttpClient { get; private set; }
-
-    protected MagicCarpetDbContext MagicCarpetDbContext { get; private set; }
-
-    protected static readonly JsonSerializerOptions JsonSerializerOptions = new() { PropertyNameCaseInsensitive = true };
-
-    [OneTimeSetUp]
-    public void OneTimeSetUp()
-    {
-        _webApplication = new CustomWebApplicationFactory<Program>();
-        HttpClient = _webApplication
-            .WithWebHostBuilder(builder =>
-            {
-                builder.ConfigureTestServices(services =>
-                {
-                    using var loggerFactory = new LoggerFactory();
-                    loggerFactory.AddSerilog(new LoggerConfiguration()
-                        .ReadFrom.Configuration(new ConfigurationBuilder()
-                            .SetBasePath(Directory.GetCurrentDirectory())
-                            .AddJsonFile("appsettings.json")
-                            .Build())
-                        .CreateLogger());
-                    services.AddSingleton(loggerFactory);
-                });
-            })
-            .CreateClient();
-
-        var request = HttpClient.GetAsync("/login/user").GetAwaiter().GetResult();
-        var data = request.Content.ReadAsStringAsync().GetAwaiter().GetResult();
-        HttpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {data}");
-
-        MagicCarpetDbContext = _webApplication.Services.GetRequiredService<MagicCarpetDbContext>();
-        MagicCarpetDbContext.Database.EnsureDeleted();
-        MagicCarpetDbContext.Database.EnsureCreated();
-    }
-
-    [OneTimeTearDown]
-    public void OneTimeTearDown()
-    {
-        MagicCarpetDbContext?.Database.EnsureDeleted();
-        MagicCarpetDbContext?.Dispose();
-        HttpClient?.Dispose();
-        _webApplication?.Dispose();
-    }
-
-    protected static async Task<T?> GetModelFromResponseAsync<T>(HttpResponseMessage response) =>
-        JsonSerializer.Deserialize<T>(await response.Content.ReadAsStringAsync(), JsonSerializerOptions);
-
-    protected static StringContent MakeContent(object model) =>
-        new(JsonSerializer.Serialize(model), Encoding.UTF8, "application/json");
-}

MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/ClientControllerTests.cs

@@ -1,375 +0,0 @@
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.ViewModels;
-using MagicCarpetDatabase.Models;
-using MagicCarpetTests.Infrastructure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.WebApiControllersTests;
-
-[TestFixture]
-internal class ClientControllerTests : BaseWebApiControllerTest
-{
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemoveSalesFromDatabase();
-        MagicCarpetDbContext.RemoveEmployeesFromDatabase();
-        MagicCarpetDbContext.RemoveClientsFromDatabase();
-    }
-
-    [Test]
-    public async Task GetList_WhenHaveRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn(phoneNumber: "+5-555-555-55-55");
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn(phoneNumber: "+6-666-666-66-66");
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn(phoneNumber: "+7-777-777-77-77");
-        //Act
-        var response = await HttpClient.GetAsync("/api/clients");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<ClientViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(3));
-        });
-        AssertElement(data.First(x => x.Id == client.Id), client);
-    }
-
-    [Test]
-    public async Task GetList_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync("/api/clients");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<ClientViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(0));
-        });
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/clients/{client.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<ClientViewModel>(response), client);
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/clients/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ByFIO_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/clients/{client.FIO}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<ClientViewModel>(response), client);
-    }
-
-    [Test]
-    public async Task GetElement_ByFIO_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/clients/New%20Fio");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ByPhoneNumber_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/clients/{client.PhoneNumber}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<ClientViewModel>(response), client);
-    }
-
-    [Test]
-    public async Task GetElement_ByPhoneNumber_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/clients/+8-888-888-88-88");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task Post_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        var clientModel = CreateBindingModel();
-        //Act
-        var response = await HttpClient.PostAsync($"/api/clients", MakeContent(clientModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        AssertElement(MagicCarpetDbContext.GetClientFromDatabase(clientModel.Id!), clientModel);
-    }
-
-    [Test]
-    public async Task Post_WhenHaveRecordWithSameId_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var clientModel = CreateBindingModel();
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn(clientModel.Id);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/clients", MakeContent(clientModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenHaveRecordWithSamePhoneNumber_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var clientModel = CreateBindingModel();
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn(phoneNumber: clientModel.PhoneNumber!);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/clients", MakeContent(clientModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenDataIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var clientModelWithIdIncorrect = new ClientBindingModel { Id = "Id", FIO = "fio", PhoneNumber = "+7-111-111-11-11", DiscountSize = 10 };
-        var clientModelWithFioIncorrect = new ClientBindingModel { Id = Guid.NewGuid().ToString(), FIO = string.Empty, PhoneNumber = "+7-111-111-11-11", DiscountSize = 10 };
-        var clientModelWithPhoneNumberIncorrect = new ClientBindingModel { Id = Guid.NewGuid().ToString(), FIO = "fio", PhoneNumber = "71", DiscountSize = 10 };
-        //Act
-        var responseWithIdIncorrect = await HttpClient.PostAsync($"/api/clients", MakeContent(clientModelWithIdIncorrect));
-        var responseWithFioIncorrect = await HttpClient.PostAsync($"/api/clients", MakeContent(clientModelWithFioIncorrect));
-        var responseWithPhoneNumberIncorrect = await HttpClient.PostAsync($"/api/clients", MakeContent(clientModelWithPhoneNumberIncorrect));
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(responseWithIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Id is incorrect");
-            Assert.That(responseWithFioIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Fio is incorrect");
-            Assert.That(responseWithPhoneNumberIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "PhoneNumber is incorrect");
-        });
-    }
-
-    [Test]
-    public async Task Post_WhenSendEmptyData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/clients", MakeContent(string.Empty));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/clients", MakeContent(new { Data = "test", Position = 10 }));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_ShouldSuccess_Test()
-    {
-        //Arrange
-        var clientModel = CreateBindingModel(fio: "new fio");
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn(clientModel.Id);
-        //Act
-        var response = await HttpClient.PutAsync($"/api/clients", MakeContent(clientModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        MagicCarpetDbContext.ChangeTracker.Clear();
-        AssertElement(MagicCarpetDbContext.GetClientFromDatabase(clientModel.Id!), clientModel);
-    }
-
-    [Test]
-    public async Task Put_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var clientModel = CreateBindingModel(fio: "new fio");
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.PutAsync($"/api/clients", MakeContent(clientModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenHaveRecordWithSamePhoneNumber_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var clientModel = CreateBindingModel(fio: "new fio");
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn(clientModel.Id);
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn(phoneNumber: clientModel.PhoneNumber!);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/clients", MakeContent(clientModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenDataIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var clientModelWithIdIncorrect = new ClientBindingModel { Id = "Id", FIO = "fio", PhoneNumber = "+7-111-111-11-11", DiscountSize = 10 };
-        var clientModelWithFioIncorrect = new ClientBindingModel { Id = Guid.NewGuid().ToString(), FIO = string.Empty, PhoneNumber = "+7-111-111-11-11", DiscountSize = 10 };
-        var clientModelWithPhoneNumberIncorrect = new ClientBindingModel { Id = Guid.NewGuid().ToString(), FIO = "fio", PhoneNumber = "71", DiscountSize = 10 };
-        //Act
-        var responseWithIdIncorrect = await HttpClient.PutAsync($"/api/clients", MakeContent(clientModelWithIdIncorrect));
-        var responseWithFioIncorrect = await HttpClient.PutAsync($"/api/clients", MakeContent(clientModelWithFioIncorrect));
-        var responseWithPhoneNumberIncorrect = await HttpClient.PutAsync($"/api/clients", MakeContent(clientModelWithPhoneNumberIncorrect));
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(responseWithIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Id is incorrect");
-            Assert.That(responseWithFioIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Fio is incorrect");
-            Assert.That(responseWithPhoneNumberIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "PhoneNumber is incorrect");
-        });
-    }
-
-    [Test]
-    public async Task Put_WhenSendEmptyData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PutAsync($"/api/clients", MakeContent(string.Empty));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PutAsync($"/api/clients", MakeContent(new { Data = "test", Position = 10 }));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_ShouldSuccess_Test()
-    {
-        //Arrange
-        var clientId = Guid.NewGuid().ToString();
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn(clientId);
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/clients/{clientId}");
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-            Assert.That(MagicCarpetDbContext.GetClientFromDatabase(clientId), Is.Null);
-        });
-    }
-
-    [Test]
-    public async Task Delete_WhenHaveSalesByThisClient_ShouldSuccess_Test()
-    {
-        //Arrange
-        var client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn();
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, client.Id);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, client.Id);
-        var salesBeforeDelete = MagicCarpetDbContext.GetSalesByClientId(client.Id);
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/clients/{client.Id}");
-        //Assert
-        MagicCarpetDbContext.ChangeTracker.Clear();
-        var element = MagicCarpetDbContext.GetClientFromDatabase(client.Id);
-        var salesAfterDelete = MagicCarpetDbContext.GetSalesByClientId(client.Id);
-        var salesNoClients = MagicCarpetDbContext.GetSalesByClientId(null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-            Assert.That(element, Is.Null);
-            Assert.That(salesBeforeDelete, Has.Length.EqualTo(2));
-            Assert.That(salesAfterDelete, Is.Empty);
-            Assert.That(salesNoClients, Has.Length.EqualTo(2));
-        });
-    }
-
-    [Test]
-    public async Task Delete_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertClientToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/clients/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/clients/id");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    private static void AssertElement(ClientViewModel? actual, Client expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.FIO, Is.EqualTo(expected.FIO));
-            Assert.That(actual.PhoneNumber, Is.EqualTo(expected.PhoneNumber));
-            Assert.That(actual.DiscountSize, Is.EqualTo(expected.DiscountSize));
-        });
-    }
-
-    private static ClientBindingModel CreateBindingModel(string? id = null, string fio = "fio", string phoneNumber = "+7-666-666-66-66", double discountSize = 10) =>
-        new()
-        {
-            Id = id ?? Guid.NewGuid().ToString(),
-            FIO = fio,
-            PhoneNumber = phoneNumber,
-            DiscountSize = discountSize
-        };
-
-    private static void AssertElement(Client? actual, ClientBindingModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.FIO, Is.EqualTo(expected.FIO));
-            Assert.That(actual.PhoneNumber, Is.EqualTo(expected.PhoneNumber));
-            Assert.That(actual.DiscountSize, Is.EqualTo(expected.DiscountSize));
-        });
-    }
-}

MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/EmployeeControllerTests.cs

@@ -1,556 +0,0 @@
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.ViewModels;
-using MagicCarpetDatabase.Models;
-using MagicCarpetTests.Infrastructure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.WebApiControllersTests;
-
-[TestFixture]
-internal class EmployeeControllerTests : BaseWebApiControllerTest
-{
-    private Post _post;
-
-    [SetUp]
-    public void SetUp()
-    {
-        _post = MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemovePostsFromDatabase();
-        MagicCarpetDbContext.RemoveEmployeesFromDatabase();
-    }
-
-    [Test]
-    public async Task GetList_WhenHaveRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 1", postId: _post.PostId)
-            .AddPost(_post);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 2", postId: _post.PostId);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 3", postId: _post.PostId);
-        //Act
-        var response = await HttpClient.GetAsync("/api/employees/getrecords");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<EmployeeViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(3));
-        });
-        AssertElement(data.First(x => x.Id == employee.Id), employee);
-    }
-
-    [Test]
-    public async Task GetList_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync("/api/employees/getrecords");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<EmployeeViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(0));
-        });
-    }
-
-    [Test]
-    public async Task GetList_OnlyActual_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 1", postId: _post.PostId, isDeleted: true);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 2", postId: _post.PostId, isDeleted: false);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 3", postId: _post.PostId, isDeleted: false);
-        //Act
-        var response = await HttpClient.GetAsync("/api/employees/getrecords?includeDeleted=false");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<EmployeeViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(2));
-            Assert.That(data.All(x => !x.IsDeleted));
-        });
-    }
-
-    [Test]
-    public async Task GetList_IncludeNoActual_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 1", postId: _post.PostId, isDeleted: true);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 2", postId: _post.PostId, isDeleted: true);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 3", postId: _post.PostId, isDeleted: false);
-        //Act
-        var response = await HttpClient.GetAsync("/api/employees/getrecords?includeDeleted=true");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<EmployeeViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(3));
-            Assert.That(data.Any(x => x.IsDeleted));
-            Assert.That(data.Any(x => !x.IsDeleted));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByPostId_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 1", postId: _post.PostId);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 2", postId: _post.PostId);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 3", postId: _post.PostId, isDeleted: true);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 4");
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getpostrecords?id={_post.PostId}&includeDeleted=true");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<EmployeeViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(3));
-            Assert.That(data.All(x => x.PostId == _post.PostId));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByPostId_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 1", postId: _post.PostId);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 4");
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getpostrecords?id={Guid.NewGuid()}&includeDeleted=true");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<EmployeeViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.That(data, Has.Count.EqualTo(0));
-    }
-
-    [Test]
-    public async Task GetList_ByPostId_WhenIdIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getpostrecords?id=id&includeDeleted=true");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByBirthDate_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 1", birthDate: DateTime.UtcNow.AddYears(-25));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 2", birthDate: DateTime.UtcNow.AddYears(-21));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 3", birthDate: DateTime.UtcNow.AddYears(-20), isDeleted: true);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 4", birthDate: DateTime.UtcNow.AddYears(-19));
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getbirthdaterecords?fromDate={DateTime.UtcNow.AddYears(-21).AddMinutes(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddYears(-20).AddMinutes(1):MM/dd/yyyy HH:mm:ss}&includeDeleted=true");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<EmployeeViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(2));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByBirthDate_WhenDateIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getbirthdaterecords?fromDate={DateTime.UtcNow.AddMinutes(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddMinutes(-1):MM/dd/yyyy HH:mm:ss}&includeDeleted=true");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByEmploymentDate_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 1", employmentDate: DateTime.UtcNow.AddDays(-2));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 2", employmentDate: DateTime.UtcNow.AddDays(-1));
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 3", employmentDate: DateTime.UtcNow.AddDays(1), isDeleted: true);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "fio 4", employmentDate: DateTime.UtcNow.AddDays(2));
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getemploymentrecords?fromDate={DateTime.UtcNow.AddDays(-1).AddMinutes(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1).AddMinutes(1):MM/dd/yyyy HH:mm:ss}&includeDeleted=true");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<EmployeeViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(2));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByEmploymentDate_WhenDateIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getemploymentrecords?fromDate={DateTime.UtcNow.AddMinutes(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddMinutes(-1):MM/dd/yyyy HH:mm:ss}&includeDeleted=true");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(postId: _post.PostId).AddPost(_post);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getrecord/{employee.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<EmployeeViewModel>(response), employee);
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getrecord/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenRecordWasDeleted_ShouldNotFound_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(postId: _post.PostId, isDeleted: true);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getrecord/{employee.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ByFIO_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(postId: _post.PostId).AddPost(_post);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getrecord/{employee.FIO}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<EmployeeViewModel>(response), employee);
-    }
-
-    [Test]
-    public async Task GetElement_ByFIO_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getrecord/New%20Fio");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ByFIO_WhenRecordWasDeleted_ShouldNotFound_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(postId: _post.PostId, isDeleted: true);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getrecord/{employee.FIO}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ByEmail_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(postId: _post.PostId).AddPost(_post);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getrecord/{employee.Email}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<EmployeeViewModel>(response), employee);
-    }
-
-    [Test]
-    public async Task GetElement_ByEmail_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getrecord/New%20Email");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ByEmail_WhenRecordWasDeleted_ShouldNotFound_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(postId: _post.PostId, isDeleted: true);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/employees/getrecord/{employee.Email}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task Post_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn();
-        var employeeModel = CreateModel(_post.Id);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/employees/register", MakeContent(employeeModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        AssertElement(MagicCarpetDbContext.GetEmployeeFromDatabaseById(employeeModel.Id!), employeeModel);
-    }
-
-    [Test]
-    public async Task Post_WhenHaveRecordWithSameId_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var employeeModel = CreateModel(_post.Id);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(employeeModel.Id);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/employees/register", MakeContent(employeeModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenDataIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var employeeModelWithIdIncorrect = new EmployeeBindingModel { Id = "Id", FIO = "fio", BirthDate = DateTime.UtcNow.AddYears(-22), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = _post.Id };
-        var employeeModelWithFioIncorrect = new EmployeeBindingModel { Id = Guid.NewGuid().ToString(), FIO = string.Empty, BirthDate = DateTime.UtcNow.AddYears(-22), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = _post.Id };
-        var employeeModelWithEmailIncorrect = new EmployeeBindingModel { Id = Guid.NewGuid().ToString(), FIO = "fio", Email = "abc", BirthDate = DateTime.UtcNow.AddYears(-22), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = _post.Id };
-        var employeeModelWithPostIdIncorrect = new EmployeeBindingModel { Id = Guid.NewGuid().ToString(), FIO = "fio", BirthDate = DateTime.UtcNow.AddYears(-22), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = "Id" };
-        var employeeModelWithBirthDateIncorrect = new EmployeeBindingModel { Id = Guid.NewGuid().ToString(), FIO = "fio", BirthDate = DateTime.UtcNow.AddYears(-15), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = _post.Id };
-        //Act
-        var responseWithIdIncorrect = await HttpClient.PostAsync($"/api/employees/register", MakeContent(employeeModelWithIdIncorrect));
-        var responseWithFioIncorrect = await HttpClient.PostAsync($"/api/employees/register", MakeContent(employeeModelWithFioIncorrect));
-        var responseWithEmailIncorrect = await HttpClient.PostAsync($"/api/employees/register", MakeContent(employeeModelWithEmailIncorrect));
-        var responseWithPostIdIncorrect = await HttpClient.PostAsync($"/api/employees/register", MakeContent(employeeModelWithPostIdIncorrect));
-        var responseWithBirthDateIncorrect = await HttpClient.PostAsync($"/api/employees/register", MakeContent(employeeModelWithBirthDateIncorrect));
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(responseWithIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Id is incorrect");
-            Assert.That(responseWithFioIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Fio is incorrect");
-            Assert.That(responseWithEmailIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Email is incorrect");
-            Assert.That(responseWithPostIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "PostId is incorrect");
-            Assert.That(responseWithBirthDateIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "BirthDate is incorrect");
-        });
-    }
-
-    [Test]
-    public async Task Post_WhenSendEmptyData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/employees/register", MakeContent(string.Empty));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/employees/register", MakeContent(new { Data = "test", Position = 10 }));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employeeModel = CreateModel(_post.Id);
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(employeeModel.Id);
-        //Act
-        var response = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(employeeModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        MagicCarpetDbContext.ChangeTracker.Clear();
-        AssertElement(MagicCarpetDbContext.GetEmployeeFromDatabaseById(employeeModel.Id!), employeeModel);
-    }
-
-    [Test]
-    public async Task Put_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var employeeModel = CreateModel(_post.Id, fio: "new fio");
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(employeeModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenRecordWasDeleted_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var employeeModel = CreateModel(_post.Id, fio: "new fio");
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(employeeModel.Id, isDeleted: true);
-        //Act
-        var response = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(employeeModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenDataIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var employeeModelWithIdIncorrect = new EmployeeBindingModel { Id = "Id", FIO = "fio", Email = "abc@mail.ru", BirthDate = DateTime.UtcNow.AddYears(-22), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = _post.Id };
-        var employeeModelWithFioIncorrect = new EmployeeBindingModel { Id = Guid.NewGuid().ToString(), FIO = string.Empty, Email = "abc@mail.ru", BirthDate = DateTime.UtcNow.AddYears(-22), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = _post.Id };
-        var employeeModelWithEmailIncorrect = new EmployeeBindingModel { Id = Guid.NewGuid().ToString(), FIO = "fio", Email = "abc", BirthDate = DateTime.UtcNow.AddYears(-22), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = _post.Id };
-        var employeeModelWithPostIdIncorrect = new EmployeeBindingModel { Id = Guid.NewGuid().ToString(), FIO = "fio", Email = "abc@mail.ru", BirthDate = DateTime.UtcNow.AddYears(-22), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = "Id" };
-        var employeeModelWithBirthDateIncorrect = new EmployeeBindingModel { Id = Guid.NewGuid().ToString(), FIO = "fio", Email = "abc@mail.ru", BirthDate = DateTime.UtcNow.AddYears(-15), EmploymentDate = DateTime.UtcNow.AddDays(-5), PostId = _post.Id };
-        //Act
-        var responseWithIdIncorrect = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(employeeModelWithIdIncorrect));
-        var responseWithFioIncorrect = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(employeeModelWithFioIncorrect));
-        var responseWithEmailIncorrect = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(employeeModelWithEmailIncorrect));
-        var responseWithPostIdIncorrect = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(employeeModelWithPostIdIncorrect));
-        var responseWithBirthDateIncorrect = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(employeeModelWithBirthDateIncorrect));
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(responseWithIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Id is incorrect");
-            Assert.That(responseWithFioIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Fio is incorrect");
-            Assert.That(responseWithEmailIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Email is incorrect");
-            Assert.That(responseWithPostIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "PostId is incorrect");
-            Assert.That(responseWithBirthDateIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "BirthDate is incorrect");
-        });
-    }
-
-    [Test]
-    public async Task Put_WhenSendEmptyData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(string.Empty));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PutAsync($"/api/employees/changeinfo", MakeContent(new { Data = "test", Position = 10 }));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employeeId = Guid.NewGuid().ToString();
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(employeeId);
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/employees/delete/{employeeId}");
-        MagicCarpetDbContext.ChangeTracker.Clear();
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-            Assert.That(MagicCarpetDbContext.GetEmployeeFromDatabaseById(employeeId)!.IsDeleted);
-        });
-    }
-
-    [Test]
-    public async Task Delete_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/employees/delete/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/employees/delete/id");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_WhenRecordWasDeleted_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var employeeId = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(isDeleted: true).Id;
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/employees/delete/{employeeId}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    private static void AssertElement(EmployeeViewModel? actual, Employee expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.PostId, Is.EqualTo(expected.PostId));
-            Assert.That(actual.PostName, Is.EqualTo(expected.Post!.PostName));
-            Assert.That(actual.FIO, Is.EqualTo(expected.FIO));
-            Assert.That(actual.Email, Is.EqualTo(expected.Email));
-            Assert.That(actual.BirthDate.ToString(), Is.EqualTo(expected.BirthDate.ToString()));
-            Assert.That(actual.EmploymentDate.ToString(), Is.EqualTo(expected.EmploymentDate.ToString()));
-            Assert.That(actual.IsDeleted, Is.EqualTo(expected.IsDeleted));
-        });
-    }
-
-    private static EmployeeBindingModel CreateModel(string postId, string? id = null, string fio = "fio", string email = "abc@gmail.com", DateTime? birthDate = null, DateTime? employmentDate = null)
-    {
-        return new()
-        {
-            Id = id ?? Guid.NewGuid().ToString(),
-            FIO = fio,
-            Email = email,
-            BirthDate = birthDate ?? DateTime.UtcNow.AddYears(-22),
-            EmploymentDate = employmentDate ?? DateTime.UtcNow.AddDays(-5),
-            PostId = postId
-        };
-    }
-
-    private static void AssertElement(Employee? actual, EmployeeBindingModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.PostId, Is.EqualTo(expected.PostId));
-            Assert.That(actual.FIO, Is.EqualTo(expected.FIO));
-            Assert.That(actual.Email, Is.EqualTo(expected.Email));
-            Assert.That(actual.BirthDate.ToString(), Is.EqualTo(expected.BirthDate.ToString()));
-            Assert.That(actual.EmploymentDate.ToString(), Is.EqualTo(expected.EmploymentDate.ToString()));
-            Assert.That(!actual.IsDeleted);
-        });
-    }
-}

MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/PostControllerTests.cs

@@ -1,460 +0,0 @@
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.Enums;
-using MagicCarpetContracts.ViewModels;
-using MagicCarpetDatabase.Models;
-using MagicCarpetTests.Infrastructure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.WebApiControllersTests;
-
-[TestFixture]
-internal class PostControllerTests : BaseWebApiControllerTest
-{
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemovePostsFromDatabase();
-    }
-
-    [Test]
-    public async Task GetRecords_WhenHaveRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var post = MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postName: "name 1");
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postName: "name 2");
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postName: "name 3");
-        //Act
-        var response = await HttpClient.GetAsync("/api/posts");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<PostViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(3));
-        });
-        AssertElement(data.First(x => x.Id == post.PostId), post);
-    }
-
-    [Test]
-    public async Task GetHistory_WhenHaveRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var postId = Guid.NewGuid().ToString();
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postName: "name 1", isActual: true);
-        var post = MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postId, "name 2", isActual: true);
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postId, "name 2", isActual: false);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/posthistory/{postId}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<PostViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(2));
-        });
-        AssertElement(data.First(x => x.Id == post.PostId), post);
-    }
-
-    [Test]
-    public async Task GetHistory_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var postId = Guid.NewGuid().ToString();
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postName: "name 1", isActual: true);
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postId, "name 2", isActual: true);
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postId, "name 2", isActual: false);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/posthistory/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<PostViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(0));
-        });
-    }
-
-    [Test]
-    public async Task GetHistory_WhenWrongData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/posthistory/id");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var post = MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/posts/{post.PostId}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<PostViewModel>(response), post);
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/posts/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenRecordWasDeleted_ShouldNotFound_Test()
-    {
-        //Arrange
-        var post = MagicCarpetDbContext.InsertPostToDatabaseAndReturn(isActual: false);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/posts/{post.PostId}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ByName_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var post = MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/posts/{post.PostName}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<PostViewModel>(response), post);
-    }
-
-    [Test]
-    public async Task GetElement_ByName_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/posts/New%20Name");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ByName_WhenRecordWasDeleted_ShouldNotFound_Test()
-    {
-        //Arrange
-        var post = MagicCarpetDbContext.InsertPostToDatabaseAndReturn(isActual: false);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/posts/{post.PostName}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task Post_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-        var postModel = CreateModel();
-        //Act
-        var response = await HttpClient.PostAsync($"/api/posts", MakeContent(postModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        AssertElement(MagicCarpetDbContext.GetPostFromDatabaseByPostId(postModel.Id!), postModel);
-    }
-
-    [Test]
-    public async Task Post_WhenHaveRecordWithSameId_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var postModel = CreateModel();
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postModel.Id);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/posts", MakeContent(postModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenHaveRecordWithSameName_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var postModel = CreateModel(postName: "unique name");
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postName: postModel.PostName!);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/posts", MakeContent(postModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenDataIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var postModelWithIdIncorrect = new PostBindingModel { Id = "Id", PostName = "name", PostType = PostType.Manager.ToString(), Salary = 10 };
-        var postModelWithNameIncorrect = new PostBindingModel { Id = Guid.NewGuid().ToString(), PostName = string.Empty, PostType = PostType.Manager.ToString(), Salary = 10 };
-        var postModelWithPostTypeIncorrect = new PostBindingModel { Id = Guid.NewGuid().ToString(), PostName = string.Empty, PostType = string.Empty, Salary = 10 };
-        var postModelWithSalaryIncorrect = new PostBindingModel { Id = Guid.NewGuid().ToString(), PostName = string.Empty, PostType = PostType.Manager.ToString(), Salary = -10 };
-        //Act
-        var responseWithIdIncorrect = await HttpClient.PostAsync($"/api/posts", MakeContent(postModelWithIdIncorrect));
-        var responseWithNameIncorrect = await HttpClient.PostAsync($"/api/posts", MakeContent(postModelWithNameIncorrect));
-        var responseWithPostTypeIncorrect = await HttpClient.PostAsync($"/api/posts", MakeContent(postModelWithPostTypeIncorrect));
-        var responseWithSalaryIncorrect = await HttpClient.PostAsync($"/api/posts", MakeContent(postModelWithSalaryIncorrect));
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(responseWithIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Id is incorrect");
-            Assert.That(responseWithNameIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Name is incorrect");
-            Assert.That(responseWithPostTypeIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Type is incorrect");
-            Assert.That(responseWithSalaryIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Salary is incorrect");
-        });
-    }
-
-    [Test]
-    public async Task Post_WhenSendEmptyData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/posts", MakeContent(string.Empty));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/posts", MakeContent(new { Data = "test", Position = 10 }));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_ShouldSuccess_Test()
-    {
-        //Arrange
-        var postModel = CreateModel();
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postModel.Id);
-        //Act
-        var response = await HttpClient.PutAsync($"/api/posts", MakeContent(postModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        MagicCarpetDbContext.ChangeTracker.Clear();
-        AssertElement(MagicCarpetDbContext.GetPostFromDatabaseByPostId(postModel.Id!), postModel);
-    }
-
-    [Test]
-    public async Task Put_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var postModel = CreateModel();
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.PutAsync($"/api/posts", MakeContent(postModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenRecordWasDeleted_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var postModel = CreateModel();
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postModel.Id, isActual: false);
-        //Act
-        var response = await HttpClient.PutAsync($"/api/posts", MakeContent(postModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenHaveRecordWithSameName_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var postModel = CreateModel(postName: "unique name");
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postModel.Id);
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn(postName: postModel.PostName!);
-        //Act
-        var response = await HttpClient.PutAsync($"/api/posts", MakeContent(postModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenDataIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var postModelWithIdIncorrect = new PostBindingModel { Id = "Id", PostName = "name", PostType = PostType.Manager.ToString(), Salary = 10 };
-        var postModelWithNameIncorrect = new PostBindingModel { Id = Guid.NewGuid().ToString(), PostName = string.Empty, PostType = PostType.Manager.ToString(), Salary = 10 };
-        var postModelWithPostTypeIncorrect = new PostBindingModel { Id = Guid.NewGuid().ToString(), PostName = string.Empty, PostType = string.Empty, Salary = 10 };
-        var postModelWithSalaryIncorrect = new PostBindingModel { Id = Guid.NewGuid().ToString(), PostName = string.Empty, PostType = PostType.Manager.ToString(), Salary = -10 };
-        //Act
-        var responseWithIdIncorrect = await HttpClient.PutAsync($"/api/posts", MakeContent(postModelWithIdIncorrect));
-        var responseWithNameIncorrect = await HttpClient.PutAsync($"/api/posts", MakeContent(postModelWithNameIncorrect));
-        var responseWithPostTypeIncorrect = await HttpClient.PutAsync($"/api/posts", MakeContent(postModelWithPostTypeIncorrect));
-        var responseWithSalaryIncorrect = await HttpClient.PutAsync($"/api/posts", MakeContent(postModelWithSalaryIncorrect));
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(responseWithIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Id is incorrect");
-            Assert.That(responseWithNameIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Name is incorrect");
-            Assert.That(responseWithPostTypeIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Type is incorrect");
-            Assert.That(responseWithSalaryIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Salary is incorrect");
-        });
-    }
-
-    [Test]
-    public async Task Put_WhenSendEmptyData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PutAsync($"/api/posts", MakeContent(string.Empty));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PutAsync($"/api/posts", MakeContent(new { Data = "test", Position = 10 }));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_ShouldSuccess_Test()
-    {
-        //Arrange
-        var postId = MagicCarpetDbContext.InsertPostToDatabaseAndReturn().PostId;
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/posts/{postId}");
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-            Assert.That(MagicCarpetDbContext.GetPostFromDatabaseByPostId(postId), Is.Null);
-        });
-    }
-
-    [Test]
-    public async Task Delete_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/posts/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_WhenRecordWasDeleted_Test()
-    {
-        //Arrange
-        var postId = MagicCarpetDbContext.InsertPostToDatabaseAndReturn(isActual: false).PostId;
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/posts/{postId}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/posts/id");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Patch_ShouldSuccess_Test()
-    {
-        //Arrange
-        var postId = MagicCarpetDbContext.InsertPostToDatabaseAndReturn(isActual: false).PostId;
-        //Act
-        var response = await HttpClient.PatchAsync($"/api/posts/{postId}", null);
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-            Assert.That(MagicCarpetDbContext.GetPostFromDatabaseByPostId(postId), Is.Not.Null);
-        });
-    }
-
-    [Test]
-    public async Task Patch_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.PatchAsync($"/api/posts/{Guid.NewGuid()}", null);
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Patch_WhenRecordNotWasDeleted_ShouldSuccess_Test()
-    {
-        //Arrange
-        var postId = MagicCarpetDbContext.InsertPostToDatabaseAndReturn().PostId;
-        //Act
-        var response = await HttpClient.PatchAsync($"/api/posts/{postId}", null);
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-            Assert.That(MagicCarpetDbContext.GetPostFromDatabaseByPostId(postId), Is.Not.Null);
-        });
-    }
-
-    [Test]
-    public async Task Patch_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PatchAsync($"/api/posts/id", null);
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    private static void AssertElement(PostViewModel? actual, Post expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.PostId));
-            Assert.That(actual.PostName, Is.EqualTo(expected.PostName));
-            Assert.That(actual.PostType, Is.EqualTo(expected.PostType.ToString()));
-            Assert.That(actual.Salary, Is.EqualTo(expected.Salary));
-        });
-    }
-
-    private static PostBindingModel CreateModel(string? postId = null, string postName = "name", PostType postType = PostType.Manager, double salary = 10)
-        => new()
-        {
-            Id = postId ?? Guid.NewGuid().ToString(),
-            PostName = postName,
-            PostType = postType.ToString(),
-            Salary = salary
-        };
-
-    private static void AssertElement(Post? actual, PostBindingModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.PostId, Is.EqualTo(expected.Id));
-            Assert.That(actual.PostName, Is.EqualTo(expected.PostName));
-            Assert.That(actual.PostType.ToString(), Is.EqualTo(expected.PostType));
-            Assert.That(actual.Salary, Is.EqualTo(expected.Salary));
-        });
-    }
-}

MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SalaryControllerTests.cs

@@ -1,217 +0,0 @@
-using MagicCarpetContracts.ViewModels;
-using MagicCarpetTests.Infrastructure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.WebApiControllersTests;
-
-[TestFixture]
-internal class SalaryControllerTests : BaseWebApiControllerTest
-{
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemovePostsFromDatabase();
-        MagicCarpetDbContext.RemoveEmployeesFromDatabase();
-        MagicCarpetDbContext.RemoveSalariesFromDatabase();
-    }
-
-    [Test]
-    public async Task GetList_WhenHaveRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Иванов И.И.");
-        var salary = MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id, employeeSalary: 100);
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id);
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/salary/getrecords?fromDate={DateTime.UtcNow.AddDays(-10):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(10):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SalaryViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(3));
-        });
-    }
-
-    [Test]
-    public async Task GetList_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/salary/getrecords?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SalaryViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(0));
-        });
-    }
-
-    [Test]
-    public async Task GetList_OnlyInDatePeriod_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Иванов И.И.");
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id, salaryDate: DateTime.UtcNow.AddDays(-2));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id, salaryDate: DateTime.UtcNow.AddDays(-1).AddMinutes(5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id, salaryDate: DateTime.UtcNow.AddDays(1).AddMinutes(-5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee.Id, salaryDate: DateTime.UtcNow.AddDays(-2));
-        //Act
-        var response = await HttpClient.GetAsync($"/api/salary/getrecords?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SalaryViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(2));
-        });
-    }
-
-    [Test]
-    public async Task GetList_WhenDateIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByEmployee_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee1 = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Иванов И.И.");
-        var employee2 = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Иванов И.И.");
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee1.Id);
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee1.Id);
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee2.Id);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&id={employee1.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SalaryViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(2));
-            Assert.That(data.All(x => x.EmployeeId == employee1.Id));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByEmployee_OnlyInDatePeriod_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee1 = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Иванов И.И.");
-        var employee2 = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Иванов И.И.");
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee1.Id, salaryDate: DateTime.UtcNow.AddDays(-2));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee1.Id, salaryDate: DateTime.UtcNow.AddDays(-1).AddMinutes(5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee2.Id, salaryDate: DateTime.UtcNow.AddDays(-1).AddMinutes(5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee1.Id, salaryDate: DateTime.UtcNow.AddDays(1).AddMinutes(-5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee2.Id, salaryDate: DateTime.UtcNow.AddDays(1).AddMinutes(-5));
-        MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee1.Id, salaryDate: DateTime.UtcNow.AddDays(-2));
-        //Act
-        var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&id={employee1.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SalaryViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(2));
-            Assert.That(data.All(x => x.EmployeeId == employee1.Id));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByEmployee_WhenDateIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Иванов И.И.");
-        //Act
-        var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&id={employee.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByEmployee_WhenIdIsNotGuid_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&id=id");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Calculate_ShouldSuccess_Test()
-    {
-        //Arrange
-        var post = MagicCarpetDbContext.InsertPostToDatabaseAndReturn(salary: 1000);
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Иванов И.И.", postId: post.PostId);
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id);
-
-        var expectedSum = sale.Sum * 0.1 + post.Salary;
-        //Act
-        var response = await HttpClient.PostAsync($"/api/salary/calculate?date={DateTime.UtcNow:MM/dd/yyyy}", null);
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        var salaries = MagicCarpetDbContext.GetSalariesFromDatabaseByEmployeeId(employee.Id);
-        Assert.Multiple(() =>
-        {
-            Assert.That(salaries, Has.Length.EqualTo(1));
-            Assert.That(salaries.First().EmployeeSalary, Is.EqualTo(expectedSum));
-            Assert.That(salaries.First().SalaryDate.Month, Is.EqualTo(DateTime.UtcNow.Month));
-        });
-    }
-
-    [Test]
-    public async Task Calculate_WithoutEmployees_ShouldSuccess_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/salary/calculate?date={DateTime.UtcNow:MM/dd/yyyy}", null);
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        var salaries = MagicCarpetDbContext.Salaries.ToArray();
-        Assert.That(salaries, Has.Length.EqualTo(0));
-    }
-
-    [Test]
-    public async Task Calculate_WithoutSalesByEmployee_ShouldSuccess_Test()
-    {
-        //Arrange
-        var post = MagicCarpetDbContext.InsertPostToDatabaseAndReturn(salary: 1000);
-        var employee1 = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "name 1", postId: post.PostId);
-        var employee2 = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "name 2", postId: post.PostId);
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee1.Id);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/salary/calculate?date={DateTime.UtcNow:MM/dd/yyyy}", null);
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        var salary1 = MagicCarpetDbContext.GetSalariesFromDatabaseByEmployeeId(employee1.Id).First().EmployeeSalary;
-        var salary2 = MagicCarpetDbContext.GetSalariesFromDatabaseByEmployeeId(employee2.Id).First().EmployeeSalary;
-        Assert.That(salary1, Is.Not.EqualTo(salary2));
-    }
-
-    [Test]
-    public async Task Calculate_PostNotFound_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertPostToDatabaseAndReturn();
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "name", postId: Guid.NewGuid().ToString());
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/salary/calculate?date={DateTime.UtcNow:MM/dd/yyyy}", null);
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-}

MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SaleControllerTests.cs

@@ -1,508 +0,0 @@
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.Enums;
-using MagicCarpetContracts.ViewModels;
-using MagicCarpetDatabase.Models;
-using MagicCarpetTests.Infrastructure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.WebApiControllersTests;
-
-[TestFixture]
-internal class SaleControllerTests : BaseWebApiControllerTest
-{
-    private string _clientId;
-    private string _employeeId;
-    private string _tourId;
-
-    [SetUp]
-    public void SetUp()
-    {
-        _clientId = MagicCarpetDbContext.InsertClientToDatabaseAndReturn().Id;
-        _employeeId = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn().Id;
-        _tourId = MagicCarpetDbContext.InsertTourToDatabaseAndReturn().Id;
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemoveSalesFromDatabase();
-        MagicCarpetDbContext.RemoveEmployeesFromDatabase();
-        MagicCarpetDbContext.RemoveClientsFromDatabase();
-        MagicCarpetDbContext.RemoveToursFromDatabase();
-    }
-
-    [Test]
-    public async Task GetList_WhenHaveRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, sum: 10, tours: [(_tourId, 10, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 10, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 10, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getrecords?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        var data = await GetModelFromResponseAsync<List<SaleViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(3));
-        });
-        AssertElement(data.First(x => x.Sum == sale.Sum), sale);
-    }
-
-    [Test]
-    public async Task GetList_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getrecords?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SaleViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(0));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByPeriod_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, saleDate: DateTime.UtcNow.AddDays(-1).AddMinutes(-3), tours: [(_tourId, 1, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, saleDate: DateTime.UtcNow.AddDays(-1).AddMinutes(3), tours: [(_tourId, 1, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, null, saleDate: DateTime.UtcNow.AddDays(1).AddMinutes(-3), tours: [(_tourId, 1, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, null, saleDate: DateTime.UtcNow.AddDays(1).AddMinutes(3), tours: [(_tourId, 1, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getrecords?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SaleViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(2));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByPeriod_WhenDateIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getrecords?fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByEmployeeId_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Other employee");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 1, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 1, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, null, tours: [(_tourId, 1, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getemployeerecords?id={_employeeId}&fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SaleViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(2));
-            Assert.That(data.All(x => x.EmployeeId == _employeeId));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByEmployeeId_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var employee = MagicCarpetDbContext.InsertEmployeeToDatabaseAndReturn(fio: "Other employee");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 1, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getemployeerecords?id={employee.Id}&fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SaleViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.That(data, Has.Count.EqualTo(0));
-    }
-
-    [Test]
-    public async Task GetList_ByEmployeeId_WhenDateIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getemployeerecords?id={_employeeId}&fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByEmployeeId_WhenIdIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getemployeerecords?id=Id&fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByClientId_ShouldSuccess_Test()
-    {
-        //Arrange
-        var client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn(fio: "Other fio", phoneNumber: "+8-888-888-88-88");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 1, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 1, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, client.Id, tours: [(_tourId, 1, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, null, tours: [(_tourId, 1, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getclientrecords?id={_clientId}&fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SaleViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(2));
-            Assert.That(data.All(x => x.ClientId == _clientId));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByClientId_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var client = MagicCarpetDbContext.InsertClientToDatabaseAndReturn(fio: "Other client", phoneNumber: "+8-888-888-88-88");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 1, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getclientrecords?id={client.Id}&fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SaleViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.That(data, Has.Count.EqualTo(0));
-    }
-
-    [Test]
-    public async Task GetList_ByClientId_WhenDateIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getclientrecords?id={_clientId}&fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByClientId_WhenIdIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getclientrecords?id=Id&fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByTourId_ShouldSuccess_Test()
-    {
-        //Arrange
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: "Other name");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 5, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 1, 1.1), (tour.Id, 4, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, null, tours: [(tour.Id, 1, 1.1)]);
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, null, tours: [(tour.Id, 1, 1.1), (_tourId, 1, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/gettourrecords?id={_tourId}&fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SaleViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Has.Count.EqualTo(3));
-            Assert.That(data.All(x => x.Tours.Any(y => y.TourId == _tourId)));
-        });
-    }
-
-    [Test]
-    public async Task GetList_ByTourId_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: "Other tour");
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 1, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/gettourrecords?id={tour.Id}&fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<SaleViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.That(data, Has.Count.EqualTo(0));
-    }
-
-    [Test]
-    public async Task GetList_ByTourId_WhenDateIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/gettourrecords?id={_tourId}&fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetList_ByTourId_WhenIdIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/gettourrecords?id=Id&fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 5, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getrecord/{sale.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<SaleViewModel>(response), sale);
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 5, 1.1)]);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getrecord/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenRecordHasCanceled_ShouldSuccess_Test()
-    {
-        //Arrange
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 1, 1.2)], isCancel: true);
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getrecord/{sale.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenIdIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/sales/getrecord/Id");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, null, tours: [(_tourId, 5, 1.1)]);
-        var saleModel = CreateModel(_employeeId, _clientId, _tourId);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(saleModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        AssertElement(MagicCarpetDbContext.GetSalesByClientId(_clientId)[0], saleModel);
-    }
-
-    [Test]
-    public async Task Post_WhenNoClient_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 5, 1.1)]);
-        var saleModel = CreateModel(_employeeId, null, _tourId);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(saleModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        AssertElement(MagicCarpetDbContext.GetSalesByClientId(null)[0], saleModel);
-    }
-
-    [Test]
-    public async Task Post_WhenDataIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var saleId = Guid.NewGuid().ToString();
-        var saleModelWithIdIncorrect = new SaleBindingModel { Id = "Id", EmployeeId = _employeeId, ClientId = _clientId, DiscountType = 1, Tours = [new SaleTourBindingModel { SaleId = saleId, TourId = _tourId, Count = 10, Price = 1.1 }] };
-        var saleModelWithEmployeeIdIncorrect = new SaleBindingModel { Id = saleId, EmployeeId = "Id", ClientId = _clientId, DiscountType = 1, Tours = [new SaleTourBindingModel { SaleId = saleId, TourId = _tourId, Count = 10, Price = 1.1 }] };
-        var saleModelWithClientIdIncorrect = new SaleBindingModel { Id = saleId, EmployeeId = _employeeId, ClientId = "Id", DiscountType = 1, Tours = [new SaleTourBindingModel { SaleId = saleId, TourId = _tourId, Count = 10, Price = 1.1 }] };
-        var saleModelWithToursIncorrect = new SaleBindingModel { Id = saleId, EmployeeId = _employeeId, ClientId = _clientId, DiscountType = 1, Tours = null };
-        var saleModelWithTourIdIncorrect = new SaleBindingModel { Id = saleId, EmployeeId = _employeeId, ClientId = _clientId, DiscountType = 1, Tours = [new SaleTourBindingModel { SaleId = saleId, TourId = "Id", Count = 10, Price = 1.1 }] };
-        var saleModelWithCountIncorrect = new SaleBindingModel { Id = saleId, EmployeeId = _employeeId, ClientId = _clientId, DiscountType = 1, Tours = [new SaleTourBindingModel { SaleId = saleId, TourId = _tourId, Count = -10, Price = 1.1 }] };
-        var saleModelWithPriceIncorrect = new SaleBindingModel { Id = saleId, EmployeeId = _employeeId, ClientId = _clientId, DiscountType = 1, Tours = [new SaleTourBindingModel { SaleId = saleId, TourId = _tourId, Count = 10, Price = -1.1 }] };
-        //Act
-        var responseWithIdIncorrect = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(saleModelWithIdIncorrect));
-        var responseWithEmployeeIdIncorrect = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(saleModelWithEmployeeIdIncorrect));
-        var responseWithClientIdIncorrect = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(saleModelWithClientIdIncorrect));
-        var responseWithToursIncorrect = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(saleModelWithToursIncorrect));
-        var responseWithTourIdIncorrect = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(saleModelWithTourIdIncorrect));
-        var responseWithCountIncorrect = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(saleModelWithCountIncorrect));
-        var responseWithPriceIncorrect = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(saleModelWithPriceIncorrect));
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(responseWithIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "EmployeeId is incorrect");
-            Assert.That(responseWithEmployeeIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "EmployeeId is incorrect");
-            Assert.That(responseWithClientIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "ClientId is incorrect");
-            Assert.That(responseWithToursIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Tours is incorrect");
-            Assert.That(responseWithTourIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "TourId is incorrect");
-            Assert.That(responseWithCountIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Count is incorrect");
-            Assert.That(responseWithPriceIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Price is incorrect");
-        });
-    }
-
-    [Test]
-    public async Task Post_WhenSendEmptyData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(string.Empty));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/sales/sale", MakeContent(new { Data = "test", Position = 10 }));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_ShouldSuccess_Test()
-    {
-        //Arrange
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 5, 1.1)]);
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/sales/cancel/{sale.Id}");
-        MagicCarpetDbContext.ChangeTracker.Clear();
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-            Assert.That(MagicCarpetDbContext.GetSaleFromDatabaseById(sale.Id)!.IsCancel);
-        });
-    }
-
-    [Test]
-    public async Task Delete_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 5, 1.1)]);
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/sales/cancel/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_WhenIsCanceled_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var sale = MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(_employeeId, _clientId, tours: [(_tourId, 5, 1.1)], isCancel: true);
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/sales/cancel/{sale.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/sales/cancel/id");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    private static void AssertElement(SaleViewModel? actual, Sale expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.EmployeeFIO, Is.EqualTo(expected.Employee!.FIO));
-            Assert.That(actual.ClientFIO, Is.EqualTo(expected.Client?.FIO));
-            Assert.That(actual.DiscountType, Is.EqualTo(expected.DiscountType.ToString()));
-            Assert.That(actual.Discount, Is.EqualTo(expected.Discount));
-            Assert.That(actual.IsCancel, Is.EqualTo(expected.IsCancel));
-        });
-
-        if (expected.SaleTours is not null)
-        {
-            Assert.That(actual.Tours, Is.Not.Null);
-            Assert.That(actual.Tours, Has.Count.EqualTo(expected.SaleTours.Count));
-            for (int i = 0; i < actual.Tours.Count; ++i)
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(actual.Tours[i].TourName, Is.EqualTo(expected.SaleTours[i].Tour!.TourName));
-                    Assert.That(actual.Tours[i].Count, Is.EqualTo(expected.SaleTours[i].Count));
-                });
-            }
-        }
-        else
-        {
-            Assert.That(actual.Tours, Is.Null);
-        }
-    }
-
-    private static SaleBindingModel CreateModel(string employeeId, string? clientId, string tourId, string? id = null, DiscountType discountType = DiscountType.OnSale, int count = 1, double price = 1.1)
-    {
-        var saleId = id ?? Guid.NewGuid().ToString();
-        return new()
-        {
-            Id = saleId,
-            EmployeeId = employeeId,
-            ClientId = clientId,
-            DiscountType = (int)discountType,
-            Tours = [new SaleTourBindingModel { SaleId = saleId, TourId = tourId, Count = count, Price = price }]
-        };
-    }
-
-    private static void AssertElement(Sale? actual, SaleBindingModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.EmployeeId, Is.EqualTo(expected.EmployeeId));
-            Assert.That(actual.ClientId, Is.EqualTo(expected.ClientId));
-            Assert.That((int)actual.DiscountType, Is.EqualTo(expected.DiscountType));
-            Assert.That(!actual.IsCancel);
-        });
-
-        if (expected.Tours is not null)
-        {
-            Assert.That(actual.SaleTours, Is.Not.Null);
-            Assert.That(actual.SaleTours, Has.Count.EqualTo(expected.Tours.Count));
-            for (int i = 0; i < actual.SaleTours.Count; ++i)
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(actual.SaleTours[i].TourId, Is.EqualTo(expected.Tours[i].TourId));
-                    Assert.That(actual.SaleTours[i].Count, Is.EqualTo(expected.Tours[i].Count));
-                    Assert.That(actual.SaleTours[i].Price, Is.EqualTo(expected.Tours[i].Price));
-                });
-            }
-        }
-        else
-        {
-            Assert.That(actual.SaleTours, Is.Null);
-        }
-    }
-}

MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/TourControllerTests.cs

@@ -1,394 +0,0 @@
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.Enums;
-using MagicCarpetContracts.ViewModels;
-using MagicCarpetDatabase.Models;
-using MagicCarpetTests.Infrastructure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MagicCarpetTests.WebApiControllersTests;
-
-[TestFixture]
-internal class TourControllerTests : BaseWebApiControllerTest
-{
-    [TearDown]
-    public void TearDown()
-    {
-        MagicCarpetDbContext.RemoveToursFromDatabase();
-    }
-
-    [Test]
-    public async Task GetList_WhenHaveRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: "name 1");
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: "name 2");
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: "name 3");
-        //Act
-        var response = await HttpClient.GetAsync("/api/tours/getrecords");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<TourViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(3));
-        });
-        AssertElement(data.First(x => x.Id == tour.Id), tour);
-    }
-
-    [Test]
-    public async Task GetList_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync("/api/tours/getrecords");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<TourViewModel>>(response);
-        Assert.Multiple(() =>
-        {
-            Assert.That(data, Is.Not.Null);
-            Assert.That(data, Has.Count.EqualTo(0));
-        });
-    }
-
-    [Test]
-    public async Task GetHistoryByTourId_WhenHaveRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 20, DateTime.UtcNow.AddDays(-1));
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 30, DateTime.UtcNow.AddMinutes(-10));
-        var history = MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 40, DateTime.UtcNow.AddDays(1));
-        //Act
-        var response = await HttpClient.GetAsync($"/api/tours/gethistory?id={tour.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<TourHistoryViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.That(data, Has.Count.EqualTo(3));
-        AssertElement(data[0], history);
-    }
-
-    [Test]
-    public async Task GetHistoryByTourId_WhenNoRecords_ShouldSuccess_Test()
-    {
-        //Arrange
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 20, DateTime.UtcNow.AddDays(-1));
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 30, DateTime.UtcNow.AddMinutes(-10));
-        MagicCarpetDbContext.InsertTourHistoryToDatabaseAndReturn(tour.Id, 40, DateTime.UtcNow.AddDays(1));
-        //Act
-        var response = await HttpClient.GetAsync($"/api/tours/gethistory?id={Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        var data = await GetModelFromResponseAsync<List<TourViewModel>>(response);
-        Assert.That(data, Is.Not.Null);
-        Assert.That(data, Has.Count.EqualTo(0));
-    }
-
-    [Test]
-    public async Task GetHistoryByTourId_WhenTourIdIsNotGuid_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.GetAsync($"/api/tours/gethistory?id=id");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/tours/getrecord/{tour.Id}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<TourViewModel>(response), tour);
-    }
-
-    [Test]
-    public async Task GetElement_ById_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/tours/getrecord/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-    [Test]
-    public async Task GetElement_ByName_WhenHaveRecord_ShouldSuccess_Test()
-    {
-        //Arrange
-        var tour = MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/tours/getrecord/{tour.TourName}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-        AssertElement(await GetModelFromResponseAsync<TourViewModel>(response), tour);
-    }
-
-    [Test]
-    public async Task GetElement_ByName_WhenNoRecord_ShouldNotFound_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.GetAsync($"/api/tours/getrecord/New%20Name");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-    }
-
-
-    [Test]
-    public async Task Post_ShouldSuccess_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-        var tourModel = CreateModel();
-        //Act
-        var response = await HttpClient.PostAsync($"/api/tours/register", MakeContent(tourModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        AssertElement(MagicCarpetDbContext.GetTourFromDatabaseById(tourModel.Id!), tourModel);
-    }
-
-    [Test]
-    public async Task Post_WhenHaveRecordWithSameId_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var tourModel = CreateModel();
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourModel.Id);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/tours/register", MakeContent(tourModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenHaveRecordWithSameName_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var tourModel = CreateModel(tourName: "unique name");
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: tourModel.TourName!);
-        //Act
-        var response = await HttpClient.PostAsync($"/api/tours/register", MakeContent(tourModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenDataIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var tourModelWithIdIncorrect = new TourBindingModel { Id = "Id", TourName = "name", TourCountry = "country", Price = 100, TourType = TourType.Beach.ToString() };
-        var tourModelWithNameIncorrect = new TourBindingModel { Id = Guid.NewGuid().ToString(), TourName = string.Empty, TourCountry = "country", Price = 100, TourType = TourType.Beach.ToString() };
-        var tourModelWithCountryIncorrect = new TourBindingModel { Id = Guid.NewGuid().ToString(), TourName = "name", TourCountry = string.Empty, Price = 100, TourType = TourType.Beach.ToString() };
-        var tourModelWithTourTypeIncorrect = new TourBindingModel { Id = Guid.NewGuid().ToString(), TourName = "name", TourCountry = "country", Price = 100, TourType = string.Empty };
-        var tourModelWithPriceIncorrect = new TourBindingModel { Id = Guid.NewGuid().ToString(), TourName = "name", TourCountry = "country", Price = 0, TourType = TourType.Beach.ToString() };
-        //Act
-        var responseWithIdIncorrect = await HttpClient.PostAsync($"/api/tours/register", MakeContent(tourModelWithIdIncorrect));
-        var responseWithNameIncorrect = await HttpClient.PostAsync($"/api/tours/register", MakeContent(tourModelWithNameIncorrect));
-        var responseWithCountryIncorrect = await HttpClient.PostAsync($"/api/tours/register", MakeContent(tourModelWithCountryIncorrect));
-        var responseWithTourTypeIncorrect = await HttpClient.PostAsync($"/api/tours/register", MakeContent(tourModelWithTourTypeIncorrect));
-        var responseWithPriceIncorrect = await HttpClient.PostAsync($"/api/tours/register", MakeContent(tourModelWithPriceIncorrect));
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(responseWithIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Id is incorrect");
-            Assert.That(responseWithNameIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Name is incorrect");
-            Assert.That(responseWithCountryIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Country is incorrect");
-            Assert.That(responseWithTourTypeIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "TourType is incorrect");
-            Assert.That(responseWithPriceIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Price is incorrect");
-        });
-    }
-
-    [Test]
-    public async Task Post_WhenSendEmptyData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/tours/register", MakeContent(string.Empty));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Post_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PostAsync($"/api/tours/register", MakeContent(new { Data = "test", Position = 10 }));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_ShouldSuccess_Test()
-    {
-        //Arrange
-        var tourModel = CreateModel();
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourModel.Id);
-        //Act
-        var response = await HttpClient.PutAsync($"/api/tours/changeinfo", MakeContent(tourModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        MagicCarpetDbContext.ChangeTracker.Clear();
-        AssertElement(MagicCarpetDbContext.GetTourFromDatabaseById(tourModel.Id!), tourModel);
-    }
-
-    [Test]
-    public async Task Put_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var tourModel = CreateModel();
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.PutAsync($"/api/tours/changeinfo", MakeContent(tourModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenHaveRecordWithSameName_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var tourModel = CreateModel(tourName: "unique name");
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourModel.Id);
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourName: tourModel.TourName!);
-        //Act
-        var response = await HttpClient.PutAsync($"/api/tours/changeinfo", MakeContent(tourModel));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenDataIsIncorrect_ShouldBadRequest_Test()
-    {
-        //Arrange
-        var tourModelWithIdIncorrect = new TourBindingModel { Id = "Id", TourName = "name", Price = 100, TourType = TourType.Beach.ToString() };
-        var tourModelWithNameIncorrect = new TourBindingModel { Id = Guid.NewGuid().ToString(), TourName = string.Empty, Price = 100, TourType  = TourType.Beach.ToString() };
-        var tourModelWithCountryIncorrect = new TourBindingModel { Id = Guid.NewGuid().ToString(), TourName = "name", TourCountry = string.Empty, Price = 100, TourType = TourType.Beach.ToString() };
-        var tourModelWithTourTypeIncorrect = new TourBindingModel { Id = Guid.NewGuid().ToString(), TourName = "name", Price = 100, TourType = string.Empty };
-        var tourModelWithPriceIncorrect = new TourBindingModel { Id = Guid.NewGuid().ToString(), TourName = "name", Price = 0, TourType = TourType.Beach.ToString() };
-        //Act
-        var responseWithIdIncorrect = await HttpClient.PutAsync($"/api/tours/changeinfo", MakeContent(tourModelWithIdIncorrect));
-        var responseWithNameIncorrect = await HttpClient.PutAsync($"/api/tours/changeinfo", MakeContent(tourModelWithNameIncorrect));
-        var responseWithCountryIncorrect = await HttpClient.PostAsync($"/api/tours/register", MakeContent(tourModelWithCountryIncorrect));
-        var responseWithTourTypeIncorrect = await HttpClient.PutAsync($"/api/tours/changeinfo", MakeContent(tourModelWithTourTypeIncorrect));
-        var responseWithPriceIncorrect = await HttpClient.PutAsync($"/api/tours/changeinfo", MakeContent(tourModelWithPriceIncorrect));
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(responseWithIdIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Id is incorrect");
-            Assert.That(responseWithNameIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Name is incorrect");
-            Assert.That(responseWithCountryIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Country is incorrect");
-            Assert.That(responseWithTourTypeIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "TourType is incorrect");
-            Assert.That(responseWithPriceIncorrect.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest), "Price is incorrect");
-        });
-    }
-
-    [Test]
-    public async Task Put_WhenSendEmptyData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PutAsync($"/api/tours/changeinfo", MakeContent(string.Empty));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Put_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.PutAsync($"/api/tours/changeinfo", MakeContent(new { Data = "test", Position = 10 }));
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_ShouldSuccess_Test()
-    {
-        //Arrange
-        var tourId = Guid.NewGuid().ToString();
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn(tourId);
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/tours/delete/{tourId}");
-        MagicCarpetDbContext.ChangeTracker.Clear();
-        //Assert
-        Assert.Multiple(() =>
-        {
-            Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-        });
-    }
-
-    [Test]
-    public async Task Delete_WhenNoFoundRecord_ShouldBadRequest_Test()
-    {
-        //Arrange
-        MagicCarpetDbContext.InsertTourToDatabaseAndReturn();
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/tours/delete/{Guid.NewGuid()}");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    [Test]
-    public async Task Delete_WhenSendWrongFormatData_ShouldBadRequest_Test()
-    {
-        //Act
-        var response = await HttpClient.DeleteAsync($"/api/tours/delete/id");
-        //Assert
-        Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-    }
-
-    private static void AssertElement(TourViewModel? actual, Tour expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.TourName, Is.EqualTo(expected.TourName));
-            Assert.That(actual.TourType, Is.EqualTo(expected.TourType.ToString()));
-            Assert.That(actual.Price, Is.EqualTo(expected.Price));
-        });
-    }
-
-    private static void AssertElement(TourHistoryViewModel? actual, TourHistory expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.TourName, Is.EqualTo(expected.Tour!.TourName));
-            Assert.That(actual.OldPrice, Is.EqualTo(expected.OldPrice));
-            Assert.That(actual.ChangeDate.ToString(), Is.EqualTo(expected.ChangeDate.ToString()));
-        });
-    }
-
-    private static TourBindingModel CreateModel(string? id = null, string tourName = "name", string tourCountry = "country", TourType tourType = TourType.Beach, double price = 1)
-        => new()
-        {
-            Id = id ?? Guid.NewGuid().ToString(),
-            TourName = tourName,
-            TourCountry = tourCountry,
-            TourType = tourType.ToString(),
-            Price = price
-        };
-
-    private static void AssertElement(Tour? actual, TourBindingModel expected)
-    {
-        Assert.That(actual, Is.Not.Null);
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.TourName, Is.EqualTo(expected.TourName));
-            Assert.That(actual.TourType.ToString(), Is.EqualTo(expected.TourType));
-            Assert.That(actual.Price, Is.EqualTo(expected.Price));
-        });
-    }
-}

MagicCarpetProject/MagicCarpetTests/appsettings.json

@@ -1,28 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "Serilog": {
-    "Using": [ "Serilog.Sinks.File" ],
-    "MinimumLevel": {
-      "Default": "Information"
-    },
-    "WriteTo": [
-      {
-        "Name": "File",
-        "Args": {
-          "path": "../logs/magiccarpet-.log",
-          "rollingInterval": "Day",
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} {CorrelationId} {Level:u3} {Username} {Message:lj}{Exception}{NewLine}"
-        }
-      }
-    ]
-  },
-  "AllowedHosts": "*"
-  //"DataBaseSettings": {
-  //  "ConnectionString": "Host=127.0.0.1;Port=5432;Database=MagicCarpetTest;Username=postgres;Password=postgres;"
-  //}
-}

MagicCarpetProject/MagicCarpetWebApi/Adapters/ClientAdapter.cs

@@ -1,188 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.AdapterContracts;
-using MagicCarpetContracts.AdapterContracts.OperationResponses;
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.BuisnessLogicContracts;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.ViewModels;
-
-namespace MagicCarpetWebApi.Adapters;
-
-public class ClientAdapter : IClientAdapter
-{
-    private readonly IClientBusinessLogicContract _clientBusinessLogicContract;
-
-    private readonly ILogger _logger;
-
-    private readonly Mapper _mapper;
-    public ClientAdapter(IClientBusinessLogicContract clientBusinessLogicContract, ILogger<ClientAdapter> logger)
-    {
-        _clientBusinessLogicContract = clientBusinessLogicContract;
-        _logger = logger;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<ClientBindingModel, ClientDataModel>();
-            cfg.CreateMap<ClientDataModel, ClientViewModel>();
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public ClientOperationResponse GetList()
-    {
-        try
-        {
-            return ClientOperationResponse.OK([.. _clientBusinessLogicContract.GetAllClients().Select(x => _mapper.Map<ClientViewModel>(x))]);
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return ClientOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return ClientOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return ClientOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public ClientOperationResponse GetElement(string data)
-    {
-        try
-        {
-            return ClientOperationResponse.OK(_mapper.Map<ClientViewModel>(_clientBusinessLogicContract.GetClientByData(data)));
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return ClientOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return ClientOperationResponse.NotFound($"Not found element by data {data}");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return ClientOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return ClientOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public ClientOperationResponse RegisterClient(ClientBindingModel clientModel)
-    {
-        try
-        {
-            _clientBusinessLogicContract.InsertClient(_mapper.Map<ClientDataModel>(clientModel));
-            return ClientOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return ClientOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return ClientOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementExistsException ex)
-        {
-            _logger.LogError(ex, "ElementExistsException");
-            return ClientOperationResponse.BadRequest(ex.Message);
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return ClientOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return ClientOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public ClientOperationResponse ChangeClientInfo(ClientBindingModel clientModel)
-    {
-        try
-        {
-            _clientBusinessLogicContract.UpdateClient(_mapper.Map<ClientDataModel>(clientModel));
-            return ClientOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return ClientOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return ClientOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return ClientOperationResponse.BadRequest($"Not found element by Id {clientModel.Id}");
-        }
-        catch (ElementExistsException ex)
-        {
-            _logger.LogError(ex, "ElementExistsException");
-            return ClientOperationResponse.BadRequest(ex.Message);
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return ClientOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return ClientOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public ClientOperationResponse RemoveClient(string id)
-    {
-        try
-        {
-            _clientBusinessLogicContract.DeleteClient(id);
-            return ClientOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return ClientOperationResponse.BadRequest("Id is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return ClientOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return ClientOperationResponse.BadRequest($"Not found element by id: {id}");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return ClientOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return ClientOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-}

MagicCarpetProject/MagicCarpetWebApi/Adapters/EmployeeAdapter.cs

@@ -1,278 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.AdapterContracts;
-using MagicCarpetContracts.AdapterContracts.OperationResponses;
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.BuisnessLogicContracts;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.ViewModels;
-
-namespace MagicCarpetWebApi.Adapters;
-
-public class EmployeeAdapter : IEmployeeAdapter
-{
-    private readonly IEmployeeBusinessLogicContract _employeeBusinessLogicContract;
-
-    private readonly ILogger _logger;
-
-    private readonly Mapper _mapper;
-
-    public EmployeeAdapter(IEmployeeBusinessLogicContract employeeBusinessLogicContract, ILogger<EmployeeAdapter> logger)
-    {
-        _employeeBusinessLogicContract = employeeBusinessLogicContract;
-        _logger = logger;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<EmployeeBindingModel, EmployeeDataModel>();
-            cfg.CreateMap<EmployeeDataModel, EmployeeViewModel>();
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public EmployeeOperationResponse GetList(bool includeDeleted)
-    {
-        try
-        {
-            return EmployeeOperationResponse.OK([.. _employeeBusinessLogicContract.GetAllEmployees(!includeDeleted).Select(x => _mapper.Map<EmployeeViewModel>(x))]);
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return EmployeeOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return EmployeeOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return EmployeeOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public EmployeeOperationResponse GetPostList(string id, bool includeDeleted)
-    {
-        try
-        {
-            return EmployeeOperationResponse.OK([.. _employeeBusinessLogicContract.GetAllEmployeesByPost(id, !includeDeleted).Select(x => _mapper.Map<EmployeeViewModel>(x))]);
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return EmployeeOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return EmployeeOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return EmployeeOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return EmployeeOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public EmployeeOperationResponse GetListByBirthDate(DateTime fromDate, DateTime toDate, bool includeDeleted)
-    {
-        try
-        {
-            return EmployeeOperationResponse.OK([.. _employeeBusinessLogicContract.GetAllEmployeesByBirthDate(fromDate, toDate, !includeDeleted).Select(x => _mapper.Map<EmployeeViewModel>(x))]);
-        }
-        catch (IncorrectDatesException ex)
-        {
-            _logger.LogError(ex, "IncorrectDatesException");
-            return EmployeeOperationResponse.BadRequest($"Incorrect dates: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return EmployeeOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return EmployeeOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return EmployeeOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public EmployeeOperationResponse GetListByEmploymentDate(DateTime fromDate, DateTime toDate, bool includeDeleted)
-    {
-        try
-        {
-            return EmployeeOperationResponse.OK([.. _employeeBusinessLogicContract.GetAllEmployeesByEmploymentDate(fromDate, toDate, !includeDeleted).Select(_mapper.Map<EmployeeViewModel>)]);
-        }
-        catch (IncorrectDatesException ex)
-        {
-            _logger.LogError(ex, "IncorrectDatesException");
-            return EmployeeOperationResponse.BadRequest($"Incorrect dates: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return EmployeeOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return EmployeeOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return EmployeeOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public EmployeeOperationResponse GetElement(string data)
-    {
-        try
-        {
-            return EmployeeOperationResponse.OK(_mapper.Map<EmployeeViewModel>(_employeeBusinessLogicContract.GetEmployeeByData(data)));
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return EmployeeOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return EmployeeOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return EmployeeOperationResponse.NotFound($"Not found element by data {data}");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return EmployeeOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return EmployeeOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public EmployeeOperationResponse RegisterEmployee(EmployeeBindingModel employeeModel)
-    {
-        try
-        {
-            _employeeBusinessLogicContract.InsertEmployee(_mapper.Map<EmployeeDataModel>(employeeModel));
-            return EmployeeOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return EmployeeOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return EmployeeOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementExistsException ex)
-        {
-            _logger.LogError(ex, "ElementExistsException");
-            return EmployeeOperationResponse.BadRequest(ex.Message);
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return EmployeeOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return EmployeeOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public EmployeeOperationResponse ChangeEmployeeInfo(EmployeeBindingModel employeeModel)
-    {
-        try
-        {
-            _employeeBusinessLogicContract.UpdateEmployee(_mapper.Map<EmployeeDataModel>(employeeModel));
-            return EmployeeOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return EmployeeOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return EmployeeOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return EmployeeOperationResponse.BadRequest($"Not found element by Id {employeeModel.Id}");
-        }
-        catch (ElementExistsException ex)
-        {
-            _logger.LogError(ex, "ElementExistsException");
-            return EmployeeOperationResponse.BadRequest(ex.Message);
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return EmployeeOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return EmployeeOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public EmployeeOperationResponse RemoveEmployee(string id)
-    {
-        try
-        {
-            _employeeBusinessLogicContract.DeleteEmployee(id);
-            return EmployeeOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return EmployeeOperationResponse.BadRequest("Id is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return EmployeeOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return EmployeeOperationResponse.BadRequest($"Not found element by id: {id}");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return EmployeeOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return EmployeeOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-}

MagicCarpetProject/MagicCarpetWebApi/Adapters/PostAdapter.cs

@@ -1,266 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.AdapterContracts;
-using MagicCarpetContracts.AdapterContracts.OperationResponses;
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.BuisnessLogicContracts;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.ViewModels;
-
-namespace MagicCarpetWebApi.Adapters;
-
-public class PostAdapter : IPostAdapter
-{
-    private readonly IPostBusinessLogicContract _postBusinessLogicContract;
-
-    private readonly ILogger _logger;
-
-    private readonly Mapper _mapper;
-
-    public PostAdapter(IPostBusinessLogicContract postBusinessLogicContract, ILogger<PostAdapter> logger)
-    {
-        _postBusinessLogicContract = postBusinessLogicContract;
-        _logger = logger;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<PostBindingModel, PostDataModel>();
-            cfg.CreateMap<PostDataModel, PostViewModel>();
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public PostOperationResponse GetList()
-    {
-        try
-        {
-            return PostOperationResponse.OK([.. _postBusinessLogicContract.GetAllPosts().Select(x => _mapper.Map<PostViewModel>(x))]);
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return PostOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return PostOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return PostOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public PostOperationResponse GetHistory(string id)
-    {
-        try
-        {
-            return PostOperationResponse.OK([.. _postBusinessLogicContract.GetAllDataOfPost(id).Select(x => _mapper.Map<PostViewModel>(x))]);
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return PostOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return PostOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return PostOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return PostOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public PostOperationResponse GetElement(string data)
-    {
-        try
-        {
-            return PostOperationResponse.OK(_mapper.Map<PostViewModel>(_postBusinessLogicContract.GetPostByData(data)));
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return PostOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return PostOperationResponse.NotFound($"Not found element by data {data}");
-        }
-        catch (ElementDeletedException ex)
-        {
-            _logger.LogError(ex, "ElementDeletedException");
-            return PostOperationResponse.BadRequest($"Element by data: {data} was deleted");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return PostOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return PostOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public PostOperationResponse RegisterPost(PostBindingModel postModel)
-    {
-        try
-        {
-            _postBusinessLogicContract.InsertPost(_mapper.Map<PostDataModel>(postModel));
-            return PostOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return PostOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return PostOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementExistsException ex)
-        {
-            _logger.LogError(ex, "ElementExistsException");
-            return PostOperationResponse.BadRequest(ex.Message);
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return PostOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return PostOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public PostOperationResponse ChangePostInfo(PostBindingModel postModel)
-    {
-        try
-        {
-            _postBusinessLogicContract.UpdatePost(_mapper.Map<PostDataModel>(postModel));
-            return PostOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return PostOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return PostOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return PostOperationResponse.BadRequest($"Not found element by Id {postModel.Id}");
-        }
-        catch (ElementExistsException ex)
-        {
-            _logger.LogError(ex, "ElementExistsException");
-            return PostOperationResponse.BadRequest(ex.Message);
-        }
-        catch (ElementDeletedException ex)
-        {
-            _logger.LogError(ex, "ElementDeletedException");
-            return PostOperationResponse.BadRequest($"Element by id: {postModel.Id} was deleted");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return PostOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return PostOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public PostOperationResponse RemovePost(string id)
-    {
-        try
-        {
-            _postBusinessLogicContract.DeletePost(id);
-            return PostOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return PostOperationResponse.BadRequest("Id is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return PostOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return PostOperationResponse.BadRequest($"Not found element by id: {id}");
-        }
-        catch (ElementDeletedException ex)
-        {
-            _logger.LogError(ex, "ElementDeletedException");
-            return PostOperationResponse.BadRequest($"Element by id: {id} was deleted");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return PostOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return PostOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public PostOperationResponse RestorePost(string id)
-    {
-        try
-        {
-            _postBusinessLogicContract.RestorePost(id);
-            return PostOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return PostOperationResponse.BadRequest("Id is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return PostOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return PostOperationResponse.BadRequest($"Not found element by id: {id}");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return PostOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return PostOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-}

MagicCarpetProject/MagicCarpetWebApi/Adapters/SalaryAdapter.cs

@@ -1,119 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.AdapterContracts.OperationResponses;
-using MagicCarpetContracts.AdapterContracts;
-using MagicCarpetContracts.BuisnessLogicContracts;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.ViewModels;
-using MagicCarpetContracts.DataModels;
-
-namespace MagicCarpetWebApi.Adapters;
-
-public class SalaryAdapter : ISalaryAdapter
-{
-    private readonly ISalaryBusinessLogicContract _salaryBusinessLogicContract;
-
-    private readonly ILogger _logger;
-
-    private readonly Mapper _mapper;
-
-    public SalaryAdapter(ISalaryBusinessLogicContract salaryBusinessLogicContract, ILogger<SalaryAdapter> logger)
-    {
-        _salaryBusinessLogicContract = salaryBusinessLogicContract;
-        _logger = logger;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<SalaryDataModel, SalaryViewModel>();
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public SalaryOperationResponse GetListByPeriod(DateTime fromDate, DateTime toDate)
-    {
-        try
-        {
-            return SalaryOperationResponse.OK([.. _salaryBusinessLogicContract.GetAllSalariesByPeriod(fromDate, toDate).Select(x => _mapper.Map<SalaryViewModel>(x))]);
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return SalaryOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (IncorrectDatesException ex)
-        {
-            _logger.LogError(ex, "IncorrectDatesException");
-            return SalaryOperationResponse.BadRequest($"Incorrect dates: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return SalaryOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SalaryOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SalaryOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public SalaryOperationResponse GetListByPeriodByEmployee(DateTime fromDate, DateTime toDate, string workerId)
-    {
-        try
-        {
-            return SalaryOperationResponse.OK([.. _salaryBusinessLogicContract.GetAllSalariesByPeriodByEmployee(fromDate, toDate, workerId).Select(x => _mapper.Map<SalaryViewModel>(x))]);
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return SalaryOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (IncorrectDatesException ex)
-        {
-            _logger.LogError(ex, "IncorrectDatesException");
-            return SalaryOperationResponse.BadRequest($"Incorrect dates: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return SalaryOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SalaryOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SalaryOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public SalaryOperationResponse CalculateSalary(DateTime date)
-    {
-        try
-        {
-            _salaryBusinessLogicContract.CalculateSalaryByMounth(date);
-            return SalaryOperationResponse.NoContent();
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return SalaryOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SalaryOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SalaryOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-}

MagicCarpetProject/MagicCarpetWebApi/Adapters/SaleAdapter.cs

@@ -1,262 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.AdapterContracts;
-using MagicCarpetContracts.AdapterContracts.OperationResponses;
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.BuisnessLogicContracts;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.ViewModels;
-
-namespace MagicCarpetWebApi.Adapters;
-
-public class SaleAdapter : ISaleAdapter
-{
-    private readonly ISaleBusinessLogicContract _saleBusinessLogicContract;
-
-    private readonly ILogger _logger;
-
-    private readonly Mapper _mapper;
-
-    public SaleAdapter(ISaleBusinessLogicContract saleBusinessLogicContract, ILogger<SaleAdapter> logger)
-    {
-        _saleBusinessLogicContract = saleBusinessLogicContract;
-        _logger = logger;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<SaleBindingModel, SaleDataModel>();
-            cfg.CreateMap<SaleDataModel, SaleViewModel>();
-            cfg.CreateMap<SaleTourBindingModel, SaleTourDataModel>();
-            cfg.CreateMap<SaleTourDataModel, SaleTourViewModel>();
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public SaleOperationResponse GetList(DateTime fromDate, DateTime toDate)
-    {
-        try
-        {
-            return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByPeriod(fromDate, toDate).Select(x => _mapper.Map<SaleViewModel>(x))]);
-        }
-        catch (IncorrectDatesException ex)
-        {
-            _logger.LogError(ex, "IncorrectDatesException");
-            return SaleOperationResponse.BadRequest($"Incorrect dates: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return SaleOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SaleOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SaleOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public SaleOperationResponse GetEmployeeList(string id, DateTime fromDate, DateTime toDate)
-    {
-        try
-        {
-            return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByEmployeeByPeriod(id, fromDate, toDate).Select(x => _mapper.Map<SaleViewModel>(x))]);
-        }
-        catch (IncorrectDatesException ex)
-        {
-            _logger.LogError(ex, "IncorrectDatesException");
-            return SaleOperationResponse.BadRequest($"Incorrect dates: {ex.Message}");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return SaleOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return SaleOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SaleOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SaleOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public SaleOperationResponse GetClientList(string id, DateTime fromDate, DateTime toDate)
-    {
-        try
-        {
-            return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByClientByPeriod(id, fromDate, toDate).Select(x => _mapper.Map<SaleViewModel>(x))]);
-        }
-        catch (IncorrectDatesException ex)
-        {
-            _logger.LogError(ex, "IncorrectDatesException");
-            return SaleOperationResponse.BadRequest($"Incorrect dates: {ex.Message}");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return SaleOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return SaleOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SaleOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SaleOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public SaleOperationResponse GetTourList(string id, DateTime fromDate, DateTime toDate)
-    {
-        try
-        {
-            return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByTourByPeriod(id, fromDate, toDate).Select(x => _mapper.Map<SaleViewModel>(x))]);
-        }
-        catch (IncorrectDatesException ex)
-        {
-            _logger.LogError(ex, "IncorrectDatesException");
-            return SaleOperationResponse.BadRequest($"Incorrect dates: {ex.Message}");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return SaleOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return SaleOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SaleOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SaleOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public SaleOperationResponse GetElement(string id)
-    {
-        try
-        {
-            return SaleOperationResponse.OK(_mapper.Map<SaleViewModel>(_saleBusinessLogicContract.GetSaleByData(id)));
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return SaleOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return SaleOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return SaleOperationResponse.NotFound($"Not found element by data {id}");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SaleOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SaleOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public SaleOperationResponse MakeSale(SaleBindingModel saleModel)
-    {
-        try
-        {
-            var data = _mapper.Map<SaleDataModel>(saleModel);
-            _saleBusinessLogicContract.InsertSale(_mapper.Map<SaleDataModel>(saleModel));
-            return SaleOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return SaleOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return SaleOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SaleOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SaleOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public SaleOperationResponse CancelSale(string id)
-    {
-        try
-        {
-            _saleBusinessLogicContract.CancelSale(id);
-            return SaleOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return SaleOperationResponse.BadRequest("Id is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return SaleOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return SaleOperationResponse.BadRequest($"Not found element by id: {id}");
-        }
-        catch (ElementDeletedException ex)
-        {
-            _logger.LogError(ex, "ElementDeletedException");
-            return SaleOperationResponse.BadRequest($"Element by id: {id} was deleted");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return SaleOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return SaleOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-}

MagicCarpetProject/MagicCarpetWebApi/Adapters/TourAdapter.cs

@@ -1,233 +0,0 @@
-using AutoMapper;
-using MagicCarpetContracts.AdapterContracts;
-using MagicCarpetContracts.AdapterContracts.OperationResponses;
-using MagicCarpetContracts.BindingModels;
-using MagicCarpetContracts.BuisnessLogicContracts;
-using MagicCarpetContracts.DataModels;
-using MagicCarpetContracts.Exceptions;
-using MagicCarpetContracts.ViewModels;
-
-namespace MagicCarpetWebApi.Adapters;
-
-public class TourAdapter : ITourAdapter
-{
-    private readonly ITourBusinessLogicContract _tourBusinessLogicContract;
-
-    private readonly ILogger _logger;
-
-    private readonly Mapper _mapper;
-
-    public TourAdapter(ITourBusinessLogicContract tourBusinessLogicContract, ILogger<TourAdapter> logger)
-    {
-        _tourBusinessLogicContract = tourBusinessLogicContract;
-        _logger = logger;
-        var config = new MapperConfiguration(cfg =>
-        {
-            cfg.CreateMap<TourBindingModel, TourDataModel>();
-            cfg.CreateMap<TourDataModel, TourViewModel>();
-            cfg.CreateMap<TourHistoryDataModel, TourHistoryViewModel>();
-
-        });
-        _mapper = new Mapper(config);
-    }
-
-    public TourOperationResponse GetList(bool includeDeleted)
-    {
-        try
-        {
-            return TourOperationResponse.OK([.. _tourBusinessLogicContract.GetAllTours().Select(_mapper.Map<TourViewModel>)]);
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return TourOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return TourOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return TourOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-    public TourOperationResponse GetHistory(string id)
-    {
-        try
-        {
-            return TourOperationResponse.OK([.. _tourBusinessLogicContract.GetTourHistoryByTour(id).Select(x => _mapper.Map<TourHistoryViewModel>(x))]);
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return TourOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (NullListException)
-        {
-            _logger.LogError("NullListException");
-            return TourOperationResponse.NotFound("The list is not initialized");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return TourOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return TourOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public TourOperationResponse GetElement(string data)
-    {
-        try
-        {
-            return TourOperationResponse.OK(_mapper.Map<TourViewModel>(_tourBusinessLogicContract.GetTourByData(data)));
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return TourOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return TourOperationResponse.NotFound($"Not found element by data {data}");
-        }
-        catch (ElementDeletedException ex)
-        {
-            _logger.LogError(ex, "ElementDeletedException");
-            return TourOperationResponse.BadRequest($"Element by data: {data} was deleted");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return TourOperationResponse.InternalServerError($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return TourOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public TourOperationResponse RegisterTour(TourBindingModel tourModel)
-    {
-        try
-        {
-            _tourBusinessLogicContract.InsertTour(_mapper.Map<TourDataModel>(tourModel));
-            return TourOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return TourOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return TourOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementExistsException ex)
-        {
-            _logger.LogError(ex, "ElementExistsException");
-            return TourOperationResponse.BadRequest(ex.Message);
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return TourOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return TourOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public TourOperationResponse ChangeTourInfo(TourBindingModel tourModel)
-    {
-        try
-        {
-            _tourBusinessLogicContract.UpdateTour(_mapper.Map<TourDataModel>(tourModel));
-            return TourOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return TourOperationResponse.BadRequest("Data is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return TourOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return TourOperationResponse.BadRequest($"Not found element by Id {tourModel.Id}");
-        }
-        catch (ElementExistsException ex)
-        {
-            _logger.LogError(ex, "ElementExistsException");
-            return TourOperationResponse.BadRequest(ex.Message);
-        }
-        catch (ElementDeletedException ex)
-        {
-            _logger.LogError(ex, "ElementDeletedException");
-            return TourOperationResponse.BadRequest($"Element by id: {tourModel.Id} was deleted");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return TourOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return TourOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-
-    public TourOperationResponse RemoveTour(string id)
-    {
-        try
-        {
-            _tourBusinessLogicContract.DeleteTour(id);
-            return TourOperationResponse.NoContent();
-        }
-        catch (ArgumentNullException ex)
-        {
-            _logger.LogError(ex, "ArgumentNullException");
-            return TourOperationResponse.BadRequest("Id is empty");
-        }
-        catch (ValidationException ex)
-        {
-            _logger.LogError(ex, "ValidationException");
-            return TourOperationResponse.BadRequest($"Incorrect data transmitted: {ex.Message}");
-        }
-        catch (ElementNotFoundException ex)
-        {
-            _logger.LogError(ex, "ElementNotFoundException");
-            return TourOperationResponse.BadRequest($"Not found element by id: {id}");
-        }
-        catch (ElementDeletedException ex)
-        {
-            _logger.LogError(ex, "ElementDeletedException");
-            return TourOperationResponse.BadRequest($"Element by id: {id} was deleted");
-        }
-        catch (StorageException ex)
-        {
-            _logger.LogError(ex, "StorageException");
-            return TourOperationResponse.BadRequest($"Error while working with data storage: {ex.InnerException!.Message}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception");
-            return TourOperationResponse.InternalServerError(ex.Message);
-        }
-    }
-}

MagicCarpetProject/MagicCarpetWebApi/AuthOptions.cs

@@ -1,12 +0,0 @@
-using Microsoft.IdentityModel.Tokens;
-using System.Text;
-
-namespace MagicCarpetWebApi;
-
-public class AuthOptions
-{
-    public const string ISSUER = "MagicCarpet_AuthServer"; // издатель токена
-    public const string AUDIENCE = "MagicCarpetl_AuthClient"; // потребитель токена
-    const string KEY = "catsecret_secretsecretsecretkey!123";   // ключ для шифрации
-    public static SymmetricSecurityKey GetSymmetricSecurityKey() => new(Encoding.UTF8.GetBytes(KEY));
-}

MagicCarpetProject/MagicCarpetWebApi/Controllers/ClientsController.cs

@@ -1,46 +0,0 @@
-using MagicCarpetContracts.AdapterContracts;
-using MagicCarpetContracts.BindingModels;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MagicCarpetWebApi.Controllers;
-
-[Authorize]
-[Route("api/[controller]")]
-[ApiController]
-[Produces("application/json")]
-public class ClientsController(IClientAdapter adapter) : ControllerBase
-{
-    private readonly IClientAdapter _adapter = adapter;
-
-    [HttpGet]
-    public IActionResult GetAllRecords()
-    {
-        return _adapter.GetList().GetResponse(Request, Response);
-    }
-
-    [HttpGet("{data}")]
-    public IActionResult GetRecord(string data)
-    {
-        return _adapter.GetElement(data).GetResponse(Request, Response);
-    }
-
-    [HttpPost]
-    public IActionResult Register([FromBody] ClientBindingModel model)
-    {
-        return _adapter.RegisterClient(model).GetResponse(Request, Response);
-    }
-
-    [HttpPut]
-    public IActionResult ChangeInfo([FromBody] ClientBindingModel model)
-    {
-        return _adapter.ChangeClientInfo(model).GetResponse(Request, Response);
-    }
-
-    [HttpDelete("{id}")]
-    public IActionResult Delete(string id)
-    {
-        return _adapter.RemoveClient(id).GetResponse(Request, Response);
-    }
-}

MagicCarpetProject/MagicCarpetWebApi/Controllers/EmployeesController.cs

@@ -1,64 +0,0 @@
-using MagicCarpetContracts.AdapterContracts;
-using MagicCarpetContracts.BindingModels;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MagicCarpetWebApi.Controllers;
-
-[Authorize]
-[Route("api/[controller]/[action]")]
-[ApiController]
-[Produces("application/json")]
-public class EmployeesController(IEmployeeAdapter adapter) : ControllerBase
-{
-    private readonly IEmployeeAdapter _adapter = adapter;
-
-    [HttpGet]
-    public IActionResult GetRecords(bool includeDeleted = false)
-    {
-        return _adapter.GetList(includeDeleted).GetResponse(Request, Response);
-    }
-
-    [HttpGet]
-    public IActionResult GetPostRecords(string id, bool includeDeleted = false)
-    {
-        return _adapter.GetPostList(id, includeDeleted).GetResponse(Request, Response);
-    }
-
-    [HttpGet]
-    public IActionResult GetBirthDateRecords(DateTime fromDate, DateTime toDate, bool includeDeleted = false)
-    {
-        return _adapter.GetListByBirthDate(fromDate, toDate, includeDeleted).GetResponse(Request, Response);
-    }
-
-    [HttpGet]
-    public IActionResult GetEmploymentRecords(DateTime fromDate, DateTime toDate, bool includeDeleted = false)
-    {
-        return _adapter.GetListByEmploymentDate(fromDate, toDate, includeDeleted).GetResponse(Request, Response);
-    }
-
-    [HttpGet("{data}")]
-    public IActionResult GetRecord(string data)
-    {
-        return _adapter.GetElement(data).GetResponse(Request, Response);
-    }
-
-    [HttpPost]
-    public IActionResult Register([FromBody] EmployeeBindingModel model)
-    {
-        return _adapter.RegisterEmployee(model).GetResponse(Request, Response);
-    }
-
-    [HttpPut]
-    public IActionResult ChangeInfo([FromBody] EmployeeBindingModel model)
-    {
-        return _adapter.ChangeEmployeeInfo(model).GetResponse(Request, Response);
-    }
-
-    [HttpDelete("{id}")]
-    public IActionResult Delete(string id)
-    {
-        return _adapter.RemoveEmployee(id).GetResponse(Request, Response);
-    }
-}

MagicCarpetProject/MagicCarpetWebApi/Controllers/PostHistoryController.cs

@@ -1,21 +0,0 @@
-using MagicCarpetContracts.AdapterContracts;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MagicCarpetWebApi.Controllers;
-
-[Authorize]
-[Route("api/[controller]")]
-[ApiController]
-[Produces("application/json")]
-public class PostHistoryController(IPostAdapter adapter) : ControllerBase
-{
-    private readonly IPostAdapter _adapter = adapter;
-
-    [HttpGet("{id}")]
-    public IActionResult GetHistory(string id)
-    {
-        return _adapter.GetHistory(id).GetResponse(Request, Response);
-    }
-}