4

Author: Luke Sikina

src/main/java/edu/harvard/dbmi/avillach/dictionary/ConceptDecoratorService.java

@@ -54,8 +54,8 @@ public Concept populateParentConcepts(Concept concept) {
     private Concept populateTabledConcept(Concept concept, List<String> conceptNodes) {
         String studyPath = String.join("\\", conceptNodes.subList(0, 1)) + "\\";
         String tablePath = String.join("\\", conceptNodes.subList(0, 2)) + "\\";
-        Concept study = conceptService.conceptDetail(concept.dataset(), studyPath).orElse(null);
-        Concept table = conceptService.conceptDetail(concept.dataset(), tablePath).orElse(null);
+        Concept study = conceptService.conceptDetailWithoutAncestors(concept.dataset(), studyPath).orElse(null);
+        Concept table = conceptService.conceptDetailWithoutAncestors(concept.dataset(), tablePath).orElse(null);
         return concept.withStudy(study).withTable(table);
     }
 

src/main/java/edu/harvard/dbmi/avillach/dictionary/concept/ConceptService.java

@@ -48,19 +48,28 @@ public long countConcepts(Filter filter) {
     }
 
     public Optional<Concept> conceptDetail(String dataset, String conceptPath) {
-        return conceptRepository.getConcept(dataset, conceptPath)
+        return getConcept(dataset, conceptPath, true);
+    }
+
+    private Optional<Concept> getConcept(String dataset, String conceptPath, boolean addAncestors) {
+        Optional<Concept> concept = conceptRepository.getConcept(dataset, conceptPath)
             .map(core -> {
-                var meta = conceptRepository.getConceptMeta(dataset, conceptPath);
-                return switch (core) {
-                    case ContinuousConcept cont -> new ContinuousConcept(cont, meta);
-                    case CategoricalConcept cat -> new CategoricalConcept(cat, meta);
-                    case ConceptShell ignored -> throw new RuntimeException("Concept shell escaped to API");
-                };
-            }
-        ).map(conceptDecoratorService::populateParentConcepts);
+                    var meta = conceptRepository.getConceptMeta(dataset, conceptPath);
+                    return switch (core) {
+                        case ContinuousConcept cont -> new ContinuousConcept(cont, meta);
+                        case CategoricalConcept cat -> new CategoricalConcept(cat, meta);
+                        case ConceptShell ignored -> throw new RuntimeException("Concept shell escaped to API");
+                    };
+                }
+            );
+        return addAncestors ? concept.map(conceptDecoratorService::populateParentConcepts) : concept;
     }
 
     public Optional<Concept> conceptTree(String dataset, String conceptPath, int depth) {
         return conceptRepository.getConceptTree(dataset, conceptPath, depth);
     }
+
+    public Optional<Concept> conceptDetailWithoutAncestors(String dataset, String conceptPath) {
+        return getConcept(dataset, conceptPath, false);
+    }
 }