Further cleanup
This commit is contained in:
parent
cd104ad635
commit
fe684ee4c0
|
@ -20,7 +20,6 @@ package ca.uhn.fhir.jpa.dao.data;
|
||||||
* #L%
|
* #L%
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import ca.uhn.fhir.jpa.entity.TermCodeSystem;
|
|
||||||
import ca.uhn.fhir.jpa.entity.TermValueSet;
|
import ca.uhn.fhir.jpa.entity.TermValueSet;
|
||||||
import ca.uhn.fhir.jpa.entity.TermValueSetPreExpansionStatusEnum;
|
import ca.uhn.fhir.jpa.entity.TermValueSetPreExpansionStatusEnum;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
|
@ -33,6 +32,7 @@ import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
public interface ITermValueSetDao extends JpaRepository<TermValueSet, Long> {
|
public interface ITermValueSetDao extends JpaRepository<TermValueSet, Long> {
|
||||||
|
|
||||||
@Query("SELECT vs FROM TermValueSet vs WHERE vs.myResourcePid = :resource_pid")
|
@Query("SELECT vs FROM TermValueSet vs WHERE vs.myResourcePid = :resource_pid")
|
||||||
Optional<TermValueSet> findByResourcePid(@Param("resource_pid") Long theResourcePid);
|
Optional<TermValueSet> findByResourcePid(@Param("resource_pid") Long theResourcePid);
|
||||||
|
|
||||||
|
|
|
@ -117,10 +117,6 @@ public class ExpungeEverythingService {
|
||||||
counter.addAndGet(doExpungeEverythingQuery("UPDATE " + TermCodeSystem.class.getSimpleName() + " d SET d.myCurrentVersion = null"));
|
counter.addAndGet(doExpungeEverythingQuery("UPDATE " + TermCodeSystem.class.getSimpleName() + " d SET d.myCurrentVersion = null"));
|
||||||
return null;
|
return null;
|
||||||
});
|
});
|
||||||
// myTxTemplate.execute(t -> {
|
|
||||||
// counter.addAndGet(doExpungeEverythingQuery("UPDATE " + TermValueSet.class.getSimpleName() + " d SET d.myCurrentVersion = null"));
|
|
||||||
// return null;
|
|
||||||
// });
|
|
||||||
counter.addAndGet(expungeEverythingByType(NpmPackageVersionResourceEntity.class));
|
counter.addAndGet(expungeEverythingByType(NpmPackageVersionResourceEntity.class));
|
||||||
counter.addAndGet(expungeEverythingByType(NpmPackageVersionEntity.class));
|
counter.addAndGet(expungeEverythingByType(NpmPackageVersionEntity.class));
|
||||||
counter.addAndGet(expungeEverythingByType(NpmPackageEntity.class));
|
counter.addAndGet(expungeEverythingByType(NpmPackageEntity.class));
|
||||||
|
@ -139,7 +135,6 @@ public class ExpungeEverythingService {
|
||||||
counter.addAndGet(expungeEverythingByType(SearchInclude.class));
|
counter.addAndGet(expungeEverythingByType(SearchInclude.class));
|
||||||
counter.addAndGet(expungeEverythingByType(TermValueSetConceptDesignation.class));
|
counter.addAndGet(expungeEverythingByType(TermValueSetConceptDesignation.class));
|
||||||
counter.addAndGet(expungeEverythingByType(TermValueSetConcept.class));
|
counter.addAndGet(expungeEverythingByType(TermValueSetConcept.class));
|
||||||
// counter.addAndGet(expungeEverythingByType(TermValueSetVersion.class));
|
|
||||||
counter.addAndGet(expungeEverythingByType(TermValueSet.class));
|
counter.addAndGet(expungeEverythingByType(TermValueSet.class));
|
||||||
counter.addAndGet(expungeEverythingByType(TermConceptParentChildLink.class));
|
counter.addAndGet(expungeEverythingByType(TermConceptParentChildLink.class));
|
||||||
counter.addAndGet(expungeEverythingByType(TermConceptMapGroupElementTarget.class));
|
counter.addAndGet(expungeEverythingByType(TermConceptMapGroupElementTarget.class));
|
||||||
|
|
|
@ -343,7 +343,6 @@ public abstract class BaseTermReadSvcImpl implements ITermReadSvc {
|
||||||
myValueSetConceptDao.deleteByTermValueSetId(existingTermValueSet.getId());
|
myValueSetConceptDao.deleteByTermValueSetId(existingTermValueSet.getId());
|
||||||
myValueSetDao.deleteById(existingTermValueSet.getId());
|
myValueSetDao.deleteById(existingTermValueSet.getId());
|
||||||
ourLog.info("Done deleting existing TermValueSet[{}] and its children.", existingTermValueSet.getId());
|
ourLog.info("Done deleting existing TermValueSet[{}] and its children.", existingTermValueSet.getId());
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -395,7 +394,8 @@ public abstract class BaseTermReadSvcImpl implements ITermReadSvc {
|
||||||
if (theValueSetToExpand.hasVersion()) {
|
if (theValueSetToExpand.hasVersion()) {
|
||||||
optionalTermValueSet = myValueSetDao.findTermValueSetByUrlAndVersion(theValueSetToExpand.getUrl(), theValueSetToExpand.getVersion());
|
optionalTermValueSet = myValueSetDao.findTermValueSetByUrlAndVersion(theValueSetToExpand.getUrl(), theValueSetToExpand.getVersion());
|
||||||
} else {
|
} else {
|
||||||
optionalTermValueSet = myValueSetDao.findTermValueSetByUrlAndNullVersion(theValueSetToExpand.getUrl());
|
List<TermValueSet> termValueSets = myValueSetDao.findTermValueSetByUrl(PageRequest.of(0, 1), theValueSetToExpand.getUrl());
|
||||||
|
optionalTermValueSet = Optional.of(termValueSets.get(0));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
optionalTermValueSet = Optional.empty();
|
optionalTermValueSet = Optional.empty();
|
||||||
|
@ -421,7 +421,7 @@ public abstract class BaseTermReadSvcImpl implements ITermReadSvc {
|
||||||
ValueSetExpansionOptions expansionOptions = provideExpansionOptions(theExpansionOptions);
|
ValueSetExpansionOptions expansionOptions = provideExpansionOptions(theExpansionOptions);
|
||||||
int offset = expansionOptions.getOffset();
|
int offset = expansionOptions.getOffset();
|
||||||
int count = expansionOptions.getCount();
|
int count = expansionOptions.getCount();
|
||||||
populateExpansionComponent(expansionComponent, termValueSet, offset, count, termValueSet.getUrl());
|
populateExpansionComponent(expansionComponent, termValueSet, offset, count);
|
||||||
|
|
||||||
ValueSet valueSet = new ValueSet();
|
ValueSet valueSet = new ValueSet();
|
||||||
valueSet.setStatus(Enumerations.PublicationStatus.ACTIVE);
|
valueSet.setStatus(Enumerations.PublicationStatus.ACTIVE);
|
||||||
|
@ -430,7 +430,7 @@ public abstract class BaseTermReadSvcImpl implements ITermReadSvc {
|
||||||
return valueSet;
|
return valueSet;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void populateExpansionComponent(ValueSet.ValueSetExpansionComponent theExpansionComponent, TermValueSet theTermValueSet, int theOffset, int theCount, String theValueSetUrl) {
|
private void populateExpansionComponent(ValueSet.ValueSetExpansionComponent theExpansionComponent, TermValueSet theTermValueSet, int theOffset, int theCount) {
|
||||||
int total = theTermValueSet.getTotalConcepts().intValue();
|
int total = theTermValueSet.getTotalConcepts().intValue();
|
||||||
theExpansionComponent.setTotal(total);
|
theExpansionComponent.setTotal(total);
|
||||||
theExpansionComponent.setOffset(theOffset);
|
theExpansionComponent.setOffset(theOffset);
|
||||||
|
@ -441,17 +441,17 @@ public abstract class BaseTermReadSvcImpl implements ITermReadSvc {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
expandConcepts(theExpansionComponent, theTermValueSet, theOffset, theCount, theValueSetUrl);
|
expandConcepts(theExpansionComponent, theTermValueSet, theOffset, theCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void expandConcepts(ValueSet.ValueSetExpansionComponent theExpansionComponent, TermValueSet theTermValueSet, int theOffset, int theCount, String theValueSetUrl) {
|
private void expandConcepts(ValueSet.ValueSetExpansionComponent theExpansionComponent, TermValueSet theTermValueSet, int theOffset, int theCount) {
|
||||||
int conceptsExpanded = 0;
|
int conceptsExpanded = 0;
|
||||||
int designationsExpanded = 0;
|
int designationsExpanded = 0;
|
||||||
int toIndex = theOffset + theCount;
|
int toIndex = theOffset + theCount;
|
||||||
Collection<TermValueSetConceptView> conceptViews = myTermValueSetConceptViewDao.findByTermValueSetId(theOffset, toIndex, theTermValueSet.getId());
|
Collection<TermValueSetConceptView> conceptViews = myTermValueSetConceptViewDao.findByTermValueSetId(theOffset, toIndex, theTermValueSet.getId());
|
||||||
|
|
||||||
if (conceptViews.isEmpty()) {
|
if (conceptViews.isEmpty()) {
|
||||||
logConceptsExpanded("No concepts to expand. ", theValueSetUrl, conceptsExpanded);
|
logConceptsExpanded("No concepts to expand. ", theTermValueSet, conceptsExpanded);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -482,28 +482,28 @@ public abstract class BaseTermReadSvcImpl implements ITermReadSvc {
|
||||||
designationComponent.setValue(conceptView.getDesignationVal());
|
designationComponent.setValue(conceptView.getDesignationVal());
|
||||||
|
|
||||||
if (++designationsExpanded % 250 == 0) {
|
if (++designationsExpanded % 250 == 0) {
|
||||||
logDesignationsExpanded("Expansion of designations in progress. ", theValueSetUrl, designationsExpanded);
|
logDesignationsExpanded("Expansion of designations in progress. ", theTermValueSet, designationsExpanded);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (++conceptsExpanded % 250 == 0) {
|
if (++conceptsExpanded % 250 == 0) {
|
||||||
logConceptsExpanded("Expansion of concepts in progress. ", theValueSetUrl, conceptsExpanded);
|
logConceptsExpanded("Expansion of concepts in progress. ", theTermValueSet, conceptsExpanded);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logDesignationsExpanded("Finished expanding designations. ", theValueSetUrl, designationsExpanded);
|
logDesignationsExpanded("Finished expanding designations. ", theTermValueSet, designationsExpanded);
|
||||||
logConceptsExpanded("Finished expanding concepts. ", theValueSetUrl, conceptsExpanded);
|
logConceptsExpanded("Finished expanding concepts. ", theTermValueSet, conceptsExpanded);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void logConceptsExpanded(String theLogDescriptionPrefix, String theValueSetUrl, int theConceptsExpanded) {
|
private void logConceptsExpanded(String theLogDescriptionPrefix, TermValueSet theTermValueSet, int theConceptsExpanded) {
|
||||||
if (theConceptsExpanded > 0) {
|
if (theConceptsExpanded > 0) {
|
||||||
ourLog.debug("{}Have expanded {} concepts in ValueSet[{}]", theLogDescriptionPrefix, theConceptsExpanded, theValueSetUrl);
|
ourLog.debug("{}Have expanded {} concepts in ValueSet[{}]", theLogDescriptionPrefix, theConceptsExpanded, theTermValueSet.getUrl());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void logDesignationsExpanded(String theLogDescriptionPrefix, String theValueSetUrl, int theDesignationsExpanded) {
|
private void logDesignationsExpanded(String theLogDescriptionPrefix, TermValueSet theTermValueSet, int theDesignationsExpanded) {
|
||||||
if (theDesignationsExpanded > 0) {
|
if (theDesignationsExpanded > 0) {
|
||||||
ourLog.debug("{}Have expanded {} designations in ValueSet[{}]", theLogDescriptionPrefix, theDesignationsExpanded, theValueSetUrl);
|
ourLog.debug("{}Have expanded {} designations in ValueSet[{}]", theLogDescriptionPrefix, theDesignationsExpanded, theTermValueSet.getUrl());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1807,7 +1807,9 @@ public abstract class BaseTermReadSvcImpl implements ITermReadSvc {
|
||||||
optionalExistingTermValueSetByUrl = myValueSetDao.findTermValueSetByUrlAndNullVersion(url);
|
optionalExistingTermValueSetByUrl = myValueSetDao.findTermValueSetByUrlAndNullVersion(url);
|
||||||
}
|
}
|
||||||
if (!optionalExistingTermValueSetByUrl.isPresent()) {
|
if (!optionalExistingTermValueSetByUrl.isPresent()) {
|
||||||
|
|
||||||
myValueSetDao.save(termValueSet);
|
myValueSetDao.save(termValueSet);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
TermValueSet existingTermValueSet = optionalExistingTermValueSetByUrl.get();
|
TermValueSet existingTermValueSet = optionalExistingTermValueSetByUrl.get();
|
||||||
String msg;
|
String msg;
|
||||||
|
|
|
@ -833,7 +833,7 @@ public class FhirResourceDaoR4TerminologyTest extends BaseJpaR4Test {
|
||||||
|
|
||||||
StringType code = new StringType("ParentA");
|
StringType code = new StringType("ParentA");
|
||||||
StringType system = new StringType("http://snomed.info/sct");
|
StringType system = new StringType("http://snomed.info/sct");
|
||||||
IValidationSupport.LookupCodeResult outcome = myCodeSystemDao.lookupCode(code, system, null,null, mySrd);
|
IValidationSupport.LookupCodeResult outcome = myCodeSystemDao.lookupCode(code, system, null, mySrd);
|
||||||
assertEquals(true, outcome.isFound());
|
assertEquals(true, outcome.isFound());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -208,9 +208,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
|
||||||
myStructureDefinitionDao.create(loadResourceFromClasspath(StructureDefinition.class, "/r4/bl/bb-sd.json"));
|
myStructureDefinitionDao.create(loadResourceFromClasspath(StructureDefinition.class, "/r4/bl/bb-sd.json"));
|
||||||
|
|
||||||
runInTransaction(() -> {
|
runInTransaction(() -> {
|
||||||
TermValueSet vs = myTermValueSetDao.findTermValueSetByUrlAndVersion("https://bb/ValueSet/BBDemographicAgeUnit","20190731").orElseThrow(() -> new IllegalArgumentException());
|
TermValueSet vs = myTermValueSetDao.findByUrl("https://bb/ValueSet/BBDemographicAgeUnit").orElseThrow(() -> new IllegalArgumentException());
|
||||||
// TermValueSetVersion vsv = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(vs.getId());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, vsv.getExpansionStatus());
|
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, vs.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, vs.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -239,18 +237,14 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
|
||||||
|
|
||||||
// Before, the VS wasn't pre-expanded. Try again with it pre-expanded
|
// Before, the VS wasn't pre-expanded. Try again with it pre-expanded
|
||||||
runInTransaction(() -> {
|
runInTransaction(() -> {
|
||||||
TermValueSet vs = myTermValueSetDao.findTermValueSetByUrlAndVersion("https://bb/ValueSet/BBDemographicAgeUnit","20190731").orElseThrow(() -> new IllegalArgumentException());
|
TermValueSet vs = myTermValueSetDao.findByUrl("https://bb/ValueSet/BBDemographicAgeUnit").orElseThrow(() -> new IllegalArgumentException());
|
||||||
// TermValueSetVersion vsv = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(vs.getId());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, vsv.getExpansionStatus());
|
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, vs.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, vs.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
|
||||||
myTermReadSvc.preExpandDeferredValueSetsToTerminologyTables();
|
myTermReadSvc.preExpandDeferredValueSetsToTerminologyTables();
|
||||||
|
|
||||||
runInTransaction(() -> {
|
runInTransaction(() -> {
|
||||||
TermValueSet vs = myTermValueSetDao.findTermValueSetByUrlAndVersion("https://bb/ValueSet/BBDemographicAgeUnit", "20190731").orElseThrow(() -> new IllegalArgumentException());
|
TermValueSet vs = myTermValueSetDao.findByUrl("https://bb/ValueSet/BBDemographicAgeUnit").orElseThrow(() -> new IllegalArgumentException());
|
||||||
// TermValueSetVersion vsv = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(vs.getId());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, vsv.getExpansionStatus());
|
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, vs.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, vs.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -284,9 +278,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
|
||||||
myStructureDefinitionDao.create(loadResourceFromClasspath(StructureDefinition.class, "/r4/bl/bb-sd.json"));
|
myStructureDefinitionDao.create(loadResourceFromClasspath(StructureDefinition.class, "/r4/bl/bb-sd.json"));
|
||||||
|
|
||||||
runInTransaction(() -> {
|
runInTransaction(() -> {
|
||||||
TermValueSet vs = myTermValueSetDao.findTermValueSetByUrlAndVersion("https://bb/ValueSet/BBDemographicAgeUnit", "20190731").orElseThrow(() -> new IllegalArgumentException());
|
TermValueSet vs = myTermValueSetDao.findByUrl("https://bb/ValueSet/BBDemographicAgeUnit").orElseThrow(() -> new IllegalArgumentException());
|
||||||
// TermValueSetVersion vsv = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(vs.getId());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, vsv.getExpansionStatus());
|
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, vs.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, vs.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -383,8 +383,6 @@ public abstract class BaseJpaR5Test extends BaseJpaTest {
|
||||||
protected IFhirResourceDaoValueSet<ValueSet, Coding, CodeableConcept> myValueSetDao;
|
protected IFhirResourceDaoValueSet<ValueSet, Coding, CodeableConcept> myValueSetDao;
|
||||||
@Autowired
|
@Autowired
|
||||||
protected ITermValueSetDao myTermValueSetDao;
|
protected ITermValueSetDao myTermValueSetDao;
|
||||||
// @Autowired
|
|
||||||
// protected ITermValueSetVersionDao myTermValueSetVersionDao;
|
|
||||||
@Autowired
|
@Autowired
|
||||||
protected ITermValueSetConceptDao myTermValueSetConceptDao;
|
protected ITermValueSetConceptDao myTermValueSetConceptDao;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|
|
@ -13,7 +13,6 @@ import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc;
|
||||||
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
|
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
|
||||||
import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
|
import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
|
||||||
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
|
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
|
||||||
import ca.uhn.fhir.util.TestUtil;
|
|
||||||
import ca.uhn.fhir.util.UrlUtil;
|
import ca.uhn.fhir.util.UrlUtil;
|
||||||
import com.google.common.base.Charsets;
|
import com.google.common.base.Charsets;
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
|
@ -37,7 +36,6 @@ import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent;
|
||||||
import org.hl7.fhir.dstu3.model.ValueSet.FilterOperator;
|
import org.hl7.fhir.dstu3.model.ValueSet.FilterOperator;
|
||||||
import org.hl7.fhir.instance.model.api.IIdType;
|
import org.hl7.fhir.instance.model.api.IIdType;
|
||||||
import org.junit.jupiter.api.AfterEach;
|
import org.junit.jupiter.api.AfterEach;
|
||||||
import org.junit.jupiter.api.AfterAll;
|
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.transaction.TransactionStatus;
|
import org.springframework.transaction.TransactionStatus;
|
||||||
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
|
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
|
||||||
|
|
|
@ -807,9 +807,6 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals(theValueSetName, termValueSet.getName());
|
assertEquals(theValueSetName, termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(0, termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(0, termValueSet.getConcepts().size());
|
assertEquals(0, termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
@ -828,13 +825,9 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals(theValueSetName, termValueSet.getName());
|
assertEquals(theValueSetName, termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(theCodeSystem.getConcept().size(), termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(theCodeSystem.getConcept().size(), termValueSet.getConcepts().size());
|
assertEquals(theCodeSystem.getConcept().size(), termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
||||||
|
|
||||||
// TermValueSetConcept concept = termValueSetVersion.getConcepts().get(0);
|
|
||||||
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -857,7 +850,6 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(1);
|
|
||||||
concept = termValueSet.getConcepts().get(1);
|
concept = termValueSet.getConcepts().get(1);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
|
|
@ -10,7 +10,6 @@ import ca.uhn.fhir.jpa.entity.TermValueSet;
|
||||||
import ca.uhn.fhir.jpa.entity.TermValueSetConcept;
|
import ca.uhn.fhir.jpa.entity.TermValueSetConcept;
|
||||||
import ca.uhn.fhir.jpa.entity.TermValueSetConceptDesignation;
|
import ca.uhn.fhir.jpa.entity.TermValueSetConceptDesignation;
|
||||||
import ca.uhn.fhir.jpa.entity.TermValueSetPreExpansionStatusEnum;
|
import ca.uhn.fhir.jpa.entity.TermValueSetPreExpansionStatusEnum;
|
||||||
import ca.uhn.fhir.jpa.entity.TermValueSetVersion;
|
|
||||||
import ca.uhn.fhir.jpa.model.entity.ResourceTable;
|
import ca.uhn.fhir.jpa.model.entity.ResourceTable;
|
||||||
import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc;
|
import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc;
|
||||||
import ca.uhn.fhir.jpa.term.api.ITermReadSvc;
|
import ca.uhn.fhir.jpa.term.api.ITermReadSvc;
|
||||||
|
@ -1120,9 +1119,6 @@ public class ResourceProviderR5ValueSetTest extends BaseResourceProviderR5Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals(theValueSetName, termValueSet.getName());
|
assertEquals(theValueSetName, termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(0, termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(0, termValueSet.getConcepts().size());
|
assertEquals(0, termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
@ -1141,13 +1137,9 @@ public class ResourceProviderR5ValueSetTest extends BaseResourceProviderR5Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals(theValueSetName, termValueSet.getName());
|
assertEquals(theValueSetName, termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(theCodeSystem.getConcept().size(), termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(theCodeSystem.getConcept().size(), termValueSet.getConcepts().size());
|
assertEquals(theCodeSystem.getConcept().size(), termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
||||||
|
|
||||||
// TermValueSetConcept concept = termValueSetVersion.getConcepts().get(0);
|
|
||||||
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1170,7 +1162,6 @@ public class ResourceProviderR5ValueSetTest extends BaseResourceProviderR5Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(1);
|
|
||||||
concept = termValueSet.getConcepts().get(1);
|
concept = termValueSet.getConcepts().get(1);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1181,7 +1172,6 @@ public class ResourceProviderR5ValueSetTest extends BaseResourceProviderR5Test {
|
||||||
|
|
||||||
// ...
|
// ...
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(22);
|
|
||||||
concept = termValueSet.getConcepts().get(22);
|
concept = termValueSet.getConcepts().get(22);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1197,7 +1187,6 @@ public class ResourceProviderR5ValueSetTest extends BaseResourceProviderR5Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(23);
|
|
||||||
concept = termValueSet.getConcepts().get(23);
|
concept = termValueSet.getConcepts().get(23);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
|
|
@ -184,7 +184,7 @@ public class TerminologySvcDeltaR4Test extends BaseJpaR4Test {
|
||||||
assertEquals(2, outcome.getUpdatedConceptCount());
|
assertEquals(2, outcome.getUpdatedConceptCount());
|
||||||
|
|
||||||
runInTransaction(() -> {
|
runInTransaction(() -> {
|
||||||
TermConcept concept = myTermSvc.findCode("http://foo/cs", "ChildAA", null).orElseThrow(() -> new IllegalStateException());
|
TermConcept concept = myTermSvc.findCode("http://foo/cs", "ChildAA").orElseThrow(() -> new IllegalStateException());
|
||||||
assertEquals(2, concept.getParents().size());
|
assertEquals(2, concept.getParents().size());
|
||||||
assertThat(concept.getParentPidsAsString(), matchesPattern("^[0-9]+ [0-9]+$"));
|
assertThat(concept.getParentPidsAsString(), matchesPattern("^[0-9]+ [0-9]+$"));
|
||||||
});
|
});
|
||||||
|
|
|
@ -194,11 +194,8 @@ public class TerminologySvcImplR4Test extends BaseTermR4Test {
|
||||||
TermValueSet termValueSet = myTermValueSetDao.findByResourcePid(myExtensionalVsIdOnResourceTable).get();
|
TermValueSet termValueSet = myTermValueSetDao.findByResourcePid(myExtensionalVsIdOnResourceTable).get();
|
||||||
Long termValueSetId = termValueSet.getId();
|
Long termValueSetId = termValueSet.getId();
|
||||||
assertEquals(3, myTermValueSetConceptDesignationDao.countByTermValueSetId(termValueSetId).intValue());
|
assertEquals(3, myTermValueSetConceptDesignationDao.countByTermValueSetId(termValueSetId).intValue());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(3, termValueSetVersion.getTotalConceptDesignations().intValue());
|
|
||||||
assertEquals(3, termValueSet.getTotalConceptDesignations().intValue());
|
assertEquals(3, termValueSet.getTotalConceptDesignations().intValue());
|
||||||
assertEquals(24, myTermValueSetConceptDao.countByTermValueSetId(termValueSetId).intValue());
|
assertEquals(24, myTermValueSetConceptDao.countByTermValueSetId(termValueSetId).intValue());
|
||||||
// assertEquals(24, termValueSetVersion.getTotalConcepts().intValue());
|
|
||||||
assertEquals(24, termValueSet.getTotalConcepts().intValue());
|
assertEquals(24, termValueSet.getTotalConcepts().intValue());
|
||||||
|
|
||||||
new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
|
new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
|
||||||
|
@ -234,11 +231,8 @@ public class TerminologySvcImplR4Test extends BaseTermR4Test {
|
||||||
TermValueSet termValueSet = myTermValueSetDao.findByResourcePid(myExtensionalVsIdOnResourceTable).get();
|
TermValueSet termValueSet = myTermValueSetDao.findByResourcePid(myExtensionalVsIdOnResourceTable).get();
|
||||||
Long termValueSetId = termValueSet.getId();
|
Long termValueSetId = termValueSet.getId();
|
||||||
assertEquals(3, myTermValueSetConceptDesignationDao.countByTermValueSetId(termValueSetId).intValue());
|
assertEquals(3, myTermValueSetConceptDesignationDao.countByTermValueSetId(termValueSetId).intValue());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(3, termValueSetVersion.getTotalConceptDesignations().intValue());
|
|
||||||
assertEquals(3, termValueSet.getTotalConceptDesignations().intValue());
|
assertEquals(3, termValueSet.getTotalConceptDesignations().intValue());
|
||||||
assertEquals(24, myTermValueSetConceptDao.countByTermValueSetId(termValueSetId).intValue());
|
assertEquals(24, myTermValueSetConceptDao.countByTermValueSetId(termValueSetId).intValue());
|
||||||
// assertEquals(24, termValueSetVersion.getTotalConcepts().intValue());
|
|
||||||
assertEquals(24, termValueSet.getTotalConcepts().intValue());
|
assertEquals(24, termValueSet.getTotalConcepts().intValue());
|
||||||
|
|
||||||
new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
|
new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
|
||||||
|
|
|
@ -1165,9 +1165,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(0, termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(0, termValueSet.getConcepts().size());
|
assertEquals(0, termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
@ -1186,13 +1183,9 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(codeSystem.getConcept().size(), termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(codeSystem.getConcept().size(), termValueSet.getConcepts().size());
|
assertEquals(codeSystem.getConcept().size(), termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
||||||
|
|
||||||
// TermValueSetConcept concept = termValueSetVersion.getConcepts().get(0);
|
|
||||||
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1215,7 +1208,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(1);
|
|
||||||
concept = termValueSet.getConcepts().get(1);
|
concept = termValueSet.getConcepts().get(1);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1226,7 +1218,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
|
|
||||||
// ...
|
// ...
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(22);
|
|
||||||
concept = termValueSet.getConcepts().get(22);
|
concept = termValueSet.getConcepts().get(22);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1242,7 +1233,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(23);
|
|
||||||
concept = termValueSet.getConcepts().get(23);
|
concept = termValueSet.getConcepts().get(23);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1277,9 +1267,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(0, termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(0, termValueSet.getConcepts().size());
|
assertEquals(0, termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
@ -1298,13 +1285,9 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(codeSystem.getConcept().size(), termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(codeSystem.getConcept().size(), termValueSet.getConcepts().size());
|
assertEquals(codeSystem.getConcept().size(), termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
||||||
|
|
||||||
// TermValueSetConcept concept = termValueSetVersion.getConcepts().get(0);
|
|
||||||
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1327,7 +1310,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(1);
|
|
||||||
concept = termValueSet.getConcepts().get(1);
|
concept = termValueSet.getConcepts().get(1);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1338,7 +1320,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
|
|
||||||
// ...
|
// ...
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(22);
|
|
||||||
concept = termValueSet.getConcepts().get(22);
|
concept = termValueSet.getConcepts().get(22);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1354,7 +1335,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(23);
|
|
||||||
concept = termValueSet.getConcepts().get(23);
|
concept = termValueSet.getConcepts().get(23);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1389,9 +1369,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(0, termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(0, termValueSet.getConcepts().size());
|
assertEquals(0, termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
@ -1410,13 +1387,9 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(codeSystem.getConcept().size() - 2, termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(codeSystem.getConcept().size() - 2, termValueSet.getConcepts().size());
|
assertEquals(codeSystem.getConcept().size() - 2, termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
||||||
|
|
||||||
// TermValueSetConcept concept = termValueSetVersion.getConcepts().get(0);
|
|
||||||
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1439,7 +1412,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(1);
|
|
||||||
concept = termValueSet.getConcepts().get(1);
|
concept = termValueSet.getConcepts().get(1);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1450,7 +1422,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
|
|
||||||
// ...
|
// ...
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(20);
|
|
||||||
concept = termValueSet.getConcepts().get(20);
|
concept = termValueSet.getConcepts().get(20);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1466,7 +1437,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(21);
|
|
||||||
concept = termValueSet.getConcepts().get(21);
|
concept = termValueSet.getConcepts().get(21);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1501,9 +1471,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(0, termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(0, termValueSet.getConcepts().size());
|
assertEquals(0, termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.NOT_EXPANDED, termValueSet.getExpansionStatus());
|
||||||
});
|
});
|
||||||
|
@ -1522,13 +1489,9 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
ourLog.info("ValueSet:\n" + termValueSet.toString());
|
||||||
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
assertEquals("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", termValueSet.getUrl());
|
||||||
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
assertEquals("Terminology Services Connectation #1 Extensional case #2", termValueSet.getName());
|
||||||
// TermValueSetVersion termValueSetVersion = myTermValueSetVersionDao.findByValueSetPidAndNullVersion(termValueSet.getId());
|
|
||||||
// assertEquals(codeSystem.getConcept().size() - 2, termValueSetVersion.getConcepts().size());
|
|
||||||
// assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSetVersion.getExpansionStatus());
|
|
||||||
assertEquals(codeSystem.getConcept().size() - 2, termValueSet.getConcepts().size());
|
assertEquals(codeSystem.getConcept().size() - 2, termValueSet.getConcepts().size());
|
||||||
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
assertEquals(TermValueSetPreExpansionStatusEnum.EXPANDED, termValueSet.getExpansionStatus());
|
||||||
|
|
||||||
// TermValueSetConcept concept = termValueSetVersion.getConcepts().get(0);
|
|
||||||
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
TermValueSetConcept concept = termValueSet.getConcepts().get(0);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1551,7 +1514,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
assertEquals("Systoliskt blodtryck - utgång", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(1);
|
|
||||||
concept = termValueSet.getConcepts().get(1);
|
concept = termValueSet.getConcepts().get(1);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1562,7 +1524,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
|
|
||||||
// ...
|
// ...
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(20);
|
|
||||||
concept = termValueSet.getConcepts().get(20);
|
concept = termValueSet.getConcepts().get(20);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
@ -1578,7 +1539,6 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
|
||||||
assertEquals("Synonym", designation.getUseDisplay());
|
assertEquals("Synonym", designation.getUseDisplay());
|
||||||
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
assertEquals("Systolische bloeddruk minimaal 1 uur", designation.getValue());
|
||||||
|
|
||||||
// concept = termValueSetVersion.getConcepts().get(21);
|
|
||||||
concept = termValueSet.getConcepts().get(21);
|
concept = termValueSet.getConcepts().get(21);
|
||||||
ourLog.info("Concept:\n" + concept.toString());
|
ourLog.info("Concept:\n" + concept.toString());
|
||||||
assertEquals("http://acme.org", concept.getSystem());
|
assertEquals("http://acme.org", concept.getSystem());
|
||||||
|
|
Loading…
Reference in New Issue