TD-4880- undoing Sherif's change for the task TD-4879 since it was supposed to be made for Delegate Activities and not Activity Delegates, adding specific logic to the Self Assessment service layer and showing Unauthorised activity based on return type.

Author: ABSinhaa

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -244,7 +244,7 @@ LEFT JOIN dbo.CandidateAssessmentSupervisorVerifications AS casv WITH (NOLOCK) O
 
                 WHERE sa.ID = @selfAssessmentId 
                 AND da.CentreID = @centreID AND csa.CentreID = @centreID
-                AND (ca.RemovedDate IS NULL) AND ( aaEnrolledBy.CategoryID IS NULL OR sa.CategoryID = aaEnrolledBy.CategoryID)
+                AND (ca.RemovedDate IS NULL)
                 AND ( u.FirstName + ' ' + u.LastName + ' ' + COALESCE(ucd.Email, u.PrimaryEmail) + ' ' + COALESCE(da.CandidateNumber, '') LIKE N'%' + @searchString + N'%')
                 AND ((@isDelegateActive IS NULL) OR (@isDelegateActive = 1 AND (da.Active = 1)) OR (@isDelegateActive = 0 AND (da.Active = 0)))
 				AND ((@removed IS NULL) OR (@removed = 1 AND (ca.RemovedDate IS NOT NULL)) OR (@removed = 0 AND (ca.RemovedDate IS NULL)))

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/CourseDelegatesControllerTests.cs

@@ -95,7 +95,7 @@ public void Index_shows_index_page_when_no_selfAssessmentId_supplied()
             var selfAssessmentDelegate = new SelfAssessmentDelegate(6, "Lname");
 
             A.CallTo(() => selfAssessmentDelegatesService.GetSelfAssessmentDelegatesPerPage("", 0, 10, "SearchableName", "Ascending",
-                6, UserCentreId, null, null, null, null))
+                6, UserCentreId, null, null, null, null, null))
                 .Returns((new SelfAssessmentDelegatesData(
                         new List<SelfAssessmentDelegate> { selfAssessmentDelegate }
                     ), 1)
@@ -137,7 +137,7 @@ public void SelfAssessmentDelegates_Index_returns_ViewResult_with_EmptyDelegates
             var selfAssessmentDelegate = new SelfAssessmentDelegate(6, "Lname");
 
             A.CallTo(() => selfAssessmentDelegatesService.GetSelfAssessmentDelegatesPerPage("", 0, 10, "SearchableName", "Ascending",
-                10, UserCentreId, null, null, null, null))
+                10, UserCentreId, null, null, null, null, null))
                 .Returns((new SelfAssessmentDelegatesData(
                         new List<SelfAssessmentDelegate> { selfAssessmentDelegate }
                     ), 0)
@@ -147,8 +147,7 @@ public void SelfAssessmentDelegates_Index_returns_ViewResult_with_EmptyDelegates
             var result = controller.Index(null, 10);
 
             // Then
-            result.Should().BeViewResult().ModelAs<ActivityDelegatesViewModel>()
-            .DelegatesDetails?.Delegates?.Should().BeEmpty();
+            result.Should().BeRedirectToActionResult();
         }
 
         [Test]

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ActivityDelegatesController.cs

@@ -131,12 +131,7 @@ public IActionResult Index(
 
             var centreId = User.GetCentreIdKnownNotNull();
             var adminCategoryId = User.GetAdminCategoryId();
-            var selfAssessmentCategoryId = selfAssessmentService.GetSelfAssessmentCategoryId((int)selfAssessmentId);
 
-            if (adminCategoryId > 0 && adminCategoryId != selfAssessmentCategoryId)
-            {
-                return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
-            }
 
             bool? isDelegateActive, isProgressLocked, removed, hasCompleted, submitted, signedOff;
             isDelegateActive = isProgressLocked = removed = hasCompleted = submitted = signedOff = null;
@@ -216,7 +211,7 @@ public IActionResult Index(
             {
                 var courseDelegatesData = new CourseDelegatesData();
                 var selfAssessmentDelegatesData = new SelfAssessmentDelegatesData();
-                var resultCount = 0;
+                int? resultCount;
                 if (isCourseDelegate)
                 {
                     (courseDelegatesData, resultCount) = courseDelegatesService.GetCoursesAndCourseDelegatesPerPageForCentre(searchString ?? string.Empty, offSet, itemsPerPage ?? 0, sortBy, sortDirection,
@@ -238,14 +233,20 @@ public IActionResult Index(
                 else
                 {
                     (selfAssessmentDelegatesData, resultCount) = selfAssessmentService.GetSelfAssessmentDelegatesPerPage(searchString ?? string.Empty, offSet, itemsPerPage ?? 0, sortBy, sortDirection,
-                    selfAssessmentId, centreId, isDelegateActive, removed, submitted, signedOff);
+                    selfAssessmentId, centreId, isDelegateActive, removed, submitted, signedOff, adminCategoryId);
+
+                    if (selfAssessmentDelegatesData?.Delegates == null && resultCount == null)
+                    {
+                        //redirect as unauthorized through null comparisions when category Id is a mismatch.
+                        return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
+                    }
 
                     if (selfAssessmentDelegatesData?.Delegates?.Count() == 0 && resultCount > 0)
                     {
                         page = 1; offSet = 0;
                         (selfAssessmentDelegatesData, resultCount) = selfAssessmentService.GetSelfAssessmentDelegatesPerPage(searchString ?? string.Empty, offSet, itemsPerPage ?? 0, sortBy, sortDirection,
-                            selfAssessmentId, centreId, isDelegateActive, removed, submitted, signedOff);
-                    }
+                            selfAssessmentId, centreId, isDelegateActive, removed, submitted, signedOff, adminCategoryId);
+                    }                    
 
                     var adminId = User.GetCustomClaimAsRequiredInt(CustomClaimTypes.UserAdminId);
 
@@ -280,7 +281,7 @@ public IActionResult Index(
                 {
                     var result = paginateService.Paginate(
                     courseDelegatesData.Delegates,
-                    resultCount,
+                    (int)resultCount,
                     new PaginationOptions(page, itemsPerPage),
                     new FilterOptions(existingFilterString, availableFilters, CourseDelegateAccountStatusFilterOptions.Active.FilterValue),
                     searchString,
@@ -298,7 +299,7 @@ public IActionResult Index(
                 {
                     var result = paginateService.Paginate(
                     selfAssessmentDelegatesData.Delegates,
-                    resultCount,
+                    (int)resultCount,
                     new PaginationOptions(page, itemsPerPage),
                     new FilterOptions(existingFilterString, availableFilters, CourseDelegateAccountStatusFilterOptions.Active.FilterValue),
                     searchString,

DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs

@@ -128,8 +128,8 @@ int delegateUserId
         );
 
         void RemoveEnrolment(int selfAssessmentId, int delegateUserId);
-        public (SelfAssessmentDelegatesData, int) GetSelfAssessmentDelegatesPerPage(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection,
-            int? selfAssessmentId, int centreId, bool? isDelegateActive, bool? removed, bool? submitted, bool? signedOff);
+        public (SelfAssessmentDelegatesData, int?) GetSelfAssessmentDelegatesPerPage(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection,
+            int? selfAssessmentId, int centreId, bool? isDelegateActive, bool? removed, bool? submitted, bool? signedOff, int? adminCategoryId);
         public SelfAssessmentDelegatesData GetSelfAssessmentActivityDelegatesExport(string searchString, int itemsPerPage, string sortBy, string sortDirection,
            int? selfAssessmentId, int centreId, bool? isDelegateActive, bool? removed, int currentRun, bool? submitted, bool? signedOff);
         public int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string sortBy, string sortDirection,
@@ -448,9 +448,18 @@ public void RemoveEnrolment(int selfAssessmentId, int delegateUserId)
             return selfAssessmentDataService.GetSelfAssessmentNameById(selfAssessmentId);
         }
 
-        public (SelfAssessmentDelegatesData, int) GetSelfAssessmentDelegatesPerPage(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection,
-            int? selfAssessmentId, int centreId, bool? isDelegateActive, bool? removed, bool? submitted, bool? signedOff)
+        public (SelfAssessmentDelegatesData, int?) GetSelfAssessmentDelegatesPerPage(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection,
+            int? selfAssessmentId, int centreId, bool? isDelegateActive, bool? removed, bool? submitted, bool? signedOff, int? adminCategoryId)
         {
+
+            var selfAssessmentCategoryId = selfAssessmentDataService.GetSelfAssessmentCategoryId((int)selfAssessmentId);
+
+            if (adminCategoryId > 0  && adminCategoryId != selfAssessmentCategoryId)
+            {
+                // return null variants of the object when the categoryID mismatches 
+                return (new SelfAssessmentDelegatesData(), null);      
+            }
+
             (var delegateselfAssessments, int resultCount) = selfAssessmentDataService.GetSelfAssessmentDelegates(searchString, offSet, itemsPerPage, sortBy, sortDirection,
             selfAssessmentId, centreId, isDelegateActive, removed, submitted, signedOff);