Merge pull request #109 from EJTRES/bugfix/v13/activecampaign-retry-workflow

Fix ActiveCampaign workflow retry

Author: acoumb

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/ActiveCampaignContactsWorkflow.cs

@@ -60,9 +60,30 @@ public override async Task<WorkflowExecutionStatus> ExecuteAsync(WorkflowExecuti
 		{
 			var mappings = JsonSerializer.Deserialize<List<ContactMappingDto>>(ContactMappings);
 
-			var email = context.Record.RecordFields[Guid.Parse(mappings.First(p => p.ContactField == "email").FormField.Id)]
-				.ValuesAsString();
+			string email = string.Empty;
+			var mappedEmailGuid = Guid.Parse(mappings.First(p => p.ContactField == "email").FormField.Id);
 
+			if (context.Record.RecordFields.ContainsKey(mappedEmailGuid) == false)
+			{
+				// Get email when retrying workflow
+				var matchedField = context.Record.RecordFields.FirstOrDefault(x => x.Value.FieldId == mappedEmailGuid);
+				if (matchedField.Value != null)
+				{
+					email = matchedField.Value.ValuesAsString();
+				}
+			}
+			else
+			{
+				// Get email when executing workflow for the first time
+				email = context.Record.RecordFields[mappedEmailGuid]
+					.ValuesAsString();
+			}
+
+			if (string.IsNullOrEmpty(email))
+			{
+				_logger.LogWarning("Email not set for the record!");
+				return WorkflowExecutionStatus.Failed;
+			}
 			// Check if contact exists.
 			var contacts = await _contactService.Get(email);
 
@@ -160,4 +181,4 @@ private string ReadMappingValue(Record record, List<ContactMappingDto> mappings,
 			? record.RecordFields[Guid.Parse(mappingItem.FormField.Id)].ValuesAsString()
 			: string.Empty;
 	}
-}
+}