#3008 While validating an element, use it's FHIR attribute name not t…

…he class property name if it is available.
FirelyTeam · Jan 14, 2025 · 74055f3 · 74055f3
1 parent fa4bd61
commit 74055f3
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/Hl7.Fhir.Base/Introspection/FhirElementAttribute.cs b/src/Hl7.Fhir.Base/Introspection/FhirElementAttribute.cs
@@ -35,6 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Reflection;
 
 #nullable enable
 
@@ -125,7 +126,18 @@ public FhirElementAttribute(string name, ChoiceType choice, XmlRepresentation re
 
         private void validateElement(object value, ValidationContext validationContext, List<ValidationResult> result)
         {
-            DotNetAttributeValidation.TryValidate(value, validationContext.IntoPath(value, validationContext.MemberName ?? Name), result);
+            var useName = validationContext.MemberName;
+            if (!string.IsNullOrEmpty(useName))
+            {
+                var pm = ReflectionHelper.FindProperty(validationContext.ObjectType, validationContext.MemberName);
+                if (pm != null)
+                {
+                    var at = pm.GetCustomAttribute<FhirElementAttribute>();
+                    if (at != null)
+                        useName = at.Name;
+                }
+            }
+            DotNetAttributeValidation.TryValidate(value, validationContext.IntoPath(value, useName ?? Name), result);
         }
     }
 }