Merge pull request #2731 from TechnologyEnhancedLearning/Develop/Fix/TD-4277-Adding-course-to-Delegate-group

TD-4277- Added restriction to add archived courses

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -337,7 +337,8 @@ FROM Customisations cu
                         cc.CategoryName,
                         ct.CourseTopic,
                         CASE WHEN ({TutorialWithLearningCountQuery}) > 0 THEN 1 ELSE 0 END  AS HasLearning,
-                        CASE WHEN ({TutorialWithDiagnosticCountQuery}) > 0 THEN 1 ELSE 0 END AS HasDiagnostic
+                        CASE WHEN ({TutorialWithDiagnosticCountQuery}) > 0 THEN 1 ELSE 0 END AS HasDiagnostic,
+                        CASE WHEN ap.ArchivedDate IS NULL THEN 0 ELSE 1 END AS Archived
                     FROM Customisations AS c
                     INNER JOIN Applications AS ap ON ap.ApplicationID = c.ApplicationID
                     INNER JOIN CourseCategories AS cc ON ap.CourseCategoryId = cc.CourseCategoryId
@@ -869,8 +870,8 @@ public IEnumerable<CourseStatistics> GetNonArchivedCourseStatisticsAtCentreFilte
 
         public IEnumerable<DelegateCourseInfo> GetDelegateCoursesInfo(int delegateId)
         {
-                return connection.Query<DelegateCourseInfo>(
-                $@"{selectDelegateCourseInfoQuery}
+            return connection.Query<DelegateCourseInfo>(
+            $@"{selectDelegateCourseInfoQuery}
                     WHERE pr.CandidateID = @delegateId
                         AND pr.RemovedDate IS NULL
                         AND ap.DefaultContentTypeID <> 4
@@ -914,8 +915,8 @@ AND ap.DefaultContentTypeID <> 4
                         u.ProfessionalRegistrationNumber,
                         da.CentreID,
                         ap.ArchivedDate",
-                new { delegateId }
-            );            
+            new { delegateId }
+        );
         }
 
         public DelegateCourseInfo? GetDelegateCourseInfoByProgressId(int progressId)

DigitalLearningSolutions.Web.Tests/Services/CourseServiceTests.cs

@@ -784,7 +784,7 @@ public void GetEligibleCoursesToAddToGroup_does_not_return_courses_already_in_gr
             var result = courseService.GetEligibleCoursesToAddToGroup(centreId, categoryId, groupId).ToList();
 
             // Then
-            result.Should().HaveCount(4);
+            result.Should().HaveCount(3);
             result.Should().NotContain(c => c.CustomisationId == 2);
         }
 

DigitalLearningSolutions.Web/Services/CourseService.cs

@@ -384,7 +384,7 @@ int groupId
         )
         {
             var allPossibleCourses = courseDataService.GetCoursesAvailableToCentreByCategory(centreId, categoryId)
-                .Where(c => c.Active);
+                .Where(c => c.Active && !c.Archived);
 
             var groupCourseIds = groupsDataService.GetGroupCoursesVisibleToCentre(centreId)
                 .Where(gc => gc.IsUsable && gc.GroupId == groupId)