Merge pull request #1850 from FirelyTeam/feature/603-add-fuent-prefix…

…-suffix-humanname-initializers

Add fluent HumanName initializers for prefix and suffix

src/Hl7.Fhir.Core.Tests/Model/ModelTests.cs

@@ -16,6 +16,7 @@
 using System.ComponentModel.DataAnnotations;
 using Hl7.Fhir.Validation;
 using Hl7.Fhir.Serialization;
+using FluentAssertions;
 
 namespace Hl7.Fhir.Tests.Model
 {
@@ -629,5 +630,17 @@ public void TestCheckMinorVersionCompatibilityWithNull()
         {
             ModelInfo.CheckMinorVersionCompatibility(null);
         }
+
+        [TestMethod]
+        public void TestHumanNameFluentInitializers()
+        {
+            var pat = new Patient();
+            pat.Name.Add(new HumanName().WithPrefix("Mr.").WithGiven("Henry").AndFamily("Levin").WithSuffix("The 7th"));
+
+            pat.Name.FirstOrDefault().Prefix.Should().ContainSingle("Mr.");
+            pat.Name.FirstOrDefault().Given.Should().ContainSingle("Henry");
+            pat.Name.FirstOrDefault().Family.Should().Be("Levin");
+            pat.Name.FirstOrDefault().Suffix.Should().ContainSingle("The 7th");
+        }
     }
 }

src/Hl7.Fhir.Core/Model/Initializers.cs

@@ -53,6 +53,22 @@ public HumanName WithGiven(string given)
             return this;
         }
 
+        public HumanName WithPrefix(string prefix)
+        {
+            if (this.PrefixElement == null) this.PrefixElement = new List<FhirString>();
+            this.PrefixElement.Add(new FhirString(prefix));
+
+            return this;
+        }
+
+        public HumanName WithSuffix(string prefix)
+        {
+            if (this.SuffixElement == null) this.SuffixElement = new List<FhirString>();
+            this.SuffixElement.Add(new FhirString(prefix));
+
+            return this;
+        }
+
         public HumanName AndFamily(string family)
         {
             this.Family = family;