Removed ContactChannelCreations object which encapsulated list of Con…

…tactChannelCreation types given the attribute was masked from the underlying reflection property values extractor.
DFE-Digital · Jan 22, 2025 · 2ae66ef · 2ae66ef
1 parent 2702912
commit 2ae66ef
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 89 deletions.
diff --git a/GetIntoTeachingApi/Models/Crm/Candidate.cs b/GetIntoTeachingApi/Models/Crm/Candidate.cs
@@ -298,7 +298,7 @@ public enum RegistrationStatus
         [EntityRelationship("dfe_contact_dfe_candidateschoolexperience_ContactId", typeof(CandidateSchoolExperience))]
         public List<CandidateSchoolExperience> SchoolExperiences { get; set; } = new List<CandidateSchoolExperience>();
         [EntityRelationship("dfe_contact_dfe_contactchannelcreation_ContactId", typeof(ContactChannelCreation))]
-        public ContactChannelCreations ContactChannelCreations { get; set; } = new ContactChannelCreations();
+        public List<ContactChannelCreation> ContactChannelCreations { get; set; } = new List<ContactChannelCreation>();
 
         public Candidate() : base(){
         }
@@ -344,7 +344,7 @@ public void ConfigureChannel(ICreateContactChannel contactChannelCreator, Guid?
                 {
                     ChannelId = null;
                     AddContactChannelCreation(
-                        channelCreation: !ContactChannelCreations.HasExistingContactChannelCreations,
+                        channelCreation: !ContactChannelCreations.Any(),
                         contactChannelCreator: contactChannelCreator);
                 }
                 else
@@ -378,7 +378,7 @@ public void ConfigureChannel(ICreateContactChannel contactChannelCreator, Guid?
         /// </param>
         private void AddContactChannelCreation(bool channelCreation, ICreateContactChannel contactChannelCreator)
         {
-            ContactChannelCreations.AddContactChannelCreation(
+            ContactChannelCreations.Add(
                 ContactChannelCreation.Create(
                     creationChannel: channelCreation,
                     sourceId: contactChannelCreator.CreationChannelSourceId,

diff --git a/GetIntoTeachingApi/Models/Crm/ContactChannelCreations.cs b/GetIntoTeachingApi/Models/Crm/ContactChannelCreations.cs
diff --git a/GetIntoTeachingApi/Models/Crm/Validators/CandidateValidator.cs b/GetIntoTeachingApi/Models/Crm/Validators/CandidateValidator.cs
@@ -60,7 +60,7 @@ public CandidateValidator(IStore store, IDateTimeProvider dateTime)
             RuleFor(candidate => candidate.ChannelId)
                 .NotNull()
                 .When(candidate => candidate.Id == null)
-                .When(candidate => !candidate.ContactChannelCreations.HasExistingContactChannelCreations)
+                .When(candidate => !candidate.ContactChannelCreations.Any())
                 .SetValidator(new PickListItemIdValidator<Candidate>("contact", "dfe_channelcreation", store));
             RuleFor(candidate => candidate.HasGcseEnglishId)
                 .SetValidator(new PickListItemIdValidator<Candidate>("contact", "dfe_websitehasgcseenglish", store))

diff --git a/GetIntoTeachingApi/Services/CandidateUpserter.cs b/GetIntoTeachingApi/Services/CandidateUpserter.cs
@@ -96,8 +96,8 @@ private static IEnumerable<CandidateSchoolExperience> ClearSchoolExperiences(Can
         private static IEnumerable<ContactChannelCreation> ClearContactChannelCreations(Candidate candidate)
         {
             List<ContactChannelCreation> contactChannelCreations =
-                new(candidate.ContactChannelCreations.GetContactChannelCreations());
-            candidate.ContactChannelCreations.Reset();
+                new(candidate.ContactChannelCreations);
+            candidate.ContactChannelCreations.Clear();
 
             return contactChannelCreations;
         }

diff --git a/GetIntoTeachingApiTests/Models/GetIntoTeaching/GetIntoTeachingCallbackTests.cs b/GetIntoTeachingApiTests/Models/GetIntoTeaching/GetIntoTeachingCallbackTests.cs
@@ -66,7 +66,7 @@ public void ExistingCandidate_MapsCorrectly()
             candidate.PrivacyPolicy.AcceptedPolicyId.Should().Be((Guid)request.AcceptedPolicyId);
             candidate.PrivacyPolicy.AcceptedAt.Should().BeCloseTo(DateTime.UtcNow, TimeSpan.FromSeconds(30));
 
-            var contactChannelCreation = candidate.ContactChannelCreations.GetContactChannelCreations().First();
+            var contactChannelCreation = candidate.ContactChannelCreations.First();
             contactChannelCreation.CreationChannel.Should().Be(false);
             contactChannelCreation.CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
             contactChannelCreation.CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);
@@ -85,7 +85,7 @@ public void NewCandidate_MapsCorrectly()
                 CreationChannelActivityId = 222750001,
             };
 
-            var contactChannelCreation = request.Candidate.ContactChannelCreations.GetContactChannelCreations().First();
+            var contactChannelCreation = request.Candidate.ContactChannelCreations.First();
             contactChannelCreation.CreationChannel.Should().Be(true);
             contactChannelCreation.CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
             contactChannelCreation.CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);

diff --git a/GetIntoTeachingApiTests/Models/GetIntoTeaching/MailingListAddMemberTests.cs b/GetIntoTeachingApiTests/Models/GetIntoTeaching/MailingListAddMemberTests.cs
@@ -116,7 +116,7 @@ public void ExistingCandidate_MapsCorrectly()
             candidate.Qualifications.First().TypeId.Should().Be((int)CandidateQualification.DegreeType.Degree);
             candidate.Qualifications.First().Id.Should().Be(request.QualificationId);
 
-            var contactChannelCreation = candidate.ContactChannelCreations.GetContactChannelCreations().First();
+            var contactChannelCreation = candidate.ContactChannelCreations.First();
             contactChannelCreation.CreationChannel.Should().Be(false);
             contactChannelCreation.CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
             contactChannelCreation.CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);
@@ -135,7 +135,7 @@ public void NewCandidate_MapsCreationChannelCorrectly()
                 CreationChannelActivityId = 222750001,
             };
 
-            var contactChannelCreation = request.Candidate.ContactChannelCreations.GetContactChannelCreations().First();
+            var contactChannelCreation = request.Candidate.ContactChannelCreations.First();
             contactChannelCreation.CreationChannel.Should().Be(true);
             contactChannelCreation.CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
             contactChannelCreation.CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);

diff --git a/GetIntoTeachingApiTests/Models/GetIntoTeaching/TeachingEventAddAttendeeTests.cs b/GetIntoTeachingApiTests/Models/GetIntoTeaching/TeachingEventAddAttendeeTests.cs
@@ -125,7 +125,7 @@ public void ExistingCandidate_MapsCorrectly()
             candidate.Qualifications.First().TypeId.Should().Be((int)CandidateQualification.DegreeType.Degree);
             candidate.Qualifications.First().Id.Should().Be(request.QualificationId);
 
-            var contactChannelCreation = candidate.ContactChannelCreations.GetContactChannelCreations().First();
+            var contactChannelCreation = candidate.ContactChannelCreations.First();
             contactChannelCreation.CreationChannel.Should().Be(false);
             contactChannelCreation.CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
             contactChannelCreation.CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);
@@ -144,7 +144,7 @@ public void NewCandidate_MapsCorrectly()
                 CreationChannelActivityId = 222750001,
             };
 
-            var contactChannelCreation = request.Candidate.ContactChannelCreations.GetContactChannelCreations().First();
+            var contactChannelCreation = request.Candidate.ContactChannelCreations.First();
             contactChannelCreation.CreationChannel.Should().Be(true);
             contactChannelCreation.CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
             contactChannelCreation.CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);

diff --git a/GetIntoTeachingApiTests/Models/SchoolsExperience/SchoolsExperienceSignUpTests.cs b/GetIntoTeachingApiTests/Models/SchoolsExperience/SchoolsExperienceSignUpTests.cs
@@ -106,7 +106,7 @@ public void ExistingCandidate_MapsCorrectly()
             candidate.PrivacyPolicy.AcceptedPolicyId.Should().Be((Guid)request.AcceptedPolicyId);
             candidate.PrivacyPolicy.AcceptedAt.Should().BeCloseTo(DateTime.UtcNow, TimeSpan.FromSeconds(30));
 
-            var contactChannelCreation = candidate.ContactChannelCreations.GetContactChannelCreations().First();
+            var contactChannelCreation = candidate.ContactChannelCreations.First();
             contactChannelCreation.CreationChannel.Should().Be(false);
             contactChannelCreation.CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
             contactChannelCreation.CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);
@@ -125,7 +125,7 @@ public void NewCandidate_MapsCorrectly()
                 CreationChannelActivityId = 222750001,
             };
 
-            var contactChannelCreation = request.Candidate.ContactChannelCreations.GetContactChannelCreations().First();
+            var contactChannelCreation = request.Candidate.ContactChannelCreations.First();
             contactChannelCreation.CreationChannel.Should().Be(true);
             contactChannelCreation.CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
             contactChannelCreation.CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);

diff --git a/GetIntoTeachingApiTests/Models/TeacherTrainingAdviser/TeacherTrainingAdviserSignUpTests.cs b/GetIntoTeachingApiTests/Models/TeacherTrainingAdviser/TeacherTrainingAdviserSignUpTests.cs
@@ -203,9 +203,9 @@ public void Candidate_MapsCorrectly()
             candidate.Qualifications.First().DegreeSubject.Should().Be(request.DegreeSubject);
             candidate.Qualifications.First().TypeId.Should().Be(request.DegreeTypeId);
 
-            candidate.ContactChannelCreations.GetContactChannelCreations().First().CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
-            candidate.ContactChannelCreations.GetContactChannelCreations().First().CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);
-            candidate.ContactChannelCreations.GetContactChannelCreations().First().CreationChannelActivityId.Should().Be(request.CreationChannelActivityId);
+            candidate.ContactChannelCreations.First().CreationChannelSourceId.Should().Be(request.CreationChannelSourceId);
+            candidate.ContactChannelCreations.First().CreationChannelServiceId.Should().Be(request.CreationChannelServiceId);
+            candidate.ContactChannelCreations.First().CreationChannelActivityId.Should().Be(request.CreationChannelActivityId);
 
             candidate.HasTeacherTrainingAdviserSubscription.Should().BeTrue();
         }
@@ -301,9 +301,9 @@ public void Candidate_ContactChannelCreationWhenCandidateIdIsNull()
 
             request.Candidate.ChannelId.Should().BeNull();
             request.Candidate.ChangedPropertyNames.Should().Contain("ContactChannelCreations");
-            request.Candidate.ContactChannelCreations.GetContactChannelCreations().First().CreationChannelSourceId.Should().Be(222750000);
-            request.Candidate.ContactChannelCreations.GetContactChannelCreations().First().CreationChannelServiceId.Should().Be(222750001);
-            request.Candidate.ContactChannelCreations.GetContactChannelCreations().First().CreationChannelActivityId.Should().Be(222750002);
+            request.Candidate.ContactChannelCreations.First().CreationChannelSourceId.Should().Be(222750000);
+            request.Candidate.ContactChannelCreations.First().CreationChannelServiceId.Should().Be(222750001);
+            request.Candidate.ContactChannelCreations.First().CreationChannelActivityId.Should().Be(222750002);
         }
 
         [Fact]
@@ -320,9 +320,9 @@ public void Candidate_ContactChannelCreationWhenCandidateIdIsNotNull()
             request.Candidate.ChannelId.Should().BeNull();
             request.Candidate.ChangedPropertyNames.Should().NotContain("ChannelId");
             request.Candidate.ChangedPropertyNames.Should().Contain("ContactChannelCreations");
-            request.Candidate.ContactChannelCreations.GetContactChannelCreations().First().CreationChannelSourceId.Should().Be(222750000);
-            request.Candidate.ContactChannelCreations.GetContactChannelCreations().First().CreationChannelServiceId.Should().Be(222750001);
-            request.Candidate.ContactChannelCreations.GetContactChannelCreations().First().CreationChannelActivityId.Should().Be(222750002);
+            request.Candidate.ContactChannelCreations.First().CreationChannelSourceId.Should().Be(222750000);
+            request.Candidate.ContactChannelCreations.First().CreationChannelServiceId.Should().Be(222750001);
+            request.Candidate.ContactChannelCreations.First().CreationChannelActivityId.Should().Be(222750002);
         }
 
         [Fact]

diff --git a/GetIntoTeachingApiTests/Services/CandidateUpserterTests.cs b/GetIntoTeachingApiTests/Services/CandidateUpserterTests.cs
@@ -275,7 +275,7 @@ public void Upsert_WithContactChannelCreation_SavesContactChannelCreations()
                 CreationChannelSourceId = 222750002,
             };
 
-            _candidate.ContactChannelCreations.AddContactChannelCreation(contactChannelCreation);
+            _candidate.ContactChannelCreations.Add(contactChannelCreation);
 
             _upserter.Upsert(_candidate);