diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs index 0a3d6df4..e4271c8f 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs @@ -420,6 +420,6 @@ public class DailyReportService : IDailyReportService var from = DateOnly.FromDateTime(datesRange.From); var to = DateOnly.FromDateTime(datesRange.To); - return from >= dateDailyReport && dateDailyReport <= to; + return dateDailyReport >= from && dateDailyReport <= to; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/WellOperationImport/Files/WellOperationImportTemplate.xlsx b/AsbCloudInfrastructure/Services/WellOperationImport/Files/WellOperationImportTemplate.xlsx index 1e89ad31..7e9cec5e 100644 Binary files a/AsbCloudInfrastructure/Services/WellOperationImport/Files/WellOperationImportTemplate.xlsx and b/AsbCloudInfrastructure/Services/WellOperationImport/Files/WellOperationImportTemplate.xlsx differ diff --git a/AsbCloudWebApi.Tests/UnitTests/Services/DailyReportServiceTest.cs b/AsbCloudWebApi.Tests/UnitTests/Services/DailyReportServiceTest.cs index c11dda49..b75b6947 100644 --- a/AsbCloudWebApi.Tests/UnitTests/Services/DailyReportServiceTest.cs +++ b/AsbCloudWebApi.Tests/UnitTests/Services/DailyReportServiceTest.cs @@ -196,6 +196,11 @@ public class DailyReportServiceTest KUsage = 30 }; + private readonly SimpleTimezoneDto fakeWellTimezone = new() + { + Hours = 5, + }; + private readonly IWellService wellServiceMock = Substitute.For(); private readonly ITrajectoryNnbRepository trajectoryFactNnbRepositoryMock = Substitute.For(); private readonly IDailyReportRepository dailyReportRepositoryMock = Substitute.For(); @@ -281,6 +286,9 @@ public class DailyReportServiceTest processMapReportWellDrillingServiceMock.GetAsync(Arg.Any(), Arg.Any()) .ReturnsForAnyArgs(new[] { fakeProcessMapReportWellDrilling }); + + wellServiceMock.GetTimezone(Arg.Any()) + .ReturnsForAnyArgs(fakeWellTimezone); } [Fact] @@ -527,6 +535,9 @@ public class DailyReportServiceTest yield return new object[] { new DateOnly(2090, 01, 01), + }; + yield return new object[] + { new DateOnly(2000, 01, 01) }; }