fixing issue with recommend endpoint

Author: paxtonhare

src/main/ml-modules/root/lib/entity.sjs

@@ -75,7 +75,7 @@ function getDataByDocument(entityDocument, optionsIn){
   if (entityURI != null){
     let entity = createEntity(entityDocument.root);
 
-    result.type = entity.getType(entity);
+    result.type = entity.getType();
 
     result.preferredName = entity.getPreferredName();
 

src/main/ml-modules/services/recommend.sjs

@@ -7,30 +7,29 @@ let nodes = [];
 let edges = [];
 let maxLevel = 1;
 let maxNodes = 1000;
-let limitPerNode = 100;
 let traversed = {};
 let alreadyAddedtoNode = {};
 let entityOptions = {
   'getRelationships': true,
-  'getContent': false
+  'getContent': true
 }
 
 let breakException = {};
 let currentUser = user.getCurrentUser();
 
 function isEntityInCurrentWorkspace(entityUri) {
   if(
-    currentUser != null && 
-    currentUser.hasOwnProperty("currentWorkspace")  && 
-    currentUser.currentWorkspace.hasOwnProperty("content") && 
-    currentUser.currentWorkspace.content != null && 
-    currentUser.currentWorkspace.content.hasOwnProperty("entities") && 
+    currentUser != null &&
+    currentUser.hasOwnProperty("currentWorkspace")  &&
+    currentUser.currentWorkspace.hasOwnProperty("content") &&
+    currentUser.currentWorkspace.content != null &&
+    currentUser.currentWorkspace.content.hasOwnProperty("entities") &&
     currentUser.currentWorkspace.content.entities.hasOwnProperty(entityUri)
   ) {
     return true;
   }
   else {
-    return false; 
+    return false;
   }
 };
 
@@ -39,9 +38,10 @@ function buildNodesAndEdges(level, entityUri, visibleIds, options = {}) {
     const entityObject = entity.getData(entityUri, entityOptions);
     let nextLevel = level + 1;
     let id = entityUri;
-    let label = entityObject.preferredName;
-    let group = entityObject.type;
-    if(!alreadyAddedtoNode.hasOwnProperty(id)) { 
+    const e = entityObject.entity || {};
+    let label = e.preferredName;
+    let group = e.type;
+    if(!alreadyAddedtoNode.hasOwnProperty(id)) {
       let node = {
         id: id,
         label: label,
@@ -67,86 +67,16 @@ function buildNodesAndEdges(level, entityUri, visibleIds, options = {}) {
       // Only include edges for links to nodes already visible on the graph.
       const relationshipId = relationship.uri;
       if (doesListContain(visibleIds, relationshipId.toString())) {
-        // let relationshipLabel = relationship.preferredName;
-        // let relationshipGroup = relationship.entityType;
         let edge = {
           from: id,
           to: relationshipId
         };
-        
-        edges.push(edge);
-      }
-
-      if((nextLevel <= maxLevel || relationship.autoExpand) && !traversed.hasOwnProperty(relationshipId) && nodes.length < maxNodes) {
-        buildNodesAndEdges(nextLevel, relationship.uri, visibleIds, {autoExpand : relationship.autoExpand});
-      }
-    });
-  }
-};
 
-function buildNodesAndEdgesv1(level, entityUri, options = {}) {
-  if((level <= maxLevel || options.autoExpand) && !traversed.hasOwnProperty(entityUri)) {
-    const entityObject = entity.getData(entityUri, entityOptions);
-    let nextLevel = level + 1;
-    let id = entityUri;
-    let label = entityObject.preferredName;
-    let group = entityObject.type;
-    if(!alreadyAddedtoNode.hasOwnProperty(id)) { 
-      let node = {
-        id: id,
-        label: label,
-        group: group + 'Recommendation',
-        level: (level - 1),
-        isInCurrentWorkspace: isEntityInCurrentWorkspace(entityUri),
-        isRecommendation: true
-      };
-
-      if(nodes.length < maxNodes || (level - 1) == 0){
-        nodes.push(node);
-      }
-      else {
-        throw breakException;
-      }
-
-      alreadyAddedtoNode[id] = true;
-    }
-
-    traversed[id] = true;
-
-    entityObject.relationships.slice(0, limitPerNode).forEach(function(relationship) {
-      let relationshipId = relationship.uri;
-      let relationshipLabel = relationship.preferredName;
-      let relationshipGroup = relationship.entityType;
-
-      if(!alreadyAddedtoNode.hasOwnProperty(relationshipId) && nodes.length < maxNodes) {
-        let node = {
-          id: relationshipId,
-          label: relationshipLabel,
-          group: relationshipGroup + 'Recommendation',
-          level: level,
-          isInCurrentWorkspace: isEntityInCurrentWorkspace(entityUri),
-          isRecommendation: true
-        };
-        
-        if(nodes.length < maxNodes) {
-          nodes.push(node);
-        }
-        else {
-          throw breakException;
-        }
-
-        alreadyAddedtoNode[relationshipId] = true;
-
-        let edge = {
-          from: id,
-          to: relationshipId
-        };
-        
         edges.push(edge);
       }
 
       if((nextLevel <= maxLevel || relationship.autoExpand) && !traversed.hasOwnProperty(relationshipId) && nodes.length < maxNodes) {
-        buildNodesAndEdgesv1(nextLevel, relationship.uri, {autoExpand : relationship.autoExpand});
+        buildNodesAndEdges(nextLevel, relationship.uri, visibleIds, {autoExpand : relationship.autoExpand});
       }
     });
   }
@@ -169,8 +99,6 @@ function get(context, params) {
   // Search on Pubs with text:  obesity exercise
   if(params.hasOwnProperty("id")) {
     let visibleIds = [];
-    let workspaceId = null;
-    let algorithmName = null;
 
     // uri can come in encoded many times
     const sourceIds = params.id.toString().split(",").map(key => decodeURIComponent(decodeURIComponent(decodeURIComponent(decodeURIComponent(key)))));
@@ -197,16 +125,16 @@ function get(context, params) {
     if(params.hasOwnProperty("algorithmName")) {
       algorithmName = params.algorithmName;
     }
-    
+
     uris.forEach(function(uri) {
       try {
-        buildNodesAndEdges(1, uri);
+        buildNodesAndEdges(1, uri, []);
       }
       catch(e) {
         if(e !== breakException) throw e;
       }
     });
-    
+
     // Remove the visible and source ids that overlap with the recommended nodes.
     const finalNodes = nodes.filter(node => {
       const idStr = fn.string(node.id);
@@ -230,8 +158,6 @@ function post(context, params, input) {
   // Search on Pubs with text:  obesity exercise
   if(input.root && input.root.ids) {
     let visibleIds = [];
-    let workspaceId = null;
-    let algorithmName = null;
 
     const sourceIds = Sequence.from(input.root.ids).toArray();
     var recommended = recom.bestNewConnection(sourceIds);
@@ -259,7 +185,7 @@ function post(context, params, input) {
     }
 
     const allIds = sourceIds.concat(uris);
-    
+
     uris.forEach(function(uri) {
       try {
         buildNodesAndEdges(1, uri, allIds);