Skip to content
GitLab
Unverified Commit 0390d3b1 authored by Anil Gupta's avatar Anil Gupta Committed by GitHub
Browse files

Issue #KN-547 merge: Merge pull request #881 from Jayaprakash8887/release-5.1.0 

Issue #KN-547 fix: Collection hierarchy dialcodes coming as string
parents 7c47a885 2b9501ef
release-5.3.0 AmiableAnil-patch-1 Gcloud_copy Gcloud_fix Remove_unwantedCode_Gcloud_fix bulk-upload-comptenecy-mapping bulk-upload-excelsheet bulk-upload-test_excel bulk_upload csp-migration knowlg-oneclick local-setup-kube master patch-1 patch-2 patch-3 poc_bulk_upload rahul_bulk_upload_postgres release-5.1.0 release-5.1.0-content release-5.2.0 release-5.2.0_RC2 release-5.2.0_RC1 release-5.1.0_RC1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 6 deletions
+3 -6
content-api/content-actors/src/main/scala/org/sunbird/content/dial/DIALManager.scala
+ 3
− 6
View file @ 0390d3b1
...@@ -356,15 +356,12 @@ object DIALManager { ...@@ -356,15 +356,12 @@ object DIALManager {
HierarchyManager.getHierarchy(request).flatMap(getImageHierarchyResponse => { HierarchyManager.getHierarchy(request).flatMap(getImageHierarchyResponse => {
val imageCollectionHierarchy = getImageHierarchyResponse.getResult.getOrDefault(ContentConstants.CONTENT, new java.util.HashMap[String, AnyRef]()).asInstanceOf[java.util.Map[String, AnyRef]] val imageCollectionHierarchy = getImageHierarchyResponse.getResult.getOrDefault(ContentConstants.CONTENT, new java.util.HashMap[String, AnyRef]()).asInstanceOf[java.util.Map[String, AnyRef]]
TelemetryManager.info("DIALManager:: populateAssignedDialCodes:: imageCollectionHierarchy:: " + imageCollectionHierarchy)
val imageChildrenHierarchy = imageCollectionHierarchy.get(ContentConstants.CHILDREN).asInstanceOf[util.List[util.Map[String, AnyRef]]].asScala.toList val imageChildrenHierarchy = imageCollectionHierarchy.get(ContentConstants.CHILDREN).asInstanceOf[util.List[util.Map[String, AnyRef]]].asScala.toList
val imageChildrenAssignedDIALList = getAssignedDIALcodes(imageChildrenHierarchy) val imageChildrenAssignedDIALList = getAssignedDIALcodes(imageChildrenHierarchy)
val contentImageAssignedDIALList = if(imageCollectionHierarchy.containsKey(DIALConstants.DIALCODES) && imageCollectionHierarchy.get(DIALConstants.DIALCODES) != null) { val contentImageAssignedDIALList = if(imageCollectionHierarchy.containsKey(DIALConstants.DIALCODES) && imageCollectionHierarchy.get(DIALConstants.DIALCODES) != null) {
TelemetryManager.info("DIALManager:: populateAssignedDialCodes:: collection DIAL codes:: " + imageCollectionHierarchy.get(DIALConstants.DIALCODES)) val collectionDialCodeStr = ScalaJsonUtils.serialize(imageCollectionHierarchy.get(DIALConstants.DIALCODES))
val hierarchyDialCodeStr = ScalaJsonUtils.serialize(imageCollectionHierarchy.get(DIALConstants.DIALCODES)) val collectionDialCode = ScalaJsonUtils.deserialize[List[String]](collectionDialCodeStr)
TelemetryManager.info("DIALManager:: populateAssignedDialCodes:: hierarchyDialCodeStr:: " + hierarchyDialCodeStr) imageChildrenAssignedDIALList ++ collectionDialCode
val hierarchyDialCode = ScalaJsonUtils.deserialize[List[String]](hierarchyDialCodeStr)
imageChildrenAssignedDIALList ++ hierarchyDialCode
} }
else imageChildrenAssignedDIALList else imageChildrenAssignedDIALList
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment