Release 6.0.0 s

assessment-api/assessment-actors/src/main/scala/org/sunbird/utils/AssessmentContants.scala

@@ -45,4 +45,35 @@ object AssessmentConstants {
   val PRE_CONDITION: String = "preCondition"
   val SOURCE: String = "source"
   val PRE_CONDITION_VAR : String = "var"
+  val ASSESSMENTS = "assessments"
+  val QUESTION_SET_TOKEN = "questionSetToken"
+  val QUESTION_LIST = "questionList"
+  val QUESTION_LIST_EDITOR_URL = "question.list.search.editor.url"
+  val QUESTIONS = "questions"
+  val CORRECT_RESPONSE = "correctResponse"
+  val EVENTS = "events"
+  val EDATA = "edata"
+  val ITEM = "item"
+  val ID = "id"
+  val RESPONSE1 = "response1"
+  val CARDINALITY = "cardinality"
+  val MAX_SCORE = "maxScore"
+  val MULTIPLE = "multiple"
+  val EDITOR_STATE = "editorState"
+  val RESPONSE_DECLARATION = "responseDeclaration"
+  val PASS = "pass"
+  val YES = "Yes"
+  val NO = "No"
+  val RESVALUES = "resvalues"
+  val PARAMS = "params"
+  val SCORE = "score"
+  val VALUE = "value"
+  val MAPPING = "mapping"
+  val RESPONSE = "response"
+  val OUTCOMES = "outcomes"
+  val OPTIONS = "options"
+  val EVAL: String = "evalMode"
+  val SERVER: String = "server"
+  val FLOWER_BRACKETS: String = "{}"
+
 }

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

@@ -1,16 +1,18 @@
 package org.sunbird.v5.actors
 
+import com.fasterxml.jackson.databind.ObjectMapper
 import org.apache.commons.lang3.StringUtils
 import org.sunbird.`object`.importer.{ImportConfig, ImportManager}
 import org.sunbird.actor.core.BaseActor
 import org.sunbird.common.dto.{Request, Response, ResponseHandler}
-import org.sunbird.common.exception.ClientException
+import org.sunbird.common.exception.{ClientException, ServerException}
 import org.sunbird.common.{DateUtils, Platform}
 import org.sunbird.graph.OntologyEngineContext
 import org.sunbird.graph.nodes.DataNode
 import org.sunbird.graph.schema.DefinitionNode
+import org.sunbird.graph.utils.NodeUtil
 import org.sunbird.managers.CopyManager
-import org.sunbird.utils.{AssessmentErrorCodes, RequestUtil}
+import org.sunbird.utils.{AssessmentConstants, AssessmentErrorCodes, RequestUtil}
 import org.sunbird.v5.managers.AssessmentV5Manager
 
 import java.util
@@ -25,7 +27,8 @@ class QuestionActor @Inject()(implicit oec: OntologyEngineContext) extends BaseA
 
   private lazy val importConfig = getImportConfig()
   private lazy val importMgr = new ImportManager(importConfig)
-  val defaultVersion = Platform.config.getNumber("v5_default_qumlVersion")
+  val defaultVersion:String = Platform.config.getNumber("v5_default_qumlVersion").toString
+  private val mapper = new ObjectMapper()
 
   override def onReceive(request: Request): Future[Response] = request.getOperation match {
     case "createQuestion" => AssessmentV5Manager.create(request)
@@ -48,6 +51,16 @@ class QuestionActor @Inject()(implicit oec: OntologyEngineContext) extends BaseA
     val extPropNameList:util.List[String] = DefinitionNode.getExternalProps(request.getContext.get("graph_id").asInstanceOf[String], request.getContext.get("version").asInstanceOf[String], request.getContext.get("schemaName").asInstanceOf[String]).asJava
     request.getRequest.put("fields", extPropNameList)
     DataNode.read(request).map(node => {
+      val serverEvaluable = node.getMetadata.get(AssessmentConstants.EVAL)
+      val data = serverEvaluable
+      if (data != null && data == AssessmentConstants.SERVER && !StringUtils.equals(request.getOrDefault("isEditor", "").asInstanceOf[String], "true")) {
+        val hideEditorResponse = AssessmentV5Manager.hideEditorStateAns(node)
+        if (StringUtils.isNotEmpty(hideEditorResponse))
+          node.getMetadata.put(AssessmentConstants.EDITOR_STATE, hideEditorResponse)
+        val hideCorrectAns = AssessmentV5Manager.hideCorrectResponse(node)
+        if (StringUtils.isNotEmpty(hideCorrectAns))
+          node.getMetadata.put(AssessmentConstants.RESPONSE_DECLARATION, hideCorrectAns)
+      }
       if (StringUtils.equalsIgnoreCase(node.getMetadata.get("visibility").asInstanceOf[String], "Private"))
         throw new ClientException(AssessmentErrorCodes.ERR_ACCESS_DENIED, s"Question visibility is private, hence access denied")
       ResponseHandler.OK.put("question", AssessmentV5Manager.getQuestionMetadata(node, fields, extPropNameList))
@@ -77,12 +90,46 @@ class QuestionActor @Inject()(implicit oec: OntologyEngineContext) extends BaseA
     RequestUtil.validateListRequest(request)
     val fields: util.List[String] = JavaConverters.seqAsJavaListConverter(request.get("fields").asInstanceOf[String].split(",").filter(field => StringUtils.isNotBlank(field) && !StringUtils.equalsIgnoreCase(field, "null"))).asJava
     request.getRequest.put("fields", fields)
-    DataNode.search(request).map(nodeList => {
-      val questionList = nodeList.map(node => AssessmentV5Manager.getQuestionMetadata(node, fields, List().asJava)).asJava
-      ResponseHandler.OK.put("questions", questionList).put("count", questionList.size)
+    val extPropNameList: util.List[String] = DefinitionNode.getExternalProps(request.getContext.get("graph_id").asInstanceOf[String], request.getContext.get("version").asInstanceOf[String], request.getContext.get("schemaName").asInstanceOf[String]).asJava
+    request.getRequest.put("extPropNameList", extPropNameList)
+
+    DataNode.search(request).flatMap(nodeList => {
+      // Use map to process each node and return a Future[util.Map[String, AnyRef]]
+      val processedNodes: List[Future[util.Map[String, AnyRef]]] = nodeList.map(node => {
+        val serverEvaluable = node.getMetadata.get(AssessmentConstants.EVAL)
+        val data = serverEvaluable
+        if (data  != null && data == AssessmentConstants.SERVER && !StringUtils.equals(request.get("isEditor").asInstanceOf[String], "true")) {
+          val hideEditorStateAns = AssessmentV5Manager.hideEditorStateAns(node)
+          if (StringUtils.isNotEmpty(hideEditorStateAns))
+            node.getMetadata.put(AssessmentConstants.EDITOR_STATE, hideEditorStateAns)
+          val hideCorrectResponse = AssessmentV5Manager.hideCorrectResponse(node)
+          if (StringUtils.isNotEmpty(hideCorrectResponse))
+            node.getMetadata.put(AssessmentConstants.RESPONSE_DECLARATION, hideCorrectResponse)
+        }
+
+        // Process each node and return a Future[util.Map[String, AnyRef]]
+        val result = NodeUtil.serialize(node, fields, node.getObjectType.toLowerCase.replace("Image", ""), request.getContext.get("version").asInstanceOf[String])
+        val questionMetadata = AssessmentV5Manager.getQuestionMetadata(node, fields, extPropNameList)
+        val responseMap: util.Map[String, AnyRef] = new util.HashMap[String, AnyRef]()
+        responseMap.put("question", questionMetadata)
+        Future.successful(responseMap)
+      })
+
+      // Use Future.sequence to collect the results into a List[util.Map[String, AnyRef]]
+      val collectedResponses: Future[List[util.Map[String, AnyRef]]] = Future.sequence(processedNodes)
+
+      collectedResponses.map { responses =>
+        val collectedResponsesJava = new java.util.ArrayList[util.Map[String, AnyRef]](responses.asJava)
+        ResponseHandler.OK.put("questions", collectedResponsesJava).put("count", responses.size)
+      }.recover {
+        case _ => // Handle the error case here
+          val errorMessage = "Failed to retrieve questions."
+          throw new ServerException("ERR_QUESTION_","" + errorMessage)
+      }
     })
   }
 
+
   def privateRead(request: Request)(implicit oec: OntologyEngineContext, ec: ExecutionContext): Future[Response] = {
     val fields: util.List[String] = JavaConverters.seqAsJavaListConverter(request.get("fields").asInstanceOf[String].split(",").filter(field => StringUtils.isNotBlank(field) && !StringUtils.equalsIgnoreCase(field, "null"))).asJava
     val extPropNameList:util.List[String] = DefinitionNode.getExternalProps(request.getContext.get("graph_id").asInstanceOf[String], request.getContext.get("version").asInstanceOf[String], request.getContext.get("schemaName").asInstanceOf[String]).asJava

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

@@ -17,19 +17,24 @@ import org.sunbird.graph.schema.{DefinitionNode, ObjectCategoryDefinition}
 import org.sunbird.graph.utils.NodeUtil
 import org.sunbird.managers.HierarchyManager.hierarchyPrefix
 import org.sunbird.managers.{CopyManager, HierarchyManager, UpdateHierarchyManager}
-import org.sunbird.utils.{AssessmentErrorCodes, RequestUtil}
+import org.sunbird.utils.{AssessmentConstants, AssessmentErrorCodes, HierarchyConstants, RequestUtil}
 import org.sunbird.v5.managers.AssessmentV5Manager
 
 import scala.collection.JavaConverters
 import scala.collection.JavaConverters._
 import scala.concurrent.{ExecutionContext, Future}
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.scala.DefaultScalaModule
+import com.fasterxml.jackson.databind.JsonNode
+
+import scala.collection.mutable
 
 class QuestionSetActor @Inject()(implicit oec: OntologyEngineContext) extends BaseActor {
 
   implicit val ec: ExecutionContext = getContext().dispatcher
   private lazy val importConfig = getImportConfig()
   private lazy val importMgr = new ImportManager(importConfig)
-  val defaultVersion = Platform.config.getNumber("v5_default_qumlVersion")
+  val defaultVersion:String = Platform.config.getNumber("v5_default_qumlVersion").toString
 
   override def onReceive(request: Request): Future[Response] = request.getOperation match {
     case "createQuestionSet" => AssessmentV5Manager.create(request)
@@ -49,6 +54,7 @@ class QuestionSetActor @Inject()(implicit oec: OntologyEngineContext) extends Ba
     case "copyQuestionSet" => copy(request)
     case "updateCommentQuestionSet" => updateComment(request)
     case "readCommentQuestionSet" => AssessmentV5Manager.readComment(request, "comments")
+    case "assessQuestionSet" => assessment(request)
     case _ => ERROR(request.getOperation)
   }
 
@@ -74,24 +80,55 @@ class QuestionSetActor @Inject()(implicit oec: OntologyEngineContext) extends Ba
   }
 
   def getHierarchy(request: Request)(implicit oec: OntologyEngineContext, ec: ExecutionContext): Future[Response] = {
-    HierarchyManager.getHierarchy(request).map(resp => {
-      if (StringUtils.equalsIgnoreCase(resp.getResponseCode.toString, "OK")) {
-        val hierarchyMap = resp.getResult.get("questionSet").asInstanceOf[util.Map[String, AnyRef]]
+  HierarchyManager.getHierarchy(request).map(resp => {
+    if (StringUtils.equalsIgnoreCase(resp.getResponseCode.toString, "OK")) {
+      val hierarchyMap = resp.getResult.get("questionSet").asInstanceOf[util.Map[String, AnyRef]]
+      val schemaVersion = hierarchyMap.getOrDefault("schemaVersion", "1.1").asInstanceOf[String]
+      val updateHierarchy = if (StringUtils.equalsIgnoreCase(schemaVersion, "1.0")) {
         val hStr: String = JsonUtils.serialize(hierarchyMap)
         val regex = """\"identifier\":\"(.*?)\.img\""""
         val pattern = regex.r
         val updateHStr = pattern.replaceAllIn(hStr, m => s""""identifier":"${m.group(1)}"""")
         val updatedHierarchyMap = JsonUtils.deserialize[util.Map[String, AnyRef]](updateHStr, classOf[util.Map[String, AnyRef]])
-        val schemaVersion = updatedHierarchyMap.getOrDefault("schemaVersion", "1.0").asInstanceOf[String]
-        val updateHierarchy = if (StringUtils.equalsIgnoreCase("1.0", schemaVersion)) AssessmentV5Manager.getTransformedHierarchy(updatedHierarchyMap) else {
-          updatedHierarchyMap
+        AssessmentV5Manager.getTransformedHierarchy(updatedHierarchyMap).asInstanceOf[mutable.Map[String, AnyRef]]
+      } else {
+        mutable.Map[String, AnyRef](hierarchyMap.asScala.toSeq: _*)
+      }
+      val mode = request.getOrDefault("mode", "").asInstanceOf[String]
+      val serverEvaluable = request.getOrDefault(HierarchyConstants.SERVEREVALUABLE, HierarchyConstants.FALSE).asInstanceOf[String]
+      if (!mode.equals("edit") && serverEvaluable.equalsIgnoreCase(HierarchyConstants.TRUE)) {
+        val childrenList = updateHierarchy.get(HierarchyConstants.CHILDREN).getOrElse(new util.ArrayList[java.util.Map[String, AnyRef]]())
+          .asInstanceOf[util.ArrayList[java.util.Map[String, AnyRef]]]
+        val updatedChildrenList = childrenList.asScala.map(child => {
+          val maxQuestions = Option(child.get(HierarchyConstants.MAXQUESTIONS)).map(_.asInstanceOf[Int]).getOrElse(0)
+          val shuffle = Option(child.get(HierarchyConstants.SHUFFLE)).map(_.asInstanceOf[Boolean]).getOrElse(false)
+          val randomizedChild = if (shuffle) HierarchyManager.shuffleQuestions(child) else child
+          val limitedChild = HierarchyManager.limitQuestions(randomizedChild, maxQuestions)
+
+          limitedChild
+        }).asJava
+        val serverEvaluable = updatedChildrenList.get(0).get(HierarchyConstants.EVAL)
+        if (serverEvaluable != null && serverEvaluable == HierarchyConstants.SERVER) {
+          request.put(HierarchyConstants.EVAL_MODE, HierarchyConstants.SERVER)
+        } else {
+          request.put(HierarchyConstants.EVAL_MODE, HierarchyConstants.CLIENT)
         }
-        resp.getResult.remove("questionSet")
-        resp.put("questionset", updateHierarchy)
-        resp
-      } else resp
-    })
-  }
+        val nestedChildrenIdentifiers = HierarchyManager.getNestedChildrenIdentifiers(updatedChildrenList)
+        val mergedMap: util.Map[String, String] = HierarchyManager.createMergedMap(request, nestedChildrenIdentifiers)
+        val userMapJson = JsonUtils.serialize(mergedMap)
+        val jwtToken = HierarchyManager.generateJwtToken(userMapJson)
+        updateHierarchy.put(HierarchyConstants.QUESTIONSETTOKEN, jwtToken)
+        updateHierarchy.put(HierarchyConstants.IDENTIFIER, request.get("contentID"))
+        updateHierarchy.put(HierarchyConstants.CHILDREN, updatedChildrenList)
+        resp.getResult.put("questionset", updateHierarchy.asJava)
+      }
+      resp
+   } else {
+      resp.getResult.remove("questionSet")
+      resp
+    }
+  })
+}
 
   @throws[Exception]
   def review(request: Request): Future[Response] = {
@@ -262,5 +299,12 @@ class QuestionSetActor @Inject()(implicit oec: OntologyEngineContext) extends Ba
       }
     }
   }
+  private def assessment(req: Request): Future[Response] = {
+    val assessments = req.getRequest.getOrDefault(AssessmentConstants.ASSESSMENTS, new util.ArrayList[util.Map[String, AnyRef]]).asInstanceOf[util.List[util.Map[String, AnyRef]]]
+    val quesDoIds = AssessmentV5Manager.validateAssessRequest(req)
+    val list: Response = AssessmentV5Manager.questionList(quesDoIds)
+    AssessmentV5Manager.calculateScore(list, assessments)
+    Future(ResponseHandler.OK.put(AssessmentConstants.QUESTIONS, req.getRequest))
+  }
 }