Issue #KN-1041 fix: updated code to create vertices and edges

content-api/content-actors/pom.xml

@@ -93,6 +93,19 @@
             <version>2.5.22</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.sunbird</groupId>
+            <artifactId>graph-dac</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>1.0-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
 
     <build>

content-api/content-actors/src/main/scala/org/sunbird/content/actors/ContentActor.scala

@@ -15,8 +15,9 @@ import org.sunbird.content.review.mgr.ReviewManager
 import org.sunbird.content.upload.mgr.UploadManager
 import org.sunbird.content.util._
 import org.sunbird.graph.OntologyEngineContext
-import org.sunbird.graph.dac.model.Node
+import org.sunbird.graph.dac.model.{Node, Vertex}
 import org.sunbird.graph.nodes.DataNode
+import org.sunbird.graph.vertex.DataVertex
 import org.sunbird.graph.utils.NodeUtil
 import org.sunbird.managers.HierarchyManager
 import org.sunbird.managers.HierarchyManager.hierarchyPrefix
@@ -66,7 +67,7 @@ class ContentActor @Inject() (implicit oec: OntologyEngineContext, ss: StorageSe
 	def create(request: Request): Future[Response] = {
 		populateDefaultersForCreation(request)
 		RequestUtil.restrictProperties(request)
-		DataNode.create(request, dataModifier).map(node => {
+		DataVertex.create(request, vertexDataModifier).map(node => {
 			ResponseHandler.OK.put(ContentConstants.IDENTIFIER, node.getIdentifier).put("node_id", node.getIdentifier)
 				.put("versionKey", node.getMetadata.get("versionKey"))
 		})
@@ -296,6 +297,20 @@ class ContentActor @Inject() (implicit oec: OntologyEngineContext, ss: StorageSe
 		node
 	}
 
+	def vertexDataModifier(vertex: Vertex): Vertex = {
+		if (vertex.getMetadata.containsKey("trackable") &&
+			vertex.getMetadata.getOrDefault("trackable", new java.util.HashMap[String, AnyRef]).asInstanceOf[java.util.Map[String, AnyRef]].containsKey("enabled") &&
+			"Yes".equalsIgnoreCase(vertex.getMetadata.getOrDefault("trackable", new java.util.HashMap[String, AnyRef]).asInstanceOf[java.util.Map[String, AnyRef]].getOrDefault("enabled", "").asInstanceOf[String])) {
+			vertex.getMetadata.put("contentType", "Course")
+		}
+
+		//TODO: Below fix to be reviewed when the fix for null to Stringify in ExternalStore.scala is implemented
+		if (vertex.getExternalData != null && vertex.getExternalData.containsKey("relational_metadata") && vertex.getExternalData.get("relational_metadata") == null) {
+			vertex.getExternalData.put("relational_metadata", "{}")
+		}
+		vertex
+	}
+
 	def getImportConfig(): ImportConfig = {
 		val requiredProps = Platform.getStringList("import.required_props", java.util.Arrays.asList("name", "code", "mimeType", "contentType", "artifactUrl", "framework")).asScala.toList
 		val validStages = Platform.getStringList("import.valid_stages", java.util.Arrays.asList("create", "upload", "review", "publish")).asScala.toList

content-api/content-actors/src/main/scala/org/sunbird/content/actors/EventActor.scala

@@ -6,7 +6,7 @@ import org.sunbird.common.dto.{Request, Response, ResponseHandler}
 import org.sunbird.common.exception.{ClientException, ResponseCode}
 import org.sunbird.content.util.ContentConstants
 import org.sunbird.graph.OntologyEngineContext
-import org.sunbird.graph.dac.model.{Node, Relation}
+import org.sunbird.graph.dac.model.{Node, Relation, Vertex}
 import org.sunbird.graph.nodes.DataNode
 
 import java.util
@@ -79,4 +79,13 @@ class EventActor @Inject()(implicit oec: OntologyEngineContext, ss: StorageServi
     node
   }
 
+  override def vertexDataModifier(vertex: Vertex): Vertex = {
+    if (vertex.getMetadata.containsKey("trackable") &&
+      vertex.getMetadata.getOrDefault("trackable", new java.util.HashMap[String, AnyRef]).asInstanceOf[java.util.Map[String, AnyRef]].containsKey("enabled") &&
+      "Yes".equalsIgnoreCase(vertex.getMetadata.getOrDefault("trackable", new java.util.HashMap[String, AnyRef]).asInstanceOf[java.util.Map[String, AnyRef]].getOrDefault("enabled", "").asInstanceOf[String])) {
+      vertex.getMetadata.put("contentType", "Event")
+    }
+    vertex
+  }
+
 }

ontology-engine/graph-common/src/main/java/org/sunbird/graph/common/enums/GraphDACParams.java

@@ -8,5 +8,5 @@ public enum GraphDACParams {
     MERGE, nodes, RETURN, keys,  rootNode, nodeId, WHERE, startNodeId, endNodeId, relationType,
     startNodeIds, endNodeIds, collectionId, collection, indexProperty, taskId, input, getTags,
     searchCriteria, paramMap, cypherQuery, paramValueMap, queryStatementMap, SYS_INTERNAL_LAST_UPDATED_ON,
-    CONSUMER_ID, consumerId, CHANNEL_ID, channel, APP_ID, appId, Nodes_Count, Relations_Count;
+    CONSUMER_ID, consumerId, CHANNEL_ID, channel, APP_ID, appId, Nodes_Count, Relations_Count, vertex;
 }

ontology-engine/graph-core_2.12/pom.xml

@@ -28,6 +28,18 @@
             <version>1.0-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.sunbird</groupId>
+            <artifactId>graph-dac</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>1.0-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
         <dependency>
             <groupId>org.sunbird</groupId>
             <artifactId>schema-validator</artifactId>

ontology-engine/graph-core_2.12/src/main/scala/org/sunbird/graph/GraphService.scala

@@ -12,6 +12,7 @@ import java.lang
 import scala.concurrent.{ExecutionContext, Future}
 
 class GraphService {
+
     implicit  val ec: ExecutionContext = ExecutionContext.global
     val isrRelativePathEnabled: lang.Boolean = Platform.getBoolean("cloudstorage.metadata.replace_absolute_path", false)
 

ontology-engine/graph-core_2.12/src/main/scala/org/sunbird/graph/JanusGraphService.scala

@@ -0,0 +1,75 @@
+package org.sunbird.graph
+
+import org.sunbird.common.Platform
+import org.sunbird.common.dto.{Property, Request, Response}
+import org.sunbird.graph.dac.model.{Vertex, VertexSubGraph}
+import org.sunbird.graph.util.CSPMetaUtil
+import org.sunbird.janus.service.operation.{EdgeOperations, SearchOperations, VertexOperations}
+
+import java.lang
+import scala.concurrent.{ExecutionContext, Future}
+class JanusGraphService {
+
+  private val VertexOperations = new VertexOperations()
+  private val EdgeOperations = new EdgeOperations()
+  private val SearchOperations = new SearchOperations()
+
+  implicit val ec: ExecutionContext = ExecutionContext.global
+  val isrRelativePathEnabled: lang.Boolean = Platform.getBoolean("cloudstorage.metadata.replace_absolute_path", false)
+
+
+  def addVertex(graphId: String, vertex: Vertex): Future[Vertex] = {
+    if (isrRelativePathEnabled) {
+      val metadata = CSPMetaUtil.updateRelativePath(vertex.getMetadata)
+      vertex.setMetadata(metadata)
+    }
+    VertexOperations.addVertex(graphId, vertex).map(resVertex => if (isrRelativePathEnabled) CSPMetaUtil.updateAbsolutePath(resVertex) else resVertex)
+
+  }
+
+  def createEdges(graphId: String, edgeMap: java.util.List[java.util.Map[String, AnyRef]]): Future[Response] = {
+    EdgeOperations.createEdges(graphId, edgeMap)
+  }
+
+  def removeEdges(graphId: String, edgeMap: java.util.List[java.util.Map[String, AnyRef]]): Future[Response] = {
+    EdgeOperations.removeEdges(graphId, edgeMap)
+  }
+
+  def getNodeByUniqueId(graphId: String, vertexId: String, getTags: Boolean, request: Request): Future[Vertex] = {
+    SearchOperations.getNodeByUniqueId(graphId, vertexId, getTags, request).map(vertex => if (isrRelativePathEnabled) CSPMetaUtil.updateAbsolutePath(vertex) else vertex)
+  }
+
+  def deleteNode(graphId: String, vertexId: String, request: Request): Future[java.lang.Boolean] = {
+    VertexOperations.deleteVertex(graphId, vertexId, request)
+  }
+
+  def upsertVertex(graphId: String, vertex: Vertex, request: Request): Future[Vertex] = {
+    if (isrRelativePathEnabled) {
+      val metadata = CSPMetaUtil.updateRelativePath(vertex.getMetadata)
+      vertex.setMetadata(metadata)
+    }
+    VertexOperations.upsertVertex(graphId, vertex, request)
+      .map(resVertex => if (isrRelativePathEnabled) CSPMetaUtil.updateAbsolutePath(resVertex) else resVertex)
+  }
+
+  def upsertRootNode(graphId: String, request: Request): Future[Vertex] = {
+    VertexOperations.upsertRootVertex(graphId, request)
+  }
+
+  def updateVertexes(graphId: String, identifiers: java.util.List[String], metadata: java.util.Map[String, AnyRef]): Future[java.util.Map[String, Vertex]] = {
+    val updatedMetadata = if (isrRelativePathEnabled) CSPMetaUtil.updateRelativePath(metadata) else metadata
+    VertexOperations.updateVertexes(graphId, identifiers, updatedMetadata)
+  }
+
+  def getNodeProperty(graphId: String, identifier: String, property: String): Future[Property] = {
+    SearchOperations.getNodeProperty(graphId, identifier, property).map(property => if (isrRelativePathEnabled) CSPMetaUtil.updateAbsolutePath(property) else property)
+  }
+
+  def checkCyclicLoop(graphId: String, endNodeId: String, startNodeId: String, relationType: String) = {
+    SearchOperations.checkCyclicLoop(graphId, endNodeId, relationType, startNodeId)
+  }
+
+  def getSubGraph(graphId: String, nodeId: String, depth: Int): Future[VertexSubGraph] = {
+    EdgeOperations.getSubGraph(graphId, nodeId, depth)
+  }
+}

ontology-engine/graph-core_2.12/src/main/scala/org/sunbird/graph/OntologyEngineContext.scala

@@ -10,11 +10,15 @@ class OntologyEngineContext {
     private val dialGraphDB = new DialGraphService
     private val hUtil = new HttpUtil
     private lazy val kfClient = new KafkaClient
-
+    private lazy val janusGraphDB = new JanusGraphService
     def graphService = {
         graphDB
     }
 
+    def janusGraphService = {
+        janusGraphDB
+    }
+
     def dialgraphService = {
         dialGraphDB
     }

ontology-engine/graph-core_2.12/src/main/scala/org/sunbird/graph/util/CSPMetaUtil.scala

@@ -1,13 +1,12 @@
 package org.sunbird.graph.util
 
 import java.util
-
 import org.apache.commons.collections4.MapUtils
 import org.apache.commons.lang3.StringUtils
 import org.slf4j.LoggerFactory
 import org.sunbird.common.dto.Property
 import org.sunbird.common.{JsonUtils, Platform}
-import org.sunbird.graph.dac.model.Node
+import org.sunbird.graph.dac.model.{Node, Vertex}
 
 import scala.collection.JavaConverters._
 import scala.collection.immutable.Map
@@ -43,6 +42,12 @@ object CSPMetaUtil {
     node
   }
 
+  def updateAbsolutePath(vertex: Vertex): Vertex = {
+    val metadata = updateAbsolutePath(vertex.getMetadata)
+    vertex.setMetadata(metadata)
+    vertex
+  }
+
   def updateAbsolutePath(nodes: java.util.List[Node]): java.util.List[Node] = {
     nodes.asScala.toList.map(node => {
       updateAbsolutePath(node)

ontology-engine/graph-dac-api/pom.xml

@@ -86,6 +86,21 @@
 			<version>1.17.6</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tinkerpop</groupId>
+			<artifactId>gremlin-driver</artifactId>
+			<version>3.7.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.janusgraph</groupId>
+			<artifactId>janusgraph-core</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.janusgraph</groupId>
+			<artifactId>janusgraph-inmemory</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>