Merge pull request #2650 from FirelyTeam/bugfix/2631-fix-localtermino…

…logy-system-exceptions LocalTerminologyService returns original FhirOperationException from getExpandedValueSet
FirelyTeam · Jan 4, 2024 · 4fa8588 · 4fa8588
2 parents 2fcb466 + b3a8990
commit 4fa8588
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Hl7.Fhir.Shims.Base/Specification/Terminology/LocalTerminologyService.cs b/src/Hl7.Fhir.Shims.Base/Specification/Terminology/LocalTerminologyService.cs
@@ -132,7 +132,6 @@ private async Task<ValueSet> getExpandedValueSet(ValueSet vs, string operation)
                 }
             }
             catch (TerminologyServiceException e)
-#pragma warning restore CS0618
             {
                 // Unprocessable entity
                 throw new FhirOperationException(
@@ -176,7 +175,7 @@ public async T.Task<Parameters> ValueSetValidateCode(Parameters parameters, stri
                 else
                     return await validateCodeVS(valueSet, validateCodeParams.Code?.Value, validateCodeParams.System?.Value, validateCodeParams.Display?.Value, validateCodeParams.Abstract?.Value).ConfigureAwait(false);
             }
-            catch (Exception e)
+            catch (Exception e) when (e is not FhirOperationException)
             {
                 //500 internal server error
                 throw new FhirOperationException(e.Message, (HttpStatusCode)500);

diff --git a/src/Hl7.Fhir.Specification.Shared.Tests/Source/TerminologyTests.cs b/src/Hl7.Fhir.Specification.Shared.Tests/Source/TerminologyTests.cs
@@ -312,8 +312,8 @@ public async void LocalTermServiceValidateCodeWithParamsTest()
             inParams = new ValidateCodeParameters()
                 .WithValueSet(url: "http://hl7.org/fhir/ValueSet/substance-code")
                 .WithCode(code: "1166006", system: "http://snomed.info/sct");
-            await Assert.ThrowsAsync<FhirOperationException>(async () => await svc.ValueSetValidateCode(inParams));
-
+            var exception = await Assert.ThrowsAsync<FhirOperationException>(async () => await svc.ValueSetValidateCode(inParams));
+            Assert.Equal(System.Net.HttpStatusCode.UnprocessableEntity, exception.Status);
         }
 
         [Fact]
@@ -332,8 +332,8 @@ public async T.Task LocalTermServiceValidateCodeWithoutSystemOrContext()
                 }
             };
 
-            await Assert.ThrowsAsync<FhirOperationException>(async () => await svc.ValueSetValidateCode(inParams));
-
+            var exception = await Assert.ThrowsAsync<FhirOperationException>(async () => await svc.ValueSetValidateCode(inParams));
+            Assert.Equal(System.Net.HttpStatusCode.UnprocessableEntity, exception.Status);
         }
 
 
@@ -363,7 +363,8 @@ public async T.Task LocalTermServiceUsingDuplicateParameters()
                 }
             };
 
-            await Assert.ThrowsAsync<FhirOperationException>(async () => await svc.ValueSetValidateCode(inParams));
+            var exception = await Assert.ThrowsAsync<FhirOperationException>(async () => await svc.ValueSetValidateCode(inParams));
+            Assert.Equal(System.Net.HttpStatusCode.UnprocessableEntity, exception.Status);
         }
 
         [Fact]