From 4ee9d8fed65e1e7fa6d8e32ee32f5ec52803fd4b Mon Sep 17 00:00:00 2001 From: The Drake Date: Thu, 4 Mar 2021 15:59:00 -0700 Subject: [PATCH] Update ValidateWorkItemTypes.cs Fix validation errors whenever mapped fields are encountered --- Common/Validation/WorkItem/ValidateWorkItemTypes.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Common/Validation/WorkItem/ValidateWorkItemTypes.cs b/Common/Validation/WorkItem/ValidateWorkItemTypes.cs index b114071..7455d5d 100644 --- a/Common/Validation/WorkItem/ValidateWorkItemTypes.cs +++ b/Common/Validation/WorkItem/ValidateWorkItemTypes.cs @@ -214,7 +214,8 @@ public bool CompareWorkItemType(IValidationContext context, string workItemType, { if (!context.ValidatedFields.Contains(field) && !context.SkippedFields.Contains(field)) { - if (!targetFields.Contains(field)) + var replacementFieldExists = context.Config.FieldReplacements.TryGetValue(field, out var replacementField); + if (!replacementFieldExists && !targetFields.Contains(field) || replacementFieldExists && replacementField.FieldReferenceName == null) { matches = false; context.SkippedFields.Add(field); @@ -222,7 +223,10 @@ public bool CompareWorkItemType(IValidationContext context, string workItemType, } else { - matches &= CompareField(context, context.SourceFields[field], context.TargetFields[field]); + if(!replacementFieldExists) + matches &= CompareField(context, context.SourceFields[field], context.TargetFields[field]); + else + matches &= CompareField(context, context.SourceFields[field], context.TargetFields[replacementField.FieldReferenceName]); } } }