Merge branch 'release-3.6.0' into question-api

content-api/content-actors/src/test/scala/org/sunbird/content/actors/TestAssetActor.scala

@@ -30,12 +30,6 @@ class TestAssetActor extends BaseSpec with MockFactory {
     (graphDB.getNodeByUniqueId(_: String, _: String, _: Boolean, _: Request)).expects(*, *, *, *).returns(Future(getNode()))
     (graphDB.addNode(_: String, _: Node)).expects(*, *).returns(Future(node))
     (graphDB.readExternalProps(_: Request, _: List[String])).expects(*, *).returns(Future(new Response())).anyNumberOfTimes()
-    (graphDB.getNodeByUniqueIds(_: String, _: SearchCriteria)).expects(*, *).returns(Future(new util.ArrayList[Node]() {
-      {
-        add(getBoardNode())
-        add(getFrameworkNode())
-      }
-    }))
     implicit val ss = mock[StorageService]
     val request = getContentRequest()
     request.getContext.put("identifier","do_1234")

content-api/content-actors/src/test/scala/org/sunbird/content/actors/TestContentActor.scala

@@ -45,17 +45,16 @@ class TestContentActor extends BaseSpec with MockFactory {
         implicit val oec: OntologyEngineContext = mock[OntologyEngineContext]
         val graphDB = mock[GraphService]
         (oec.graphService _).expects().returns(graphDB).anyNumberOfTimes()
-//        (graphDB.readExternalProps(_: Request, _: List[String])).expects(*, *).returns(Future(new Response()))
+        // Uncomment below line if running individual file in local.
+        //(graphDB.readExternalProps(_: Request, _: List[String])).expects(*, *).returns(Future(new Response()))
         (graphDB.addNode(_: String, _: Node)).expects(*, *).returns(Future(getValidNode()))
         (graphDB.getNodeByUniqueIds(_: String, _: SearchCriteria)).expects(*, *).returns(Future(new util.ArrayList[Node]() {
             {
                 add(getBoardNode())
-                add(getFrameworkNode())
             }
         }))
         val request = getContentRequest()
-        request.getRequest.putAll( mapAsJavaMap(Map("channel"-> "in.ekstep","name" -> "New Content", "code" -> "1234", "mimeType"-> "application/vnd.ekstep.content-collection", "contentType" -> "Course", "primaryCategory" -> "Learning Resource", "channel" -> "in.ekstep",
-        "framework" ->  "NCF", "organisationBoardIds" -> new util.ArrayList[String](){{add("ncf_board_cbse")}})))
+        request.getRequest.putAll( mapAsJavaMap(Map("channel"-> "in.ekstep","name" -> "New Content", "code" -> "1234", "mimeType"-> "application/vnd.ekstep.content-collection", "contentType" -> "Course", "primaryCategory" -> "Learning Resource", "channel" -> "in.ekstep", "targetBoardIds" -> new util.ArrayList[String](){{add("ncf_board_cbse")}})))
         request.setOperation("createContent")
         val response = callActor(request, Props(new ContentActor()))
         assert(response.get("identifier") != null)
@@ -69,15 +68,8 @@ class TestContentActor extends BaseSpec with MockFactory {
         (oec.graphService _).expects().returns(graphDB).anyNumberOfTimes()
         (graphDB.getNodeByUniqueId(_: String, _: String, _: Boolean, _: Request)).expects(*, *, *, *).returns(Future(getDefinitionNode())).anyNumberOfTimes()
         (graphDB.addNode(_: String, _: Node)).expects(*, *).returns(Future(getValidNode()))
-        (graphDB.getNodeByUniqueIds(_: String, _: SearchCriteria)).expects(*, *).returns(Future(new util.ArrayList[Node]() {
-            {
-                add(getBoardNode())
-                add(getFrameworkNode())
-            }
-        }))
         val request = getContentRequest()
-        request.getRequest.putAll( mapAsJavaMap(Map("name" -> "New Content", "code" -> "1234", "mimeType"-> "application/vnd.ekstep.plugin-archive", "contentType" -> "Course", "primaryCategory" -> "Learning Resource", "channel" -> "in.ekstep",
-        "framework" ->  "NCF", "organisationBoardIds" -> new util.ArrayList[String](){{add("ncf_board_cbse")}})))
+        request.getRequest.putAll( mapAsJavaMap(Map("name" -> "New Content", "code" -> "1234", "mimeType"-> "application/vnd.ekstep.plugin-archive", "contentType" -> "Course", "primaryCategory" -> "Learning Resource", "channel" -> "in.ekstep", "framework"-> "NCF", "organisationBoardIds" -> new util.ArrayList[String](){{add("ncf_board_cbse")}})))
         request.setOperation("createContent")
         val response = callActor(request, Props(new ContentActor()))
         assert(response.get("identifier") != null)
@@ -311,12 +303,6 @@ class TestContentActor extends BaseSpec with MockFactory {
         (graphDB.getNodeByUniqueId(_: String, _: String, _: Boolean, _: Request)).expects(*, *, *, *).returns(Future(node)).anyNumberOfTimes()
         (graphDB.addNode(_: String, _: Node)).expects(*, *).returns(Future(node))
         (graphDB.readExternalProps(_: Request, _: List[String])).expects(*, *).returns(Future(new Response()))
-        (graphDB.getNodeByUniqueIds(_: String, _: SearchCriteria)).expects(*, *).returns(Future(new util.ArrayList[Node]() {
-            {
-                add(getBoardNode())
-                add(getFrameworkNode())
-            }
-        }))
         implicit val ss = mock[StorageService]
         val request = getContentRequest()
         request.getContext.put("identifier","do1234")

ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/FrameworkValidator.scala

@@ -17,13 +17,12 @@ import scala.concurrent.{ExecutionContext, Future}
 
 trait FrameworkValidator extends IDefinition {
 
-  val ORGANISATIONAL_FRAMEWORK_TERMS = List("framework", "boardIds", "gradeLevelIds", "subjectIds", "mediumIds", "topicsIds")
-  val TARGET_FRAMEWORK_TERMS = List("targetFWIds", "targetBoardIds", "targetGradeLevelIds", "targetSubjectIds", "targetMediumIds", "targetTopicIds")
-
   @throws[Exception]
   abstract override def validate(node: Node, operation: String, setDefaultValue: Boolean)(implicit ec: ExecutionContext, oec: OntologyEngineContext): Future[Node] = {
       val fwCategories: List[String] = schemaValidator.getConfig.getStringList("frameworkCategories").asScala.toList
-      validateAndSetMultiFrameworks(node).map(_ => {
+      val orgFwTerms: List[String] = schemaValidator.getConfig.getStringList("orgFrameworkTerms").asScala.toList
+      val targetFwTerms: List[String] = schemaValidator.getConfig.getStringList("targetFrameworkTerms").asScala.toList
+      validateAndSetMultiFrameworks(node, orgFwTerms, targetFwTerms).map(_ => {
         val framework: String = node.getMetadata.getOrDefault("framework", "").asInstanceOf[String]
         if (null != fwCategories && fwCategories.nonEmpty && framework.nonEmpty) {
           //prepare data for validation
@@ -59,10 +58,8 @@ trait FrameworkValidator extends IDefinition {
       }).flatMap(f => f)
   }
 
-  private def validateAndSetMultiFrameworks(node: Node)(implicit ec: ExecutionContext, oec: OntologyEngineContext): Future[Map[String, AnyRef]] = {
-    getValidatedTerms(node, ORGANISATIONAL_FRAMEWORK_TERMS).map(orgTermMap => {
-//      if (StringUtils.isNotBlank(node.getMetadata.get("organisationFrameworkId").asInstanceOf[String]))
-//        node.getMetadata.putIfAbsent("framework", node.getMetadata.get("organisationFrameworkId").asInstanceOf[String])
+  private def validateAndSetMultiFrameworks(node: Node, orgFwTerms: List[String], targetFwTerms: List[String])(implicit ec: ExecutionContext, oec: OntologyEngineContext): Future[Map[String, AnyRef]] = {
+    getValidatedTerms(node, orgFwTerms).map(orgTermMap => {
       val boardIds = getList("boardIds", node)
       if (CollectionUtils.isNotEmpty(boardIds))
         node.getMetadata.putIfAbsent("board", orgTermMap(boardIds.get(0)))
@@ -78,7 +75,7 @@ trait FrameworkValidator extends IDefinition {
       val topicIds = getList("topicsIds", node)
       if (CollectionUtils.isNotEmpty(topicIds))
         node.getMetadata.putIfAbsent("topics", topicIds.asScala.map(id => orgTermMap(id)).toList.asJava)
-      getValidatedTerms(node, TARGET_FRAMEWORK_TERMS)
+      getValidatedTerms(node, targetFwTerms)
     }).flatMap(f => f)
   }
 

schemas/asset/1.0/config.json

@@ -49,6 +49,8 @@
     "version": "disable",
     "versionCheckMode": "ON",
     "frameworkCategories": ["board","medium","subject","gradeLevel","difficultyLevel","topic", "subDomains", "subjectCodes"],
+    "orgFrameworkTerms": ["boardIds", "gradeLevelIds", "subjectIds", "mediumIds", "topicsIds"],
+    "targetFrameworkTerms": ["targetFWIds", "targetBoardIds", "targetGradeLevelIds", "targetSubjectIds", "targetMediumIds", "targetTopicIds"],
     "edge": {
         "properties": {
             "license": "License"

schemas/category/1.0/config.json

@@ -3,6 +3,8 @@
   "version": "disable",
   "versionCheckMode": "OFF",
   "frameworkCategories": [],
+  "orgFrameworkTerms": [],
+  "targetFrameworkTerms": [],
   "restrictProps": {
     "create" : [
       "status"

schemas/channel/1.0/config.json

@@ -9,6 +9,8 @@
   },
   "objectType": "Channel",
   "frameworkCategories": [],
+  "orgFrameworkTerms": [],
+  "targetFrameworkTerms": [],
   "relations": {
     "categories": {
       "type": "hasSequenceMember",

schemas/collection/1.0/config.json

@@ -43,6 +43,8 @@
   },
   "version": "enable",
   "frameworkCategories": ["board","medium","subject","gradeLevel","difficultyLevel","topic", "subDomains", "subjectCodes"],
+  "orgFrameworkTerms": ["boardIds", "gradeLevelIds", "subjectIds", "mediumIds", "topicsIds"],
+  "targetFrameworkTerms": ["targetFWIds", "targetBoardIds", "targetGradeLevelIds", "targetSubjectIds", "targetMediumIds", "targetTopicIds"],
   "edge": {
     "properties": {
       "license": "License"

schemas/content/1.0/config.json

@@ -73,6 +73,8 @@
     "version": "enable",
     "versionCheckMode": "ON",
     "frameworkCategories": ["board","medium","subject","gradeLevel","difficultyLevel","topic", "subDomains", "subjectCodes"],
+    "orgFrameworkTerms": ["boardIds", "gradeLevelIds", "subjectIds", "mediumIds", "topicsIds"],
+    "targetFrameworkTerms": ["targetFWIds", "targetBoardIds", "targetGradeLevelIds", "targetSubjectIds", "targetMediumIds", "targetTopicIds"],
     "edge": {
         "properties": {
             "license": "License"

schemas/itemset/2.0/config.json

@@ -10,5 +10,7 @@
     "version": "disable",
     "versionCheckMode": "OFF",
     "frameworkCategories": ["board","medium","subject","gradeLevel","topic"],
+    "orgFrameworkTerms": ["boardIds", "gradeLevelIds", "subjectIds", "mediumIds", "topicsIds"],
+    "targetFrameworkTerms": ["targetFWIds", "targetBoardIds", "targetGradeLevelIds", "targetSubjectIds", "targetMediumIds", "targetTopicIds"],
     "cacheEnabled": false
 }
\ No newline at end of file

schemas/license/1.0/config.json

@@ -3,6 +3,8 @@
   "version": "disable",
   "versionCheckMode": "OFF",
   "frameworkCategories": [],
+  "orgFrameworkTerms": [],
+  "targetFrameworkTerms": [],
   "edge": {
     "key": "name"
   },

schemas/objectcategory/1.0/config.json

@@ -3,6 +3,8 @@
   "version": "disable",
   "versionCheckMode": "OFF",
   "frameworkCategories": [],
+  "orgFrameworkTerms": [],
+  "targetFrameworkTerms": [],
   "restrictProps": {
     "create" : [
 

schemas/objectcategorydefinition/1.0/config.json

@@ -3,6 +3,8 @@
   "version": "disable",
   "versionCheckMode": "OFF",
   "frameworkCategories": [],
+  "orgFrameworkTerms": [],
+  "targetFrameworkTerms": [],
   "schema_restrict_api": true,
   "external": {
     "tableName": "category_definition_data",