diff --git a/MagicCarpetProject/MagicCarpetContracts/DataModels/EmployeeDataModel.cs b/MagicCarpetProject/MagicCarpetContracts/DataModels/EmployeeDataModel.cs index 0d83d77..0cd84fa 100644 --- a/MagicCarpetProject/MagicCarpetContracts/DataModels/EmployeeDataModel.cs +++ b/MagicCarpetProject/MagicCarpetContracts/DataModels/EmployeeDataModel.cs @@ -23,9 +23,9 @@ public class EmployeeDataModel(string id, string fio, string email, string postI public string PostId { get; private set; } = postId; - public DateTime BirthDate { get; private set; } = birthDate; + public DateTime BirthDate { get; private set; } = birthDate.ToUniversalTime(); - public DateTime EmploymentDate { get; private set; } = employmentDate; + public DateTime EmploymentDate { get; private set; } = employmentDate.ToUniversalTime(); public bool IsDeleted { get; private set; } = isDeleted; diff --git a/MagicCarpetProject/MagicCarpetContracts/DataModels/SalaryDataModel.cs b/MagicCarpetProject/MagicCarpetContracts/DataModels/SalaryDataModel.cs index 3582be4..dc19dc6 100644 --- a/MagicCarpetProject/MagicCarpetContracts/DataModels/SalaryDataModel.cs +++ b/MagicCarpetProject/MagicCarpetContracts/DataModels/SalaryDataModel.cs @@ -14,7 +14,7 @@ public class SalaryDataModel(string employeeId, DateTime salaryDate, double empl private readonly EmployeeDataModel? _employee; public string EmployeeId { get; private set; } = employeeId; - public DateTime SalaryDate { get; private set; } = salaryDate; + public DateTime SalaryDate { get; private set; } = salaryDate.ToUniversalTime(); public double Salary { get; private set; } = employeeSalary; diff --git a/MagicCarpetProject/MagicCarpetTests/DataModelTests/EmployeeDataModelTests.cs b/MagicCarpetProject/MagicCarpetTests/DataModelTests/EmployeeDataModelTests.cs index 3c6b612..9e8658e 100644 --- a/MagicCarpetProject/MagicCarpetTests/DataModelTests/EmployeeDataModelTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/DataModelTests/EmployeeDataModelTests.cs @@ -102,8 +102,8 @@ internal class EmployeeDataModelTests Assert.That(employee.FIO, Is.EqualTo(fio)); Assert.That(employee.Email, Is.EqualTo(employeeEmail)); Assert.That(employee.PostId, Is.EqualTo(postId)); - Assert.That(employee.BirthDate, Is.EqualTo(birthDate)); - Assert.That(employee.EmploymentDate, Is.EqualTo(employmentDate)); + Assert.That(employee.BirthDate, Is.EqualTo(birthDate.ToUniversalTime())); + Assert.That(employee.EmploymentDate, Is.EqualTo(employmentDate.ToUniversalTime())); Assert.That(employee.IsDeleted, Is.EqualTo(isDelete)); }); } diff --git a/MagicCarpetProject/MagicCarpetTests/DataModelTests/SalaryDataModelTests.cs b/MagicCarpetProject/MagicCarpetTests/DataModelTests/SalaryDataModelTests.cs index 4584523..1ae07c6 100644 --- a/MagicCarpetProject/MagicCarpetTests/DataModelTests/SalaryDataModelTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/DataModelTests/SalaryDataModelTests.cs @@ -47,7 +47,7 @@ internal class SalaryDataModelTests Assert.Multiple(() => { Assert.That(salary.EmployeeId, Is.EqualTo(employeeId)); - Assert.That(salary.SalaryDate, Is.EqualTo(salaryDate)); + Assert.That(salary.SalaryDate, Is.EqualTo(salaryDate.ToUniversalTime())); Assert.That(salary.Salary, Is.EqualTo(enployeeSalary)); }); } diff --git a/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/EmployeeControllerTests.cs b/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/EmployeeControllerTests.cs index 5b7077b..c8a33ac 100644 --- a/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/EmployeeControllerTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/EmployeeControllerTests.cs @@ -160,7 +160,7 @@ internal class EmployeeControllerTests : BaseWebApiControllerTest 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"); + var response = await HttpClient.GetAsync($"/api/employees/getbirthdaterecords?fromDate={DateTime.Now.AddYears(-21).AddMinutes(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.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>(response); @@ -189,7 +189,7 @@ internal class EmployeeControllerTests : BaseWebApiControllerTest 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"); + var response = await HttpClient.GetAsync($"/api/employees/getemploymentrecords?fromDate={DateTime.Now.AddDays(-1).AddMinutes(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.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>(response); @@ -204,7 +204,7 @@ internal class EmployeeControllerTests : BaseWebApiControllerTest 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"); + var response = await HttpClient.GetAsync($"/api/employees/getemploymentrecords?fromDate={DateTime.Now.AddMinutes(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddMinutes(-1):MM/dd/yyyy HH:mm:ss}&includeDeleted=true"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest)); } diff --git a/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/ReportControllerTests.cs b/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/ReportControllerTests.cs index 6d3e586..8989579 100644 --- a/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/ReportControllerTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/ReportControllerTests.cs @@ -88,7 +88,7 @@ internal class ReportControllerTests : BaseWebApiControllerTest MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, client.Id, tours: [(tour2.Id, 10, 1.1)]); //Act var response = await - HttpClient.GetAsync($"/api/report/getsales?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}"); + HttpClient.GetAsync($"/api/report/getsales?fromDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK)); var data = await GetModelFromResponseAsync>(response); @@ -103,7 +103,7 @@ internal class ReportControllerTests : BaseWebApiControllerTest { //Act var response = await - HttpClient.GetAsync($"/api/report/getsales?fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); + HttpClient.GetAsync($"/api/report/getsales?fromDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest)); } @@ -118,7 +118,7 @@ internal class ReportControllerTests : BaseWebApiControllerTest MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, tours: [(tour1.Id, 10, 1.1), (tour2.Id, 10, 1.1)]); MagicCarpetDbContext.InsertSaleToDatabaseAndReturn(employee.Id, tours: [(tour1.Id, 10, 1.1)]); //Act - var response = await HttpClient.GetAsync($"/api/report/loadsales?fromDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}"); + var response = await HttpClient.GetAsync($"/api/report/loadsales?fromDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}"); //Assert await AssertStreamAsync(response, "file.xlsx"); } @@ -129,8 +129,8 @@ internal class ReportControllerTests : BaseWebApiControllerTest // Act var response = await HttpClient.GetAsync( $"/api/report/loadsales?" + - $"fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&" + - $"toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); + $"fromDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}&" + + $"toDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); // Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest)); @@ -158,7 +158,7 @@ internal class ReportControllerTests : BaseWebApiControllerTest MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee2.Id, employeeSalary: 300, salaryDate: DateTime.UtcNow.AddDays(-3)); var response = await - HttpClient.GetAsync($"/api/report/getsalary?fromDate={DateTime.UtcNow.AddDays(-7):yyyy-MM-dd}&toDate={DateTime.UtcNow.AddDays(-1):yyyy-MM-dd}"); + HttpClient.GetAsync($"/api/report/getsalary?fromDate={DateTime.Now.AddDays(-7):yyyy-MM-dd}&toDate={DateTime.Now.AddDays(-1):yyyy-MM-dd}"); Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK)); var data = await GetModelFromResponseAsync>(response); Assert.That(data, Is.Not.Null); @@ -178,8 +178,8 @@ internal class ReportControllerTests : BaseWebApiControllerTest // Act var response = await HttpClient.GetAsync( $"/api/report/getsalary?" + - $"fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&" + - $"toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); + $"fromDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}&" + + $"toDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); // Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest)); @@ -198,7 +198,7 @@ internal class ReportControllerTests : BaseWebApiControllerTest MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee2.Id, employeeSalary: 500, salaryDate: DateTime.UtcNow.AddDays(-5)); MagicCarpetDbContext.InsertSalaryToDatabaseAndReturn(employee2.Id, employeeSalary: 300, salaryDate: DateTime.UtcNow.AddDays(-3)); //Act - var response = await HttpClient.GetAsync($"/api/report/loadsalary?fromDate={DateTime.UtcNow.AddDays(-7):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); + var response = await HttpClient.GetAsync($"/api/report/loadsalary?fromDate={DateTime.Now.AddDays(-7):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); //Assert await AssertStreamAsync(response, "file.pdf"); } @@ -209,8 +209,8 @@ internal class ReportControllerTests : BaseWebApiControllerTest // Act var response = await HttpClient.GetAsync( $"/api/report/loadsalary?" + - $"fromDate={DateTime.UtcNow.AddDays(1):MM/dd/yyyy HH:mm:ss}&" + - $"toDate={DateTime.UtcNow.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); + $"fromDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}&" + + $"toDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); // Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest)); diff --git a/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SalaryControllerTests.cs b/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SalaryControllerTests.cs index e0c742d..281a797 100644 --- a/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SalaryControllerTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SalaryControllerTests.cs @@ -29,7 +29,7 @@ internal class SalaryControllerTests : BaseWebApiControllerTest 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}"); + var response = await HttpClient.GetAsync($"/api/salary/getrecords?fromDate={DateTime.Now.AddDays(-10):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(10):MM/dd/yyyy HH:mm:ss}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK)); var data = await GetModelFromResponseAsync>(response); @@ -44,7 +44,7 @@ internal class SalaryControllerTests : BaseWebApiControllerTest 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}"); + var response = await HttpClient.GetAsync($"/api/salary/getrecords?fromDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK)); var data = await GetModelFromResponseAsync>(response); @@ -65,7 +65,7 @@ internal class SalaryControllerTests : BaseWebApiControllerTest 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}"); + var response = await HttpClient.GetAsync($"/api/salary/getrecords?fromDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK)); var data = await GetModelFromResponseAsync>(response); @@ -80,7 +80,7 @@ internal class SalaryControllerTests : BaseWebApiControllerTest 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}"); + var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest)); } @@ -95,7 +95,7 @@ internal class SalaryControllerTests : BaseWebApiControllerTest 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}"); + var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}&id={employee1.Id}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK)); var data = await GetModelFromResponseAsync>(response); @@ -120,7 +120,7 @@ internal class SalaryControllerTests : BaseWebApiControllerTest 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}"); + var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}&id={employee1.Id}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK)); var data = await GetModelFromResponseAsync>(response); @@ -138,7 +138,7 @@ internal class SalaryControllerTests : BaseWebApiControllerTest //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}"); + var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&id={employee.Id}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest)); } @@ -147,7 +147,7 @@ internal class SalaryControllerTests : BaseWebApiControllerTest 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"); + var response = await HttpClient.GetAsync($"/api/salary/getemployeerecords?fromDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}&id=id"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest)); } @@ -178,7 +178,7 @@ internal class SalaryControllerTests : BaseWebApiControllerTest public async Task Calculate_WithoutEmployees_ShouldSuccess_Test() { //Act - var response = await HttpClient.PostAsync($"/api/salary/calculate?date={DateTime.UtcNow:MM/dd/yyyy}", null); + var response = await HttpClient.PostAsync($"/api/salary/calculate?date={DateTime.Now:MM/dd/yyyy}", null); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.NoContent)); var salaries = MagicCarpetDbContext.Salaries.ToArray(); diff --git a/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SaleControllerTests.cs b/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SaleControllerTests.cs index 62cdc2a..48c80ca 100644 --- a/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SaleControllerTests.cs +++ b/MagicCarpetProject/MagicCarpetTests/WebApiControllersTests/SaleControllerTests.cs @@ -44,7 +44,7 @@ internal class SaleControllerTests : BaseWebApiControllerTest 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}"); + var response = await HttpClient.GetAsync($"/api/sales/getrecords?fromDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}"); //Assert var data = await GetModelFromResponseAsync>(response); Assert.Multiple(() => @@ -59,7 +59,7 @@ internal class SaleControllerTests : BaseWebApiControllerTest 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}"); + var response = await HttpClient.GetAsync($"/api/sales/getrecords?fromDate={DateTime.Now.AddDays(-1):MM/dd/yyyy HH:mm:ss}&toDate={DateTime.Now.AddDays(1):MM/dd/yyyy HH:mm:ss}"); //Assert Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK)); var data = await GetModelFromResponseAsync>(response); diff --git a/MagicCarpetProject/MagicCarpetWebApi/Adapters/EmployeeAdapter.cs b/MagicCarpetProject/MagicCarpetWebApi/Adapters/EmployeeAdapter.cs index 7984619..d5ccf06 100644 --- a/MagicCarpetProject/MagicCarpetWebApi/Adapters/EmployeeAdapter.cs +++ b/MagicCarpetProject/MagicCarpetWebApi/Adapters/EmployeeAdapter.cs @@ -84,7 +84,7 @@ public class EmployeeAdapter : IEmployeeAdapter { try { - return EmployeeOperationResponse.OK([.. _employeeBusinessLogicContract.GetAllEmployeesByBirthDate(fromDate, toDate, !includeDeleted).Select(x => _mapper.Map(x))]); + return EmployeeOperationResponse.OK([.. _employeeBusinessLogicContract.GetAllEmployeesByBirthDate(fromDate.ToUniversalTime(), toDate.ToUniversalTime(), !includeDeleted).Select(x => _mapper.Map(x))]); } catch (IncorrectDatesException ex) { @@ -112,7 +112,7 @@ public class EmployeeAdapter : IEmployeeAdapter { try { - return EmployeeOperationResponse.OK([.. _employeeBusinessLogicContract.GetAllEmployeesByEmploymentDate(fromDate, toDate, !includeDeleted).Select(_mapper.Map)]); + return EmployeeOperationResponse.OK([.. _employeeBusinessLogicContract.GetAllEmployeesByEmploymentDate(fromDate.ToUniversalTime(), toDate.ToUniversalTime(), !includeDeleted).Select(_mapper.Map)]); } catch (IncorrectDatesException ex) { diff --git a/MagicCarpetProject/MagicCarpetWebApi/Adapters/ReportAdapter.cs b/MagicCarpetProject/MagicCarpetWebApi/Adapters/ReportAdapter.cs index 88b79e4..6bf1163 100644 --- a/MagicCarpetProject/MagicCarpetWebApi/Adapters/ReportAdapter.cs +++ b/MagicCarpetProject/MagicCarpetWebApi/Adapters/ReportAdapter.cs @@ -60,7 +60,7 @@ public class ReportAdapter : IReportAdapter { try { - return SendStream(await _reportContract.CreateDocumentSalesByPeriodAsync(dateStart, dateFinish, ct), + return SendStream(await _reportContract.CreateDocumentSalesByPeriodAsync(dateStart.ToUniversalTime(), dateFinish.ToUniversalTime(), ct), "sales.xslx"); } catch (IncorrectDatesException ex) @@ -114,7 +114,7 @@ public class ReportAdapter : IReportAdapter { try { - return ReportOperationResponse.OK((await _reportContract.GetDataBySalesAsync(dateStart, dateFinish, ct)).Select(x => + return ReportOperationResponse.OK((await _reportContract.GetDataBySalesAsync(dateStart.ToUniversalTime(), dateFinish.ToUniversalTime(), ct)).Select(x => _mapper.Map(x)).ToList()); } catch (IncorrectDatesException ex) @@ -150,7 +150,7 @@ public class ReportAdapter : IReportAdapter { try { - return ReportOperationResponse.OK((await _reportContract.GetDataSalaryByPeriodAsync(dateStart, dateFinish, ct)) + return ReportOperationResponse.OK((await _reportContract.GetDataSalaryByPeriodAsync(dateStart.ToUniversalTime(), dateFinish.ToUniversalTime(), ct)) .Select(x => _mapper.Map(x)).ToList()); } catch (IncorrectDatesException ex) @@ -180,7 +180,7 @@ public class ReportAdapter : IReportAdapter { try { - return SendStream(await _reportContract.CreateDocumentSalaryByPeriodAsync(dateStart, dateFinish, ct), "salary.pdf"); + return SendStream(await _reportContract.CreateDocumentSalaryByPeriodAsync(dateStart.ToUniversalTime(), dateFinish.ToUniversalTime(), ct), "salary.pdf"); } catch (IncorrectDatesException ex) { diff --git a/MagicCarpetProject/MagicCarpetWebApi/Adapters/SalaryAdapter.cs b/MagicCarpetProject/MagicCarpetWebApi/Adapters/SalaryAdapter.cs index 5c9cd46..89b1acb 100644 --- a/MagicCarpetProject/MagicCarpetWebApi/Adapters/SalaryAdapter.cs +++ b/MagicCarpetProject/MagicCarpetWebApi/Adapters/SalaryAdapter.cs @@ -31,7 +31,7 @@ public class SalaryAdapter : ISalaryAdapter { try { - return SalaryOperationResponse.OK([.. _salaryBusinessLogicContract.GetAllSalariesByPeriod(fromDate, toDate).Select(x => _mapper.Map(x))]); + return SalaryOperationResponse.OK([.. _salaryBusinessLogicContract.GetAllSalariesByPeriod(fromDate.ToUniversalTime(), toDate.ToUniversalTime()).Select(x => _mapper.Map(x))]); } catch (ValidationException ex) { @@ -64,7 +64,7 @@ public class SalaryAdapter : ISalaryAdapter { try { - return SalaryOperationResponse.OK([.. _salaryBusinessLogicContract.GetAllSalariesByPeriodByEmployee(fromDate, toDate, workerId).Select(x => _mapper.Map(x))]); + return SalaryOperationResponse.OK([.. _salaryBusinessLogicContract.GetAllSalariesByPeriodByEmployee(fromDate.ToUniversalTime(), toDate.ToUniversalTime(), workerId).Select(x => _mapper.Map(x))]); } catch (ValidationException ex) { diff --git a/MagicCarpetProject/MagicCarpetWebApi/Adapters/SaleAdapter.cs b/MagicCarpetProject/MagicCarpetWebApi/Adapters/SaleAdapter.cs index dae85d1..050b9cb 100644 --- a/MagicCarpetProject/MagicCarpetWebApi/Adapters/SaleAdapter.cs +++ b/MagicCarpetProject/MagicCarpetWebApi/Adapters/SaleAdapter.cs @@ -35,7 +35,7 @@ public class SaleAdapter : ISaleAdapter { try { - return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByPeriod(fromDate, toDate).Select(x => _mapper.Map(x))]); + return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByPeriod(fromDate.ToUniversalTime(), toDate.ToUniversalTime()).Select(x => _mapper.Map(x))]); } catch (IncorrectDatesException ex) { @@ -63,7 +63,7 @@ public class SaleAdapter : ISaleAdapter { try { - return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByEmployeeByPeriod(id, fromDate, toDate).Select(x => _mapper.Map(x))]); + return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByEmployeeByPeriod(id, fromDate.ToUniversalTime(), toDate.ToUniversalTime()).Select(x => _mapper.Map(x))]); } catch (IncorrectDatesException ex) { @@ -96,7 +96,7 @@ public class SaleAdapter : ISaleAdapter { try { - return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByClientByPeriod(id, fromDate, toDate).Select(x => _mapper.Map(x))]); + return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByClientByPeriod(id, fromDate.ToUniversalTime(), toDate.ToUniversalTime()).Select(x => _mapper.Map(x))]); } catch (IncorrectDatesException ex) { @@ -129,7 +129,7 @@ public class SaleAdapter : ISaleAdapter { try { - return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByTourByPeriod(id, fromDate, toDate).Select(x => _mapper.Map(x))]); + return SaleOperationResponse.OK([.. _saleBusinessLogicContract.GetAllSalesByTourByPeriod(id, fromDate.ToUniversalTime(), toDate.ToUniversalTime()).Select(x => _mapper.Map(x))]); } catch (IncorrectDatesException ex) {