Skip to content

Correct IsSummary (not dependent on IsModifier anymore) #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 13, 2022
Merged

Correct IsSummary (not dependent on IsModifier anymore) #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10c2747
Correct IsSummary (not dependent on IsModifier anymore)
marcovisserFurore Jul 13, 2021
bc877fd
Adding IsModifier to FhirElement
marcovisserFurore Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/Microsoft.Health.Fhir.SpecManager/Language/CSharpFirely2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,11 +1492,24 @@ private void WriteCodedElement(
element,
subset,
out string summary,
out string isModifier,
out string choice,
out string allowedTypes,
out string resourceReferences);

_writer.WriteLineIndented($"[FhirElement(\"{element.Name}\"{summary}, Order={GetOrder(element)}{choice})]");
/* Exceptions:
* o OperationOutcome.issue.severity does not have `IsModifier` anymore since R4.
*/

if (element.Path == "OperationOutcome.issue.severity")
{
_writer.WriteLineIndented($"[FhirElement(\"{element.Name}\"{summary}, IsModifier=true, Order={GetOrder(element)}{choice})]");
_writer.WriteLineIndented($"[FhirElement(\"{element.Name}\"{summary}, Order={GetOrder(element)}{choice}, Since=FhirRelease.R4)]");
}
else
{
_writer.WriteLineIndented($"[FhirElement(\"{element.Name}\"{summary}{isModifier}, Order={GetOrder(element)}{choice})]");
}

if (hasDefinedEnum)
{
Expand Down Expand Up @@ -1686,6 +1699,7 @@ private void WriteElement(
element,
subset,
out string summary,
out string isModifier,
out string choice,
out string allowedTypes,
out string resourceReferences);
Expand All @@ -1698,15 +1712,15 @@ private void WriteElement(
* automate this, by scanning differences between 3/4/5/6/7 etc.. */
if (element.Path == "Meta.source")
{
_writer.WriteLineIndented($"[FhirElement(\"{name}\"{summary}, Order={GetOrder(element)}{choice}, Since=FhirRelease.R4)]");
_writer.WriteLineIndented($"[FhirElement(\"{name}\"{summary}{isModifier}, Order={GetOrder(element)}{choice}, Since=FhirRelease.R4)]");
}
else if (element.Path == "Reference.type")
{
_writer.WriteLineIndented($"[FhirElement(\"{name}\"{summary}, Order={GetOrder(element)}{choice}, Since=FhirRelease.R4)]");
_writer.WriteLineIndented($"[FhirElement(\"{name}\"{summary}{isModifier}, Order={GetOrder(element)}{choice}, Since=FhirRelease.R4)]");
}
else
{
_writer.WriteLineIndented($"[FhirElement(\"{name}\"{summary}, Order={GetOrder(element)}{choice})]");
_writer.WriteLineIndented($"[FhirElement(\"{name}\"{summary}{isModifier}, Order={GetOrder(element)}{choice})]");
}

if (element.Path == "Meta.profile")
Expand Down Expand Up @@ -1991,6 +2005,7 @@ private void BuildElementOptionals(
FhirElement element,
GenSubset subset,
out string summary,
out string isModifier,
out string choice,
out string allowedTypes,
out string resourceReferences)
Expand All @@ -1999,6 +2014,7 @@ private void BuildElementOptionals(
allowedTypes = string.Empty;
resourceReferences = string.Empty;
summary = element.IsSummary ? ", InSummary=true" : string.Empty;
isModifier = element.IsModifier ? ", IsModifier=true" : string.Empty;

bool inCommon = subset.HasFlag(GenSubset.Common);

Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.Health.Fhir.SpecManager/Models/FhirElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Microsoft.Health.Fhir.SpecManager.Extensions;

namespace Microsoft.Health.Fhir.SpecManager.Models
Expand Down Expand Up @@ -141,7 +140,7 @@ public FhirElement(
}

IsModifier = isModifier == true;
IsSummary = (isSummary == true) || IsModifier;
IsSummary = isSummary == true;

DefaultFieldName = defaultFieldName;
DefaultFieldValue = defaultFieldValue;
Expand Down