Merge pull request #2143 from TechnologyEnhancedLearning/Develop/Fixes/TD-937-TD-2522-ValidateReportsRowLimit

kevwhitt-hee · web-flow · commit a1c9af6ef1ca · 2023-09-19T09:19:24.000+01:00
TD-937 TD-2522 validation to prevent report filter returning too many…
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/ReportsControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/ReportsControllerTests.cs
@@ -70,7 +70,7 @@ public void EditFilters_post_sets_cookie_value()
             var result = reportsController.EditFilters(model);
 
             // Then
-            A.CallTo(() => httpResponse.Cookies.Append("ReportsFilterCookie", A<string>._, A<CookieOptions>._))
+            A.CallTo(() => httpResponse.Cookies.Append("CourseUsageReportFilterCookie", A<string>._, A<CookieOptions>._))
                 .MustHaveHappened();
             result.Should().BeRedirectToActionResult().WithActionName("Index");
         }
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/TrackingSystem/Centre/Reports/EditFilterViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/TrackingSystem/Centre/Reports/EditFilterViewModelTests.cs
@@ -56,6 +56,7 @@ public void Missing_end_date_doesnt_trigger_validation_when_EndDate_bool_is_fals
                 StartMonth = 1,
                 StartYear = 2021,
                 EndDate = false,
+                ReportInterval = Data.Enums.ReportInterval.Months,
             };
 
             // When
@@ -75,6 +76,7 @@ public void Missing_end_date_triggers_validation_when_EndDate_bool_is_true()
                 StartMonth = 1,
                 StartYear = 2021,
                 EndDate = true,
+                ReportInterval = Data.Enums.ReportInterval.Months,
             };
             const string expectedErrorMessage = "Enter an End Date";
 
@@ -146,6 +148,7 @@ int endYear
                 EndMonth = endMonth,
                 EndYear = endYear,
                 EndDate = false,
+                ReportInterval = Data.Enums.ReportInterval.Months,
             };
 
             // When
diff --git a/DigitalLearningSolutions.Web/Controllers/SuperAdmin/PlatformReports/IndependentSelfAssessmentReport.cs b/DigitalLearningSolutions.Web/Controllers/SuperAdmin/PlatformReports/IndependentSelfAssessmentReport.cs
@@ -10,8 +10,13 @@ public partial class PlatformReportsController
         [Route("SelfAssessments/Independent")]
         public IActionResult IndependentSelfAssessmentsReport()
         {
-            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("SuperAdminDSATReportsFilterCookie", null);
-            Response.Cookies.SetReportsFilterCookie("SuperAdminDSATReportsFilterCookie", filterData, clockUtility.UtcNow);
+            //Removing an old cookie if it exists because it may contain problematic options (filters that return too many rows):
+            if (HttpContext.Request.Cookies.ContainsKey("SuperAdminDSATReportsFilterCookie"))
+            {
+                HttpContext.Response.Cookies.Delete("SuperAdminDSATReportsFilterCookie");
+            }
+            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("SuperAdminIndependentSAReportsFilterCookie", null);
+            Response.Cookies.SetReportsFilterCookie("SuperAdminIndependentSAReportsFilterCookie", filterData, clockUtility.UtcNow);
             var activity = platformReportsService.GetSelfAssessmentActivity(filterData, false);
             var (regionName, centreTypeName, centreName, jobGroupName, brandName, categoryName, selfAssessmentName) = reportFilterService.GetSelfAssessmentFilterNames(filterData);
             var selfAssessmentReportFilterModel = new SelfAssessmentReportFilterModel(
@@ -43,7 +48,7 @@ public IActionResult IndependentSelfAssessmentsReport()
         [Route("SelfAssessments/Independent/EditFilters")]
         public IActionResult IndependentSelfAssessmentsEditFilters()
         {
-            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("SuperAdminDSATReportsFilterCookie", null);
+            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("SuperAdminIndependentSAReportsFilterCookie", null);
             var filterOptions = GetDropdownValues(false);
             var dataStartDate = platformReportsService.GetSelfAssessmentActivityStartDate(false);
             var model = new SelfAssessmentsEditFiltersViewModel(
@@ -84,7 +89,7 @@ public IActionResult IndependentSelfAssessmentsEditFilters(SelfAssessmentsEditFi
                 model.FilterType,
                 model.ReportInterval
             );
-            Response.Cookies.SetReportsFilterCookie("SuperAdminDSATReportsFilterCookie", filterData, clockUtility.UtcNow);
+            Response.Cookies.SetReportsFilterCookie("SuperAdminIndependentSAReportsFilterCookie", filterData, clockUtility.UtcNow);
 
             return RedirectToAction("IndependentSelfAssessmentsReport");
         }
diff --git a/DigitalLearningSolutions.Web/Controllers/SuperAdmin/PlatformReports/PlatformReportsController.cs b/DigitalLearningSolutions.Web/Controllers/SuperAdmin/PlatformReports/PlatformReportsController.cs
@@ -54,7 +54,7 @@ public IActionResult Index()
         [Route("SelfAssessments/{selfAssessmentType}/Data")]
         public IEnumerable<SelfAssessmentActivityDataRowModel> GetGraphData(string selfAssessmentType)
         {
-            var cookieName = selfAssessmentType == "Independent" ? "SuperAdminDSATReportsFilterCookie" : "SuperAdminReportsFilterCookie";
+            var cookieName = selfAssessmentType == "Independent" ? "SuperAdminIndependentSAReportsFilterCookie" : "SuperAdminSupervisedSAReportsFilterCookie";
             var filterData = Request.Cookies.RetrieveFilterDataFromCookie(cookieName, null);
             var activity = platformReportsService.GetSelfAssessmentActivity(filterData!, selfAssessmentType == "Independent" ? false : true);
             return activity.Select(
diff --git a/DigitalLearningSolutions.Web/Controllers/SuperAdmin/PlatformReports/SupervisedSelfAssessmentReport.cs b/DigitalLearningSolutions.Web/Controllers/SuperAdmin/PlatformReports/SupervisedSelfAssessmentReport.cs
@@ -4,15 +4,21 @@
     using DigitalLearningSolutions.Web.Helpers;
     using DigitalLearningSolutions.Web.ViewModels.Common;
     using DigitalLearningSolutions.Web.ViewModels.SuperAdmin.PlatformReports;
+    using DocumentFormat.OpenXml.InkML;
     using Microsoft.AspNetCore.Mvc;
 
     public partial class PlatformReportsController
     {
         [Route("SelfAssessments/Supervised")]
         public IActionResult SupervisedSelfAssessmentsReport()
         {
-            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("SuperAdminReportsFilterCookie", null);
-            Response.Cookies.SetReportsFilterCookie("SuperAdminReportsFilterCookie", filterData, clockUtility.UtcNow);
+            //Removing an old cookie if it exists because it may contain problematic options (filters that return too many rows):
+            if (HttpContext.Request.Cookies.ContainsKey("SuperAdminReportsFilterCookie"))
+            {
+                HttpContext.Response.Cookies.Delete("SuperAdminReportsFilterCookie");
+            }
+            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("SuperAdminSupervisedSAReportsFilterCookie", null);
+            Response.Cookies.SetReportsFilterCookie("SuperAdminSupervisedSAReportsFilterCookie", filterData, clockUtility.UtcNow);
             var activity = platformReportsService.GetSelfAssessmentActivity(filterData, true);
             var (regionName, centreTypeName, centreName, jobGroupName, brandName, categoryName, selfAssessmentName) = reportFilterService.GetSelfAssessmentFilterNames(filterData);
             var selfAssessmentReportFilterModel = new SelfAssessmentReportFilterModel(
@@ -46,7 +52,7 @@ public IActionResult SupervisedSelfAssessmentsReport()
         [Route("SelfAssessments/Supervised/EditFilters")]
         public IActionResult SupervisedSelfAssessmentsEditFilters()
         {
-            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("SuperAdminReportsFilterCookie", null);
+            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("SuperAdminSupervisedSAReportsFilterCookie", null);
             var filterOptions = GetDropdownValues(true);
             var dataStartDate = platformReportsService.GetSelfAssessmentActivityStartDate(true);
             var model = new SelfAssessmentsEditFiltersViewModel(
@@ -88,7 +94,7 @@ public IActionResult SupervisedSelfAssessmentsEditFilters(SelfAssessmentsEditFil
                 model.FilterType,
                 model.ReportInterval
             );
-            Response.Cookies.SetReportsFilterCookie("SuperAdminReportsFilterCookie", filterData, clockUtility.UtcNow);
+            Response.Cookies.SetReportsFilterCookie("SuperAdminSupervisedSAReportsFilterCookie", filterData, clockUtility.UtcNow);
             return RedirectToAction("SupervisedSelfAssessmentsReport");
         }
     }
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Reports/ReportsController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Reports/ReportsController.cs
@@ -46,10 +46,14 @@ public IActionResult Index()
         {
             var centreId = User.GetCentreIdKnownNotNull();
             var categoryIdFilter = User.GetAdminCategoryId();
+            //Removing an old cookie if it exists because it may contain problematic options (filters that return too many rows):
+            if (HttpContext.Request.Cookies.ContainsKey("ReportsFilterCookie"))
+            {
+                HttpContext.Response.Cookies.Delete("ReportsFilterCookie");
+            }
+            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("CourseUsageReportFilterCookie", categoryIdFilter);
 
-            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("ReportsFilterCookie", categoryIdFilter);
-
-            Response.Cookies.SetReportsFilterCookie("ReportsFilterCookie", filterData, clockUtility.UtcNow);
+            Response.Cookies.SetReportsFilterCookie("CourseUsageReportFilterCookie", filterData, clockUtility.UtcNow);
 
             var activity = activityService.GetFilteredActivity(centreId, filterData);
 
@@ -84,7 +88,7 @@ public IEnumerable<ActivityDataRowModel> GetGraphData()
             var centreId = User.GetCentreIdKnownNotNull();
             var categoryIdFilter = User.GetAdminCategoryId();
 
-            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("ReportsFilterCookie", categoryIdFilter);
+            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("CourseUsageReportFilterCookie", categoryIdFilter);
 
             var activity = activityService.GetFilteredActivity(centreId, filterData!);
             return activity.Select(
@@ -98,7 +102,7 @@ public IActionResult EditFilters()
         {
             var centreId = User.GetCentreIdKnownNotNull();
             var categoryIdFilter = User.GetAdminCategoryId();
-            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("ReportsFilterCookie", categoryIdFilter);
+            var filterData = Request.Cookies.RetrieveFilterDataFromCookie("CourseUsageReportFilterCookie", categoryIdFilter);
 
             var filterOptions = GetDropdownValues(centreId, categoryIdFilter);
 
@@ -144,7 +148,7 @@ public IActionResult EditFilters(EditFiltersViewModel model)
                 model.ReportInterval
             );
 
-            Response.Cookies.SetReportsFilterCookie("ReportsFilterCookie", filterData, clockUtility.UtcNow);
+            Response.Cookies.SetReportsFilterCookie("CourseUsageReportFilterCookie", filterData, clockUtility.UtcNow);
 
             return RedirectToAction("Index");
         }
diff --git a/DigitalLearningSolutions.Web/Helpers/CommonValidationErrorMessages.cs b/DigitalLearningSolutions.Web/Helpers/CommonValidationErrorMessages.cs
@@ -34,5 +34,6 @@ public static class CommonValidationErrorMessages
         public const string PrimaryEmailInUseDuringDelegateRegistration =
             "A user with this email address is already registered";
         public const string CentreNameAlreadyExist = "The centre name you have entered already exists, please enter a different centre name";
+        public const string ReportFilterReturnsTooManyRows = "The report frequency is too high for the date range. Choose a lower report frequency (or shorten the date range)";
     }
 }
diff --git a/DigitalLearningSolutions.Web/Helpers/ReportValidationHelper.cs b/DigitalLearningSolutions.Web/Helpers/ReportValidationHelper.cs
@@ -0,0 +1,35 @@
+﻿using DigitalLearningSolutions.Data.Enums;
+using System;
+
+namespace DigitalLearningSolutions.Web.Helpers
+{
+    public static class ReportValidationHelper
+    {
+        public static bool IsPeriodCompatibleWithDateRange(ReportInterval reportInterval, DateTime startDate, DateTime? endDate)
+        {
+            if (endDate == null)
+            {
+                endDate = DateTime.Now;
+            }
+
+            int rowLimit = 250;
+            int differenceInDays = (int)(endDate.Value - startDate).TotalDays;
+
+            switch (reportInterval)
+            {
+                case ReportInterval.Days:
+                    return (differenceInDays) <= rowLimit;
+                case ReportInterval.Weeks:
+                    return (differenceInDays / 7) <= rowLimit;
+                case ReportInterval.Months:
+                    return (differenceInDays / 30) <= rowLimit;
+                case ReportInterval.Quarters:
+                    return (differenceInDays / 90) <= rowLimit;
+                case ReportInterval.Years:
+                    return (differenceInDays / 365) <= rowLimit;
+                default:
+                    throw new ArgumentException("Invalid report interval");
+            }
+        }
+    }
+}
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/PlatformReports/CourseUsageEditFiltersViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/PlatformReports/CourseUsageEditFiltersViewModel.cs
@@ -92,6 +92,8 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
                 ValidateEndDate(validationResults);
             }
 
+            ValidatePeriodIsCompatibleWithDateRange(validationResults);
+
             return validationResults;
         }
 
@@ -150,11 +152,11 @@ private void ValidateStartDateIsAfterDataStart(List<ValidationResult> startDateV
         {
             var startDate = GetValidatedStartDate();
 
-            if (startDate < DataStart)
+            if (startDate.AddDays(1) < DataStart)
             {
                 startDateValidationResults.Add(
                     new ValidationResult(
-                        "Enter a start date after the start of data for this centre",
+                        "Enter a start date after the start of data in the platform",
                         new[]
                         {
                             nameof(StartDay),
@@ -217,5 +219,25 @@ private void ValidateEndDateIsAfterStartDate(List<ValidationResult> endDateValid
                 );
             }
         }
+        private void ValidatePeriodIsCompatibleWithDateRange(List<ValidationResult> periodValidationResults)
+        {
+            if (!periodValidationResults.Any())
+            {
+                var startDate = GetValidatedStartDate();
+                var endDate = GetValidatedEndDate();
+                if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))
+                {
+                    periodValidationResults.Add(
+                        new ValidationResult(
+                            CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,
+                            new[]
+                            {
+                            nameof(ReportInterval),
+                            }
+                        )
+                        );
+                }
+            }
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/PlatformReports/SelfAssessmentsEditFiltersViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/PlatformReports/SelfAssessmentsEditFiltersViewModel.cs
@@ -92,6 +92,8 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
                 ValidateEndDate(validationResults);
             }
 
+            ValidatePeriodIsCompatibleWithDateRange(validationResults);
+
             return validationResults;
         }
 
@@ -148,11 +150,11 @@ private void ValidateStartDateIsAfterDataStart(List<ValidationResult> startDateV
         {
             var startDate = GetValidatedStartDate();
 
-            if (startDate < DataStart)
+            if (startDate.AddDays(1) < DataStart)
             {
                 startDateValidationResults.Add(
                     new ValidationResult(
-                        "Enter a start date after the start of data for this centre",
+                        "Enter a start date after the start of data in the platform",
                         new[]
                         {
                             nameof(StartDay),
@@ -215,5 +217,26 @@ private void ValidateEndDateIsAfterStartDate(List<ValidationResult> endDateValid
                 );
             }
         }
+        private void ValidatePeriodIsCompatibleWithDateRange(List<ValidationResult> periodValidationResults)
+        {
+            if (!periodValidationResults.Any())
+            {
+                var startDate = GetValidatedStartDate();
+                var endDate = GetValidatedEndDate();
+
+                if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))
+                {
+                    periodValidationResults.Add(
+                        new ValidationResult(
+                            CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,
+                            new[]
+                            {
+                            nameof(ReportInterval),
+                            }
+                        )
+                        );
+                }
+            }
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Reports/EditFiltersViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Reports/EditFiltersViewModel.cs
@@ -81,6 +81,8 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
                 ValidateEndDate(validationResults);
             }
 
+            ValidatePeriodIsCompatibleWithDateRange(validationResults);
+
             return validationResults;
         }
 
@@ -135,7 +137,7 @@ private void ValidateStartDateIsAfterDataStart(List<ValidationResult> startDateV
         {
             var startDate = GetValidatedStartDate();
 
-            if (startDate < DataStart)
+            if (startDate.AddDays(1) < DataStart)
             {
                 startDateValidationResults.Add(
                     new ValidationResult(
@@ -172,7 +174,7 @@ private void ValidateEndDate(List<ValidationResult> validationResults)
                 .ToValidationResultList(nameof(EndDay), nameof(EndMonth), nameof(EndYear));
 
             ValidateEndDateIsAfterStartDate(endDateValidationResults);
-
+            ValidatePeriodIsCompatibleWithDateRange(endDateValidationResults);
             validationResults.AddRange(endDateValidationResults);
         }
 
@@ -201,6 +203,27 @@ private void ValidateEndDateIsAfterStartDate(List<ValidationResult> endDateValid
                     )
                 );
             }
+
+        }
+        private void ValidatePeriodIsCompatibleWithDateRange(List<ValidationResult> periodValidationResults)
+        {
+            if (!periodValidationResults.Any())
+            {
+                var startDate = GetValidatedStartDate();
+                var endDate = GetValidatedEndDate();
+                if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))
+                {
+                    periodValidationResults.Add(
+                        new ValidationResult(
+                            CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,
+                            new[]
+                            {
+                            nameof(ReportInterval),
+                            }
+                        )
+                        );
+                }
+            }
         }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/PlatformReports/SelfAssessmentsEditFilters.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/PlatformReports/SelfAssessmentsEditFilters.cshtml
@@ -31,7 +31,7 @@
         }
 
         <h1 class="nhsuk-heading-xl">Edit report filters</h1>
-        <form class="nhsuk-u-margin-bottom-3" method="post" novalidate asp-action=@(Model.Supervised ? "SupervisedSelfAssessmentsEditFilters" : "IndependentSelfAssessmentsEditFilters" )>
+        <form class="nhsuk-u-margin-bottom-3" method="post" novalidate asp-action=@(Model.Supervised ? "SupervisedSelfAssessmentsEditFilters" : "IndependentSelfAssessmentsEditFilters")>
             <input type="hidden" name="dataStart" value="@Model.DataStart" />
 
             <vc:select-list asp-for="@nameof(Model.RegionId)"
@@ -102,7 +102,6 @@
                                  end-date-checkbox-label="End date"
                                  hint-text="Reporting data starts on @Model.DataStart?.ToString(DateHelper.StandardDateFormat). Please select any date range between that date and now."
                                  end-date-checkbox-hint-text="Check this box to specify an end date. If left unchecked will display data until today." />
-
             <vc:select-list asp-for="@nameof(Model.ReportInterval)"
                             label="Report by frequency"
                             value="@reportIntervalValue.ToString()"
@@ -111,9 +110,8 @@
                             css-class="nhsuk-u-width-one-half"
                             default-option=""
                             select-list-options="@Model.ReportIntervalOptions" />
-
             <button class="nhsuk-button" type="submit" value="save">Apply filters</button>
-            <vc:cancel-link asp-controller="PlatformReports" asp-action=@(Model.Supervised ? "SupervisedSelfAssessmentsReport" : "IndependentSelfAssessmentsReport" ) />
+            <vc:cancel-link asp-controller="PlatformReports" asp-action=@(Model.Supervised ? "SupervisedSelfAssessmentsReport" : "IndependentSelfAssessmentsReport") />
         </form>
     </div>
 </div>

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void EditFilters_post_sets_cookie_value()`
`70`	`70`	`var result = reportsController.EditFilters(model);`
`71`	`71`
`72`	`72`	`// Then`
`73`		`- A.CallTo(() => httpResponse.Cookies.Append("ReportsFilterCookie", A<string>._, A<CookieOptions>._))`
	`73`	`+ A.CallTo(() => httpResponse.Cookies.Append("CourseUsageReportFilterCookie", A<string>._, A<CookieOptions>._))`
`74`	`74`	`.MustHaveHappened();`
`75`	`75`	`result.Should().BeRedirectToActionResult().WithActionName("Index");`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public IActionResult Index()`
`54`	`54`	`[Route("SelfAssessments/{selfAssessmentType}/Data")]`
`55`	`55`	`public IEnumerable<SelfAssessmentActivityDataRowModel> GetGraphData(string selfAssessmentType)`
`56`	`56`	`{`
`57`		`- var cookieName = selfAssessmentType == "Independent" ? "SuperAdminDSATReportsFilterCookie" : "SuperAdminReportsFilterCookie";`
	`57`	`+ var cookieName = selfAssessmentType == "Independent" ? "SuperAdminIndependentSAReportsFilterCookie" : "SuperAdminSupervisedSAReportsFilterCookie";`
`58`	`58`	`var filterData = Request.Cookies.RetrieveFilterDataFromCookie(cookieName, null);`
`59`	`59`	`var activity = platformReportsService.GetSelfAssessmentActivity(filterData!, selfAssessmentType == "Independent" ? false : true);`
`60`	`60`	`return activity.Select(`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@ public static class CommonValidationErrorMessages`
`34`	`34`	`public const string PrimaryEmailInUseDuringDelegateRegistration =`
`35`	`35`	`"A user with this email address is already registered";`
`36`	`36`	`public const string CentreNameAlreadyExist = "The centre name you have entered already exists, please enter a different centre name";`
	`37`	`+ public const string ReportFilterReturnsTooManyRows = "The report frequency is too high for the date range. Choose a lower report frequency (or shorten the date range)";`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,8 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`92`	`92`	`ValidateEndDate(validationResults);`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ ValidatePeriodIsCompatibleWithDateRange(validationResults);`
	`96`	`+`
`95`	`97`	`return validationResults;`
`96`	`98`	`}`
`97`	`99`
`@@ -150,11 +152,11 @@ private void ValidateStartDateIsAfterDataStart(List<ValidationResult> startDateV`
`150`	`152`	`{`
`151`	`153`	`var startDate = GetValidatedStartDate();`
`152`	`154`
`153`		`- if (startDate < DataStart)`
	`155`	`+ if (startDate.AddDays(1) < DataStart)`
`154`	`156`	`{`
`155`	`157`	`startDateValidationResults.Add(`
`156`	`158`	`new ValidationResult(`
`157`		`- "Enter a start date after the start of data for this centre",`
	`159`	`+ "Enter a start date after the start of data in the platform",`
`158`	`160`	`new[]`
`159`	`161`	`{`
`160`	`162`	`nameof(StartDay),`
`@@ -217,5 +219,25 @@ private void ValidateEndDateIsAfterStartDate(List<ValidationResult> endDateValid`
`217`	`219`	`);`
`218`	`220`	`}`
`219`	`221`	`}`
	`222`	`+ private void ValidatePeriodIsCompatibleWithDateRange(List<ValidationResult> periodValidationResults)`
	`223`	`+ {`
	`224`	`+ if (!periodValidationResults.Any())`
	`225`	`+ {`
	`226`	`+ var startDate = GetValidatedStartDate();`
	`227`	`+ var endDate = GetValidatedEndDate();`
	`228`	`+ if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))`
	`229`	`+ {`
	`230`	`+ periodValidationResults.Add(`
	`231`	`+ new ValidationResult(`
	`232`	`+ CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,`
	`233`	`+ new[]`
	`234`	`+ {`
	`235`	`+ nameof(ReportInterval),`
	`236`	`+ }`
	`237`	`+ )`
	`238`	`+ );`
	`239`	`+ }`
	`240`	`+ }`
	`241`	`+ }`
`220`	`242`	`}`
`221`	`243`	`}`