From 83720c273a3d76991a556b9836757b73de4d0e6c Mon Sep 17 00:00:00 2001 From: Anil Gupta Date: Fri, 21 Jan 2022 15:53:13 +0530 Subject: [PATCH] Issue #SB-15501 feat: Fixed API version and name. --- .../app/controllers/v4/AssetController.scala | 2 +- .../app/controllers/v4/CollectionController.scala | 4 ++-- .../app/controllers/v4/ContentController.scala | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/content-api/content-service/app/controllers/v4/AssetController.scala b/content-api/content-service/app/controllers/v4/AssetController.scala index feaf9a6b7..2c0ef6237 100644 --- 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 index d8d7ee3c9..2c649a219 100644 --- 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 index dcebab65f..ddf2dc45c 100644 --- 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 =>