Merge pull request #111 from umbraco/feature/v13/activecampaign-get-email-refactoring

Update the ReadMappingsValue function to work on workflow retries.

Author: acoumb

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

@@ -60,24 +60,7 @@ public override async Task<WorkflowExecutionStatus> ExecuteAsync(WorkflowExecuti
 		{
 			var mappings = JsonSerializer.Deserialize<List<ContactMappingDto>>(ContactMappings);
 
-			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();
-			}
+			string email = ReadMappingValue(context.Record, mappings, "email");
 
 			if (string.IsNullOrEmpty(email))
 			{
@@ -175,10 +158,27 @@ private ContactDto Build(Record record)
 
 	private string ReadMappingValue(Record record, List<ContactMappingDto> mappings, string name)
 	{
+		string value = string.Empty;
+
 		var mappingItem = mappings.FirstOrDefault(p => p.ContactField == name);
 
-		return mappingItem != null
-			? record.RecordFields[Guid.Parse(mappingItem.FormField.Id)].ValuesAsString()
-			: string.Empty;
+		if (mappingItem != null)
+		{
+			var key = Guid.Parse(mappingItem.FormField.Id);
+            if (!record.RecordFields.ContainsKey(key))
+			{
+                var matchedField = record.RecordFields.FirstOrDefault(x => x.Value.FieldId == key);
+				if (matchedField.Value != null)
+				{
+					value = matchedField.Value.ValuesAsString();
+				}
+			}
+            else
+			{
+				value = record.RecordFields[key].ValuesAsString();
+			}
+		}
+
+        return value;
 	}
 }

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Umbraco.Forms.Integrations.Crm.ActiveCampaign.csproj

@@ -13,7 +13,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations/tree/main-v10/src/Umbraco.Forms.Integrations.Crm.ActiveCampaign</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
-		<Version>2.0.0</Version>
+		<Version>2.0.1</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>