Skip to content

KN-846 - Enhancement in Copy Content w.r.t artifact url copying #931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juhiagl8 wants to merge 1 commit into
base: release-5.3.0
Choose a base branch
from
Open

KN-846 - Enhancement in Copy Content w.r.t artifact url copying #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions content-api/content-actors/src/main/scala/org/sunbird/content/util/CopyManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ object CopyManager {
private val originMetadataKeys: util.List[String] = Platform.getStringList("content.copy.origin_data", new util.ArrayList[String]())
private val internalHierarchyProps = List("identifier", "parent", "index", "depth")
private val restrictedMimeTypesForUpload = List("application/vnd.ekstep.ecml-archive","application/vnd.ekstep.content-collection")

private val copyArtifactUrl = Platform.config.getBoolean("content.copy.is_copy_artifacturl")
private var copySchemeMap: util.Map[String, AnyRef] = new util.HashMap[String, AnyRef]()

def copy(request: Request)(implicit ec: ExecutionContext, oec: OntologyEngineContext, ss: StorageService): Future[Response] = {
Expand Down Expand Up @@ -73,7 +73,11 @@ object CopyManager {
val copyCreateReq: Future[Request] = getCopyRequest(node, request)
copyCreateReq.map(req => {
DataNode.create(req).map(copiedNode => {
artifactUpload(node, copiedNode, request)
if (copyArtifactUrl) {
artifactUpload(node, copiedNode, request)
} else {
Future(copiedNode)
}
}).flatMap(f => f)
}).flatMap(f => f)
}
Expand Down
1 change: 1 addition & 0 deletions content-api/content-service/conf/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,7 @@ actor.timeoutMillisec = 30000

#Index file validation
isIndexHtmlValidationRequired=true
content.copy.is_copy_artifacturl=true

cloud_storage_type=""
cloud_storage_key=""
Expand Down