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

MAT-7479: Handle successive requests for valueSet Search endpoint #98

Merged
merged 1 commit into from
Jul 18, 2024
Merged

MAT-7479: Handle successive requests for valueSet Search endpoint #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
132 changes: 87 additions & 45 deletions src/main/java/gov/cms/madie/terminology/service/FhirTerminologyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,58 +131,100 @@ public ValueSetSearchResult searchValueSets(String apiKey, Map<String, String> q
.getEntry()
.forEach(
entry -> {
Resource resource = entry.getResource();
ValueSet vs = (ValueSet) resource;
if (resource instanceof ValueSet) {
String oid = "";
for (Identifier identifier : ((ValueSet) resource).getIdentifier()) {
if (identifier.getValue() != null && !identifier.getValue().isEmpty()) {
oid = identifier.getValue();
}
}
ValueSetForSearch valueSet =
ValueSetForSearch.builder()
.title(vs.getTitle())
.author(
Optional.ofNullable(
vs.getExtensionByUrl(
"http://hl7.org/fhir/StructureDefinition/valueset-author"))
.map(extension -> String.valueOf(extension.getValue()))
.orElse(""))
.name(vs.getName())
.composedOf(
vs.getCompose().getInclude().stream()
.map(x -> x.getSystem())
.collect(Collectors.joining(",")))
.effectiveDate(
String.valueOf(
vs.getExtensionByUrl(
"http://hl7.org/fhir/StructureDefinition/valueset-effectiveDate")
.getValue()))
.lastReviewDate(
String.valueOf(
vs.getExtensionByUrl(
"http://hl7.org/fhir/StructureDefinition/resource-lastReviewDate")
.getValue()))
.lastUpdated(vs.getMeta().getLastUpdated().toString())
.url(vs.getUrl())
.version(vs.getVersion())
.status(vs.getStatus())
.publisher(vs.getPublisher())
.purpose(vs.getPurpose())
.steward(vs.getPublisher())
.oid(oid)
.build();
valueSetList.add(valueSet);
}
log.info("valueSetList {}", valueSetList);
traverseValueSet(entry, valueSetList);
});
// if there's a next link we want to hit it, and append the results until we're out of results
var links = bundle.getLink();
links.forEach(
(l) -> {
if (l.getRelation().equals("next")) {
recursiveRequestValueSets(valueSetList, apiKey, l.getUrl());
}
});

return ValueSetSearchResult.builder()
.valueSets(valueSetList)
.resultBundle(responseString)
.build();
}

public void recursiveRequestValueSets(
List<ValueSetForSearch> allValueSets, String apiKey, String uriString) {
String httpsString = uriString.replaceFirst("http", "https");
log.info(
"uri we're going to hit is[{}]",
httpsString); // vsac gives us http, we want https or it fails
IParser parser = fhirContext.newJsonParser();
String responseString =
fhirTerminologyServiceWebClient.fetchResourceFromVsac(httpsString, apiKey, "bundle");
Bundle bundle = parser.parseResource(Bundle.class, responseString);
List<ValueSetForSearch> valueSetListPage = new ArrayList<>();
bundle
.getEntry()
.forEach(
entry -> {
traverseValueSet(entry, valueSetListPage);
});
allValueSets.addAll(valueSetListPage);
var links = bundle.getLink();
links.forEach(
(l) -> {
if (l.getRelation().equals("next")) {
recursiveRequestValueSets(allValueSets, apiKey, l.getUrl());
}
});
}

private void traverseValueSet(
Bundle.BundleEntryComponent entry, List<ValueSetForSearch> valueSetList) {
Resource resource = entry.getResource();
ValueSet vs = (ValueSet) resource;
if (resource instanceof ValueSet) {
String oid = "";
for (Identifier identifier : ((ValueSet) resource).getIdentifier()) {
if (identifier.getValue() != null && !identifier.getValue().isEmpty()) {
oid = identifier.getValue();
}
}
ValueSetForSearch valueSet =
ValueSetForSearch.builder()
.title(vs.getTitle())
.author(
Optional.ofNullable(
vs.getExtensionByUrl(
"http://hl7.org/fhir/StructureDefinition/valueset-author"))
.map(extension -> String.valueOf(extension.getValue()))
.orElse(""))
.name(vs.getName())
.composedOf(
vs.getCompose().getInclude().stream()
.map(x -> x.getSystem())
.collect(Collectors.joining(",")))
.effectiveDate(
Optional.ofNullable(
vs.getExtensionByUrl(
"http://hl7.org/fhir/StructureDefinition/valueset-effectiveDate"))
.map(extension -> String.valueOf(extension.getValue()))
.orElse(""))
.lastReviewDate(
Optional.ofNullable(
vs.getExtensionByUrl(
"http://hl7.org/fhir/StructureDefinition/resource-lastReviewDate"))
.map(extension -> String.valueOf(extension.getValue()))
.orElse(""))
.lastUpdated(vs.getMeta().getLastUpdated().toString())
.url(vs.getUrl())
.version(vs.getVersion())
.status(vs.getStatus())
.publisher(vs.getPublisher())
.purpose(vs.getPurpose())
.steward(vs.getPublisher())
.oid(oid)
.build();
valueSetList.add(valueSet);
}
}

public List<CodeSystem> getAllCodeSystems() {
// remove items that are marked as not present in vsac to cut expense
List<CodeSystemEntry> codeSystemMappingEntries =
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gov/cms/madie/terminology/webclient/FhirTerminologyServiceWebClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public String getCodeResource(String code, CodeSystem codeSystem, String apiKey)
return fetchResourceFromVsac(uri.toString(), apiKey, "Code");
}

private String fetchResourceFromVsac(String uri, String apiKey, String resourceType) {
public String fetchResourceFromVsac(String uri, String apiKey, String resourceType) {
return fhirTerminologyWebClient
.get()
.uri(uri)
Expand Down
Loading