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.

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

Provide clearer messages where there are missing references in $package and $release operations #772

Merged
merged 2 commits into from
Apr 16, 2024
Merged

Provide clearer messages where there are missing references in $package and $release operations #772

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
db263e2
Provide clearer messages where there are missing references in $packa…
Chris0296 Apr 12, 2024
41e8177
Add missing reference to test files to resolve test failures
Chris0296 Apr 12, 2024
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
15 changes: 13 additions & 2 deletions plugin/cr/src/main/java/org/opencds/cqf/ruler/cr/KnowledgeArtifactProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,8 +938,19 @@ private void checkIfValueSetNeedsCondition(MetadataResource resource, RelatedArt
.map(list -> {
return list.stream().filter(ext -> ext.getUrl().equalsIgnoreCase(valueSetConditionUrl)).findFirst().orElse(null);
});
if (isLeaf && !maybeConditionExtension.isPresent()) {
throw new UnprocessableEntityException("Missing condition on ValueSet : " + valueSet.getUrl());
Optional<Extension> maybePriorityExtension = Optional.ofNullable(relatedArtifact)
.map(RelatedArtifact::getExtension)
.map(list -> {
return list.stream().filter(ext -> ext.getUrl().equalsIgnoreCase(valueSetPriorityUrl)).findFirst().orElse(null);
});
if (isLeaf && (maybeConditionExtension.isEmpty() || maybePriorityExtension.isEmpty())) {
if (maybeConditionExtension.isEmpty() && maybePriorityExtension.isEmpty()) {
throw new UnprocessableEntityException("Missing condition and priority references on ValueSet : " + valueSet.getUrl());
} else if (maybeConditionExtension.isEmpty()) {
throw new UnprocessableEntityException("Missing condition reference on ValueSet : " + valueSet.getUrl());
} else {
throw new UnprocessableEntityException("Missing priority reference on ValueSet : " + valueSet.getUrl());
}
}
}
}
Expand Down
94 changes: 90 additions & 4 deletions plugin/cr/src/test/java/org/opencds/cqf/ruler/cr/r4/RepositoryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ void release_preserve_extensions() {

@Test
void release_test_condition_missing() {
loadTransaction("ersd-small-approved-draft-no-conditions.json");
loadTransaction("ersd-small-approved-draft-missing-condition.json");
loadResource("artifactAssessment-search-parameter.json");
Parameters params = parameters(
part("version", new StringType("1.2.3.23")),
Expand All @@ -732,7 +732,55 @@ void release_test_condition_missing() {
noConditionExtension = e;
}
assertNotNull(noConditionExtension);
assertTrue(noConditionExtension.getMessage().contains("Missing condition"));
assertTrue(noConditionExtension.getMessage().contains("Missing condition reference"));
}

@Test
void release_test_priority_missing() {
loadTransaction("ersd-small-approved-draft-missing-priority.json");
loadResource("artifactAssessment-search-parameter.json");
Parameters params = parameters(
part("version", new StringType("1.2.3.23")),
part("versionBehavior", new StringType("default"))
);
UnprocessableEntityException noPriorityExtension = null;
try {
getClient().operation()
.onInstance(specificationLibReference)
.named("$release")
.withParameters(params)
.returnResourceType(Bundle.class)
.execute();
} catch (UnprocessableEntityException e) {
noPriorityExtension = e;
}

assertNotNull(noPriorityExtension);
assertTrue(noPriorityExtension.getMessage().contains("Missing priority reference"));
}

@Test
void release_test_condition_and_priority_missing() {
loadTransaction("ersd-small-approved-draft-missing-condition-and-priority.json");
loadResource("artifactAssessment-search-parameter.json");
Parameters params = parameters(
part("version", new StringType("1.2.3.23")),
part("versionBehavior", new StringType("default"))
);
UnprocessableEntityException noConditionAndPriorityExtension = null;
try {
getClient().operation()
.onInstance(specificationLibReference)
.named("$release")
.withParameters(params)
.returnResourceType(Bundle.class)
.execute();
} catch (UnprocessableEntityException e) {
noConditionAndPriorityExtension = e;
}

assertNotNull(noConditionAndPriorityExtension);
assertTrue(noConditionAndPriorityExtension.getMessage().contains("Missing condition and priority references"));
}

@Test
Expand Down Expand Up @@ -1323,7 +1371,7 @@ void packageOperation_big_bundle() {

@Test
void package_test_condition_missing() {
loadTransaction("ersd-small-approved-draft-no-conditions.json");
loadTransaction("ersd-small-approved-draft-missing-condition.json");
loadResource("artifactAssessment-search-parameter.json");
UnprocessableEntityException noConditionExtension = null;
try {
Expand All @@ -1338,7 +1386,45 @@ void package_test_condition_missing() {
noConditionExtension = e;
}
assertNotNull(noConditionExtension);
assertTrue(noConditionExtension.getMessage().contains("Missing condition"));
assertTrue(noConditionExtension.getMessage().contains("Missing condition reference"));
}

@Test
void package_test_priority_missing() {
loadTransaction("ersd-small-approved-draft-missing-priority.json");
loadResource("artifactAssessment-search-parameter.json");
UnprocessableEntityException noPriorityExtension = null;
try {
getClient().operation()
.onInstance(specificationLibReference)
.named("$package")
.withNoParameters(Parameters.class)
.returnResourceType(Bundle.class)
.execute();
} catch (UnprocessableEntityException e) {
noPriorityExtension = e;
}
assertNotNull(noPriorityExtension);
assertTrue(noPriorityExtension.getMessage().contains("Missing priority reference"));
}

@Test
void package_test_condition_and_priority_missing() {
loadTransaction("ersd-small-approved-draft-missing-condition-and-priority.json");
loadResource("artifactAssessment-search-parameter.json");
UnprocessableEntityException noConditionAndPriorityExtension = null;
try {
getClient().operation()
.onInstance(specificationLibReference)
.named("$package")
.withNoParameters(Parameters.class)
.returnResourceType(Bundle.class)
.execute();
} catch (UnprocessableEntityException e) {
noConditionAndPriorityExtension = e;
}
assertNotNull(noConditionAndPriorityExtension);
assertTrue(noConditionAndPriorityExtension.getMessage().contains("Missing condition and priority references"));
}

@Test
Expand Down
Loading
Loading