Merge pull request Sunbird-Knowlg#542 from krgauraw/release-3.6.0

Issue #SB-23326 fix: fix for content upload api
rahu-tarento · Feb 23, 2021 · 94b71b2 · 94b71b2
2 parents 50be938 + b711aec
commit 94b71b2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/content-api/content-service/app/controllers/BaseController.scala b/content-api/content-service/app/controllers/BaseController.scala
@@ -32,7 +32,7 @@ abstract class BaseController(protected val cc: ControllerComponents)(implicit e
         JavaJsonUtils.deserialize[java.util.Map[String, Object]](body).getOrDefault("request", new java.util.HashMap()).asInstanceOf[java.util.Map[String, Object]]
     }
 
-    def requestFormData()(implicit request: Request[AnyContent]) = {
+    def requestFormData(identifier: String)(implicit request: Request[AnyContent]) = {
         val reqMap = new util.HashMap[String, AnyRef]()
         if(!request.body.asMultipartFormData.isEmpty) {
             val multipartData = request.body.asMultipartFormData.get
@@ -49,9 +49,9 @@ abstract class BaseController(protected val cc: ControllerComponents)(implicit e
                 }
             }
             if (null != multipartData.files && !multipartData.files.isEmpty) {
-                val file: File = new File("/tmp" + File.separator + request.body.asMultipartFormData.get.files.head.filename)
-                multipartData.files.head.ref.copyTo(file, false)
-                reqMap.put("file", file)
+                val file: File = new File("/tmp" + File.separator + identifier + "_" + System.currentTimeMillis + "_"+ request.body.asMultipartFormData.get.files.head.filename)
+                val copiedFile: File = multipartData.files.head.ref.copyTo(file, false).toFile
+                reqMap.put("file", copiedFile)
             }
         }
         if(StringUtils.isNotBlank(reqMap.getOrDefault("fileUrl", "").asInstanceOf[String]) || null != reqMap.get("file").asInstanceOf[File]){

diff --git a/content-api/content-service/app/controllers/v3/ContentController.scala b/content-api/content-service/app/controllers/v3/ContentController.scala
@@ -226,7 +226,7 @@ class ContentController @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentActor:
 
     def upload(identifier: String, fileFormat: Option[String], validation: Option[String]) = Action.async { implicit request =>
         val headers = commonHeaders()
-        val content = requestFormData()
+        val content = requestFormData(identifier)
         content.putAll(headers)
         val contentRequest = getRequest(content, headers, "uploadContent")
         setRequestContext(contentRequest, version, objectType, schemaName)

diff --git a/content-api/content-service/app/controllers/v4/AssetController.scala b/content-api/content-service/app/controllers/v4/AssetController.scala
@@ -74,7 +74,7 @@ class AssetController  @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentActor:
 
     def upload(identifier: String, fileFormat: Option[String], validation: Option[String]) = Action.async { implicit request =>
         val headers = commonHeaders()
-        val content = requestFormData()
+        val content = requestFormData(identifier)
         content.putAll(headers)
         val contentRequest = getRequest(content, headers, "uploadContent")
         setRequestContext(contentRequest, version, objectType, schemaName)

diff --git a/content-api/content-service/app/controllers/v4/ContentController.scala b/content-api/content-service/app/controllers/v4/ContentController.scala
@@ -124,7 +124,7 @@ class ContentController @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentActor:
 
     def upload(identifier: String, fileFormat: Option[String], validation: Option[String]) = Action.async { implicit request =>
         val headers = commonHeaders()
-        val content = requestFormData()
+        val content = requestFormData(identifier)
         content.putAll(headers)
         val contentRequest = getRequest(content, headers, "uploadContent")
         setRequestContext(contentRequest, version, objectType, schemaName)