add metaReviewedBy object to task history log (#1100)

* add metaReviewedBy object to task history log * revert some unneeded changes * fix test error * fix test * revert changes on taskReviewService
maproulette · Feb 14, 2024 · 912b5cc · 912b5cc
1 parent d4ff1a3
commit 912b5cc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/app/org/maproulette/framework/controller/TaskHistoryController.scala b/app/org/maproulette/framework/controller/TaskHistoryController.scala
@@ -68,6 +68,13 @@ class TaskHistoryController @Inject() (
           .toMap
       )
 
+      val metaReviewers = Some(
+        this.serviceManager.user
+          .retrieveListById(entries.map(t => t.metaReviewRequestedBy.getOrElse(0).toLong))
+          .map(u => u.id -> Json.obj("username" -> u.name, "id" -> u.id))
+          .toMap
+      )
+
       val jsonList = entries.map { entry =>
         var updated = Json.toJson(entry)
         if (entry.user.getOrElse(0) != 0) {
@@ -82,6 +89,11 @@ class TaskHistoryController @Inject() (
           val reviewerJson = Json.toJson(reviewers.get(entry.reviewedBy.get.toLong)).as[JsObject]
           updated = Utils.insertIntoJson(updated, "reviewedBy", reviewerJson, true)
         }
+        if (entry.metaReviewRequestedBy.getOrElse(0) != 0) {
+          val reviewerJson =
+            Json.toJson(reviewers.get(entry.metaReviewRequestedBy.get.toLong)).as[JsObject]
+          updated = Utils.insertIntoJson(updated, "metaReviewRequestedBy", reviewerJson, true)
+        }
 
         updated
       }

diff --git a/app/org/maproulette/framework/model/TaskLogEntry.scala b/app/org/maproulette/framework/model/TaskLogEntry.scala
@@ -23,6 +23,7 @@ case class TaskLogEntry(
     status: Option[Int],
     startedAt: Option[DateTime],
     reviewStatus: Option[Int],
+    metaReviewRequestedBy: Option[Int],
     reviewRequestedBy: Option[Int],
     reviewedBy: Option[Int],
     comment: Option[String],

diff --git a/app/org/maproulette/framework/repository/TaskHistoryRepository.scala b/app/org/maproulette/framework/repository/TaskHistoryRepository.scala
@@ -37,6 +37,7 @@ class TaskHistoryRepository @Inject() (override val db: Database) extends Reposi
           None,
           None,
           None,
+          None,
           Some(comment),
           None
         )
@@ -108,6 +109,7 @@ class TaskHistoryRepository @Inject() (override val db: Database) extends Reposi
               None,
               reviewStartedAt,
               metaReviewStatus,
+              metaReviewedBy,
               Some(requestedBy),
               metaReviewedBy,
               None,
@@ -123,6 +125,7 @@ class TaskHistoryRepository @Inject() (override val db: Database) extends Reposi
               None,
               reviewStartedAt,
               reviewStatus,
+              metaReviewedBy,
               Some(requestedBy),
               reviewedBy,
               None,
@@ -154,6 +157,7 @@ class TaskHistoryRepository @Inject() (override val db: Database) extends Reposi
           None,
           None,
           None,
+          None,
           None
         )
     }
@@ -176,6 +180,7 @@ class TaskHistoryRepository @Inject() (override val db: Database) extends Reposi
           None,
           None,
           None,
+          None,
           None
         )
     }