Fix modifier hint attribute lookup bug.

DataBiosphere · Jul 26, 2023 · 5f33378 · 5f33378
1 parent adf51a1
commit 5f33378
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/service/src/main/java/bio/terra/tanagra/service/QuerysService.java b/service/src/main/java/bio/terra/tanagra/service/QuerysService.java
@@ -81,7 +81,7 @@ public EntityHintResult listEntityHints(EntityHintRequest entityHintRequest) {
 
       String attrName =
           rowResult.get(MODIFIER_AUX_DATA_ATTR_COL).getLiteral().orElseThrow().getStringVal();
-      Attribute attr = entityHintRequest.getAttribute(attrName);
+      Attribute attr = entityHintRequest.getEntity().getAttribute(attrName);
 
       OptionalDouble min = rowResult.get(MODIFIER_AUX_DATA_MIN_COL).getDouble();
       if (min.isPresent()) {

diff --git a/service/src/main/java/bio/terra/tanagra/service/instances/EntityHintRequest.java b/service/src/main/java/bio/terra/tanagra/service/instances/EntityHintRequest.java
@@ -31,12 +31,6 @@ public Entity getEntity() {
     return entity;
   }
 
-  public Attribute getAttribute(String attributeName) {
-    return isEntityLevelHints()
-        ? entity.getAttribute(attributeName)
-        : relatedEntity.getAttribute(attributeName);
-  }
-
   public Underlay.MappingType getMappingType() {
     // Hints always hit the index dataset.
     return Underlay.MappingType.INDEX;

diff --git a/service/src/test/java/bio/terra/tanagra/underlayspecific/BaseHintsTest.java b/service/src/test/java/bio/terra/tanagra/underlayspecific/BaseHintsTest.java
@@ -64,7 +64,7 @@ private void assertHintsMatch(
     EntityHintResult entityHintResult = querysService.listEntityHints(entityHintRequest);
 
     for (Map.Entry<String, DisplayHint> expected : expectedHints.entrySet()) {
-      Attribute attr = entityHintRequest.getAttribute(expected.getKey());
+      Attribute attr = entityHintRequest.getEntity().getAttribute(expected.getKey());
       DisplayHint actual = entityHintResult.getHintMap().get(attr);
       assertEquals(expected.getValue(), actual);
     }