Merge pull request #2459 from TechnologyEnhancedLearning/Develop/fix/TD-3128-Supervise-Link-410-Issue

TD-3128- Supervise link 410 issue - when clicked for next self assessment immediately.

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SupervisorService.cs

@@ -31,6 +31,7 @@ public interface ISupervisorService
         DelegateSelfAssessment? GetSelfAssessmentBySupervisorDelegateSelfAssessmentId(int selfAssessmentId, int supervisorDelegateId);
         DelegateSelfAssessment? GetSelfAssessmentBySupervisorDelegateCandidateAssessmentId(int candidateAssessmentId, int supervisorDelegateId);
         CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisorById(int candidateAssessmentSupervisorId);
+        CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisor(int candidateAssessmentID, int supervisorDelegateId, int selfAssessmentSupervisorRoleId);
         SelfAssessmentResultSummary? GetSelfAssessmentResultSummary(int candidateAssessmentId, int supervisorDelegateId);
         IEnumerable<CandidateAssessmentSupervisorVerificationSummary> GetCandidateAssessmentSupervisorVerificationSummaries(int candidateAssessmentId);
         IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID);
@@ -954,6 +955,18 @@ FROM   CandidateAssessmentSupervisors
                ).FirstOrDefault();
         }
 
+        public CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisor(int candidateAssessmentID, int supervisorDelegateId, int selfAssessmentSupervisorRoleId)
+        {
+            return connection.Query<CandidateAssessmentSupervisor>(
+               @"SELECT *
+                  FROM   CandidateAssessmentSupervisors
+                  WHERE (CandidateAssessmentID = @candidateAssessmentID 
+                        AND SupervisorDelegateId = @supervisorDelegateId 
+                        AND SelfAssessmentSupervisorRoleId = @selfAssessmentSupervisorRoleId)",
+               new { candidateAssessmentID, supervisorDelegateId, selfAssessmentSupervisorRoleId }
+               ).FirstOrDefault();
+        }
+
         public SelfAssessmentResultSummary? GetSelfAssessmentResultSummary(int candidateAssessmentId, int supervisorDelegateId)
         {
             return connection.Query<SelfAssessmentResultSummary>(

DigitalLearningSolutions.Data/Models/Supervisor/CandidateAssessmentSupervisor.cs

@@ -1,10 +1,13 @@
-namespace DigitalLearningSolutions.Data.Models.Supervisor
+using System;
+
+namespace DigitalLearningSolutions.Data.Models.Supervisor
 {
     public class CandidateAssessmentSupervisor
     {
         public int ID { get; set; }
         public int CandidateAssessmentID { get; set; }
         public int SupervisorDelegateId { get; set; }
         public int SelfAssessmentSupervisorRoleID { get; set; }
+        public DateTime? Removed { get; set; }
     }
 }

DigitalLearningSolutions.Web.Tests/Controllers/SupervisorController/SupervisorControllerTests.cs

@@ -1,22 +1,13 @@
 namespace DigitalLearningSolutions.Web.Tests.Controllers.Support
 {
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
     using DigitalLearningSolutions.Data.DataServices;
+    using DigitalLearningSolutions.Data.DataServices.SelfAssessmentDataService;
     using DigitalLearningSolutions.Data.DataServices.UserDataService;
-    using DigitalLearningSolutions.Data.Models.Support;
     using DigitalLearningSolutions.Data.Services;
-    
     using DigitalLearningSolutions.Data.Utilities;
     using DigitalLearningSolutions.Web.Controllers.SupervisorController;
-    using DigitalLearningSolutions.Web.Controllers.Support;
-    using DigitalLearningSolutions.Web.Models.Enums;
     using DigitalLearningSolutions.Web.Services;
-    using DigitalLearningSolutions.Web.ViewModels.Support.Faqs;
     using FakeItEasy;
-    using FluentAssertions;
-    using FluentAssertions.AspNetCore.Mvc;
     using GDS.MultiPageFormData;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Configuration;
@@ -44,6 +35,7 @@ public class SupervisorControllerTests
         private IEmailService emailService = null!;
         private IClockUtility clockUtility = null!;
         private ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService = null!;
+        private ISelfAssessmentDataService selfAssessmentDataService = null!;
 
         [SetUp]
         public void Setup()
@@ -67,6 +59,7 @@ public void Setup()
             emailService = A.Fake<IEmailService>();
             clockUtility = A.Fake<IClockUtility>();
             candidateAssessmentDownloadFileService = A.Fake<ICandidateAssessmentDownloadFileService>();
+            selfAssessmentDataService = A.Fake<ISelfAssessmentDataService>();
 
             A.CallTo(() => candidateAssessmentDownloadFileService.GetCandidateAssessmentDownloadFileForCentre(A<int>._, A<int>._, A<bool>._))
                 .Returns(new byte[] { });
@@ -96,6 +89,7 @@ public void ExportCandidateAssessment_should_return_file_object_with_file_name_i
                    emailGenerationService,
                    emailService,
                    candidateAssessmentDownloadFileService,
+                   selfAssessmentDataService,
                    clockUtility
                );
             string expectedFileName = $"{((selfAssessmentName.Length > 30) ? selfAssessmentName.Substring(0, 30) : selfAssessmentName)} - {delegateName} - {clockUtility.UtcNow:yyyy-MM-dd}.xlsx";

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -1003,10 +1003,16 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele
             }
             else
             {
-                if (TempData["IsAssessmentsSupervise"] != null)
+
+                var candidateAssessmentId = selfAssessmentDataService.GetCandidateAssessments(delegateUserId, selfAssessmentId).SingleOrDefault()?.Id;
+                var roleId = supervisorRoles.Where(x => x.SelfAssessmentID == selfAssessmentId).Select(x => x.ID).FirstOrDefault();
+                if (candidateAssessmentId != null)
                 {
-                    TempData.Remove("IsAssessmentsSupervise");
-                    return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });
+                    var candidateAssessmentSupervisor = supervisorService.GetCandidateAssessmentSupervisor((int)candidateAssessmentId, supervisorDelegateId, roleId);
+                    if (candidateAssessmentSupervisor != null && candidateAssessmentSupervisor.Removed == null)
+                    {
+                        return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });
+                    }
                 }
 
                 var sessionEnrolOnRoleProfile = new SessionEnrolOnRoleProfile()
@@ -1096,7 +1102,6 @@ public IActionResult QuickAddSupervisorConfirm(int? selfAssessmentSupervisorRole
                     selfAssessmentId,
                     selfAssessmentSupervisorRoleId.Value
                 );
-                TempData["IsAssessmentsSupervise"] = true;
                 return RedirectToAction("DelegateProfileAssessments", new { supervisorDelegateId = supervisorDelegateId });
             }
         }
@@ -1111,10 +1116,6 @@ public IActionResult RemoveDelegateSelfAssessment(int candidateAssessmentId, int
         public IActionResult RemoveDelegateSelfAssessmentsupervisor(int candidateAssessmentId, int supervisorDelegateId)
         {
             supervisorService.RemoveDelegateSelfAssessmentsupervisor(candidateAssessmentId, supervisorDelegateId);
-            if (TempData["IsAssessmentsSupervise"] != null)
-            {
-                TempData.Remove("IsAssessmentsSupervise");
-            }
             return RedirectToAction("DelegateProfileAssessments", new { supervisorDelegateId = supervisorDelegateId });
         }
 

DigitalLearningSolutions.Web/Controllers/SupervisorController/SupervisorController.cs

@@ -1,6 +1,7 @@
 namespace DigitalLearningSolutions.Web.Controllers.SupervisorController
 {
     using DigitalLearningSolutions.Data.DataServices;
+    using DigitalLearningSolutions.Data.DataServices.SelfAssessmentDataService;
     using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Services;
     using DigitalLearningSolutions.Data.Utilities;
@@ -29,6 +30,7 @@ public partial class SupervisorController : Controller
         private readonly IEmailGenerationService emailGenerationService;
         private readonly IEmailService emailService;
         private readonly ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService;
+        private readonly ISelfAssessmentDataService selfAssessmentDataService;
         private readonly IClockUtility clockUtility;
 
         public SupervisorController(
@@ -50,6 +52,7 @@ public SupervisorController(
            IEmailGenerationService emailGenerationService,
            IEmailService emailService,
            ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService,
+           ISelfAssessmentDataService selfAssessmentDataService,
            IClockUtility clockUtility
            )
         {
@@ -67,6 +70,7 @@ IClockUtility clockUtility
             this.emailGenerationService = emailGenerationService;
             this.emailService = emailService;
             this.candidateAssessmentDownloadFileService = candidateAssessmentDownloadFileService;
+            this.selfAssessmentDataService = selfAssessmentDataService;
             this.clockUtility = clockUtility;
         }