Merge branch 'release-3.4.0' of...

Merge branch 'release-3.4.0' of https://github.com/project-sunbird/knowledge-platform into release-3.4.0

content-api/content-actors/src/main/scala/org/sunbird/channel/managers/ChannelManager.scala

@@ -18,6 +18,14 @@ import scala.collection.mutable.ListBuffer
 
 object ChannelManager {
 
+  val CONTENT_PRIMARY_CATERGORIES: util.List[String] = Platform.getStringList("channel.content.primarycategories", new util.ArrayList[String]())
+  val COLLECTION_PRIMARY_CATERGORIES: util.List[String] =  Platform.getStringList("channel.collection.primarycategories", new util.ArrayList[String]())
+  val ASSET_PRIMARY_CATERGORIES: util.List[String] =  Platform.getStringList("channel.asset.primarycategories", new util.ArrayList[String]())
+  val CONTENT_ADDITIONAL_CATERGORIES: util.List[String] =  Platform.getStringList("channel.content.additionalcategories", new util.ArrayList[String]())
+  val COLLECTION_ADDITIONAL_CATERGORIES: util.List[String] = Platform.getStringList("channel.collection.additionalcategories", new util.ArrayList[String]())
+  val ASSET_ADDITIONAL_CATERGORIES: util.List[String] =  Platform.getStringList("channel.asset.additionalcategories", new util.ArrayList[String]())
+
+
   def channelLicenseCache(request: Request, identifier: String): Unit = {
     if (request.getRequest.containsKey(ChannelConstants.DEFAULT_LICENSE))
       RedisCache.set(ChannelConstants.CHANNEL_LICENSE_CACHE_PREFIX + identifier + ChannelConstants.CHANNEL_LICENSE_CACHE_SUFFIX, request.getRequest.get(ChannelConstants.DEFAULT_LICENSE).asInstanceOf[String], 0)
@@ -81,14 +89,23 @@ object ChannelManager {
     }
   }
 
+//  def setPrimaryAndAdditionCategories(metadata: util.Map[String, AnyRef]): Unit = {
+//    val masterCategories = seqAsJavaList(getMasterCategoryList())
+//    metadata.putIfAbsent(ChannelConstants.CONTENT_PRIMARY_CATEGORIES, masterCategories)
+//    metadata.putIfAbsent(ChannelConstants.COLLECTION_PRIMARY_CATEGORIES, masterCategories)
+//    metadata.putIfAbsent(ChannelConstants.ASSET_PRIMARY_CATEGORIES, masterCategories)
+//    metadata.putIfAbsent(ChannelConstants.CONTENT_ADDITIONAL_CATEGORIES, masterCategories)
+//    metadata.putIfAbsent(ChannelConstants.COLLECTION_ADDITIONAL_CATEGORIES, masterCategories)
+//    metadata.putIfAbsent(ChannelConstants.ASSET_ADDITIONAL_CATEGORIES, masterCategories)
+//  }
+
   def setPrimaryAndAdditionCategories(metadata: util.Map[String, AnyRef]): Unit = {
-    val masterCategories = seqAsJavaList(getMasterCategoryList())
-    metadata.putIfAbsent(ChannelConstants.CONTENT_PRIMARY_CATEGORIES, masterCategories)
-    metadata.putIfAbsent(ChannelConstants.COLLECTION_PRIMARY_CATEGORIES, masterCategories)
-    metadata.putIfAbsent(ChannelConstants.ASSET_PRIMARY_CATEGORIES, masterCategories)
-    metadata.putIfAbsent(ChannelConstants.CONTENT_ADDITIONAL_CATEGORIES, masterCategories)
-    metadata.putIfAbsent(ChannelConstants.COLLECTION_ADDITIONAL_CATEGORIES, masterCategories)
-    metadata.putIfAbsent(ChannelConstants.ASSET_ADDITIONAL_CATEGORIES, masterCategories)
+    metadata.putIfAbsent(ChannelConstants.CONTENT_PRIMARY_CATEGORIES, CONTENT_PRIMARY_CATERGORIES)
+    metadata.putIfAbsent(ChannelConstants.COLLECTION_PRIMARY_CATEGORIES, COLLECTION_PRIMARY_CATERGORIES)
+    metadata.putIfAbsent(ChannelConstants.ASSET_PRIMARY_CATEGORIES, ASSET_PRIMARY_CATERGORIES)
+    metadata.putIfAbsent(ChannelConstants.CONTENT_ADDITIONAL_CATEGORIES, CONTENT_ADDITIONAL_CATERGORIES)
+    metadata.putIfAbsent(ChannelConstants.COLLECTION_ADDITIONAL_CATEGORIES, COLLECTION_ADDITIONAL_CATERGORIES)
+    metadata.putIfAbsent(ChannelConstants.ASSET_ADDITIONAL_CATEGORIES, ASSET_ADDITIONAL_CATERGORIES)
   }
 
   def getMasterCategoryList(): List[String] = {

content-api/content-service/conf/application.conf

@@ -644,9 +644,21 @@ mimeTypeToPrimaryCategory {
 }
 
 #Default objectCategory mapping for channel
-channel.content.primarycategories=["Explanation Content", "Learning Resource", "Practice Question Set", "eTextbook", "Teacher Resource", "Course Assessment"]
-channel.collection.primarycategories=["Course", "Digital Textbook", "Content Playlist"]
-channel.asset.primarycategories=["Asset"]
+
+channel {
+  content{
+    primarycategories=["Course Assessment", "eTextbook", "Explanation Content", "Learning Resource", "Practice Question Set", "Teacher Resource"]
+    additionalcategories=["Classroom Teaching Video", "Concept Map", "Curiosity Question Set", "Experiential Resource", "Explanation Video", "Focus Spot", "Learning Outcome Definition", "Lesson Plan", "Marking Scheme Rubric", "Pedagogy Flow", "Previous Board Exam Papers", "TV Lesson", "Textbook"]
+  }
+  collection {
+    primarycategories=["Content Playlist", "Course", "Digital Textbook"]
+    additionalcategories=["Textbook", "Lesson Plan"]
+  }
+  asset {
+    primarycategories=["Asset", "CertAsset", "Certificate Template"]
+    additionalcategories=[]
+  }
+}
 
 #config for primary categories mapping for collection units
 collection.primarycategories.mapping.enabled=true

ontology-engine/graph-engine_2.11/src/test/scala/org/sunbird/graph/nodes/TestDataNode.scala

@@ -565,7 +565,11 @@ class TestDataNode extends BaseSpec {
         request.put("contentType", "Resource")
         request.put("description", "test")
         request.put("channel", "in.ekstep")
-        request.put("test", "test")
+        //TODO: Uncomment this line when schema_restrict_api is true
+//        request.put("test", "test")
+        //TODO: Remove this when schema_restrict_api is true
+        request.put("ownershipType", "test")
+
         request.put("primaryCategory", "Learning Resource")
         assertThrows[ClientException](DataNode.create(request))
         // recoverToSucceededIf[ClientException](DataNode.create(request))
@@ -590,10 +594,14 @@ class TestDataNode extends BaseSpec {
             val req = new Request(request)
             req.getContext.put("identifier", node.getIdentifier)
             req.put("name", "updated name")
-            req.put("test", "test")
+            //TODO: Uncomment this line when schema_restrict_api is true
+//            req.put("test", "test")
 //            assertThrows[ClientException](DataNode.update(req))
-            recoverToSucceededIf[ClientException](DataNode.update(req))
-        }
+//            recoverToSucceededIf[ClientException](DataNode.update(req))
+            //TODO: Remove this when schema_restrict_api is true
+            DataNode.update(req).map(node =>
+                assert(node != null)
+            )}
         } flatMap(f => f)
     }
 

schemas/asset/1.0/config.json

@@ -76,5 +76,5 @@
             "relatedBoards": 4
         }
     },
-    "schema_restrict_api": true
+    "schema_restrict_api": false
 }
\ No newline at end of file

schemas/collection/1.0/config.json

@@ -58,5 +58,5 @@
       }
     }
   },
-  "schema_restrict_api": true
+  "schema_restrict_api": false
 }
\ No newline at end of file