HEEDLS-1036: Fix - use candidateAssessmentId instead of selfAssessmentId

DigitalLearningSolutions.Data.Tests/DataServices/SelfAssessmentDataServiceTests/CandidateAssessmentsDataServiceTests.cs

@@ -288,6 +288,7 @@ public void GetCandidateAssessments_returns_expected_results()
             const int delegateId = 254480;
             var expectedCandidateAssessment = new CandidateAssessment
             {
+                Id = 1,
                 DelegateId = delegateId,
                 SelfAssessmentId = SelfAssessmentId,
                 CompletedDate = null,

DigitalLearningSolutions.Data.Tests/Services/ActionPlanServiceTests.cs

@@ -8,6 +8,7 @@
     using DigitalLearningSolutions.Data.DataServices.SelfAssessmentDataService;
     using DigitalLearningSolutions.Data.Models.External.LearningHubApiClient;
     using DigitalLearningSolutions.Data.Models.LearningResources;
+    using DigitalLearningSolutions.Data.Models.SelfAssessments;
     using DigitalLearningSolutions.Data.Services;
     using FakeItEasy;
     using FizzWare.NBuilder;
@@ -64,6 +65,7 @@ public void AddResourceToActionPlan_calls_expected_insert_data_service_methods()
             const int learningResourceReferenceId = 1;
             const int delegateId = 2;
             const int selfAssessmentId = 3;
+            const int candidateAssessmentId = 4;
             const string resourceName = "Activity";
             const string resourceLink = "www.test.com";
             const int learningLogId = 4;
@@ -93,6 +95,11 @@ public void AddResourceToActionPlan_calls_expected_insert_data_service_methods()
             A.CallTo(() => selfAssessmentDataService.GetCompetencyIdsForSelfAssessment(selfAssessmentId))
                 .Returns(assessmentCompetencies);
 
+            A.CallTo(() => selfAssessmentDataService.GetCandidateAssessments(delegateId, selfAssessmentId))
+                .Returns(
+                    new[] { Builder<CandidateAssessment>.CreateNew().With(ca => ca.Id = candidateAssessmentId).Build() }
+                );
+
             A.CallTo(
                 () => learningLogItemsDataService.InsertLearningLogItem(
                     A<int>._,
@@ -120,7 +127,7 @@ public void AddResourceToActionPlan_calls_expected_insert_data_service_methods()
             ).MustHaveHappenedOnceExactly();
             A.CallTo(
                 () => learningLogItemsDataService.InsertCandidateAssessmentLearningLogItem(
-                    selfAssessmentId,
+                    candidateAssessmentId,
                     learningLogId
                 )
             ).MustHaveHappenedOnceExactly();

DigitalLearningSolutions.Data/DataServices/LearningLogItemsDataService.cs

@@ -21,7 +21,7 @@ int InsertLearningLogItem(
             int learningResourceReferenceId
         );
 
-        void InsertCandidateAssessmentLearningLogItem(int assessmentId, int learningLogId);
+        void InsertCandidateAssessmentLearningLogItem(int candidateAssessmentId, int learningLogId);
 
         void InsertLearningLogItemCompetencies(int learningLogId, int competencyId, DateTime associatedDate);
 
@@ -156,13 +156,13 @@ OUTPUT Inserted.LearningLogItemID
             return learningLogItemId;
         }
 
-        public void InsertCandidateAssessmentLearningLogItem(int assessmentId, int learningLogId)
+        public void InsertCandidateAssessmentLearningLogItem(int candidateAssessmentId, int learningLogId)
         {
             connection.Execute(
                 @"INSERT INTO CandidateAssessmentLearningLogItems
                     (CandidateAssessmentID, LearningLogItemID)
-                    VALUES (@assessmentId, @learningLogId)",
-                new { assessmentId, learningLogId }
+                    VALUES (@candidateAssessmentId, @learningLogId)",
+                new { candidateAssessmentId, learningLogId }
             );
         }
 

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -235,6 +235,7 @@ public IEnumerable<CandidateAssessment> GetCandidateAssessments(int delegateId,
         {
             return connection.Query<CandidateAssessment>(
                 @"SELECT
+                        ID,
                         CandidateId AS DelegateId,
                         SelfAssessmentID,
                         CompletedDate,

DigitalLearningSolutions.Data/Models/SelfAssessments/CandidateAssessment.cs

@@ -4,6 +4,8 @@
 
     public class CandidateAssessment
     {
+        public int Id { get; set; }
+
         public int DelegateId { get; set; }
 
         public int SelfAssessmentId { get; set; }

DigitalLearningSolutions.Data/Services/ActionPlanService.cs

@@ -111,7 +111,23 @@ await learningHubResourceService.GetResourceByReferenceId(
                 learningResourceReferenceId
             );
 
-            learningLogItemsDataService.InsertCandidateAssessmentLearningLogItem(selfAssessmentId, learningLogItemId);
+            // We can assume a single Candidate Assessment because we'll be adding a uniqueness constraint
+            // on CandidateAssessments (candidateId, selfAssessmentId) before releasing (see HEEDLS-932)
+            var candidateAssessmentIdIfAny = selfAssessmentDataService
+                .GetCandidateAssessments(delegateId, selfAssessmentId)
+                .SingleOrDefault()?.Id;
+
+            if (candidateAssessmentIdIfAny == null)
+            {
+                throw new InvalidOperationException(
+                    $"Cannot add resource to action plan as user {delegateId} is not enrolled on self assessment {selfAssessmentId}"
+                );
+            }
+
+            learningLogItemsDataService.InsertCandidateAssessmentLearningLogItem(
+                candidateAssessmentIdIfAny!.Value,
+                learningLogItemId
+            );
 
             foreach (var competencyId in learningLogCompetenciesToAdd)
             {