From fb25ff9468bc7306a76da24028d139889785e5c8 Mon Sep 17 00:00:00 2001 From: mike bobak Date: Mon, 18 Jul 2022 16:44:23 -0500 Subject: [PATCH 1/4] Update MongoDBDatasetService.scala differentiate as Dataset error, and add notfound --- app/services/mongodb/MongoDBDatasetService.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/services/mongodb/MongoDBDatasetService.scala b/app/services/mongodb/MongoDBDatasetService.scala index 2f456f7c1..2cc3d3ea6 100644 --- a/app/services/mongodb/MongoDBDatasetService.scala +++ b/app/services/mongodb/MongoDBDatasetService.scala @@ -507,7 +507,10 @@ class MongoDBDatasetService @Inject() ( val notFound = ids.diff(found.map(_.id)) if (notFound.length > 0) - Logger.error("Not all dataset IDs found for bulk get request") + { + Logger.error("Not all dataset IDs found for [Dataset] bulk get request") + Logger.error("notfound=" + notFound.toString) + } return DBResult(found, notFound) } From ce69e95b8b0d3a53bd4a5170ee1a3ba661b3dddd Mon Sep 17 00:00:00 2001 From: mike bobak Date: Mon, 18 Jul 2022 16:46:06 -0500 Subject: [PATCH 2/4] Update MongoDBFolderService.scala differentiate error message for Folders, and add notfound --- app/services/mongodb/MongoDBFolderService.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/services/mongodb/MongoDBFolderService.scala b/app/services/mongodb/MongoDBFolderService.scala index 5dba1668d..0e62e5d3a 100644 --- a/app/services/mongodb/MongoDBFolderService.scala +++ b/app/services/mongodb/MongoDBFolderService.scala @@ -39,7 +39,10 @@ class MongoDBFolderService @Inject() (files: FileService, datasets: DatasetServi val notFound = ids.diff(found.map(ds => ds.id)) if (notFound.length > 0) - Logger.error("Not all dataset IDs found for bulk get request") + { + Logger.error("Not all dataset IDs found for [Folder] bulk get request") + Logger.error("notfound=" + notFound.toString) + } return DBResult(found, notFound) } @@ -181,4 +184,4 @@ object FolderDAO extends ModelCompanion[Folder, ObjectId] { case None =>throw new RuntimeException("No MongoSalatPlugin"); case Some(x) => new SalatDAO[Folder, ObjectId](collection = x.collection("folders")){} } -} \ No newline at end of file +} From 4f3e31fca73b2eac74003a1a7d76ec74f0ce6b3e Mon Sep 17 00:00:00 2001 From: MBcode Date: Wed, 24 Aug 2022 13:32:58 -0500 Subject: [PATCH 3/4] mention differentation in msgs and notFound IDs now included --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dc08709a..6babfae39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## Unreleased +### Changed +- MongoDB Service log error:'Not all dataset IDs found for Dataset|Folder bulk get request', now incl all the IDs notFound + ### Added - MRI previewer for NIFTY (.nii) files. From 54a4e6892d8307ef99cbddaa970091e207398608 Mon Sep 17 00:00:00 2001 From: MBcode Date: Thu, 25 Aug 2022 16:59:44 -0500 Subject: [PATCH 4/4] style change --- app/services/mongodb/MongoDBDatasetService.scala | 3 +-- app/services/mongodb/MongoDBFolderService.scala | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/services/mongodb/MongoDBDatasetService.scala b/app/services/mongodb/MongoDBDatasetService.scala index 2cc3d3ea6..15de0db8d 100644 --- a/app/services/mongodb/MongoDBDatasetService.scala +++ b/app/services/mongodb/MongoDBDatasetService.scala @@ -506,8 +506,7 @@ class MongoDBDatasetService @Inject() ( val found = Dataset.find(query).toList val notFound = ids.diff(found.map(_.id)) - if (notFound.length > 0) - { + if (notFound.length > 0) { Logger.error("Not all dataset IDs found for [Dataset] bulk get request") Logger.error("notfound=" + notFound.toString) } diff --git a/app/services/mongodb/MongoDBFolderService.scala b/app/services/mongodb/MongoDBFolderService.scala index 0e62e5d3a..5a11e6ea3 100644 --- a/app/services/mongodb/MongoDBFolderService.scala +++ b/app/services/mongodb/MongoDBFolderService.scala @@ -38,8 +38,7 @@ class MongoDBFolderService @Inject() (files: FileService, datasets: DatasetServi val found = FolderDAO.find(query).toList val notFound = ids.diff(found.map(ds => ds.id)) - if (notFound.length > 0) - { + if (notFound.length > 0) { Logger.error("Not all dataset IDs found for [Folder] bulk get request") Logger.error("notfound=" + notFound.toString) }