TD-4893 Delegate activities - view course delegates resulted in 500 error when course admin field applied filters got deleted

sherif-olaboye · sherif-olaboye · commit 4a6a4275f333 · 2024-11-26T11:48:27.000Z
diff --git a/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs b/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs
@@ -139,7 +139,7 @@ int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int sup
         public IEnumerable<DelegateAssessmentStatistics> GetDelegateAssessmentStatisticsAtCentre(string searchString, int centreId, string categoryName, string isActive, int? categoryId);
 
         bool IsSelfEnrollmentAllowed(int customisationId);
-        Customisation? GetCourse(int customisationId);
+        Customisation? GetCourse(int? customisationId);
     }
 
     public class CourseDataService : ICourseDataService
@@ -2024,7 +2024,7 @@ public bool IsSelfEnrollmentAllowed(int customisationId)
             return selfRegister > 0;
         }
 
-        public Customisation? GetCourse(int customisationId)
+        public Customisation? GetCourse(int? customisationId)
         {
             return connection.Query<Customisation>(
                 @"SELECT CustomisationID
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ActivityDelegatesController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ActivityDelegatesController.cs
@@ -95,7 +95,7 @@ public IActionResult Index(
 
             sortBy ??= DefaultSortByOptions.Name.PropertyName;
             sortDirection ??= GenericSortingHelper.Ascending;
-          var course =  courseService.GetCourse(customisationId.Value);
+          var course =  courseService.GetCourse(customisationId);
                 existingFilterString = FilteringHelper.GetFilterString(
                 existingFilterString,
                 newFilterToAdd,
diff --git a/DigitalLearningSolutions.Web/Services/CourseService.cs b/DigitalLearningSolutions.Web/Services/CourseService.cs
@@ -134,7 +134,7 @@ int diagCompletionThreshold
         int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId);
         public IEnumerable<Course> GetApplicationsAvailableToCentre(int centreId);
         bool IsSelfEnrollmentAllowed(int customisationId);
-        Customisation? GetCourse(int customisationId);
+        Customisation? GetCourse(int? customisationId);
     }
 
     public class CourseService : ICourseService
@@ -632,7 +632,7 @@ public bool IsSelfEnrollmentAllowed(int customisationId)
             return courseDataService.IsSelfEnrollmentAllowed(customisationId);
         }
 
-        public Customisation? GetCourse(int customisationId)
+        public Customisation? GetCourse(int? customisationId)
         {
             return courseDataService.GetCourse(customisationId);
         }

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int sup`
`139`	`139`	`public IEnumerable<DelegateAssessmentStatistics> GetDelegateAssessmentStatisticsAtCentre(string searchString, int centreId, string categoryName, string isActive, int? categoryId);`
`140`	`140`
`141`	`141`	`bool IsSelfEnrollmentAllowed(int customisationId);`
`142`		`- Customisation? GetCourse(int customisationId);`
	`142`	`+ Customisation? GetCourse(int? customisationId);`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`public class CourseDataService : ICourseDataService`
`@@ -2024,7 +2024,7 @@ public bool IsSelfEnrollmentAllowed(int customisationId)`
`2024`	`2024`	`return selfRegister > 0;`
`2025`	`2025`	`}`
`2026`	`2026`
`2027`		`- public Customisation? GetCourse(int customisationId)`
	`2027`	`+ public Customisation? GetCourse(int? customisationId)`
`2028`	`2028`	`{`
`2029`	`2029`	`return connection.Query<Customisation>(`
`2030`	`2030`	`@"SELECT CustomisationID`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ int diagCompletionThreshold`
`134`	`134`	`int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId);`
`135`	`135`	`public IEnumerable<Course> GetApplicationsAvailableToCentre(int centreId);`
`136`	`136`	`bool IsSelfEnrollmentAllowed(int customisationId);`
`137`		`- Customisation? GetCourse(int customisationId);`
	`137`	`+ Customisation? GetCourse(int? customisationId);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public class CourseService : ICourseService`
`@@ -632,7 +632,7 @@ public bool IsSelfEnrollmentAllowed(int customisationId)`
`632`	`632`	`return courseDataService.IsSelfEnrollmentAllowed(customisationId);`
`633`	`633`	`}`
`634`	`634`
`635`		`- public Customisation? GetCourse(int customisationId)`
	`635`	`+ public Customisation? GetCourse(int? customisationId)`
`636`	`636`	`{`
`637`	`637`	`return courseDataService.GetCourse(customisationId);`
`638`	`638`	`}`