Fix recursion of dataset indexing of subfolders

Author: Max Burnette

app/services/ElasticsearchPlugin.scala

@@ -437,14 +437,8 @@ class ElasticsearchPlugin(application: Application) extends Plugin {
     // Perform recursion first if necessary
     if (recursive) {
       files.get(dataset.files).found.foreach(f => index(f, idx))
-      for (folderid <- dataset.folders) {
-        folders.get(folderid) match {
-          case Some(f) => {
-            files.get(f.files).found.foreach(fi => index(fi, idx))
-          }
-          case None => Logger.error(s"Error getting file $folderid for recursive indexing")
-        }
-      }
+      for (f <- folders.findByParentDatasetId(dataset.id))
+        files.get(f.files).found.foreach(fi => index(fi, idx))
     }
     index(SearchUtils.getElasticsearchObject(dataset), idx.getOrElse(nameOfIndex))
   }

app/services/mongodb/MongoDBDatasetService.scala

@@ -1409,7 +1409,7 @@ class MongoDBDatasetService @Inject() (
 
   def indexAll(idx: Option[String] = None) = {
     // Bypass Salat in case any of the file records are malformed to continue past them
-    Dataset.dao.dataset.find(MongoDBObject(), MongoDBObject("_id" -> 1)).foreach(d => {
+    Dataset.dao.collection.find(MongoDBObject(), MongoDBObject("_id" -> 1)).foreach(d => {
       index(new UUID(d.get("_id").toString), idx)
     })
   }