Skip to content
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.

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

Create duplicate invariant key validator #184

Merged
merged 6 commits into from
Sep 22, 2023
Merged
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ public class StructureDefinitionValidator : IValidatable
/// <inheritdoc/>
public ResultReport Validate(ITypedElement input, ValidationContext vc, ValidationState state)
{
var evidence = new List<ResultReport>();

//this can be expanded with other validate functionality
evidence.AddRange(validateInvariantUniqueness(input, state));
var evidence = validateInvariantUniqueness(input, state).ToList();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your new function already returns a list now, so, this should not be necessary anymore!


return ResultReport.FromEvidence(evidence);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to create a list:

var evidence = validateInvariantUniqueness(input,state);
return ResultReport.FromEvidence(evidence);

If there are multiple steps in the future, you can just do

var evidence = validateInvariantUniqueness(input,state)
    .Concat(validateOtherInvariant(input,state));

}
Expand All @@ -46,7 +44,7 @@ private static IEnumerable<ResultReport> validateInvariantUniqueness(ITypedEleme
return snapshotEvidence.Concat(diffEvidence).Select(i => i.AsResult(input, state));
}

private static IEnumerable<IssueAssertion> validateInvariantUniqueness(IEnumerable<ITypedElement> elements)
private static List<IssueAssertion> validateInvariantUniqueness(IEnumerable<ITypedElement> elements)
{
//Selects the combination of key and elementDefintion path for the duplicate keys where the paths are not also the same.

Expand All @@ -62,7 +60,7 @@ private static IEnumerable<IssueAssertion> validateInvariantUniqueness(IEnumerab
.Distinct())) //Distinct to remove paths that are encountered multiple times per invariant
.Where(kv => kv.Paths.Count() > 1); //Remove entries that only have a single path. These are not incorrect.

return PathsPerDuplicateInvariantKey.Select(c => new IssueAssertion(Issue.PROFILE_ELEMENTDEF_INCORRECT, $"Duplicate key '{c.Key}' in paths: {string.Join(", ", c.Paths)}"));
return PathsPerDuplicateInvariantKey.Select(c => new IssueAssertion(Issue.PROFILE_ELEMENTDEF_INCORRECT, $"Duplicate key '{c.Key}' in paths: {string.Join(", ", c.Paths)}")).ToList();
}
}
}
Expand Down