From 5c2dbdfb3f4797125f1e6267cd38649ea67c6b18 Mon Sep 17 00:00:00 2001
From: "John T.E. Timm" <johntimm@us.ibm.com>
Date: Fri, 7 May 2021 17:58:23 -0400
Subject: [PATCH] Issue #2292 - added try-catch block in memberOf function

Signed-off-by: John T.E. Timm <johntimm@us.ibm.com>
---
 .../fhir/path/function/MemberOfFunction.java  | 64 ++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/fhir-path/src/main/java/com/ibm/fhir/path/function/MemberOfFunction.java b/fhir-path/src/main/java/com/ibm/fhir/path/function/MemberOfFunction.java
index 3657121d2fe..62888fbe754 100644
--- a/fhir-path/src/main/java/com/ibm/fhir/path/function/MemberOfFunction.java
+++ b/fhir-path/src/main/java/com/ibm/fhir/path/function/MemberOfFunction.java
@@ -44,6 +44,7 @@
 import com.ibm.fhir.path.evaluator.FHIRPathEvaluator.EvaluationContext;
 import com.ibm.fhir.term.service.FHIRTermService;
 import com.ibm.fhir.term.service.ValidationOutcome;
+import com.ibm.fhir.term.service.exception.FHIRTermServiceException;
 import com.ibm.fhir.term.util.CodeSystemSupport;
 
 /**
@@ -104,40 +105,43 @@ public Collection<FHIRPathNode> apply(EvaluationContext evaluationContext, Colle
             if (strength != null && ValidationSupport.hasOnlyDataAbsentReasonExtension(element)) {
                 return SINGLETON_TRUE;
             }
-
             FHIRTermService service = FHIRTermService.getInstance();
             if (isExpanded(valueSet) || service.isExpandable(valueSet)) {
-                // Validate against expanded value set
-                if (element.is(Code.class)) {
-                    Uri system = getSystem(evaluationContext.getTree(), elementNode);
-                    Code code = element.as(Code.class);
-                    if ((system != null && validateCode(service, valueSet, system, null, code, null, evaluationContext, elementNode, strength)) ||
-                            (system == null && validateCode(service, valueSet, code, evaluationContext, elementNode, strength))) {
-                        return SINGLETON_TRUE;
-                    }
-                } else if (element.is(Coding.class)) {
-                    Coding coding = element.as(Coding.class);
-                    if (validateCode(service, valueSet, coding, evaluationContext, elementNode, strength)) {
-                        return SINGLETON_TRUE;
-                    }
-                } else if (element.is(CodeableConcept.class)) {
-                    CodeableConcept codeableConcept = element.as(CodeableConcept.class);
-                    if (codeableConcept.getCoding() != null && validateCode(service, valueSet, codeableConcept, evaluationContext, elementNode, strength)) {
-                        return SINGLETON_TRUE;
-                    }
-                } else if (element.is(Quantity.class)) {
-                    Quantity quantity = element.as(Quantity.class);
-                    if (validateCode(service, valueSet, quantity.getSystem(), null, quantity.getCode(), null, evaluationContext, elementNode, strength)) {
-                        return SINGLETON_TRUE;
-                    }
-                } else {
-                    // element.is(FHIR_STRING) || element.is(Uri.class)
-                    Code code = element.is(FHIR_STRING) ? Code.of(element.as(FHIR_STRING).getValue()) : Code.of(element.as(Uri.class).getValue());
-                    if (validateCode(service, valueSet, code, evaluationContext, elementNode, strength)) {
-                        return SINGLETON_TRUE;
+                try {
+                    // Validate against expanded value set
+                    if (element.is(Code.class)) {
+                        Uri system = getSystem(evaluationContext.getTree(), elementNode);
+                        Code code = element.as(Code.class);
+                        if ((system != null && validateCode(service, valueSet, system, null, code, null, evaluationContext, elementNode, strength)) ||
+                                (system == null && validateCode(service, valueSet, code, evaluationContext, elementNode, strength))) {
+                            return SINGLETON_TRUE;
+                        }
+                    } else if (element.is(Coding.class)) {
+                        Coding coding = element.as(Coding.class);
+                        if (validateCode(service, valueSet, coding, evaluationContext, elementNode, strength)) {
+                            return SINGLETON_TRUE;
+                        }
+                    } else if (element.is(CodeableConcept.class)) {
+                        CodeableConcept codeableConcept = element.as(CodeableConcept.class);
+                        if (codeableConcept.getCoding() != null && validateCode(service, valueSet, codeableConcept, evaluationContext, elementNode, strength)) {
+                            return SINGLETON_TRUE;
+                        }
+                    } else if (element.is(Quantity.class)) {
+                        Quantity quantity = element.as(Quantity.class);
+                        if (validateCode(service, valueSet, quantity.getSystem(), null, quantity.getCode(), null, evaluationContext, elementNode, strength)) {
+                            return SINGLETON_TRUE;
+                        }
+                    } else {
+                        // element.is(FHIR_STRING) || element.is(Uri.class)
+                        Code code = element.is(FHIR_STRING) ? Code.of(element.as(FHIR_STRING).getValue()) : Code.of(element.as(Uri.class).getValue());
+                        if (validateCode(service, valueSet, code, evaluationContext, elementNode, strength)) {
+                            return SINGLETON_TRUE;
+                        }
                     }
+                    return membershipCheckFailed(evaluationContext, elementNode, url, strength);
+                } catch (FHIRTermServiceException e) {
+                    generateIssue(evaluationContext, IssueSeverity.WARNING, IssueType.INCOMPLETE, "Membership check was not performed: value set '" + url + "' could not be expanded due to the following error: " + e.getMessage(), elementNode.path());
                 }
-                return membershipCheckFailed(evaluationContext, elementNode, url, strength);
             } else if (isSyntaxBased(valueSet)) {
                 // Validate against syntax-based value set
                 try {