add name and email to index

Author: Max Burnette

app/models/ElasticSearchObject.scala

@@ -11,6 +11,14 @@ case class ElasticsearchObject (
   resource: ResourceRef,
   name: String,
   creator: String,
+  /*
+  TODO
+    Do we still need the creator_id?
+    Do we need these in separate fields, or just include name & email under creator?
+    Should email addresses be handled in a separate way?
+   */
+  creator_name: String,
+  creator_email: String,
   created: Date,
   created_as: String = "",
   parent_of: List[String] = List.empty,
@@ -39,6 +47,8 @@ object ElasticsearchObject {
       "resource" -> JsString(eso.resource.toString),
       "name" -> JsString(eso.name),
       "creator" -> JsString(eso.creator),
+      "creator_name" -> JsString(eso.creator_name),
+      "creator_email" -> JsString(eso.creator_email),
       "created" -> JsString(eso.created.toString),
       "created_as" -> JsString(eso.created_as.toString),
       "parent_of" -> JsArray(eso.parent_of.toSeq.map( (p:String) => Json.toJson(p)): Seq[JsValue]),
@@ -60,6 +70,8 @@ object ElasticsearchObject {
       (json \ "resource").as[ResourceRef],
       (json \ "name").as[String],
       (json \ "creator").as[String],
+      (json \ "creator_name").as[String],
+      (json \ "creator_email").as[String],
       (json \ "created").as[Date],
       (json \ "created_as").as[String],
       (json \ "parent_of").as[List[String]],

app/services/ElasticsearchPlugin.scala

@@ -457,6 +457,8 @@ class ElasticsearchPlugin(application: Application) extends Plugin {
               .startObject()
               // BASIC INFO
               .field("creator", eso.creator)
+              .field("creator_name", eso.creator_name)
+              .field("creator_email", eso.creator_email)
               .field("created", eso.created)
               .field("created_as", eso.created_as)
               .field("resource_type", eso.resource.resourceType.name)
@@ -707,6 +709,8 @@ class ElasticsearchPlugin(application: Application) extends Plugin {
             |"child_of": {"type": "string", "include_in_all": false},
             |"parent_of": {"type": "string", "include_in_all": false},
             |"creator": {"type": "string", "include_in_all": false},
+            |"creator_name": {"type": "string"},
+            |"creator_email": {"type": "string"},
             |"created_as": {"type": "string"},
             |"created": {"type": "date", "format": "dateOptionalTime", "include_in_all": false},
             |"metadata": {"type": "object"},

app/util/SearchUtils.scala

@@ -97,6 +97,8 @@ object SearchUtils {
       ResourceRef(ResourceRef.file, id),
       f.filename,
       f.author.id.toString,
+      f.author.fullName.toString,
+      f.author.email.getOrElse("").toString,
       f.uploadDate,
       f.originalname,
       List.empty,
@@ -168,6 +170,8 @@ object SearchUtils {
       ResourceRef(ResourceRef.dataset, id),
       ds.name,
       ds.author.id.toString,
+      ds.author.fullName.toString,
+      ds.author.email.getOrElse("").toString,
       ds.created,
       "",
       parent_of_distinct,
@@ -196,6 +200,8 @@ object SearchUtils {
       ResourceRef(ResourceRef.collection, c.id),
       c.name,
       c.author.id.toString,
+      c.author.fullName.toString,
+      c.author.email.getOrElse("").toString,
       c.created,
       "",
       parent_of,
@@ -252,6 +258,8 @@ object SearchUtils {
       ResourceRef(ResourceRef.section, id),
       "section-"+id.toString,
       "",
+      "",
+      "",
       new Date,
       "",
       List.empty,
@@ -269,6 +277,8 @@ object SearchUtils {
       ResourceRef(ResourceRef.file, file.id),
       file.filename,
       "",
+      "",
+      "",
       file.uploadDate,
       "",
       List.empty,