filter out deleted tasks in taskCluster (#958)

maproulette · Jun 14, 2022 · df36162 · df36162
1 parent b0721e3
commit df36162
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/org/maproulette/framework/repository/TaskClusterRepository.scala b/app/org/maproulette/framework/repository/TaskClusterRepository.scala
@@ -81,7 +81,9 @@ class TaskClusterRepository @Inject() (override val db: Database, challengeDAL:
       query: Query,
       numberOfPoints: Int
   ): (StringBuilder, List[NamedParameter]) = {
-    return (new StringBuilder(s"""FROM (
+    val whereClause = query.filter.sql() + " AND c.deleted = false AND p.deleted = false"
+
+    val queryString = s"""FROM (
             SELECT tasks.*, tasks.id as taskId, tasks.status as taskStatus,
                    tasks.priority as taskPriority, tasks.geojson::TEXT as taskGeojson,
                    task_review.*, c.name as challengeName,
@@ -90,15 +92,17 @@ class TaskClusterRepository @Inject() (override val db: Database, challengeDAL:
                           CASE WHEN COUNT(*) < $numberOfPoints THEN COUNT(*) ELSE $numberOfPoints END
                         FROM tasks
                         $joinClause
-                        WHERE ${query.filter.sql()}
+                        WHERE ${whereClause}
                       )::Integer
                     ) OVER () AS kmeans, tasks.location as taskLocation, tasks.parent_id as challengeIds
             FROM tasks
             $joinClause
-            WHERE ${query.filter.sql()}
+            WHERE ${whereClause}
           ) AS ksub
           WHERE location IS NOT NULL
-      """), query.parameters())
+      """
+
+    return (new StringBuilder(queryString), query.parameters())
   }
 
   /**

diff --git a/app/org/maproulette/framework/service/TaskClusterService.scala b/app/org/maproulette/framework/service/TaskClusterService.scala
@@ -39,7 +39,9 @@ class TaskClusterService @Inject() (repository: TaskClusterRepository)
       params: SearchParameters,
       numberOfPoints: Int = this.repository.DEFAULT_NUMBER_OF_POINTS
   ): List[TaskCluster] = {
-    val query = this.filterOutDeletedParents(this.filterOnSearchParameters(params)(false))
+    val filtered = this.filterOnSearchParameters(params)(false)
+    val query = this.filterOutDeletedParents(filtered)
+
     this.repository.queryTaskClusters(query, numberOfPoints, params)
   }