test fixes

DFE-Digital · Jan 7, 2025 · c40d416 · c40d416
1 parent a819647
commit c40d416
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/GetIntoTeachingApi/Models/Crm/Validators/CandidateValidator.cs b/GetIntoTeachingApi/Models/Crm/Validators/CandidateValidator.cs
@@ -57,10 +57,11 @@ public CandidateValidator(IStore store, IDateTimeProvider dateTime)
             RuleFor(candidate => candidate.InitialTeacherTrainingYearId)
                 .SetValidator(new PickListItemIdValidator<Candidate>("contact", "dfe_ittyear", store))
                 .Unless(candidate => candidate.InitialTeacherTrainingYearId == null);
-            // RuleFor(candidate => candidate.ChannelId)
-            //     .NotNull()
-            //     .When(candidate => candidate.Id == null)
-            //     .SetValidator(new PickListItemIdValidator<Candidate>("contact", "dfe_channelcreation", store));
+            RuleFor(candidate => candidate.ChannelId)
+                .NotNull()
+                .When(candidate => candidate.Id == null)
+                .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))
                 .Unless(candidate => candidate.HasGcseEnglishId == null);

diff --git a/GetIntoTeachingApiTests/Jobs/UpsertCandidateJobTests.cs b/GetIntoTeachingApiTests/Jobs/UpsertCandidateJobTests.cs
@@ -135,7 +135,7 @@ private static bool IsMatch(object objectA, object objectB)
 
         private static string Signature(Candidate candidate)
         {
-            var changedProperties = "MergedIsNewRegistrantTeachingEventRegistrationsQualificationsPastTeachingPositionsApplicationFormsSchoolExperiencesIdEmail";
+            var changedProperties = "MergedIsNewRegistrantTeachingEventRegistrationsQualificationsPastTeachingPositionsApplicationFormsSchoolExperiencesContactChannelCreationsIdEmail";
             return $"{candidate.Id}-{candidate.Email}-{changedProperties}";
         }
     }