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

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -1532,22 +1532,6 @@ ManageOptionalCompetenciesViewModel model
                     );
                 }
             }
-            var optionalCompetency =
-            (selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId)).Where(x => !x.IncludedInSelfAssessment);
-            if (optionalCompetency.Any())
-            {
-                foreach (var optinal in optionalCompetency)
-                {
-                    var selfAssessmentResults = selfAssessmentService.GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, optinal.Id);
-                    if (selfAssessmentResults.Any())
-                    {
-                        foreach (var item in selfAssessmentResults)
-                        {
-                            selfAssessmentService.RemoveReviewCandidateAssessmentOptionalCompetencies(item.Id);
-                        }
-                    }
-                }
-            }
             if (model.GroupOptionalCompetenciesChecked != null)
             {
                 var optionalCompetencies =
@@ -1566,6 +1550,23 @@ ManageOptionalCompetenciesViewModel model
 
             }
 
+            var optionalCompetency =
+            (selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId)).Where(x => !x.IncludedInSelfAssessment);
+            if (optionalCompetency.Any())
+            {
+                foreach (var optinal in optionalCompetency)
+                {
+                    var selfAssessmentResults = selfAssessmentService.GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, optinal.Id);
+                    if (selfAssessmentResults.Any())
+                    {
+                        foreach (var item in selfAssessmentResults)
+                        {
+                            selfAssessmentService.RemoveReviewCandidateAssessmentOptionalCompetencies(item.Id);
+                        }
+                    }
+                }
+            }
+
             var recentResults = selfAssessmentService.GetMostRecentResults(selfAssessmentId, User.GetCandidateIdKnownNotNull()).ToList();
 
             bool isVerificationPending = recentResults?.SelectMany(comp => comp.AssessmentQuestions).Where(quest => quest.Required)

DigitalLearningSolutions.Web/appSettings.UAT.json

@@ -25,6 +25,9 @@
     "LoginWithLearningHub": true,
     "TableauSelfAssessmentDashboards": false
   },
+  "IpRateLimiting": {
+    "EnableEndpointRateLimiting": false
+  },
   "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net",
   "FreshdeskAPIConfig": {
     "GroupId": "80000650208",