Merge pull request #2815 from TechnologyEnhancedLearning/Develop/Features/TD-4092-RefactorDLSCompetencySelfAssessmentCertificatetoimprovemaintainabilityandsecurity

TD-4092 Resolving certificate showing error 403

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -388,59 +388,6 @@ from CandidateAssessmentSupervisorVerifications AS casv INNER JOIN
                 new { candidateAssessmentID }
             );
         }
-        public CompetencySelfAssessmentCertificate? GetCompetencySelfAssessmentCertificate(int selfassessmentId, int userId)
-        {
-            return connection.QueryFirstOrDefault<CompetencySelfAssessmentCertificate>(
-                @"SELECT
-                  LearnerDetails.ID ,
-                  LearnerDetails.SelfAssessment,
-                  LearnerDetails.LearnerName,
-                  LearnerDetails.LearnerPRN,
-                    LearnerId,LearnerDelegateAccountId,
-                  LearnerDetails.Verified,
-                  LearnerDetails.CentreName,
-                  Supervisor.SupervisorName ,
-                  Supervisor.SupervisorPRN ,
-                  Supervisor.SupervisorCentreName,
-                  LearnerDetails.BrandName ,
-                  LearnerDetails.BrandImage,
-                  LearnerDetails.CandidateAssessmentID,
-                  LearnerDetails.SelfAssessmentID,
-                  LearnerDetails.Vocabulary,
-                  LearnerDetails.SupervisorDelegateId,
-                  LearnerDetails.FormattedDate,
-                  LearnerDetails.NonReportable
-                  FROM(SELECT casv.ID, ca.NonReportable, sa.Name AS SelfAssessment, Learner.FirstName + ' ' + Learner.LastName AS LearnerName, Learner.ProfessionalRegistrationNumber AS LearnerPRN, Learner.ID AS LearnerId, da.ID AS LearnerDelegateAccountId, casv.Verified, ce.CentreName, 
-                                 Supervisor.FirstName + ' ' + Supervisor.LastName AS SupervisorName, Supervisor.ProfessionalRegistrationNumber AS SupervisorPRN, b.BrandName, b.BrandImage, ca.ID AS CandidateAssessmentID, ca.SelfAssessmentID, COALESCE (sa.Vocabulary, 'Capability') AS Vocabulary, 
-                                 cas.SupervisorDelegateId, CONVERT(VARCHAR(2), DAY(casv.Verified)) + CASE WHEN DAY(Verified) % 100 IN (11, 12, 13) THEN 'th' WHEN DAY(Verified) % 10 = 1 THEN 'st' WHEN DAY(Verified) % 10 = 2 THEN 'nd' WHEN DAY(Verified) 
-                                 % 10 = 3 THEN 'rd' ELSE 'th' END + ' ' + FORMAT(casv.Verified, 'MMMM yyyy') AS FormattedDate
-                    FROM   dbo.CandidateAssessments AS ca LEFT OUTER JOIN
-                                 dbo.DelegateAccounts AS da RIGHT OUTER JOIN
-                                 dbo.Users AS Learner ON da.UserID = Learner.ID ON ca.CentreID = da.CentreID AND ca.DelegateUserID = Learner.ID LEFT OUTER JOIN
-                                 dbo.Centres AS ce ON ca.CentreID = ce.CentreID LEFT OUTER JOIN
-                                 dbo.Brands AS b RIGHT OUTER JOIN
-                                 dbo.SelfAssessments AS sa ON b.BrandID = sa.BrandID ON ca.SelfAssessmentID = sa.ID LEFT OUTER JOIN
-                                 dbo.CandidateAssessmentSupervisors AS cas ON ca.ID = cas.CandidateAssessmentID LEFT OUTER JOIN
-                                 dbo.Users AS Supervisor RIGHT OUTER JOIN
-                                 dbo.AdminAccounts AS aa ON Supervisor.ID = aa.UserID RIGHT OUTER JOIN
-                                dbo.CandidateAssessmentSupervisorVerifications AS casv ON aa.ID = casv.ID ON cas.ID = casv.CandidateAssessmentSupervisorID
-                    WHERE (CA.SelfAssessmentID =@selfassessmentId AND Learner.ID  = @userId)  AND (casv.SignedOff = 1) AND (NOT (casv.Verified IS NULL))) LearnerDetails INNER JOIN
-                    			 (select sd.SupervisorAdminID, casv.ID ,u.FirstName + ' ' + u.LastName AS SupervisorName, 
-                                        u.ProfessionalRegistrationNumber AS SupervisorPRN,
-                                  c.CentreName AS SupervisorCentreName,ca.CentreID
-                                  from CandidateAssessmentSupervisorVerifications AS casv INNER JOIN
-                                 CandidateAssessmentSupervisors AS cas ON casv.CandidateAssessmentSupervisorID = cas.ID INNER JOIN
-                    			 SupervisorDelegates AS sd ON sd.ID = cas.SupervisorDelegateId INNER JOIN
-                    			 AdminAccounts AS aa ON sd.SupervisorAdminID = aa.ID   INNER JOIN
-                    			 Users AS u ON aa.UserID = u.ID INNER JOIN
-                    			 Centres c ON aa.CentreID = c.CentreID INNER JOIN
-                    			 CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID 
-                    			 where (CA.SelfAssessmentID =@selfassessmentId AND u.ID  = @userId)  AND  (casv.SignedOff = 1)
-                                               AND (NOT (casv.Verified IS NULL))) Supervisor ON  LearnerDetails.Id =Supervisor.Id
-                                 ORDER BY Verified DESC",
-                new { selfassessmentId , userId }
-            );
-        }
         public IEnumerable<CompetencyCountSelfAssessmentCertificate> GetCompetencyCountSelfAssessmentCertificate(int candidateAssessmentID)
         {
             return connection.Query<CompetencyCountSelfAssessmentCertificate>(
@@ -475,9 +422,9 @@ LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr
                 new { selfAssessmentId, delegateUserID }
             );
         }
-        public ActivitySummaryCompetencySelfAssesment GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId)
+        public ActivitySummaryCompetencySelfAssesment? GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId)
         {
-            return connection.QueryFirstOrDefault<ActivitySummaryCompetencySelfAssesment>(
+            return connection.QueryFirstOrDefault<ActivitySummaryCompetencySelfAssesment?>(
                 @"SELECT ca.ID AS CandidateAssessmentID, ca.SelfAssessmentID, sa.Name AS RoleName, casv.ID AS CandidateAssessmentSupervisorVerificationId,
                  (SELECT COUNT(sas1.CompetencyID) AS CompetencyAssessmentQuestionCount
                  FROM    SelfAssessmentStructure AS sas1 INNER JOIN

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -167,9 +167,8 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
         int CheckDelegateSelfAssessment(int candidateAssessmentsId);
         IEnumerable<CompetencyCountSelfAssessmentCertificate> GetCompetencyCountSelfAssessmentCertificate(int candidateAssessmentID);
         CompetencySelfAssessmentCertificate? GetCompetencySelfAssessmentCertificate(int candidateAssessmentID);
-        CompetencySelfAssessmentCertificate? GetCompetencySelfAssessmentCertificate(int selfassessmentId, int userId);
         IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserID);
-        ActivitySummaryCompetencySelfAssesment GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId);
+        ActivitySummaryCompetencySelfAssesment? GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId);
         bool IsUnsupervisedSelfAssessment(int selfAssessmentId);
     }
 

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -1618,15 +1618,14 @@ public IActionResult WithdrawSupervisorSignOffRequest(
         }
 
 
-        [Route("/LearningPortal/selfAssessments/{selfassessmentId:int}/{vocabulary}/Certificate")]
+        [Route("/LearningPortal/selfAssessments/{CandidateAssessmentId:int}/{vocabulary}/Certificate")]
 
-        public IActionResult CompetencySelfAssessmentCertificate(int selfAssessmentId, string vocabulary)
+        public IActionResult CompetencySelfAssessmentCertificate(int CandidateAssessmentId, string vocabulary)
         {
             int supervisorDelegateId = 0;
             var adminId = User.GetAdminId();
-            User.GetUserIdKnownNotNull();
-            var competencymaindata = selfAssessmentService.GetCompetencySelfAssessmentCertificate(selfAssessmentId, User.GetUserIdKnownNotNull());
-            if((competencymaindata == null)|| ( competencymaindata.LearnerId != User.GetUserIdKnownNotNull()) || (selfAssessmentId == 0))
+           var competencymaindata = selfAssessmentService.GetCompetencySelfAssessmentCertificate(CandidateAssessmentId);
+            if ((competencymaindata == null)|| ( competencymaindata.LearnerId != User.GetUserIdKnownNotNull()) || (CandidateAssessmentId == 0))
             {
                 return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
             }

DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs

@@ -145,7 +145,6 @@ public int GetSelfAssessmentActivityDelegatesExportCount(string searchString, st
         int CheckDelegateSelfAssessment(int candidateAssessmentsId);
         IEnumerable<CompetencyCountSelfAssessmentCertificate> GetCompetencyCountSelfAssessmentCertificate(int candidateAssessmentID);
         CompetencySelfAssessmentCertificate? GetCompetencySelfAssessmentCertificate(int candidateAssessmentID);
-        CompetencySelfAssessmentCertificate? GetCompetencySelfAssessmentCertificate(int selfassessmentId, int userId);
         IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserID);
         ActivitySummaryCompetencySelfAssesment GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId);
         bool IsUnsupervisedSelfAssessment(int selfAssessmentId);
@@ -531,10 +530,6 @@ public IEnumerable<CompetencyCountSelfAssessmentCertificate> GetCompetencyCountS
         {
             return selfAssessmentDataService.GetCompetencySelfAssessmentCertificate(candidateAssessmentID);
         }
-        public CompetencySelfAssessmentCertificate? GetCompetencySelfAssessmentCertificate(int selfassessmentId, int userId)
-        {
-            return selfAssessmentDataService.GetCompetencySelfAssessmentCertificate(selfassessmentId,userId);
-        }
         public IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserID)
         {
             return selfAssessmentDataService.GetAccessor(selfAssessmentId, delegateUserID);

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewActionButtons.cshtml

@@ -34,7 +34,7 @@
 @if (ViewBag.CanViewCertificate)
 {
     <a class="nhsuk-button "
-   asp-route-selfAssessmentId="@Model.SelfAssessment.Id"
+       asp-route-CandidateAssessmentId="@Model.SelfAssessment.CandidateAssessmentId"
    asp-route-vocabulary="@Model.VocabPlural()"
    asp-action="CompetencySelfAssessmentCertificate"
    role="button">