Content bug fix

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

@@ -3,6 +3,7 @@ package org.sunbird.actors
 import org.apache.commons.lang3.StringUtils
 import org.sunbird.`object`.importer.{ImportConfig, ImportManager}
 import org.sunbird.actor.core.BaseActor
+import org.sunbird.cache.impl.RedisCache
 import org.sunbird.common.dto.{Request, Response, ResponseHandler}
 import org.sunbird.common.{DateUtils, Platform}
 import org.sunbird.graph.OntologyEngineContext
@@ -92,6 +93,7 @@ class QuestionActor @Inject()(implicit oec: OntologyEngineContext) extends BaseA
 	def systemUpdate(request: Request): Future[Response] = {
 		val identifier = request.getContext.get("identifier").asInstanceOf[String]
 		RequestUtil.validateRequest(request)
+		RedisCache.delete(identifier)
 		val readReq = new Request(request)
 		val identifiers = new util.ArrayList[String](){{
 			add(identifier)

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

@@ -1,9 +1,9 @@
 package org.sunbird.actors
 
 import java.util
-
 import javax.inject.Inject
 import org.apache.commons.collections4.CollectionUtils
+import org.apache.commons.lang3.StringUtils
 import org.sunbird.`object`.importer.{ImportConfig, ImportManager}
 import org.sunbird.actor.core.BaseActor
 import org.sunbird.cache.impl.RedisCache
@@ -12,10 +12,12 @@ import org.sunbird.common.dto.{Request, Response, ResponseHandler}
 import org.sunbird.graph.OntologyEngineContext
 import org.sunbird.graph.nodes.DataNode
 import org.sunbird.graph.dac.model.Node
+import org.sunbird.graph.utils.NodeUtil
 import org.sunbird.managers.HierarchyManager.hierarchyPrefix
 import org.sunbird.managers.{AssessmentManager, HierarchyManager, UpdateHierarchyManager}
 import org.sunbird.utils.RequestUtil
 
+import scala.collection.JavaConverters
 import scala.collection.JavaConverters._
 import scala.concurrent.{ExecutionContext, Future}
 
@@ -40,9 +42,21 @@ class QuestionSetActor @Inject()(implicit oec: OntologyEngineContext) extends Ba
 		case "rejectQuestionSet" => reject(request)
 		case "importQuestionSet" => importQuestionSet(request)
 		case "systemUpdateQuestionSet" => systemUpdate(request)
+		case "listQuestionSet" => listQuestionSet(request)
 		case _ => ERROR(request.getOperation)
 	}
 
+	def listQuestionSet(request: Request): Future[Response] = {
+		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 => {
+				NodeUtil.serialize(node, fields, node.getObjectType.toLowerCase.replace("Image", ""), request.getContext.get("version").asInstanceOf[String])
+			}).asJava
+			ResponseHandler.OK.put("questionSets", questionList).put("count", questionList.size)
+		})
+	}
 	def update(request: Request): Future[Response] = {
 		RequestUtil.restrictProperties(request)
 		request.getRequest.put("identifier", request.getContext.get("identifier"))
@@ -142,9 +156,11 @@ class QuestionSetActor @Inject()(implicit oec: OntologyEngineContext) extends Ba
 	def systemUpdate(request: Request): Future[Response] = {
 		val identifier = request.getContext.get("identifier").asInstanceOf[String]
 		RequestUtil.validateRequest(request)
-		if(Platform.getBoolean("questionset.cache.enable", false))
+		if(Platform.getBoolean("questionset.cache.enable", false)) {
 			RedisCache.delete(hierarchyPrefix + identifier)
+		}
 
+		RedisCache.delete(identifier)
 		val readReq = new Request(request)
 		val identifiers = new util.ArrayList[String](){{
 			add(identifier)

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

@@ -2,12 +2,20 @@ package controllers.v4
 
 import akka.actor.{ActorRef, ActorSystem}
 import controllers.BaseController
+import org.apache.commons.lang3.StringUtils
+import org.sunbird.common.dto.{Request, Response, ResponseHandler}
+import org.sunbird.graph.nodes.DataNode
+import org.sunbird.graph.utils.NodeUtil
+import org.sunbird.utils.RequestUtil
+
 import javax.inject.{Inject, Named}
 import play.api.mvc.ControllerComponents
-import utils.{ActorNames, ApiId, QuestionSetOperations}
+import utils.{ActorNames, ApiId, QuestionOperations, QuestionSetOperations}
 
+import java.util
+import scala.collection.JavaConverters
 import scala.collection.JavaConverters._
-import scala.concurrent.ExecutionContext
+import scala.concurrent.{ExecutionContext, Future}
 
 class QuestionSetController @Inject()(@Named(ActorNames.QUESTION_SET_ACTOR) questionSetActor: ActorRef, cc: ControllerComponents, actorSystem: ActorSystem)(implicit exec: ExecutionContext) extends BaseController(cc) {
 
@@ -25,6 +33,18 @@ class QuestionSetController @Inject()(@Named(ActorNames.QUESTION_SET_ACTOR) ques
 		getResult(ApiId.CREATE_QUESTION_SET, questionSetActor, questionSetRequest)
 	}
 
+	def list(fields: Option[String]) = Action.async { implicit request =>
+		val headers = commonHeaders()
+		val body = requestBody()
+		val question = body.getOrDefault("search", new java.util.HashMap()).asInstanceOf[java.util.Map[String, Object]];
+		question.putAll(headers)
+		question.put("fields", fields.getOrElse(""))
+		val questionSetRequest = getRequest(question, headers, QuestionSetOperations.listQuestionSet.toString)
+		questionSetRequest.put("identifiers", questionSetRequest.get("identifier"))
+		setRequestContext(questionSetRequest, version, objectType, schemaName)
+		getResult(ApiId.LIST_QUESTIONSET, questionSetActor, questionSetRequest)
+	}
+
 	def read(identifier: String, mode: Option[String], fields: Option[String]) = Action.async { implicit request =>
 		val headers = commonHeaders()
 		val questionSet = new java.util.HashMap().asInstanceOf[java.util.Map[String, Object]]

assessment-api/assessment-service/app/utils/ApiId.scala

@@ -24,6 +24,7 @@ object ApiId {
 	val SYSTEM_UPDATE_QUESTION = "api.question.system.update"
 	val LIST_QUESTIONS = "api.questions.list"
 	val REJECT_QUESTION = "api.question.reject"
+	val LIST_QUESTIONSET = "api.questionset.list"
 
 	//QuestionSet APIs
 	val CREATE_QUESTION_SET = "api.questionset.create"

assessment-api/assessment-service/app/utils/QuestionSetOperations.scala

@@ -3,5 +3,5 @@ package utils
 object QuestionSetOperations extends Enumeration {
 	val createQuestionSet, readQuestionSet, readPrivateQuestionSet, updateQuestionSet, reviewQuestionSet, publishQuestionSet,
 	retireQuestionSet, addQuestion, removeQuestion, updateHierarchyQuestion, readHierarchyQuestion,
-	rejectQuestionSet, importQuestionSet, systemUpdateQuestionSet = Value
+	rejectQuestionSet, importQuestionSet, listQuestionSet,systemUpdateQuestionSet = Value
 }

assessment-api/assessment-service/conf/routes

@@ -38,4 +38,5 @@ PATCH     /questionset/v4/hierarchy/update           controllers.v4.QuestionSetC
 GET       /questionset/v4/hierarchy/:identifier      controllers.v4.QuestionSetController.getHierarchy(identifier:String, mode:Option[String])
 POST      /questionset/v4/reject/:identifier         controllers.v4.QuestionSetController.reject(identifier:String)
 POST     /questionset/v4/import                      controllers.v4.QuestionSetController.importQuestionSet()
-PATCH     /questionset/v4/system/update/:identifier  controllers.v4.QuestionSetController.systemUpdate(identifier:String)
+PATCH     /questionset/v4/system/update/:identifier  controllers.v4.QuestionSetController.systemUpdate(identifier:String)
+POST      /questionset/v4/list                       controllers.v4.QuestionSetController.list(fields:Option[String])

build/assessment-service/Dockerfile

@@ -9,6 +9,6 @@ USER sunbird
 COPY ./assessment-api/assessment-service/target/assessment-service-1.0-SNAPSHOT-dist.zip /home/sunbird/
 RUN unzip /home/sunbird/assessment-service-1.0-SNAPSHOT-dist.zip -d /home/sunbird/
 RUN rm /home/sunbird/assessment-service-1.0-SNAPSHOT-dist.zip
-COPY --chown=sunbird ./schemas /home/sunbird/assessment-service-1.0-SNAPSHOT/schemas
+COPY --chown=sunbird ./schema/schemas /home/sunbird/assessment-service-1.0-SNAPSHOT/schemas
 WORKDIR /home/sunbird/
 CMD java -XX:+PrintFlagsFinal $JAVA_OPTIONS -cp '/home/sunbird/assessment-service-1.0-SNAPSHOT/lib/*' -Dconfig.file=/home/sunbird/assessment-service-1.0-SNAPSHOT/config/application.conf  -Dlogger.file=/home/sunbird/assessment-service-1.0-SNAPSHOT/config/logback.xml play.core.server.ProdServerStart /home/sunbird/assessment-service-1.0-SNAPSHOT

build/assessment-service/Jenkinsfile

@@ -27,6 +27,13 @@ node('build-slave') {
                     print "Environment will be : ${env.NODE_ENV}"
                     sh 'mvn clean install -DskipTests=true '
                 }
+                stage('schema-pull') {
+
+                dir("${env.WORKSPACE}/schema") {
+                checkout scm: [$class: 'GitSCM', branches: [[name: schema_repo_branch]], extensions: [[$class: 'CloneOption', depth: 1, noTags: true, reference: '', shallow: true]], userRemoteConfigs: [[credentialsId: schema_repo_credentials, url: schema_repo_url]]]
+
+                }
+                }
 
                 stage('Package') {
                     dir('assessment-api') {

build/content-service/Dockerfile

@@ -9,6 +9,6 @@ USER sunbird
 COPY ./content-api/content-service/target/content-service-1.0-SNAPSHOT-dist.zip /home/sunbird/
 RUN unzip /home/sunbird/content-service-1.0-SNAPSHOT-dist.zip -d /home/sunbird/
 RUN rm /home/sunbird/content-service-1.0-SNAPSHOT-dist.zip
-COPY --chown=sunbird ./schemas /home/sunbird/content-service-1.0-SNAPSHOT/schemas
+COPY --chown=sunbird ./schema/schemas /home/sunbird/content-service-1.0-SNAPSHOT/schemas
 WORKDIR /home/sunbird/
 CMD java -XX:+PrintFlagsFinal $JAVA_OPTIONS -cp '/home/sunbird/content-service-1.0-SNAPSHOT/lib/*' -Dconfig.file=/home/sunbird/content-service-1.0-SNAPSHOT/config/application.conf -Dlogger.file=/home/sunbird/content-service-1.0-SNAPSHOT/config/logback.xml play.core.server.ProdServerStart /home/sunbird/content-service-1.0-SNAPSHOT

build/content-service/Jenkinsfile

@@ -28,7 +28,13 @@ node('build-slave') {
                     sh 'mvn clean install -DskipTests=true '
 
                 }
+                stage('schema-pull') {
 
+                dir("${env.WORKSPACE}/schema") {
+                checkout scm: [$class: 'GitSCM', branches: [[name: schema_repo_branch]], extensions: [[$class: 'CloneOption', depth: 1, noTags: true, reference: '', shallow: true]], userRemoteConfigs: [[credentialsId: schema_repo_credentials, url: schema_repo_url]]]
+
+                }
+                }
                 stage('Package') {
                     dir('content-api') {
                         sh 'mvn play2:dist -pl content-service'
@@ -47,4 +53,4 @@ node('build-slave') {
         currentBuild.result = "FAILURE"
         throw err
     }
-}
+}

build/search-service/Dockerfile

@@ -9,6 +9,6 @@ USER sunbird
 COPY ./search-api/search-service/target/search-service-1.0-SNAPSHOT-dist.zip /home/sunbird/
 RUN unzip /home/sunbird/search-service-1.0-SNAPSHOT-dist.zip -d /home/sunbird/
 RUN rm /home/sunbird/search-service-1.0-SNAPSHOT-dist.zip
-COPY --chown=sunbird ./schemas /home/sunbird/search-service-1.0-SNAPSHOT/schemas
+COPY --chown=sunbird ./schema/schemas /home/sunbird/search-service-1.0-SNAPSHOT/schemas
 WORKDIR /home/sunbird/
 CMD java -XX:+PrintFlagsFinal $JAVA_OPTIONS  -cp '/home/sunbird/search-service-1.0-SNAPSHOT/lib/*' -Dconfig.file=/home/sunbird/search-service-1.0-SNAPSHOT/config/application.conf -Dlogger.file=/home/sunbird/search-service-1.0-SNAPSHOT/config/logback.xml play.core.server.ProdServerStart /home/sunbird/search-service-1.0-SNAPSHOT

build/search-service/Jenkinsfile

@@ -28,6 +28,13 @@ node('build-slave') {
                     sh 'mvn clean install -DskipTests=true '
 
                 }
+                stage('schema-pull') {
+
+                dir("${env.WORKSPACE}/schema") {
+                checkout scm: [$class: 'GitSCM', branches: [[name: schema_repo_branch]], extensions: [[$class: 'CloneOption', depth: 1, noTags: true, reference: '', shallow: true]], userRemoteConfigs: [[credentialsId: schema_repo_credentials, url: schema_repo_url]]]
+
+                }
+                }
 
                 stage('Package') {
                     dir('search-api') {

build/taxonomy-service/Dockerfile

@@ -9,6 +9,6 @@ USER sunbird
 COPY ./taxonomy-api/taxonomy-service/target/taxonomy-service-1.0-SNAPSHOT-dist.zip /home/sunbird/
 RUN unzip /home/sunbird/taxonomy-service-1.0-SNAPSHOT-dist.zip -d /home/sunbird/
 RUN rm /home/sunbird/taxonomy-service-1.0-SNAPSHOT-dist.zip
-COPY --chown=sunbird ./schemas /home/sunbird/taxonomy-service-1.0-SNAPSHOT/schemas
+COPY --chown=sunbird ./schema/schemas /home/sunbird/taxonomy-service-1.0-SNAPSHOT/schemas
 WORKDIR /home/sunbird/
 CMD java -XX:+PrintFlagsFinal $JAVA_OPTIONS -cp '/home/sunbird/taxonomy-service-1.0-SNAPSHOT/lib/*' -Dconfig.file=/home/sunbird/taxonomy-service-1.0-SNAPSHOT/config/application.conf -Dlogger.file=/home/sunbird/taxonomy-service-1.0-SNAPSHOT/config/logback.xml play.core.server.ProdServerStart /home/sunbird/taxonomy-service-1.0-SNAPSHOT

build/taxonomy-service/Jenkinsfile

@@ -28,6 +28,13 @@ node('build-slave') {
                     sh 'mvn clean install -DskipTests=true '
 
                 }
+                stage('schema-pull') {
+
+                dir("${env.WORKSPACE}/schema") {
+                checkout scm: [$class: 'GitSCM', branches: [[name: schema_repo_branch]], extensions: [[$class: 'CloneOption', depth: 1, noTags: true, reference: '', shallow: true]], userRemoteConfigs: [[credentialsId: schema_repo_credentials, url: schema_repo_url]]]
+
+                }
+                }
 
                 stage('Package') {
                     dir('taxonomy-api') {