replace pointer with new refined marker parser

maproulette · Jun 3, 2024 · c189159 · c189159
1 parent 23d73db
commit c189159
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 16 deletions.
diff --git a/app/org/maproulette/framework/repository/TaskClusterRepository.scala b/app/org/maproulette/framework/repository/TaskClusterRepository.scala
@@ -26,7 +26,8 @@ class TaskClusterRepository @Inject() (override val db: Database, challengeDAL:
 
   val DEFAULT_NUMBER_OF_POINTS = 100
 
-  val pointParser = this.challengeDAL.pointParser
+  val pointParser  = this.challengeDAL.pointParser
+  val markerParser = this.challengeDAL.markerParser
 
   private val joinClause =
     new StringBuilder(
@@ -195,22 +196,15 @@ class TaskClusterRepository @Inject() (override val db: Database, challengeDAL:
           query
             .build(
               s"""
-                      SELECT tasks.id, tasks.name, tasks.parent_id, c.name, tasks.instruction, tasks.status, tasks.mapped_on,
-                            tasks.completed_time_spent, tasks.completed_by,
-                            tasks.bundle_id, tasks.is_bundle_primary, tasks.cooperative_work_json::TEXT as cooperative_work,
-                            task_review.review_status, task_review.review_requested_by, task_review.reviewed_by, task_review.reviewed_at,
-                            task_review.review_started_at, task_review.meta_review_status, task_review.meta_reviewed_by,
-                            task_review.meta_reviewed_at, task_review.additional_reviewers,
-                            ST_AsGeoJSON(tasks.location) AS location, priority,
-                            CASE WHEN task_review.review_started_at IS NULL
-                                  THEN 0
-                                  ELSE EXTRACT(epoch FROM (task_review.reviewed_at - task_review.review_started_at)) END
-                            AS reviewDuration
-                      FROM tasks
-                      ${joinClause.toString()}
-                      """
+                SELECT tasks.id, tasks.name, tasks.parent_id, c.name, tasks.status, 
+                      tasks.bundle_id, tasks.is_bundle_primary, 
+                      task_review.review_status, task_review.meta_review_status, 
+                      ST_AsGeoJSON(tasks.location) AS location, priority
+                FROM tasks
+                ${joinClause.toString()}
+                """
             )
-            .as(this.pointParser.*)
+            .as(this.markerParser.*)
 
         (count, Some(results))
       } else {

diff --git a/app/org/maproulette/models/dal/ChallengeDAL.scala b/app/org/maproulette/models/dal/ChallengeDAL.scala
@@ -414,6 +414,64 @@ class ChallengeDAL @Inject() (
     }
   }
 
+  val markerParser: RowParser[ClusteredPoint] = {
+    get[Long]("tasks.id") ~
+      get[String]("tasks.name") ~
+      get[Long]("tasks.parent_id") ~
+      get[String]("challenges.name").? ~
+      get[String]("challengeName").? ~
+      get[String]("location") ~
+      get[Int]("tasks.status") ~
+      get[Int]("tasks.priority") ~
+      get[Option[Long]]("tasks.bundle_id") ~
+      get[Option[Boolean]]("tasks.is_bundle_primary") ~
+      get[Option[Int]]("task_review.review_status") ~
+      get[Option[Int]]("task_review.meta_review_status") map {
+      case id ~ name ~ parentId ~ parentName ~ orParentName ~ location ~ status ~
+            priority ~ bundleId ~
+            isBundlePrimary ~ reviewStatus ~
+            metaReviewStatus =>
+        val locationJSON = Json.parse(location)
+        val coordinates  = (locationJSON \ "coordinates").as[List[Double]]
+        val point        = Point(coordinates(1), coordinates.head)
+        val pointReview =
+          PointReview(
+            reviewStatus,
+            None,
+            None,
+            None,
+            metaReviewStatus,
+            None,
+            None,
+            None,
+            None
+          )
+        ClusteredPoint(
+          id,
+          -1,
+          "",
+          name,
+          parentId,
+          parentName.getOrElse(orParentName.get),
+          point,
+          JsString(""),
+          "",
+          DateTime.now(),
+          -1,
+          Actions.ITEM_TYPE_TASK,
+          status,
+          None,
+          None,
+          None,
+          None,
+          pointReview,
+          priority,
+          bundleId,
+          isBundlePrimary
+        )
+    }
+  }
+
   private val DEFAULT_NUM_CHILDREN_LIST = 1000
 
   /**