track queue moves as a decision

Author: eviljeff

src/olympia/abuse/models.py

@@ -58,7 +58,9 @@ def unresolved(self):
             Q(decisions__isnull=True)
             | Q(
                 # i.e. the latest decision is a requeue
-                decisions__action=DECISION_ACTIONS.AMO_REQUEUE,
+                decisions__action__in=(
+                    DECISION_ACTIONS.AMO_REQUEUE, DECISION_ACTIONS.AMO_ESCALATE
+                ),
                 decisions__overridden_by__isnull=True,
             )
         )
@@ -324,8 +326,15 @@ def process_decision(
         decision.send_notifications()
 
     def process_queue_move(self, *, new_queue, notes):
-        CinderQueueMove.objects.create(cinder_job=self, notes=notes, to_queue=new_queue)
         if new_queue == CinderAddonHandledByReviewers(self.target).queue:
+            ContentDecision.objects.create(
+                addon=self.target_addon,
+                action=DECISION_ACTIONS.AMO_ESCALATE,
+                override_of=self.decision,
+                action_date=datetime.now(),
+                notes=notes,
+                cinder_job=self,
+            )
             # now escalated
             entity_helper = CinderJob.get_entity_helper(
                 self.target, resolved_in_reviewer_tools=True
@@ -358,27 +367,20 @@ def clear_needs_human_review_flags(self):
             .resolvable_in_reviewer_tools()
         )
         if (
-            (decision_actions := tuple(self.decisions.values_list('action', flat=True)))
+            (penultimate_action :=
+             tuple(self.decisions.values_list('action', flat=True))[-2:-1])
             # i.e. was the previous decision before the current a requeue
-            and len(decision_actions) >= 2
-            and decision_actions[-2] == DECISION_ACTIONS.AMO_REQUEUE
+            and penultimate_action == DECISION_ACTIONS.AMO_REQUEUE
         ):
             has_unresolved_jobs_with_similar_reason = base_unresolved_jobs_qs.filter(
                 decisions__action=DECISION_ACTIONS.AMO_REQUEUE,
                 decisions__overridden_by__isnull=True,
             ).exists()
             reasons = {NeedsHumanReview.REASONS.SECOND_LEVEL_REQUEUE}
-        elif self.forwarded_from_jobs.exists():
+        elif penultimate_action == DECISION_ACTIONS.AMO_ESCALATE_ADDON:
             has_unresolved_jobs_with_similar_reason = base_unresolved_jobs_qs.filter(
-                forwarded_from_jobs__isnull=False
-            ).exists()
-            reasons = {
-                NeedsHumanReview.REASONS.CINDER_ESCALATION,
-                NeedsHumanReview.REASONS.CINDER_APPEAL_ESCALATION,
-            }
-        elif self.queue_moves.exists():
-            has_unresolved_jobs_with_similar_reason = base_unresolved_jobs_qs.filter(
-                queue_moves__id__gt=0
+                decisions__action=DECISION_ACTIONS.AMO_ESCALATE_ADDON,
+                decisions__overridden_by__isnull=True,
             ).exists()
             reasons = {
                 NeedsHumanReview.REASONS.CINDER_ESCALATION,
@@ -1457,11 +1459,3 @@ class CinderAppeal(ModelBase):
     reporter_report = models.OneToOneField(
         to=AbuseReport, on_delete=models.CASCADE, null=True
     )
-
-
-class CinderQueueMove(ModelBase):
-    cinder_job = models.ForeignKey(
-        to=CinderJob, on_delete=models.CASCADE, related_name='queue_moves'
-    )
-    notes = models.TextField(max_length=1000, blank=True)
-    to_queue = models.CharField(max_length=128)

src/olympia/abuse/tests/test_models.py

@@ -62,7 +62,6 @@
     CinderAppeal,
     CinderJob,
     CinderPolicy,
-    CinderQueueMove,
     ContentDecision,
 )
 
@@ -1319,9 +1318,10 @@ def test_process_queue_move_into_reviewer_handled(self):
         nhr = NeedsHumanReview.objects.get()
         assert nhr.reason == NeedsHumanReview.REASONS.CINDER_ESCALATION
         assert nhr.version == addon.current_version
-        assert CinderQueueMove.objects.filter(
-            cinder_job=cinder_job, to_queue='amo-env-addon-infringement', notes='notes!'
-        ).exists()
+        assert cinder_job.decision.notes == 'notes!'
+        assert cinder_job.decision.action == DECISION_ACTIONS.AMO_ESCALATE
+        assert cinder_job.decision.cinder_job == cinder_job
+        assert cinder_job.decision.addon == cinder_job.target_addon
 
     def test_process_queue_move_out_of_reviewer_handled(self):
         # Not yet implemented, so just check it's silently ignored
@@ -1339,9 +1339,6 @@ def test_process_queue_move_out_of_reviewer_handled(self):
         assert cinder_job.resolvable_in_reviewer_tools is True
         assert len(mail.outbox) == 0
         assert NeedsHumanReview.objects.count() == 1
-        assert CinderQueueMove.objects.filter(
-            cinder_job=cinder_job, to_queue='amo-env-listings', notes='out'
-        ).exists()
 
     def test_process_queue_move_other_queue_movement(self):
         # we don't need to about these other queue moves, so just check it's silently
@@ -1354,9 +1351,6 @@ def test_process_queue_move_other_queue_movement(self):
         assert not cinder_job.resolvable_in_reviewer_tools
         assert len(mail.outbox) == 0
         assert NeedsHumanReview.objects.count() == 0
-        assert CinderQueueMove.objects.filter(
-            cinder_job=cinder_job, to_queue='amo-env-some-other-queue', notes='?'
-        ).exists()
 
     def test_all_abuse_reports(self):
         job = CinderJob.objects.create(job_id='fake_job_id')
@@ -1522,14 +1516,20 @@ def test_clear_needs_human_review_flags_forwarded_with_job(self):
     def test_clear_needs_human_review_flags_forwarded_moved_queue(self):
         job = self._setup_clear_needs_human_review_flags()
         # if the job is forwarded, we make sure that there are no other forwarded jobs
-        CinderQueueMove.objects.create(cinder_job=job, to_queue='wherever')
+        job.decision.update(action=DECISION_ACTIONS.AMO_ESCALATE)
+        ContentDecision.objects.create(
+            cinder_job=job, addon=job.target_addon, action=DECISION_ACTIONS.AMO_APPROVE
+        )
 
         other_forward = CinderJob.objects.create(
             job_id='3',
             target_addon=job.target_addon,
             resolvable_in_reviewer_tools=True,
         )
-        CinderQueueMove.objects.create(cinder_job=other_forward, to_queue='whoever')
+        ContentDecision.objects.create(
+            cinder_job=other_forward, addon=job.target_addon,
+            action=DECISION_ACTIONS.AMO_ESCALATE
+        )
         job.clear_needs_human_review_flags()
         assert self._nhr_exists(NeedsHumanReview.REASONS.ABUSE_ADDON_VIOLATION)
         assert self._nhr_exists(NeedsHumanReview.REASONS.CINDER_ESCALATION)

src/olympia/reviewers/forms.py

@@ -250,13 +250,13 @@ def create_option(
         # label_from_instance() on WidgetRenderedModelMultipleChoiceField returns the
         # full object, not a label, this is what makes this work.
         obj = label
-        forwarded_notes = [
-            *obj.forwarded_from_jobs.all().values_list('decisions__notes', flat=True),
-            *obj.queue_moves.values_list('notes', flat=True),
-            *obj.decisions.filter(action=DECISION_ACTIONS.AMO_REQUEUE).values_list(
+        forwarded_notes = list(
+            obj.decisions.filter(
+                action__in=(DECISION_ACTIONS.AMO_REQUEUE, DECISION_ACTIONS.AMO_ESCALATE)
+            ).values_list(
                 'notes', flat=True
             ),
-        ]
+        )
         is_appeal = obj.is_appeal
         reports = obj.all_abuse_reports
         reasons_set = {

src/olympia/reviewers/tests/test_forms.py

@@ -13,7 +13,6 @@
     CinderAppeal,
     CinderJob,
     CinderPolicy,
-    CinderQueueMove,
     ContentDecision,
 )
 from olympia.addons.models import Addon
@@ -1246,19 +1245,17 @@ def test_cinder_jobs_to_resolve_choices(self):
             resolvable_in_reviewer_tools=True,
             target_addon=self.addon,
         )
-        CinderJob.objects.create(
-            job_id='forwarded_from',
-            forwarded_to_job=cinder_job_forwarded,
-            decision=ContentDecision.objects.create(
-                action=DECISION_ACTIONS.AMO_ESCALATE_ADDON,
-                notes='Why o why',
-                addon=self.addon,
-            ),
+        ContentDecision.objects.create(
+            action=DECISION_ACTIONS.AMO_ESCALATE,
+            notes='Zee de zee',
+            addon=self.addon,
+            cinder_job=cinder_job_forwarded,
         )
-        CinderQueueMove.objects.create(
+        ContentDecision.objects.create(
+            action=DECISION_ACTIONS.AMO_REQUEUE,
+            notes='Why o why',
+            addon=self.addon,
             cinder_job=cinder_job_forwarded,
-            notes='Zee de zee',
-            to_queue='amo-env-content-infringment',
         )
         AbuseReport.objects.create(
             **{**abuse_kw, 'location': AbuseReport.LOCATION.AMO},