Added changes to handle visibility Public only

assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala

@@ -12,6 +12,7 @@ import org.sunbird.graph.OntologyEngineContext
 import org.sunbird.graph.nodes.DataNode
 import org.sunbird.graph.utils.NodeUtil
 import org.sunbird.managers.QuestionManager
+import org.sunbird.utils.RequestUtil
 
 import scala.collection.JavaConverters
 import scala.concurrent.{ExecutionContext, Future}
@@ -37,11 +38,12 @@ class QuestionActor @Inject()(implicit oec: OntologyEngineContext) extends BaseA
         if (StringUtils.isBlank(visibility))
             throw new ClientException("ERR_QUESTION_CREATE", "Visibility is a mandatory parameter")
         visibility match {
-            case "Parent" => if (!request.getRequest.containsKey("parent"))
-                throw new ClientException("ERR_QUESTION_CREATE", "For visibility Parent, parent id is mandatory") else
-                request.getRequest.put("questionSet", List[java.util.Map[String, AnyRef]](Map("identifier" -> request.get("parent")).asJava).asJava)
+                //TODO: Enable support in future
+//            case "Parent" => if (!request.getRequest.containsKey("parent"))
+//                throw new ClientException("ERR_QUESTION_CREATE", "For visibility Parent, parent id is mandatory") else
+//                request.getRequest.put("questionSet", List[java.util.Map[String, AnyRef]](Map("identifier" -> request.get("parent")).asJava).asJava)
             case "Public" => if (request.getRequest.containsKey("parent")) throw new ClientException("ERR_QUESTION_CREATE", "For visibility Public, question can't have parent id")
-            case _ => throw new ClientException("ERR_QUESTION_CREATE", "Visibility should be one of [\"Parent\", \"Public\"]")
+            case _ => throw new ClientException("ERR_QUESTION_CREATE", "Visibility should be one of [\"Public\"]")
         }
         DataNode.create(request).map(node => {
             val response = ResponseHandler.OK
@@ -63,16 +65,20 @@ class QuestionActor @Inject()(implicit oec: OntologyEngineContext) extends BaseA
     }
 
     def update(request: Request): Future[Response] = {
+        RequestUtil.restrictProperties(request)
         request.getRequest.put("identifier", request.getContext.get("identifier"))
         DataNode.read(request).flatMap(node => {
-            request.getRequest.getOrDefault("visibility", "") match {
-                case "Public" => request.put("parent", null)
-                case "Parent" => if (!node.getMetadata.containsKey("parent") || !request.getRequest.containsKey("parent"))
-                    throw new ClientException("ERR_QUESTION_CREATE_FAILED", "For visibility Parent, parent id is mandatory")
-                    if(node.getMetadata.containsKey("questionSet")) throw new ClientException("ERR_QUESTION_CREATE_FAILED", "For visibility Parent, cannot pass questionSet metadata")
-                else request.getRequest.put("questionSet", List[java.util.Map[String, AnyRef]](Map("identifier" -> request.get("parent")).asJava).asJava)
-                case _ => request
-            }
+            //TODO: Remove commented when required
+//            request.getRequest.getOrDefault("visibility", "") match {
+//                case "Public" => request.put("parent", null)
+//                case "Parent" => {
+//                    if (!node.getMetadata.containsKey("parent") || !request.getRequest.containsKey("parent"))
+//                    throw new ClientException("ERR_QUESTION_CREATE_FAILED", "For visibility Parent, parent id is mandatory")
+//                    if(request.getRequest.containsKey("questionSet"))
+//                        throw new ClientException("ERR_QUESTION_CREATE_FAILED", "For visibility Parent, cannot pass questionSet metadata")
+//                    else request.getRequest.put("questionSet", List[java.util.Map[String, AnyRef]](Map("identifier" -> request.get("parent")).asJava).asJava)}
+//                case _ => request
+//            }
             DataNode.update(request).map(node => {
                 val response: Response = ResponseHandler.OK
                 response.putAll(Map("identifier" -> node.getIdentifier.replace(".img", ""), "versionKey" -> node.getMetadata.get("versionKey")).asJava)

assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionSetActor.scala

@@ -14,7 +14,7 @@ import org.sunbird.graph.dac.model.Relation
 import org.sunbird.graph.nodes.DataNode
 import org.sunbird.graph.utils.NodeUtil
 import org.sunbird.managers.QuestionManager
-import org.sunbird.utils.RequestUtil
+import org.sunbird.utils.{RequestUtil}
 
 import scala.collection.JavaConverters
 import scala.collection.JavaConverters._
@@ -45,11 +45,11 @@ class QuestionSetActor @Inject() (implicit oec: OntologyEngineContext) extends B
 		if (StringUtils.isBlank(visibility))
 			throw new ClientException("ERR_QUESTION_SET_CREATE", "Visibility is a mandatory parameter")
 		visibility match {
-			case "Parent" => if (!request.getRequest.containsKey("parent"))
-				throw new ClientException("ERR_QUESTION_SET_CREATE", "For visibility Parent, parent id is mandatory") else
-				request.getRequest.put("parent", List[java.util.Map[String, AnyRef]](Map("identifier" -> request.get("parent")).asJava).asJava)
+//			case "Parent" => if (!request.getRequest.containsKey("parent"))
+//				throw new ClientException("ERR_QUESTION_SET_CREATE", "For visibility Parent, parent id is mandatory") else
+//				request.getRequest.put("parent", List[java.util.Map[String, AnyRef]](Map("identifier" -> request.get("parent")).asJava).asJava)
 			case "Public" => if (request.getRequest.containsKey("parent")) throw new ClientException("ERR_QUESTION_SET_CREATE", "For visibility Public, question can't have parent id")
-			case _ => throw new ClientException("ERR_QUESTION_SET_CREATE", "Visibility should be one of [\"Parent\", \"Public\"]")
+			case _ => throw new ClientException("ERR_QUESTION_SET_CREATE", "Visibility should be one of [\"Public\"]")
 		}
 		DataNode.create(request).map(node => {
 			val response = ResponseHandler.OK
@@ -73,14 +73,15 @@ class QuestionSetActor @Inject() (implicit oec: OntologyEngineContext) extends B
 	def update(request: Request): Future[Response] = {
 		RequestUtil.restrictProperties(request)
 		request.getRequest.put("identifier", request.getContext.get("identifier"))
-		DataNode.read(request).flatMap(node => {
-			request.getRequest.getOrDefault("visibility", "") match {
-				case "Public" => request.put("parent", null)
-				case "Parent" => if (!node.getMetadata.containsKey("parent") || !request.getRequest.containsKey("parent"))
-					throw new ClientException("ERR_QUESTION_CREATE_FAILED", "For visibility Parent, parent id is mandatory")
-				else request.getRequest.put("parent", List[java.util.Map[String, AnyRef]](Map("identifier" -> request.get("parent")).asJava).asJava)
-				case _ => request
-			}
+        //TODO: Remove commented when required
+        DataNode.read(request).flatMap(node => {
+//              request.getRequest.getOrDefault("visibility", "") match {
+//				case "Public" => request.put("parent", null)
+//				case "Parent" => if (!node.getMetadata.containsKey("parent") || !request.getRequest.containsKey("parent"))
+//					throw new ClientException("ERR_QUESTION_CREATE_FAILED", "For visibility Parent, parent id is mandatory")
+//				else request.getRequest.put("parent", List[java.util.Map[String, AnyRef]](Map("identifier" -> request.get("parent")).asJava).asJava)
+//				case _ => request
+//			}
 			DataNode.update(request).map(node => {
 				val response: Response = ResponseHandler.OK
 				response.putAll(Map("identifier" -> node.getIdentifier.replace(".img", ""), "versionKey" -> node.getMetadata.get("versionKey")).asJava)
@@ -184,6 +185,7 @@ class QuestionSetActor @Inject() (implicit oec: OntologyEngineContext) extends B
 	}
 
 	def updateHierarchy(request: Request): Future[Response] = {
+
 		Future(ResponseHandler.OK())
 	}
 
@@ -191,5 +193,13 @@ class QuestionSetActor @Inject() (implicit oec: OntologyEngineContext) extends B
 		Future(ResponseHandler.OK())
 	}
 
+//	def processUpdateHierarchyRequest(request: Request): (String, Map[String,AnyRef], Map[String, AnyRef]) =  {
+//		val nodesModified: Map[String, AnyRef] = request.getRequest.get("nodesModifier").asInstanceOf[util.Map[String, AnyRef]].asScala.toMap
+//		val hierarchy:Map[String, AnyRef]  = request.getRequest.get("hierarchy").asInstanceOf[util.Map[String, AnyRef]].asScala.toMap
+//		if (StringUtils.isEmpty(rootId) && StringUtils.isAllBlank(rootId) || StringUtils.contains(rootId, ".img"))
+//			throw new ClientException("ERR_INVALID_ROOT_ID", "Please Provide Valid Root Node Identifier")
+//		(rootId, nodesModified, hierarchy)
+//	}
+
 
 }

assessment-api/assessment-service/app/controllers/v4/QuestionController.scala

@@ -29,7 +29,7 @@ class QuestionController @Inject()(@Named(ActorNames.QUESTION_ACTOR) questionAct
 		val headers = commonHeaders()
 		val question = new java.util.HashMap().asInstanceOf[java.util.Map[String, Object]]
 		question.putAll(headers)
-		question.putAll(Map("identifier" -> identifier, "fields" -> fields.getOrElse(""), "mode" -> mode).asJava)
+		question.putAll(Map("identifier" -> identifier, "fields" -> fields.getOrElse(""), "mode" -> mode.getOrElse("read")).asJava)
 		val questionRequest = getRequest(question, headers, QuestionOperations.readQuestion.toString)
 		setRequestContext(questionRequest, version, objectType, schemaName)
 		getResult(ApiId.READ_QUESTION, questionActor, questionRequest)

assessment-api/assessment-service/app/controllers/v4/QuestionSetController.scala

@@ -29,7 +29,7 @@ class QuestionSetController @Inject()(@Named(ActorNames.QUESTION_SET_ACTOR) ques
 		val headers = commonHeaders()
 		val questionSet = new java.util.HashMap().asInstanceOf[java.util.Map[String, Object]]
 		questionSet.putAll(headers)
-		questionSet.putAll(Map("identifier" -> identifier, "fields" -> fields.getOrElse(""), "mode" -> mode).asJava)
+		questionSet.putAll(Map("identifier" -> identifier, "fields" -> fields.getOrElse(""), "mode" -> mode.getOrElse("read")).asJava)
 		val questionSetRequest = getRequest(questionSet, headers, QuestionSetOperations.readQuestionSet.toString)
 		setRequestContext(questionSetRequest, version, objectType, schemaName)
 		getResult(ApiId.READ_QUESTION_SET, questionSetActor, questionSetRequest)

schemas/question/1.0/config.json

@@ -7,6 +7,13 @@
       "objects": ["QuestionSet", "QuestionSetImage"]
     }
   },
+  "restrictProps": {
+    "create" : [
+    ],
+    "update" : [
+      "visibility"
+    ]
+  },
   "version": "enable",
   "versionCheckMode": "ON",
   "frameworkCategories": [],

schemas/questionset/1.0/config.json

@@ -22,7 +22,7 @@
       "children"
     ],
     "update" : [
-      "children"
+      "children", "visibility"
     ]
   },
   "external": {