Vonk-5143: FP validator gets an instance of ITerminologyService to pass to FhirEvaluationContext

src/Firely.Fhir.Validation/Impl/FhirPathValidator.cs

@@ -6,6 +6,8 @@
 
 using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.FhirPath;
+using Hl7.Fhir.Model;
+using Hl7.Fhir.Specification.Terminology;
 using Hl7.Fhir.Support;
 using Hl7.Fhir.Utility;
 using Hl7.Fhir.Validation;
@@ -14,6 +16,7 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Runtime.Serialization;
+using System.Threading.Tasks;
 using static Hl7.Fhir.Model.OperationOutcome;
 
 namespace Firely.Fhir.Validation
@@ -99,7 +102,11 @@ protected override (bool, ResultReport?) RunInvariant(ITypedElement input, Valid
             try
             {
                 var node = input as ScopedNode ?? new ScopedNode(input);
-                return (predicate(input, new EvaluationContext(node.ResourceContext), vc), null);
+                var context = new FhirEvaluationContext(node.ResourceContext)
+                {
+                    TerminologyService = new ValidateCodeServiceToTerminologyServiceAdapter(vc.ValidateCodeService)
+                };
+                return (predicate(input, context, vc), null);
             }
             catch (Exception e)
             {
@@ -152,5 +159,28 @@ private bool predicate(ITypedElement input, EvaluationContext context, Validatio
 
             return compiledExpression.IsTrue(input, context);
         }
+
+        /// <summary>
+        /// An adapter between the <see cref="ICodeValidationTerminologyService"/> and <see cref="ITerminologyService"/>. Be careful to use
+        /// this adapter, because it does only implement the <see cref="ICodeValidationTerminologyService"/> methods. The other methods, like those
+        /// from <see cref="IMappingTerminologyService"/> are not implemented will raise an exception.
+        /// </summary>
+        private class ValidateCodeServiceToTerminologyServiceAdapter : ITerminologyService
+        {
+            private readonly ICodeValidationTerminologyService _service;
+
+            public ValidateCodeServiceToTerminologyServiceAdapter(ICodeValidationTerminologyService service)
+            {
+                _service = service;
+            }
+
+            public Task<Resource> Closure(Parameters parameters, bool useGet = false) => throw new NotImplementedException();
+            public Task<Parameters> CodeSystemValidateCode(Parameters parameters, string? id = null, bool useGet = false) => throw new NotImplementedException();
+            public Task<Resource> Expand(Parameters parameters, string? id = null, bool useGet = false) => throw new NotImplementedException();
+            public Task<Parameters> Lookup(Parameters parameters, bool useGet = false) => throw new NotImplementedException();
+            public Task<Parameters> Subsumes(Parameters parameters, string? id = null, bool useGet = false) => _service.Subsumes(parameters, id, useGet);
+            public Task<Parameters> Translate(Parameters parameters, string? id = null, bool useGet = false) => throw new NotImplementedException();
+            public Task<Parameters> ValueSetValidateCode(Parameters parameters, string? id = null, bool useGet = false) => _service.ValueSetValidateCode(parameters, id, useGet);
+        }
     }
 }

test/Firely.Fhir.Validation.Compilation.Tests.R4/Properties/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+/* 
+ * Copyright (C) 2021, Firely ([email protected]) - All Rights Reserved
+ * Proprietary and confidential. Unauthorized copying of this file, 
+ * via any medium is strictly prohibited.
+ */
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+// Ensure that the test data source is refreshed with each execution. This requirement applies to the unit test class named ValidationManifestTests.
+[assembly: TestDataSourceDiscovery(TestDataSourceDiscoveryOption.DuringExecution)]

test/Firely.Fhir.Validation.Compilation.Tests.R5/Properties/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+/* 
+ * Copyright (C) 2021, Firely ([email protected]) - All Rights Reserved
+ * Proprietary and confidential. Unauthorized copying of this file, 
+ * via any medium is strictly prohibited.
+ */
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+// Ensure that the test data source is refreshed with each execution. This requirement applies to the unit test class named ValidationManifestTests.
+[assembly: TestDataSourceDiscovery(TestDataSourceDiscoveryOption.DuringExecution)]

test/Firely.Fhir.Validation.Compilation.Tests.STU3/Properties/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+/* 
+ * Copyright (C) 2021, Firely ([email protected]) - All Rights Reserved
+ * Proprietary and confidential. Unauthorized copying of this file, 
+ * via any medium is strictly prohibited.
+ */
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+// Ensure that the test data source is refreshed with each execution. This requirement applies to the unit test class named ValidationManifestTests.
+[assembly: TestDataSourceDiscovery(TestDataSourceDiscoveryOption.DuringExecution)]

test/Firely.Fhir.Validation.Tests/Impl/FhirPathValidatorTests.cs

@@ -6,12 +6,18 @@
 
 using FluentAssertions;
 using Hl7.Fhir.ElementModel;
+using Hl7.Fhir.FhirPath;
+using Hl7.Fhir.Model;
+using Hl7.Fhir.Specification.Terminology;
 using Hl7.Fhir.Support;
 using Hl7.FhirPath;
 using Hl7.FhirPath.Expressions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using static Hl7.Fhir.Model.OperationOutcome;
+using Task = System.Threading.Tasks.Task;
 
 namespace Firely.Fhir.Validation.Tests
 {
@@ -24,6 +30,7 @@ public FhirPathValidatorTests()
         {
             var symbolTable = new SymbolTable();
             symbolTable.AddStandardFP();
+            symbolTable.AddFhirExtensions();
             _fpCompiler = new FhirPathCompiler(symbolTable);
         }
 
@@ -94,5 +101,43 @@ public void ValidateNullableInput()
 
             result?.IsSuccessful.Should().Be(false, because: "FhirPath epressions resulting in null should return false in the FhirPathValidator");
         }
+
+        [TestMethod]
+        public void ValidateMemberOf()
+        {
+            var validatable = new FhirPathValidator("memberof", "memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2')", "This expression should use FP memberOf()", IssueSeverity.Error, false);
+
+            var input = ElementNodeAdapter.Root("Coding");
+            input.Add("system", "http://hl7.org/fhir/ValueSet/iso3166-1-2", "uri");
+            input.Add("code", "NL", "string");
+
+            var minimalContextWithFp = ValidationContext.BuildMinimalContext(fpCompiler: _fpCompiler);
+            minimalContextWithFp.ValidateCodeService = new AlwaysSuccessfulTS();
+            var result = validatable.Validate(input, minimalContextWithFp);
+
+            result?.Warnings.Should().BeEmpty(because: "There should be no warnings about the terminology service.");
+            result?.IsSuccessful.Should().BeTrue();
+        }
+
+        /// <summary>
+        /// A CodeValidationTerminologyService that always return a success with the method <see cref="ValueSetValidateCode"/>. Only meant for
+        /// testing purposes.
+        /// </summary>
+        private class AlwaysSuccessfulTS : ICodeValidationTerminologyService
+        {
+            public Task<Parameters> Subsumes(Parameters parameters, string? id = null, bool useGet = false) =>
+                throw new System.NotImplementedException();
+
+            public Task<Parameters> ValueSetValidateCode(Parameters parameters, string? id = null, bool useGet = false) =>
+                Task.FromResult(new Parameters
+                {
+                    Parameter = new List<Parameters.ParameterComponent>() {
+                        new Parameters.ParameterComponent()
+                        {
+                            Name = "result",
+                            Value = new FhirBoolean(true)}
+                    }
+                });
+        }
     }
 }