santization of org names before creating zips

sunbird-cb · Aug 11, 2024 · c8e3b7d · c8e3b7d
1 parent 067b3ca
commit c8e3b7d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/batch-models/src/main/scala/org/ekstep/analytics/dashboard/DataUtil.scala b/batch-models/src/main/scala/org/ekstep/analytics/dashboard/DataUtil.scala
@@ -1940,10 +1940,11 @@ object DataUtil extends Serializable {
     val orgsL3DF = joinedDF.filter((col("l3mapid").isNull) && col("l2mapid").isNotNull && col("l1mapid").isNotNull).select(col("sborgid").alias("organisationID"))
     val orgsDF = processOrgsL3(orgsL3DF, userOrgDF, orgHierarchyCompleteDF)
     val combinedMinistryMetricsDF = ministryOrgDF.union(deptOrgDF).union(orgsDF)
-    val updatedDF = combinedMinistryMetricsDF.withColumn("allIDs", when(col("allIDs").isNull || trim(col("allIDs")) === "", concat(lit("$"), col("ministryID"))).otherwise(col("allIDs")))
+    val updatedDF = combinedMinistryMetricsDF.withColumn("allIDs", when(col("allIDs").isNull || trim(col("allIDs")) === "", col("ministryID")).otherwise(col("allIDs")))
     show(updatedDF, "This will be the final hierarchy")
     updatedDF
   }
 
 
+
 }
diff --git a/.../scala/org/ekstep/analytics/dashboard/report/zipreports/ZipReportsWithSecurityModel.scala b/.../scala/org/ekstep/analytics/dashboard/report/zipreports/ZipReportsWithSecurityModel.scala
@@ -133,9 +133,10 @@ object ZipReportsWithSecurityModel extends AbsDashboardModel {
           val folderName = mdoidFolder.getName
           val orgID = folderName.split("=")(1)
           val orgFileName = getOrgName(orgID, orgNamesDF)
+          val sanitizedOrgFileName = orgFileName.replaceAll("[/\\\\]", "_")
           val zipFilePath = s"${mdoidFolder}"
           // Create a password-protected zip file for the mdoid folder
-          val zipFile = new ZipFile(zipFilePath+"/"+orgFileName+".zip")
+          val zipFile = new ZipFile(zipFilePath+"/"+sanitizedOrgFileName+".zip")
           val parameters = new ZipParameters()
           parameters.setCompressionMethod(CompressionMethod.DEFLATE)
           // Add all files within the mdoid folder to the zip file
@@ -179,8 +180,9 @@ object ZipReportsWithSecurityModel extends AbsDashboardModel {
         .filter(id => id != null && id.trim.nonEmpty)
         .foreach { id =>
           val orgFileName = getOrgName(id, orgNamesDF)
-          val sourceZipFilePath = s"$baseDir/mdoid=$id/$orgFileName.zip"
-          val destinationZipFilePath = s"$ministryDir/$orgFileName.zip"
+          val sanitizedOrgFileName = orgFileName.replaceAll("[/\\\\]", "_")
+          val sourceZipFilePath = s"$baseDir/mdoid=$id/$sanitizedOrgFileName.zip"
+          val destinationZipFilePath = s"$ministryDir/$sanitizedOrgFileName.zip"
 
           // Copy the zip file
           val sourceFile = new File(sourceZipFilePath)