Skip to content

Commit

Permalink
Merge pull request #2048 from FirelyTeam/feature/1692-use-expression-…
Browse files Browse the repository at this point in the history 
…stu3

Use IssueComponent.Expression instead of IssueComponent.Location
  • Loading branch information
@marcovisserFurore
marcovisserFurore authored Apr 28, 2022
2 parents 5e5df22 + 34328df commit 9ec57cd
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 28 deletions.
2 changes: 1 addition & 1 deletion common
Submodule common updated from fbf687 to 03bd00
28 changes: 12 additions & 16 deletions src/Hl7.Fhir.Core.Tests/Model/ModelTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,13 @@
* available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE
*/

using FluentAssertions;
using Hl7.Fhir.Model;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Hl7.Fhir.Model;
using System.Xml.Linq;
using System.ComponentModel.DataAnnotations;
using Hl7.Fhir.Validation;
using Hl7.Fhir.Serialization;
using FluentAssertions;

namespace Hl7.Fhir.Tests.Model
{
Expand All @@ -36,14 +32,14 @@ public void ValidateElementAssertions()
}

[TestMethod]
public void OperationOutcomeLocation()
public void OperationOutcomeExpression()
{
OperationOutcome oo = new OperationOutcome();
oo.Issue.Add(new OperationOutcome.IssueComponent()
{
Location = new string[] { "yes" }
Expression = new string[] { "this" }
});
Assert.AreEqual(1, oo.Issue[0].Location.Count());
Assert.AreEqual(1, oo.Issue[0].Expression.Count());
}

[TestMethod]
Expand Down Expand Up @@ -72,7 +68,7 @@ public void DateTimeHandling()
[TestMethod]
public void TestTryToDateTimeOffset()
{
var fdt = new FhirDateTime(new DateTimeOffset(2021, 3, 18, 12, 22, 35, 999, new TimeSpan(-4, 0, 0)));
var fdt = new FhirDateTime(new DateTimeOffset(2021, 3, 18, 12, 22, 35, 999, new TimeSpan(-4, 0, 0)));
Assert.AreEqual("2021-03-18T12:22:35.999-04:00", fdt.Value);

Assert.IsTrue(fdt.TryToDateTimeOffset(out var dto1));
Expand All @@ -87,7 +83,7 @@ public void TestTryToDateTimeOffset()
fdt = new FhirDateTime("2021-03-18T12:22:35.999Z");
Assert.IsTrue(fdt.TryToDateTimeOffset(out var dto3));
Assert.AreEqual("2021-03-18T12:22:35.9990000+00:00", dto3.ToString("o"));

fdt = new FhirDateTime("2021-03-18T12:22:35.1234+04:00");
Assert.IsTrue(fdt.TryToDateTimeOffset(out var dto4));
Assert.AreEqual("2021-03-18T12:22:35.1234000+04:00", dto4.ToString("o"));
Expand All @@ -100,7 +96,7 @@ public void TestTryToDateTimeOffset()
[TestMethod]
public void TodayTests()
{
var todayLocal = Date.Today();
var todayLocal = Date.Today();
Assert.AreEqual(DateTimeOffset.Now.ToString("yyy-MM-dd"), todayLocal.Value);

var todayUtc = Date.UtcToday();
Expand Down Expand Up @@ -135,7 +131,7 @@ public void TestBundleLinkEncoding()
var uriEncodedUrl = string.Format(urlFormat, Uri.EscapeDataString(param1), Uri.EscapeDataString(param2));
Assert.AreEqual(manuallyEncodedUrl, uriEncodedUrl);
var uri = new Uri(manuallyEncodedUrl, UriKind.RelativeOrAbsolute);
var bundle = new Bundle {SelfLink = uri};
var bundle = new Bundle { SelfLink = uri };
if (uri.IsAbsoluteUri)
{
Assert.AreEqual(uri.AbsoluteUri, bundle.SelfLink.AbsoluteUri);
Expand Down Expand Up @@ -454,7 +450,7 @@ public void TestNamingSystemCanonical()
Assert.IsNull(ns.UrlElement);

ns.UniqueId.Add(new NamingSystem.UniqueIdComponent { Value = "http://nu.nl" });
ns.UniqueId.Add(new NamingSystem.UniqueIdComponent { Value = "http://dan.nl", Preferred=true });
ns.UniqueId.Add(new NamingSystem.UniqueIdComponent { Value = "http://dan.nl", Preferred = true });

Assert.AreEqual("http://dan.nl", ns.Url);
Assert.AreEqual("http://dan.nl", ns.UrlElement.Value);
Expand Down Expand Up @@ -621,7 +617,7 @@ public void TestCheckMinorVersionCompatibiliy()
Assert.IsTrue(ModelInfo.CheckMinorVersionCompatibility("3.0.1"));
Assert.IsTrue(ModelInfo.CheckMinorVersionCompatibility("3.0"));
Assert.IsTrue(ModelInfo.CheckMinorVersionCompatibility("3.0.2"));
Assert.IsFalse(ModelInfo.CheckMinorVersionCompatibility("3"));
Assert.IsFalse(ModelInfo.CheckMinorVersionCompatibility("3"));
}

[TestMethod]
Expand Down
4 changes: 2 additions & 2 deletions src/Hl7.Fhir.Specification.Tests/Snapshot/SnapshotGeneratorTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ private static void assertIssue(OperationOutcome.IssueComponent issue, Issue exp
}
if (location != null && location.Length > 0)
{
Assert.IsTrue(location.SequenceEqual(issue.Location));
Assert.IsTrue(location.SequenceEqual(issue.Expression));
}
}

Expand Down Expand Up @@ -1619,7 +1619,7 @@ private void dumpIssue(OperationOutcome.IssueComponent issue, int index)
if (issue.Details.Text != null) sb.AppendFormat(" Text : '{0}'", issue.Details.Text);
}
if (issue.Diagnostics != null) { sb.AppendFormat(" Profile: '{0}'", issue.Diagnostics); }
if (issue.Location != null) { sb.AppendFormat(" Path: '{0}'", string.Join(" | ", issue.Location)); }
if (issue.Expression != null) { sb.AppendFormat(" Path: '{0}'", string.Join(" | ", issue.Expression)); }

Debug.Print(sb.ToString());
}
Expand Down
8 changes: 4 additions & 4 deletions src/Hl7.Fhir.Specification.Tests/Validation/BasicValidationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void TestDuplicateOperationOutcomeIssues()
{
new OperationOutcome.IssueComponent
{
Location = new string[]{"active.extension"},
Expression = new string[]{"active.extension"},
Severity = OperationOutcome.IssueSeverity.Error,
Details = new CodeableConcept
{
Expand All @@ -208,7 +208,7 @@ public void TestDuplicateOperationOutcomeIssues()
},
new OperationOutcome.IssueComponent
{
Location = new string[]{"active.extension"},
Expression = new string[]{"active.extension"},
Severity = OperationOutcome.IssueSeverity.Error,
Details = new CodeableConcept
{
Expand All @@ -224,7 +224,7 @@ public void TestDuplicateOperationOutcomeIssues()
{
new OperationOutcome.IssueComponent
{
Location = new string[]{"active.value"},
Expression = new string[]{"active.value"},
Severity = OperationOutcome.IssueSeverity.Error,
Details = new CodeableConcept
{
Expand All @@ -233,7 +233,7 @@ public void TestDuplicateOperationOutcomeIssues()
},
new OperationOutcome.IssueComponent
{
Location = new string[]{"active.extension"},
Expression = new string[]{"active.extension"},
Severity = OperationOutcome.IssueSeverity.Error,
Details = new CodeableConcept
{
Expand Down
13 changes: 9 additions & 4 deletions src/Hl7.Fhir.Specification/Schema/Binding.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private async Task<OperationOutcome> callService(ITerminologyService svc, string
Coding coding = null, CodeableConcept cc = null, bool? abstractAllowed = null, string context = null)
{
try
{
{
var parameters = new ValidateCodeParameters()
.WithValueSet(canonical)
.WithCode(code: code, system: system, display: display, context: context)
Expand All @@ -149,14 +149,19 @@ private async Task<OperationOutcome> callService(ITerminologyService svc, string


var outcome = (await svc.ValueSetValidateCode(parameters).ConfigureAwait(false)).ToOperationOutcome();
foreach (var issue in outcome.Issue) issue.Location = new string[] { location };
foreach (var issue in outcome.Issue)
{
issue.Expression = new string[] { location };
// Location is deprecated, but we set this for backwards compatibility
issue.Location = new string[] { location };
}
return outcome;
}
catch (FhirOperationException tse)
{
string message = (cc?.Coding == null || cc.Coding.Count == 1)
string message = (cc?.Coding == null || cc.Coding.Count == 1)
? $"Terminology service failed while validating code '{code ?? coding?.Code ?? cc?.Coding[0]?.Code}' (system '{system ?? coding?.System ?? cc?.Coding[0]?.System}'): {tse.Message}"
: $"Terminology service failed while validating the codes: {tse.Message}";
: $"Terminology service failed while validating the codes: {tse.Message}";

return Issue.TERMINOLOGY_SERVICE_FAILED
.NewOutcomeWithIssue(message, location);
Expand Down
2 changes: 2 additions & 0 deletions src/Hl7.Fhir.Specification/Validation/FpConstraintValidationExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ public static OperationOutcome ValidateFp(this Validator v, string structureDefi
Code = issue.Type,
Details = issue.ToCodeableConcept(text),
Diagnostics = constraintElement.GetFhirPathConstraint(), // Putting the fhirpath expression of the invariant in the diagnostics
Expression = new string[] { instance.Location },
// Location is deprecated, but we set this for backwards compatibility
Location = new string[] { instance.Location }
};
outcomeIssue.Details.Coding.Add(new Coding(structureDefinitionUrl, constraintElement.Key, constraintElement.Human));
Expand Down
6 changes: 5 additions & 1 deletion src/Hl7.Fhir.Specification/Validation/TypeRefValidationExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ internal static OperationOutcome ValidateResourceReference(
// Prefix each path with the referring resource's path to keep the locations
// interpretable
foreach (var issue in childResult.Issue)
issue.Location = issue.Location.Concat(new string[] { instance.Location });
{
issue.Expression = issue.Expression.Concat(new string[] { instance.Location });
// Location is deprecated, but we set this for backwards compatibility
issue.Location = issue.Expression.Concat(new string[] { instance.Location });
}

outcome.Include(childResult);
}
Expand Down

0 comments on commit 9ec57cd

Please sign in to comment.