Merge pull request #443 from krgauraw/3.4.0_SB-21064

SB-21064 feat: api enhancement for read api

taxonomy-api/taxonomy-actors/src/main/scala/org/sunbird/actors/ObjectCategoryDefinitionActor.scala

 package org.sunbird.actors
 
 import java.util
+import java.util.concurrent.CompletionException
 
 import javax.inject.Inject
 import org.apache.commons.lang3.StringUtils
 import org.sunbird.actor.core.BaseActor
 import org.sunbird.common.Slug
 import org.sunbird.common.dto.{Request, Response, ResponseHandler}
-import org.sunbird.common.exception.ClientException
+import org.sunbird.common.exception.{ClientException, ResourceNotFoundException}
 import org.sunbird.graph.OntologyEngineContext
 import org.sunbird.graph.nodes.DataNode
 import org.sunbird.graph.utils.NodeUtil
@@ -74,7 +75,18 @@ class ObjectCategoryDefinitionActor @Inject()(implicit oec: OntologyEngineContex
 		}
 		val fields: util.List[String] = JavaConverters.seqAsJavaListConverter(request.get(Constants.FIELDS).asInstanceOf[String].split(",").filter(field => StringUtils.isNotBlank(field) && !StringUtils.equalsIgnoreCase(field, "null"))).asJava
 		request.getRequest.put(Constants.FIELDS, fields)
-		DataNode.read(request).map(node => {
+		DataNode.read(request) recoverWith {
+			case e: ResourceNotFoundException => {
+				val id = request.get(Constants.IDENTIFIER).asInstanceOf[String]
+				println("ObjectCategoryDefinitionActor ::: read ::: node not found with id :" + id + " | Fetching node with _all")
+				if (StringUtils.equalsAnyIgnoreCase("POST", requestMethod) && !StringUtils.endsWithIgnoreCase(id, "_all")) {
+					request.put(Constants.IDENTIFIER, id.replace(id.substring(id.lastIndexOf("_") + 1), "all"))
+					DataNode.read(request)
+				} else
+					throw e
+			}
+			case ex: Throwable => throw ex
+		} map (node => {
 			val metadata: util.Map[String, AnyRef] = NodeUtil.serialize(node, fields, request.getContext.get(Constants.SCHEMA_NAME).asInstanceOf[String], request.getContext.get(Constants.VERSION).asInstanceOf[String])
 			val response: Response = ResponseHandler.OK
 			response.put(Constants.OBJECT_CATEGORY_DEFINITION, metadata)

taxonomy-api/taxonomy-actors/src/test/scala/org/sunbird/actors/ObjectCategoryDefinitionActorTest.scala

@@ -6,7 +6,7 @@ import akka.actor.Props
 import org.apache.commons.lang3.StringUtils
 import org.scalamock.scalatest.MockFactory
 import org.sunbird.common.dto.Request
-import org.sunbird.common.exception.ResponseCode
+import org.sunbird.common.exception.{ResourceNotFoundException, ResponseCode}
 import org.sunbird.graph.{GraphService, OntologyEngineContext}
 import org.sunbird.graph.dac.model.Node
 import org.sunbird.utils.Constants
@@ -104,6 +104,23 @@ class ObjectCategoryDefinitionActorTest extends BaseSpec with MockFactory {
 		assert("obj-cat:1234_content_all".equals(objectCategoryDefinition.getOrDefault("identifier", "")))
 	}
 
+	it should "return success response for readCategoryDefinition with post request for global definition" in {
+		implicit val oec: OntologyEngineContext = mock[OntologyEngineContext]
+		val graphDB = mock[GraphService]
+		(oec.graphService _).expects().returns(graphDB).anyNumberOfTimes()
+		val node = getCategoryDefinitionNode()
+		(graphDB.getNodeByUniqueId(_: String, _: String, _: Boolean, _: Request)).expects(*, "obj-cat:1234_content_test", *, *).returns(Future.failed(new ResourceNotFoundException("NODE_NOT_FOUND", "Node not found!")))
+		(graphDB.getNodeByUniqueId(_: String, _: String, _: Boolean, _: Request)).expects(*, "obj-cat:1234_content_all", *, *)
+		  .returns(Future(node)).anyNumberOfTimes()
+		val request = getCategoryDefintionRequest()
+		request.putAll(mapAsJavaMap(Map("fields" -> "", "REQ_METHOD" -> "POST", "objectType" -> "Content", "name" -> "1234", "channel" -> "test")))
+		request.setOperation(Constants.READ_OBJECT_CATEGORY_DEFINITION)
+		val response = callActor(request, Props(new ObjectCategoryDefinitionActor()))
+		val objectCategoryDefinition = response.getResult.getOrDefault("objectCategoryDefinition", new util.HashMap[String, AnyRef]()).asInstanceOf[util.Map[String, AnyRef]]
+		assert("successful".equals(response.getParams.getStatus))
+		assert("obj-cat:1234_content_all".equals(objectCategoryDefinition.getOrDefault("identifier", "")))
+	}
+
 	it should "return success response for updateCategoryDefinition for valid input" in {
 		implicit val oec: OntologyEngineContext = mock[OntologyEngineContext]
 		val graphDB = mock[GraphService]