From 1de29c202fb52d6f724b545de8f3208d8fce7179 Mon Sep 17 00:00:00 2001 From: toddn Date: Wed, 20 Mar 2024 15:11:51 -0500 Subject: [PATCH 1/3] remove file from folders if we are moving it into the same dataset --- app/api/Datasets.scala | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/api/Datasets.scala b/app/api/Datasets.scala index b59e67e8a..f43aee69b 100644 --- a/app/api/Datasets.scala +++ b/app/api/Datasets.scala @@ -716,7 +716,15 @@ class Datasets @Inject()( } Logger.debug("----- Adding file to dataset completed") } else { + val foldersContainingFile = folders.findByFileId(file.id).sortBy(_.name) Logger.debug("File was already in dataset.") + val foldersContainingFile = folders.findByFileId(file.id).sortBy(_.name) + Logger.debug("Remove file from folders in dataset") + folders.get(foldersContainingFile).foreach(folder => { + if (folder.parentDatasetId == dsId){ + folders.removeFile(folder.id, fileId) + } + }) } } From a4ae13d3ff3acfaeebeda67e281ed9ff96559ce1 Mon Sep 17 00:00:00 2001 From: toddn Date: Fri, 22 Mar 2024 15:32:24 -0500 Subject: [PATCH 2/3] duplicate line --- app/api/Datasets.scala | 1 - docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/api/Datasets.scala b/app/api/Datasets.scala index f43aee69b..48cf0163f 100644 --- a/app/api/Datasets.scala +++ b/app/api/Datasets.scala @@ -718,7 +718,6 @@ class Datasets @Inject()( } else { val foldersContainingFile = folders.findByFileId(file.id).sortBy(_.name) Logger.debug("File was already in dataset.") - val foldersContainingFile = folders.findByFileId(file.id).sortBy(_.name) Logger.debug("Remove file from folders in dataset") folders.get(foldersContainingFile).foreach(folder => { if (folder.parentDatasetId == dsId){ diff --git a/docker-compose.yml b/docker-compose.yml index 1e9f05fcb..30f9f98e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # main clowder application clowder: - image: clowder/clowder:${CLOWDER_VERSION:-latest} + image: clowder:bugfix restart: unless-stopped networks: - clowder From 4bde973b1c9eac5e1c6238db406b74d56c3af5cc Mon Sep 17 00:00:00 2001 From: toddn Date: Fri, 22 Mar 2024 15:36:46 -0500 Subject: [PATCH 3/3] fixing the iteration --- app/api/Datasets.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/api/Datasets.scala b/app/api/Datasets.scala index 48cf0163f..dd3a02526 100644 --- a/app/api/Datasets.scala +++ b/app/api/Datasets.scala @@ -719,9 +719,10 @@ class Datasets @Inject()( val foldersContainingFile = folders.findByFileId(file.id).sortBy(_.name) Logger.debug("File was already in dataset.") Logger.debug("Remove file from folders in dataset") - folders.get(foldersContainingFile).foreach(folder => { + foldersContainingFile.foreach(folder => { if (folder.parentDatasetId == dsId){ folders.removeFile(folder.id, fileId) + } }) }