Merge pull request Sunbird-Knowlg#785 from project-sunbird/release-4.6.0

Issue #SB-15501 merge: release-4.6.0 to 4.7.0
rahu-tarento · Feb 1, 2022 · 4a9ee36 · 4a9ee36
2 parents ad6ab61 + 07d32f6
commit 4a9ee36
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/content-api/content-service/app/controllers/v4/AssetController.scala b/content-api/content-service/app/controllers/v4/AssetController.scala
@@ -90,7 +90,7 @@ class AssetController  @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentActor:
         content.putAll(Map("identifier" -> identifier, "type" -> `type`.getOrElse("assets")).asJava)
         val contentRequest = getRequest(content, headers, "uploadPreSignedUrl")
         setRequestContext(contentRequest, version, objectType, schemaName)
-        getResult(ApiId.UPLOAD_PRE_SIGNED_ASSET, contentActor, contentRequest)
+        getResult(ApiId.UPLOAD_PRE_SIGNED_ASSET, contentActor, contentRequest, version = apiVersion)
     }
 
     def copy(identifier: String) = Action.async { implicit request =>

diff --git a/content-api/content-service/app/controllers/v4/CollectionController.scala b/content-api/content-service/app/controllers/v4/CollectionController.scala
@@ -90,7 +90,7 @@ class CollectionController  @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentAc
         val contentRequest = getRequest(body, headers, "addHierarchy")
         contentRequest.put("mode", "edit")
         setRequestContext(contentRequest, version, objectType, schemaName)
-        getResult(ApiId.ADD_HIERARCHY_V4, collectionActor, contentRequest)
+        getResult(ApiId.ADD_HIERARCHY_V4, collectionActor, contentRequest, version = apiVersion)
     }
 
     def removeHierarchy() = Action.async { implicit request =>
@@ -251,7 +251,7 @@ class CollectionController  @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentAc
         val contentRequest = getRequest(content, headers, "reviewContent")
         setRequestContext(contentRequest, version, objectType, schemaName)
         contentRequest.getContext.put("identifier", identifier);
-        getResult(ApiId.REVIEW_COLLECTION, contentActor, contentRequest)
+        getResult(ApiId.REVIEW_COLLECTION, contentActor, contentRequest, version = apiVersion)
     }
 
 

diff --git a/content-api/content-service/app/controllers/v4/ContentController.scala b/content-api/content-service/app/controllers/v4/ContentController.scala
@@ -33,7 +33,7 @@ class ContentController @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentActor:
         else {
             val contentRequest = getRequest(content, headers, "createContent", true)
             setRequestContext(contentRequest, version, objectType, schemaName)
-            getResult(ApiId.CREATE_ASSET, contentActor, contentRequest, version = apiVersion)
+            getResult(ApiId.CREATE_CONTENT, contentActor, contentRequest, version = apiVersion)
         }
     }
 
@@ -97,7 +97,7 @@ class ContentController @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentActor:
         content.putAll(Map("identifier" -> identifier).asJava)
         val acceptRequest = getRequest(content, headers, "acceptFlag")
         setRequestContext(acceptRequest, version, objectType, schemaName)
-        getResult(ApiId.ACCEPT_FLAG, contentActor, acceptRequest)
+        getResult(ApiId.ACCEPT_FLAG, contentActor, acceptRequest, version = apiVersion)
     }
 
 
@@ -108,7 +108,7 @@ class ContentController @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentActor:
         content.putAll(Map("identifier" -> identifier).asJava)
         val discardRequest = getRequest(content, headers, "discardContent")
         setRequestContext(discardRequest, version, objectType, schemaName)
-        getResult(ApiId.DISCARD_CONTENT, contentActor, discardRequest)
+        getResult(ApiId.DISCARD_CONTENT, contentActor, discardRequest, version = apiVersion)
     }
     def retire(identifier: String) = Action.async { implicit request =>
         val headers = commonHeaders()
@@ -192,7 +192,7 @@ class ContentController @Inject()(@Named(ActorNames.CONTENT_ACTOR) contentActor:
         val contentRequest = getRequest(content, headers, "reviewContent")
         setRequestContext(contentRequest, version, objectType, schemaName)
         contentRequest.getContext.put("identifier", identifier);
-        getResult(ApiId.REVIEW_CONTENT, contentActor, contentRequest)
+        getResult(ApiId.REVIEW_CONTENT, contentActor, contentRequest, version = apiVersion)
     }
 
     def reviewReject(identifier: String) = Action.async { implicit request =>