TD-2522 Fixes issues highlighted by tests relating to validation

kevwhitt-hee · kevwhitt-hee · commit 7a4741a6e9bb · 2023-09-19T08:38:24.000+01:00
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/ViewModels/SuperAdmin/PlatformReports/CourseUsageEditFiltersViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/PlatformReports/CourseUsageEditFiltersViewModel.cs
@@ -221,19 +221,22 @@ private void ValidateEndDateIsAfterStartDate(List<ValidationResult> endDateValid
         }
         private void ValidatePeriodIsCompatibleWithDateRange(List<ValidationResult> periodValidationResults)
         {
-            var startDate = GetValidatedStartDate();
-            var endDate = GetValidatedEndDate();
-            if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))
+            if (!periodValidationResults.Any())
             {
-                periodValidationResults.Add(
-                    new ValidationResult(
-                        CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,
-                        new[]
-                        {
+                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
@@ -219,22 +219,24 @@ private void ValidateEndDateIsAfterStartDate(List<ValidationResult> endDateValid
         }
         private void ValidatePeriodIsCompatibleWithDateRange(List<ValidationResult> periodValidationResults)
         {
-            var startDate = GetValidatedStartDate();
-            var endDate = GetValidatedEndDate();
-
-            if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))
+            if (!periodValidationResults.Any())
             {
-                periodValidationResults.Add(
-                    new ValidationResult(
-                        CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,
-                        new[]
-                        {
+                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
@@ -174,7 +174,7 @@ private void ValidateEndDate(List<ValidationResult> validationResults)
                 .ToValidationResultList(nameof(EndDay), nameof(EndMonth), nameof(EndYear));
 
             ValidateEndDateIsAfterStartDate(endDateValidationResults);
-
+            ValidatePeriodIsCompatibleWithDateRange(endDateValidationResults);
             validationResults.AddRange(endDateValidationResults);
         }
 
@@ -203,22 +203,26 @@ private void ValidateEndDateIsAfterStartDate(List<ValidationResult> endDateValid
                     )
                 );
             }
+
         }
         private void ValidatePeriodIsCompatibleWithDateRange(List<ValidationResult> periodValidationResults)
         {
-            var startDate = GetValidatedStartDate();
-            var endDate = GetValidatedEndDate();
-            if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))
-            {
-                periodValidationResults.Add(
-                    new ValidationResult(
-                        CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,
-                        new[]
-                        {
+            if (!periodValidationResults.Any())
+            {
+                var startDate = GetValidatedStartDate();
+                var endDate = GetValidatedEndDate();
+                if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))
+                {
+                    periodValidationResults.Add(
+                        new ValidationResult(
+                            CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,
+                            new[]
+                            {
                             nameof(ReportInterval),
-                        }
-                    )
-                    );
+                            }
+                        )
+                        );
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -221,19 +221,22 @@ private void ValidateEndDateIsAfterStartDate(List<ValidationResult> endDateValid`
`221`	`221`	`}`
`222`	`222`	`private void ValidatePeriodIsCompatibleWithDateRange(List<ValidationResult> periodValidationResults)`
`223`	`223`	`{`
`224`		`- var startDate = GetValidatedStartDate();`
`225`		`- var endDate = GetValidatedEndDate();`
`226`		`- if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))`
	`224`	`+ if (!periodValidationResults.Any())`
`227`	`225`	`{`
`228`		`- periodValidationResults.Add(`
`229`		`- new ValidationResult(`
`230`		`- CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,`
`231`		`- new[]`
`232`		`- {`
	`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`	`+ {`
`233`	`235`	`nameof(ReportInterval),`
`234`		`- }`
`235`		`- )`
`236`		`- );`
	`236`	`+ }`
	`237`	`+ )`
	`238`	`+ );`
	`239`	`+ }`
`237`	`240`	`}`
`238`	`241`	`}`
`239`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,22 +219,24 @@ private void ValidateEndDateIsAfterStartDate(List<ValidationResult> endDateValid`
`219`	`219`	`}`
`220`	`220`	`private void ValidatePeriodIsCompatibleWithDateRange(List<ValidationResult> periodValidationResults)`
`221`	`221`	`{`
`222`		`- var startDate = GetValidatedStartDate();`
`223`		`- var endDate = GetValidatedEndDate();`
`224`		`-`
`225`		`- if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))`
	`222`	`+ if (!periodValidationResults.Any())`
`226`	`223`	`{`
`227`		`- periodValidationResults.Add(`
`228`		`- new ValidationResult(`
`229`		`- CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,`
`230`		`- new[]`
`231`		`- {`
	`224`	`+ var startDate = GetValidatedStartDate();`
	`225`	`+ var endDate = GetValidatedEndDate();`
	`226`	`+`
	`227`	`+ if (!ReportValidationHelper.IsPeriodCompatibleWithDateRange(ReportInterval, startDate, endDate))`
	`228`	`+ {`
	`229`	`+ periodValidationResults.Add(`
	`230`	`+ new ValidationResult(`
	`231`	`+ CommonValidationErrorMessages.ReportFilterReturnsTooManyRows,`
	`232`	`+ new[]`
	`233`	`+ {`
`232`	`234`	`nameof(ReportInterval),`
`233`		`- }`
`234`		`- )`
`235`		`- );`
	`235`	`+ }`
	`236`	`+ )`
	`237`	`+ );`
	`238`	`+ }`
`236`	`239`	`}`
`237`		`-`
`238`	`240`	`}`
`239`	`241`	`}`
`240`	`242`	`}`