Merge pull request #1003 from angusmillar/develop-r4

_sort did not allow the use of underscore search parameter such as '_lastUpdated'
FirelyTeam · Jun 27, 2019 · 3f2fd08 · 3f2fd08
2 parents 351c12c + 37bbcf6
commit 3f2fd08
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Hl7.Fhir.Core.Tests/Rest/SearchParamsTests.cs b/src/Hl7.Fhir.Core.Tests/Rest/SearchParamsTests.cs
@@ -237,6 +237,21 @@ public void ParseAndSerializeParams()
             CollectionAssert.AreEquivalent(q.Elements.ToList(), q2.Elements.ToList());
         }
 
+        [TestMethod]
+        public void ParseAndSerializeSortParams()
+        {
+            var q = new SearchParams();
+
+            q.Add("_sort", "-sorted,sorted2,_lastUpdated");
+
+            var output = q.ToUriParamList().ToQueryString();
+            Assert.AreEqual("_sort=-sorted%2Csorted2%2C_lastUpdated", output);
+
+            var q2 = SearchParams.FromUriParamList(UriParamList.FromQueryString(output));
+            Assert.AreEqual(q.Query, q2.Query);     
+            CollectionAssert.AreEquivalent(q.Sort.ToList(), q2.Sort.ToList()); 
+        }
+
         [TestMethod]
         public void AcceptEmptyGenericParam()
         {

diff --git a/src/Hl7.Fhir.Core/Rest/SearchParams.cs b/src/Hl7.Fhir.Core/Rest/SearchParams.cs
@@ -128,7 +128,7 @@ public SearchParams Add(string name, string value)
                 var elements = value.Split(',');
                 if (elements.Any(f => String.IsNullOrEmpty(f)))
                     throw Error.Format($"Invalid {SEARCH_PARAM_SORT}: must be a list of non-empty element names");
-                if (!elements.All(f => Char.IsLetter(f[0]) || f[0] == '-' ))
+                if (!elements.All(f => Char.IsLetter(f[0]) || f[0] == '-' || f[0] == '_'))
                     throw Error.Format($"Invalid {SEARCH_PARAM_SORT}: must be a list of element names, optionally prefixed with '-'");
 
                 addNonEmptySort(elements);