Merge pull request #79 from cBioPortal/alias-history-feature

Alias history feature
cBioPortal · Aug 30, 2017 · 386275e · 386275e
2 parents 09b44fa + 7446e49
commit 386275e
Show file tree

Hide file tree

Showing 12 changed files with 98 additions and 320 deletions.
diff --git a/core/src/main/java/org/mskcc/oncotree/crosswalk/MSKConcept.java b/core/src/main/java/org/mskcc/oncotree/crosswalk/MSKConcept.java
@@ -37,6 +37,7 @@ public class MSKConcept {
     private HashMap<String, List<String>> crosswalks;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Set<String> history = new HashSet<String>();
 
     /**
     * No args constructor for use in serialization
@@ -81,6 +82,30 @@ public void setCrosswalks(HashMap<String, List<String>> crosswalks) {
         this.crosswalks = crosswalks;
     }
 
+    /**
+    *
+    * @return history
+    */
+    public Set<String> getHistory() {
+        return history;
+    }
+
+    /**
+    *
+    * @param oncotreeCode
+    */
+    public void addHistory(String oncotreeCode) {
+        this.history.add(oncotreeCode);
+    }
+
+    /**
+    *
+    * @param oncotreeCodes
+    */
+    public void addHistory(Set<String> oncotreeCodes) {
+        this.history.addAll(oncotreeCodes);
+    }
+
     @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {
         return this.additionalProperties;

diff --git a/core/src/main/java/org/mskcc/oncotree/crosswalk/MSKConceptCache.java b/core/src/main/java/org/mskcc/oncotree/crosswalk/MSKConceptCache.java
@@ -25,6 +25,7 @@
 import org.mskcc.oncotree.topbraid.OncoTreeNode;
 import org.mskcc.oncotree.topbraid.OncoTreeRepository;
 import org.mskcc.oncotree.utils.VersionUtil;
+import org.mskcc.oncotree.model.Version;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -41,6 +42,8 @@ public class MSKConceptCache {
 
     private final static Logger logger = Logger.getLogger(MSKConceptCache.class);
     private static HashMap<String, MSKConcept> oncoTreeCodesToMSKConcepts = new HashMap<String, MSKConcept>();
+    // use this to store and look up previous oncoTree codes
+    private static HashMap<String, HashSet<String>> topBraidURIsToOncotreeCodes = new HashMap<String, HashSet<String>>();
 
     @Autowired
     private OncoTreeRepository oncoTreeRepository;
@@ -67,20 +70,38 @@ public MSKConcept get(String oncoTreeCode) {
     private void resetCache() {
         logger.info("resetCache() -- clearing Crosswalk MSKConcept cache and refilling");
         oncoTreeCodesToMSKConcepts.clear();
-        List<OncoTreeNode> oncoTreeNodes = oncoTreeRepository.getOncoTree(VersionUtil.getDefaultVersion());
-        for (OncoTreeNode node : oncoTreeNodes) {
-            getFromCrosswalkAndSave(node.getCode());
-        } 
+        // versions are ordered in ascending order by release date
+        for (Version version : VersionUtil.getVersions()) {
+            List<OncoTreeNode> oncoTreeNodes = oncoTreeRepository.getOncoTree(version);
+            for (OncoTreeNode node : oncoTreeNodes) {
+                MSKConcept mskConcept = getFromCrosswalkAndSave(node.getCode());
+                // get all codes defined so far for this topbraid uri and save in history
+                if (topBraidURIsToOncotreeCodes.containsKey(node.getURI())) {
+                    // do not add this code to the history, but add any others
+                    HashSet<String> allButThisNode = new HashSet<String>(topBraidURIsToOncotreeCodes.get(node.getURI()));
+                    allButThisNode.remove(node.getCode());
+                    mskConcept.addHistory(allButThisNode);
+                } else {
+                    topBraidURIsToOncotreeCodes.put(node.getURI(), new HashSet<String>());
+                }
+                // now save this as onoctree code history for this topbraid uri
+                topBraidURIsToOncotreeCodes.get(node.getURI()).add(node.getCode());
+            }
+        }
     }
 
     private MSKConcept getFromCrosswalkAndSave(String oncoTreeCode) {
-        MSKConcept concept = null;
+        // only save if we have not seen before (UMLS/NCI info will not be different)
+        if (oncoTreeCodesToMSKConcepts.containsKey(oncoTreeCode)) {
+            return oncoTreeCodesToMSKConcepts.get(oncoTreeCode);
+        }
+        MSKConcept concept = new MSKConcept();
         try {
             concept = crosswalkRepository.getByOncotreeCode(oncoTreeCode);
         } catch (CrosswalkException e) {
             // do nothing
         }
-        // save even if null
+        // save even if has no information in it
         oncoTreeCodesToMSKConcepts.put(oncoTreeCode, concept);
         return concept;
     }

diff --git a/core/src/main/java/org/mskcc/oncotree/model/History.java b/core/src/main/java/org/mskcc/oncotree/model/History.java
diff --git a/core/src/main/java/org/mskcc/oncotree/model/SearchHistoryResp.java b/core/src/main/java/org/mskcc/oncotree/model/SearchHistoryResp.java
diff --git a/core/src/main/java/org/mskcc/oncotree/model/TumorType.java b/core/src/main/java/org/mskcc/oncotree/model/TumorType.java
@@ -23,7 +23,7 @@ public class TumorType {
     private Map<String, TumorType> children = new HashMap<String, TumorType>();
     private String parent = null;
     private Boolean deprecated = false;
-    private List<History> history = new ArrayList<History>();
+    private List<String> history = new ArrayList<String>();
     private Links links = null;
     private Level level = null;
 
@@ -197,11 +197,11 @@ public void setDeprecated(Boolean deprecated) {
      **/
     @ApiModelProperty(value = "")
     @JsonProperty("history")
-    public List<History> getHistory() {
+    public List<String> getHistory() {
         return history;
     }
 
-    public void setHistory(List<History> history) {
+    public void setHistory(List<String> history) {
         this.history = history;
     }