refactor: revert moderation query

Author: b0ink

app/api/units_api.rb

@@ -330,17 +330,17 @@ class UnitsApi < Grape::API
         id: t.task_id,
         project_id: t.project_id,
         task_definition_id: t.task_definition_id,
-        tutorial_id: t.tutorial_id,
+        # tutorial_id: t.tutorial_id,
         status: TaskStatus.id_to_key(t.status_id),
         completion_date: t.completion_date,
         submission_date: t.submission_date,
-        times_assessed: t.times_assessed,
-        grade: t.grade,
-        quality_pts: t.quality_pts,
-        num_new_comments: t.number_unread,
-        similarity_flag: t.similar_to_count > 0,
-        pinned: t.pinned,
-        has_extensions: t.has_extensions,
+        # times_assessed: t.times_assessed,
+        # grade: t.grade,
+        # quality_pts: t.quality_pts,
+        # num_new_comments: t.number_unread,
+        # similarity_flag: t.similar_to_count > 0,
+        # pinned: t.pinned,
+        # has_extensions: t.has_extensions,
         moderation_type: t.moderated_task&.moderation_type
       }
     end

app/models/unit.rb

@@ -2203,36 +2203,32 @@ def tasks_for_moderation(user)
     my_unit_role = unit_role_for(user)
     mentees = my_unit_role ? staff.where(mentor_id: my_unit_role.id) : staff.none
 
-    moderated_tasks = ModeratedTask
-      .where(state: %i[open waiting_for_new_feedback])
-      .joins(task: [:task_definition, { project: { tutorial_enrolments: :tutorial } }])
-      .where(tasks: { project_id: projects.select(:id) })
-      .where('tutorials.tutorial_stream_id = task_definitions.tutorial_stream_id')
-      .includes(task: :comments)
-      .distinct
-
-    tasks = Task
-      .joins(:moderated_task)
-      .merge(moderated_tasks)
-      .includes(:comments)
-      .select(
-        'tasks.id AS task_id',
-        'tasks.project_id',
-        'tasks.task_definition_id',
-        'tutorials.id AS tutorial_id',
-        'tasks.task_status_id AS status_id',
-        'tasks.completion_date',
-        'tasks.submission_date',
-        'tasks.times_assessed',
-        'tasks.grade',
-        'tasks.quality_pts',
-        '0 AS number_unread',
-        '0 AS similar_to_count',
-        'false AS pinned',
-        'false AS has_extensions',
-        'tasks.*',
-      )
-      .distinct
+    tasks = student_tasks
+                  .includes(:comments)
+                  .joins(:moderated_task)
+                  .where(moderated_tasks: { state: %i[open waiting_for_new_feedback] })
+                  .where(projects: { unit_id: id })
+                  .joins(:task_definition)
+                  .joins(project: { tutorial_enrolments: :tutorial })
+                  .where('tutorials.tutorial_stream_id = task_definitions.tutorial_stream_id')
+                  .select(
+                    'tasks.id AS task_id',
+                    'tasks.project_id',
+                    'tasks.task_definition_id',
+                    # 'tutorials.id AS tutorial_id',
+                    'tasks.task_status_id AS status_id',
+                    'tasks.completion_date',
+                    'tasks.submission_date',
+                    # 'tasks.times_assessed',
+                    # 'tasks.grade',
+                    # 'tasks.quality_pts',
+                    # '0 AS number_unread',
+                    # '0 AS similar_to_count',
+                    # 'false AS pinned',
+                    # 'false AS has_extensions',
+                    'tasks.*',
+                  )
+                  .distinct
 
     if my_unit_role.nil? || my_unit_role.role != Role.convenor
       tasks = tasks.where(tutorials: { unit_role_id: mentees.select(:id) })