Merge pull request #562 from krgauraw/release-3.8.0

Issue #SC-2200 fix: code fixes for contentType

content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/HierarchyManager.scala

@@ -41,7 +41,6 @@ object HierarchyManager {
 
     val mapPrimaryCategoriesEnabled: Boolean = if (Platform.config.hasPath("collection.primarycategories.mapping.enabled")) Platform.config.getBoolean("collection.primarycategories.mapping.enabled") else true
     val objectTypeAsContentEnabled: Boolean = if (Platform.config.hasPath("objecttype.as.content.enabled")) Platform.config.getBoolean("objecttype.as.content.enabled") else true
-    val objectTypes = List("Content", "Collection")
 
     @throws[Exception]
     def addLeafNodesToHierarchy(request:Request)(implicit oec: OntologyEngineContext, ec: ExecutionContext): Future[Response] = {
@@ -534,8 +533,8 @@ object HierarchyManager {
                 if(HierarchyConstants.RETIRED_STATUS.equalsIgnoreCase(metadata.getOrDefault("status", HierarchyConstants.RETIRED_STATUS).asInstanceOf[String])){
                     children.remove(content)
                 } else {
-                    if (objectTypes.contains(metadata.get("objectType").asInstanceOf[String]) && objectTypeAsContentEnabled)
-                        HierarchyBackwardCompatibilityUtil.setObjectTypeForRead(metadata)
+                    if (objectTypeAsContentEnabled)
+                        HierarchyBackwardCompatibilityUtil.setObjectTypeForRead(metadata, metadata.get("objectType").asInstanceOf[String])
                     content.putAll(metadata)
                 }
             } else {
@@ -589,9 +588,9 @@ object HierarchyManager {
     def updateContentMappingInChildren(children: util.List[util.Map[String, AnyRef]]): List[Any] = {
         children.toList.map(content => {
             if (mapPrimaryCategoriesEnabled)
-                HierarchyBackwardCompatibilityUtil.setContentAndCategoryTypes(content)
-            if (objectTypes.contains(content.get("objectType").asInstanceOf[String]) && objectTypeAsContentEnabled)
-                HierarchyBackwardCompatibilityUtil.setObjectTypeForRead(content)
+                HierarchyBackwardCompatibilityUtil.setContentAndCategoryTypes(content, content.get("objectType").asInstanceOf[String])
+            if (objectTypeAsContentEnabled)
+                HierarchyBackwardCompatibilityUtil.setObjectTypeForRead(content, content.get("objectType").asInstanceOf[String])
             updateContentMappingInChildren(content.getOrDefault("children", new util.ArrayList[Map[String, AnyRef]]).asInstanceOf[util.List[util.Map[String, AnyRef]]])
         })
     }
@@ -600,8 +599,8 @@ object HierarchyManager {
         val updatedHierarchy = new util.HashMap[String, AnyRef](hierarchy)
         if (mapPrimaryCategoriesEnabled)
             HierarchyBackwardCompatibilityUtil.setContentAndCategoryTypes(updatedHierarchy)
-        if (objectTypes.contains(updatedHierarchy.get("objectType").asInstanceOf[String]) && objectTypeAsContentEnabled)
-            HierarchyBackwardCompatibilityUtil.setObjectTypeForRead(updatedHierarchy)
+        if (objectTypeAsContentEnabled)
+            HierarchyBackwardCompatibilityUtil.setObjectTypeForRead(updatedHierarchy, updatedHierarchy.get("objectType").asInstanceOf[String])
         val children = new util.HashMap[String, AnyRef](hierarchy).getOrDefault("children", new util.ArrayList[java.util.Map[String, AnyRef]]).asInstanceOf[util.ArrayList[java.util.Map[String, AnyRef]]]
         updateContentMappingInChildren(children)
         updatedHierarchy

content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/UpdateHierarchyManager.scala

@@ -170,7 +170,7 @@ object UpdateHierarchyManager {
                     node.getMetadata.put(HierarchyConstants.PARENT, child.get(HierarchyConstants.PARENT))
                     node.getMetadata.put(HierarchyConstants.INDEX, child.get(HierarchyConstants.INDEX))
                     //TODO: Remove the Populate category mapping before updating for backward
-                    HierarchyBackwardCompatibilityUtil.setContentAndCategoryTypes(node.getMetadata)
+                    HierarchyBackwardCompatibilityUtil.setContentAndCategoryTypes(node.getMetadata, node.getObjectType)
                     HierarchyBackwardCompatibilityUtil.setNewObjectType(node)
                     val updatedNodes = node :: nodes
                     updatedNodes
@@ -390,7 +390,7 @@ object UpdateHierarchyManager {
                     populateHierarchyRelatedData(node, depth, index, parent)
                     node.getMetadata.put(HierarchyConstants.VISIBILITY, HierarchyConstants.DEFAULT)
                     //TODO: Populate category mapping before updating for backward
-                    HierarchyBackwardCompatibilityUtil.setContentAndCategoryTypes(node.getMetadata)
+                    HierarchyBackwardCompatibilityUtil.setContentAndCategoryTypes(node.getMetadata, node.getObjectType)
                     HierarchyBackwardCompatibilityUtil.setNewObjectType(node)
                     val nxtEnrichedNodeList = node :: enrichedNodeList
                     if (MapUtils.isNotEmpty(hierarchyStructure.getOrDefault(id, Map[String, Int]()))) {

content-api/hierarchy-manager/src/main/scala/org/sunbird/utils/HierarchyBackwardCompatibilityUtil.scala

@@ -18,22 +18,24 @@ object HierarchyBackwardCompatibilityUtil {
         new util.HashMap[String, AnyRef]()).asInstanceOf[java.util.Map[String, AnyRef]]
     val mimeTypesToCheck = List("application/vnd.ekstep.h5p-archive", "application/vnd.ekstep.html-archive", "application/vnd.android.package-archive",
         "video/webm", "video/x-youtube", "video/mp4")
+    val objectTypes = List("Content", "Collection")
 
-    def setContentAndCategoryTypes(input: java.util.Map[String, AnyRef]): Unit = {
-        val contentType = input.get("contentType").asInstanceOf[String]
+    def setContentAndCategoryTypes(input: util.Map[String, AnyRef], objType: String = ""): Unit = {
+        if(StringUtils.isBlank(objType) || objectTypes.contains(objType)) {
+            val contentType = input.get("contentType").asInstanceOf[String]
+            val primaryCategory = input.get("primaryCategory").asInstanceOf[String]
+            val (updatedContentType, updatedPrimaryCategory): (String, String) = (contentType, primaryCategory) match {
+                case (x: String, y: String) => (x, y)
+                case ("Resource", y) => (contentType, getCategoryForResource(input.getOrDefault("mimeType", "").asInstanceOf[String],
+                    input.getOrDefault("resourceType", "").asInstanceOf[String]))
+                case (x: String, y) => (x, categoryMap.get(x).asInstanceOf[String])
+                case (x, y: String) => (categoryMap.asScala.filter(entry => StringUtils.equalsIgnoreCase(entry._2.asInstanceOf[String], y)).keys.headOption.getOrElse(""), y)
+                case _ => (contentType, primaryCategory)
+            }
 
-        val primaryCategory = input.get("primaryCategory").asInstanceOf[String]
-        val (updatedContentType, updatedPrimaryCategory): (String, String) = (contentType, primaryCategory) match {
-            case (x: String, y: String) => (x, y)
-            case ("Resource", y) => (contentType, getCategoryForResource(input.getOrDefault("mimeType", "").asInstanceOf[String],
-                input.getOrDefault("resourceType", "").asInstanceOf[String]))
-            case (x: String, y) => (x, categoryMap.get(x).asInstanceOf[String])
-            case (x, y: String) => (categoryMap.asScala.filter(entry => StringUtils.equalsIgnoreCase(entry._2.asInstanceOf[String], y)).keys.headOption.getOrElse(""), y)
-            case _ => (contentType, primaryCategory)
+            input.put("contentType", updatedContentType)
+            input.put("primaryCategory", updatedPrimaryCategory)
         }
-
-        input.put("contentType", updatedContentType)
-        input.put("primaryCategory", updatedPrimaryCategory)
     }
 
     private def getCategoryForResource(mimeType: String, resourceType: String): String = (mimeType, resourceType) match {
@@ -42,8 +44,9 @@ object HierarchyBackwardCompatibilityUtil {
         case (x: String, y: String) => if (mimeTypesToCheck.contains(x)) categoryMapForMimeType.get(x).asInstanceOf[util.List[String]].asScala.headOption.getOrElse("Learning Resource") else categoryMapForResourceType.getOrDefault(y, "Learning Resource").asInstanceOf[String]
         case _ => "Learning Resource"
     }
-    def setObjectTypeForRead(result: java.util.Map[String, AnyRef]): Unit = {
-        result.put("objectType", "Content")
+    def setObjectTypeForRead(result: java.util.Map[String, AnyRef], objectType: String = ""): Unit = {
+        if(objectTypes.contains(objectType))
+            result.put("objectType", "Content")
     }
 
     def setNewObjectType(node: Node) = {

schemas/question/1.0/schema.json

@@ -63,7 +63,7 @@
         "enum": [
           "Student",
           "Teacher",
-          "Admin"
+          "Administrator"
         ],
         "default": "Student"
       }

schemas/questionset/1.0/schema.json

@@ -63,7 +63,7 @@
         "enum": [
           "Student",
           "Teacher",
-          "Admin"
+          "Administrator"
         ],
         "default": "Student"
       }