Delete elasticsearch index on deletion, omit trash search results

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+### Fixed
+
+- Search results are checked to verify nothing has been put in trash before display [#377](https://github.com/clowder-framework/clowder/issues/377)
 
 ## Unreleased
 

app/api/Collections.scala

@@ -157,6 +157,10 @@ class Collections @Inject() (datasets: DatasetService,
       case Some(collection) => {
         val useTrash = play.api.Play.configuration.getBoolean("useTrash").getOrElse(false)
         if (!useTrash || (useTrash && collection.trash)){
+          Logger.debug("Deleting collection from indexes " + collectionId)
+          current.plugin[ElasticsearchPlugin].foreach {
+            _.delete(collectionId.stringify)
+          }
           events.addObjectEvent(request.user , collection.id, collection.name, EventType.DELETE_COLLECTION.toString)
           collections.delete(collectionId)
           current.plugin[AdminsNotifierPlugin].foreach {

app/api/Datasets.scala

@@ -2041,6 +2041,11 @@ class  Datasets @Inject()(
   def deleteDatasetHelper(id: UUID, request: UserRequest[AnyContent]) = {
     datasets.get(id) match {
       case Some(dataset) => {
+        Logger.debug("Deleting dataset from indexes " + id)
+        current.plugin[ElasticsearchPlugin].foreach {
+          _.delete(id.stringify)
+        }
+
         //remove dataset from RDF triple store if triple store is used
         configuration.getString("userdfSPARQLStore").getOrElse("no") match {
           case "yes" => rdfsparql.removeDatasetFromGraphs(id)

app/api/Files.scala

@@ -1697,6 +1697,9 @@ class Files @Inject()(
         current.plugin[VersusPlugin].foreach {
           _.removeFromIndexes(id)
         }
+        current.plugin[ElasticsearchPlugin].foreach {
+          _.delete(id.stringify)
+        }
         Logger.debug("Deleting file: " + file.filename)
         files.removeFile(id, Utils.baseUrl(request), request.apiKey, request.user)
 

app/services/CollectionService.scala

@@ -252,4 +252,6 @@ trait CollectionService {
 
   def getMetrics(): Iterator[Collection]
 
+  def isInTrash(id: UUID): Boolean
+
 }

app/services/DatasetService.scala

@@ -389,5 +389,7 @@ trait DatasetService {
 
   def getTrashedIds(): List[UUID]
 
+  def isInTrash(id: UUID): Boolean
+
   def recursiveArchive(dataset: Dataset, host: String, parameters: JsObject, apiKey: Option[String], user: Option[User])
 }

app/services/ElasticsearchPlugin.scala

@@ -228,12 +228,18 @@ class ElasticsearchPlugin(application: Application) extends Plugin {
     // Check permissions for each resource
     results.foreach(resource => {
       resource.resourceType match {
-        case ResourceRef.file => if (Permission.checkPermission(user, Permission.ViewFile, resource))
-          filesFound += resource.id
-        case ResourceRef.dataset => if (Permission.checkPermission(user, Permission.ViewDataset, resource))
-          datasetsFound += resource.id
-        case ResourceRef.collection => if (Permission.checkPermission(user, Permission.ViewDataset, resource))
-          collectionsFound += resource.id
+        case ResourceRef.file => {
+          if (Permission.checkPermission(user, Permission.ViewFile, resource) && !files.isInTrash(resource.id))
+            filesFound += resource.id
+        }
+        case ResourceRef.dataset => {
+          if (Permission.checkPermission(user, Permission.ViewDataset, resource) && !datasets.isInTrash(resource.id))
+            datasetsFound += resource.id
+        }
+        case ResourceRef.collection => {
+          if (Permission.checkPermission(user, Permission.ViewDataset, resource) && !collections.isInTrash(resource.id))
+            collectionsFound += resource.id
+        }
         case _ => {}
       }
     })

app/services/FileService.scala

@@ -248,4 +248,6 @@ trait FileService {
 
   def getIterator(space: Option[String], since: Option[String], until: Option[String]): Iterator[File]
 
+  def isInTrash(id: UUID): Boolean
+
 }

app/services/mongodb/MongoDBCollectionService.scala

@@ -1116,6 +1116,10 @@ class MongoDBCollectionService @Inject() (
     Collection.find(MongoDBObject("trash" -> false)).toIterator
   }
 
+  def isInTrash(id: UUID): Boolean = {
+    Collection.findOne(MongoDBObject("trash" -> true, "_id" -> new ObjectId(id.stringify))).isDefined
+  }
+
   private def isSubCollectionIdInCollection(subCollectionId: UUID, collection: Collection) : Boolean = {
     if (collection.child_collection_ids.contains(subCollectionId)){
       return true

app/services/mongodb/MongoDBDatasetService.scala

@@ -1686,6 +1686,10 @@ class MongoDBDatasetService @Inject() (
     trashedIds.toList
   }
 
+  def isInTrash(id: UUID): Boolean = {
+    Dataset.findOne(MongoDBObject("trash" -> true, "_id" -> new ObjectId(id.stringify))).isDefined
+  }
+
   /**
   * Recursively submit requests to archive or unarchive the contents of the given dataset.
   * NOTE: "parameters" includes "operation", which supports both archiving and unarchiving

app/services/mongodb/MongoDBFileService.scala

@@ -1237,6 +1237,15 @@ class MongoDBFileService @Inject() (
     until.foreach(t => query = query ++ ("uploadDate" $lte Parsers.fromISO8601(t)))
     FileDAO.find(query)
   }
+
+  def isInTrash(id: UUID): Boolean = {
+    var foundTrash = false
+    datasets.findByFileIdAllContain(id).foreach(ds => {
+      if (ds.trash)
+        foundTrash = true
+    })
+    foundTrash
+  }
 }
 
 object FileDAO extends ModelCompanion[File, ObjectId] {