add metaReviewedBy object to task history log

maproulette · Jan 16, 2024 · 2aa3a21 · 2aa3a21
1 parent 0900af4
commit 2aa3a21
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 9 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
         )
     }

diff --git a/app/org/maproulette/framework/service/TaskReviewService.scala b/app/org/maproulette/framework/service/TaskReviewService.scala
@@ -789,23 +789,41 @@ class TaskReviewService @Inject() (
       }
     }
 
-    // Make sure we have an updated claimed at time.
-    val reviewClaimedAt = this.getTaskWithReview(task.id).task.review.reviewClaimedAt
+    val metaReviewer = user.id
 
-    val metaReviewer = task.review.metaReviewedBy match {
-      case Some(m) => m
-      case None    => user.id
-    }
+    var fetchBy = "meta_reviewed_by"
+
+    val isDisputed = task.review.reviewStatus.getOrElse(-1) != Task.REVIEW_STATUS_DISPUTED &&
+      reviewStatus == Task.REVIEW_STATUS_DISPUTED
+    val needsReReview = (task.review.reviewStatus.getOrElse(-1) != Task.REVIEW_STATUS_REQUESTED &&
+      reviewStatus == Task.REVIEW_STATUS_REQUESTED) || isDisputed
+
+    var reviewedBy          = task.review.reviewedBy
+    var reviewRequestedBy   = task.review.reviewRequestedBy
+    var additionalReviewers = task.review.additionalReviewers
+
+    val currentTask     = this.getTaskWithReview(task.id).task
+    val reviewClaimedAt = currentTask.review.reviewClaimedAt
+
+    val fetchByUser =
+      if (needsReReview) {
+        fetchBy = "meta_reviewed_by"
+        reviewRequestedBy = Some(user.id)
+        user.id
+      } else {
+        reviewedBy = Some(user.id)
+        user.id
+      }
 
     // Update the meta_review_by and meta_review_status column on the task_review
     // if error tags are currently on the review, and if this meta review provides no error tags, retain the existing tags
     val updatedRows = this.repository.updateTaskReview(
       user,
       task,
       task.review.reviewStatus.get,
-      "meta_reviewed_by",
-      metaReviewer,
-      task.review.additionalReviewers,
+      fetchBy,
+      fetchByUser,
+      additionalReviewers,
       Some(reviewStatus),
       errorTags = if (errorTags.isEmpty) task.errorTags else errorTags
     )