Merge branch 'DLS-Release-v1.2.2' into DLS-Release-v1.2.3

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -80,13 +80,13 @@ int adminId
 
         IEnumerable<GenericSelectList> GetAssessmentQuestions(int frameworkId, int adminId);
 
-        FrameworkDefaultQuestionUsage? GetFrameworkDefaultQuestionUsage(int frameworkId, int assessmentQuestionId);
+        FrameworkDefaultQuestionUsage GetFrameworkDefaultQuestionUsage(int frameworkId, int assessmentQuestionId);
 
         IEnumerable<GenericSelectList> GetAssessmentQuestionsForCompetency(int frameworkCompetencyId, int adminId);
 
-        AssessmentQuestionDetail? GetAssessmentQuestionDetailById(int assessmentQuestionId, int adminId);
+        AssessmentQuestionDetail GetAssessmentQuestionDetailById(int assessmentQuestionId, int adminId);
 
-        LevelDescriptor? GetLevelDescriptorForAssessmentQuestionId(int assessmentQuestionId, int adminId, int level);
+        LevelDescriptor GetLevelDescriptorForAssessmentQuestionId(int assessmentQuestionId, int adminId, int level);
 
         IEnumerable<CompetencyResourceAssessmentQuestionParameter>
             GetSignpostingResourceParametersByFrameworkAndCompetencyId(int frameworkId, int competencyId);
@@ -122,7 +122,7 @@ bool zeroBased
         FrameworkReviewOutcomeNotification? GetFrameworkReviewNotification(int reviewId);
 
         //INSERT DATA
-        BrandedFramework? CreateFramework(DetailFramework detailFramework, int adminId);
+        BrandedFramework CreateFramework(DetailFramework detailFramework, int adminId);
 
         int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId);
 
@@ -367,7 +367,7 @@ public FrameworkDataService(IDbConnection connection, ILogger<FrameworkDataServi
             );
         }
 
-        public BaseFramework? GetBaseFrameworkByFrameworkId(int frameworkId, int adminId)
+        public BaseFramework GetBaseFrameworkByFrameworkId(int frameworkId, int adminId)
         {
             return connection.QueryFirstOrDefault<BaseFramework>(
                 $@"SELECT {BaseFrameworkFields}
@@ -377,7 +377,7 @@ public FrameworkDataService(IDbConnection connection, ILogger<FrameworkDataServi
             );
         }
 
-        public BrandedFramework? GetBrandedFrameworkByFrameworkId(int frameworkId, int adminId)
+        public BrandedFramework GetBrandedFrameworkByFrameworkId(int frameworkId, int adminId)
         {
             return connection.QueryFirstOrDefault<BrandedFramework>(
                 $@"SELECT {BaseFrameworkFields} {BrandedFrameworkFields}
@@ -484,7 +484,7 @@ public IEnumerable<FrameworkCompetency> GetAllCompetenciesForAdminId(string name
             );
         }
 
-        public BrandedFramework? CreateFramework(DetailFramework detailFramework, int adminId)
+        public BrandedFramework CreateFramework(DetailFramework detailFramework, int adminId)
         {
             string frameworkName = detailFramework.FrameworkName;
             var description = detailFramework.Description;
@@ -532,7 +532,7 @@ public IEnumerable<FrameworkCompetency> GetAllCompetenciesForAdminId(string name
                 return new BrandedFramework();
             }
 
-            return connection.QueryFirstOrDefault<BrandedFramework?>(
+            return connection.QueryFirstOrDefault<BrandedFramework>(
                 $@"SELECT {BaseFrameworkFields}
                       FROM {FrameworkTables}
                       WHERE FrameworkName = @frameworkName AND OwnerAdminID = @adminId",
@@ -867,7 +867,7 @@ public IEnumerable<FrameworkCompetencyGroup> GetFrameworkCompetencyGroups(int fr
                 @"SELECT fcg.ID, fcg.CompetencyGroupID, cg.Name, cg.Description, fcg.Ordering, fc.ID, c.ID AS CompetencyID, c.Name, c.Description, fc.Ordering, COUNT(caq.AssessmentQuestionID) AS AssessmentQuestions
                     ,(SELECT COUNT(*) FROM CompetencyLearningResources clr WHERE clr.CompetencyID = c.ID AND clr.RemovedDate IS NULL) AS CompetencyLearningResourcesCount
                     FROM   FrameworkCompetencyGroups AS fcg INNER JOIN
-                      CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID INNER JOIN
+                      CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID LEFT OUTER JOIN
                        FrameworkCompetencies AS fc ON fcg.ID = fc.FrameworkCompetencyGroupID LEFT OUTER JOIN
                        Competencies AS c ON fc.CompetencyID = c.ID LEFT OUTER JOIN
                       CompetencyAssessmentQuestions AS caq ON c.ID = caq.CompetencyID
@@ -1519,7 +1519,7 @@ FROM AssessmentQuestionInputTypes"
             );
         }
 
-        public FrameworkDefaultQuestionUsage? GetFrameworkDefaultQuestionUsage(int frameworkId, int assessmentQuestionId)
+        public FrameworkDefaultQuestionUsage GetFrameworkDefaultQuestionUsage(int frameworkId, int assessmentQuestionId)
         {
             return connection.QueryFirstOrDefault<FrameworkDefaultQuestionUsage>(
                 @"SELECT @assessmentQuestionId AS ID,
@@ -1620,7 +1620,7 @@ FROM   CompetencyAssessmentQuestions INNER JOIN
             }
         }
 
-        public AssessmentQuestionDetail? GetAssessmentQuestionDetailById(int assessmentQuestionId, int adminId)
+        public AssessmentQuestionDetail GetAssessmentQuestionDetailById(int assessmentQuestionId, int adminId)
         {
             return connection.QueryFirstOrDefault<AssessmentQuestionDetail>(
                 $@"{AssessmentQuestionFields}{AssessmentQuestionDetailFields}
@@ -1630,7 +1630,7 @@ FROM   CompetencyAssessmentQuestions INNER JOIN
             );
         }
 
-        public LevelDescriptor? GetLevelDescriptorForAssessmentQuestionId(
+        public LevelDescriptor GetLevelDescriptorForAssessmentQuestionId(
             int assessmentQuestionId,
             int adminId,
             int level
@@ -2501,7 +2501,7 @@ FROM Flags AS f
                         FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS FlagsCsv
                     FROM 
                          Competencies AS c INNER JOIN
-                         FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID INNER JOIN
+                         FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID LEFT JOIN
                          FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID LEFT JOIN
                          CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID
                     WHERE (fc.FrameworkID = @frameworkId)

DigitalLearningSolutions.Web/ServiceFilter/RequireProcessAgreementFilter .cs

@@ -24,47 +24,50 @@ public void OnActionExecuted(ActionExecutedContext context) { }
 
         public void OnActionExecuting(ActionExecutingContext context)
         {
-            if (!(context.Controller is Controller controller))
+            if (context.HttpContext.Request.Path.ToString().Contains("/LearningPortal/SelfAssessment/"))
             {
-                return;
-            }
+                if (!(context.Controller is Controller controller))
+                {
+                    return;
+                }
 
-            if (!context.ActionArguments.ContainsKey("selfAssessmentId"))
-            {
-                return;
-            }
+                if (!context.ActionArguments.ContainsKey("selfAssessmentId"))
+                {
+                    return;
+                }
 
-            var selfAssessmentId = int.Parse(context.ActionArguments["selfAssessmentId"].ToString()!);
-            var delegateUserId = controller.User.GetUserIdKnownNotNull();
+                var selfAssessmentId = int.Parse(context.ActionArguments["selfAssessmentId"].ToString()!);
+                var delegateUserId = controller.User.GetUserIdKnownNotNull();
 
-            var selfAssessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);
+                var selfAssessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);
 
-            if (selfAssessment == null)
-            {
-                logger.LogWarning(
-                    $"Attempt to access self assessment {selfAssessmentId} by user {delegateUserId}, but no such assessment found"
-                );
-                context.Result = new RedirectToActionResult("StatusCode", "LearningSolutions", new { code = 403 });
-                return;
-            }
+                if (selfAssessment == null)
+                {
+                    logger.LogWarning(
+                        $"Attempt to access self assessment {selfAssessmentId} by user {delegateUserId}, but no such assessment found"
+                    );
+                    context.Result = new RedirectToActionResult("StatusCode", "LearningSolutions", new { code = 403 });
+                    return;
+                }
 
-            var actionName = context.RouteData.Values["action"]?.ToString();
-            if (actionName == "AgreeSelfAssessmentProcess" || actionName == "ProcessAgreed")
-            {
-                return;
-            }
+                var actionName = context.RouteData.Values["action"]?.ToString();
+                if (actionName == "AgreeSelfAssessmentProcess" || actionName == "ProcessAgreed")
+                {
+                    return;
+                }
 
-            if (!selfAssessment.SelfAssessmentProcessAgreed && selfAssessment.IsSupervised)
-            {
-                logger.LogInformation(
-                    $"Redirecting user {delegateUserId} to agree process page for self assessment {selfAssessmentId}"
-                );
+                if (!selfAssessment.SelfAssessmentProcessAgreed && selfAssessment.IsSupervised)
+                {
+                    logger.LogInformation(
+                        $"Redirecting user {delegateUserId} to agree process page for self assessment {selfAssessmentId}"
+                    );
 
-                context.Result = new RedirectToActionResult(
-                    "AgreeSelfAssessmentProcess",
-                    "LearningPortal",
-                    new { selfAssessmentId }
-                );
+                    context.Result = new RedirectToActionResult(
+                        "AgreeSelfAssessmentProcess",
+                        "LearningPortal",
+                        new { selfAssessmentId }
+                    );
+                }
             }
         }
     }