drop support for AMO_ESCALATE and forwarded jobs

Author: eviljeff

src/olympia/abuse/actions.py

@@ -523,15 +523,6 @@ def hold_action(self):
         )
 
 
-class ContentActionForwardToReviewers(ContentAction):
-    valid_targets = (Addon,)
-
-    def process_action(self):
-        from olympia.abuse.tasks import handle_escalate_action
-
-        handle_escalate_action.delay(job_pk=self.decision.cinder_job.pk)
-
-
 class ContentActionForwardToLegal(ContentAction):
     valid_targets = (Addon,)
 
@@ -733,7 +724,6 @@ class ContentActionNotImplemented(AnyTargetMixin, NoActionMixin, ContentAction):
         DECISION_ACTIONS.AMO_REJECT_VERSION_WARNING_ADDON: (
             ContentActionRejectVersionDelayed
         ),
-        DECISION_ACTIONS.AMO_ESCALATE_ADDON: ContentActionForwardToReviewers,
         DECISION_ACTIONS.AMO_DELETE_COLLECTION: ContentActionDeleteCollection,
         DECISION_ACTIONS.AMO_DELETE_RATING: ContentActionDeleteRating,
         DECISION_ACTIONS.AMO_APPROVE: ContentActionApproveNoAction,

src/olympia/abuse/management/commands/backfill_cinder_escalations.py

@@ -93,12 +93,6 @@ class CinderJob(ModelBase):
         to=Addon, blank=True, null=True, on_delete=models.deletion.SET_NULL
     )
     resolvable_in_reviewer_tools = models.BooleanField(default=None, null=True)
-    forwarded_to_job = models.ForeignKey(
-        to='self',
-        null=True,
-        on_delete=models.SET_NULL,
-        related_name='forwarded_from_jobs',
-    )
 
     objects = CinderJobManager()
 
@@ -247,45 +241,6 @@ def notify_reporters(self, action_helper):
             reporter_abuse_reports=appellants, is_appeal=True
         )
 
-    def handle_job_recreated(self, *, new_job_id, resolvable_in_reviewer_tools):
-        from olympia.reviewers.models import NeedsHumanReview
-
-        new_job, created = CinderJob.objects.update_or_create(
-            job_id=new_job_id,
-            defaults={
-                'resolvable_in_reviewer_tools': resolvable_in_reviewer_tools,
-                'target_addon': self.target_addon,
-            },
-        )
-        # If this forward has been combined with an existing non-forwarded job we need
-        # to clear the NHR for reason:ABUSE_ADDON_VIOLATION, because it now has a NHR
-        # for reason:CINDER_ESCALATION.
-        if not created and not new_job.forwarded_from_jobs.exists():
-            has_unresolved_abuse_report_jobs = (
-                self.__class__.objects.for_addon(new_job.target_addon)
-                .exclude(
-                    id=new_job.id,
-                    forwarded_from_jobs__isnull=True,
-                    appealed_decisions__isnull=True,
-                )
-                .unresolved()
-                .resolvable_in_reviewer_tools()
-                .exists()
-            )
-            # But only if there aren't other jobs that should legitimately have a NHR
-            # for reason:ABUSE_ADDON_VIOLATION
-            if not has_unresolved_abuse_report_jobs:
-                NeedsHumanReview.objects.filter(
-                    version__addon_id=new_job.target_addon.id,
-                    is_active=True,
-                    reason=NeedsHumanReview.REASONS.ABUSE_ADDON_VIOLATION,
-                ).update(is_active=False)
-                new_job.target_addon.update_all_due_dates()
-        # Update our fks to connected objects
-        AbuseReport.objects.filter(cinder_job=self).update(cinder_job=new_job)
-        ContentDecision.objects.filter(appeal_job=self).update(appeal_job=new_job)
-        self.update(forwarded_to_job=new_job)
-
     def process_decision(
         self,
         *,
@@ -368,14 +323,6 @@ def clear_needs_human_review_flags(self):
                 decisions__overridden_by__isnull=True,
             ).exists()
             reasons = {NeedsHumanReview.REASONS.SECOND_LEVEL_REQUEUE}
-        elif self.forwarded_from_jobs.exists():
-            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

src/olympia/abuse/models.py

@@ -210,20 +210,6 @@ def mark_used_orphaned_policies(policies_in_cinder):
     mark_used_orphaned_policies(policies_in_cinder)
 
 
-@task
-@use_primary_db
-def handle_escalate_action(*, job_pk, from_2nd_level=False):
-    old_job = CinderJob.objects.get(id=job_pk)
-    entity_helper = CinderJob.get_entity_helper(
-        old_job.target, resolved_in_reviewer_tools=True
-    )
-    job_id = entity_helper.workflow_recreate(
-        notes=old_job.final_decision.notes, job=old_job, from_2nd_level=from_2nd_level
-    )
-
-    old_job.handle_job_recreated(new_job_id=job_id, resolvable_in_reviewer_tools=True)
-
-
 @task
 @use_primary_db
 def handle_forward_to_legal_action(*, decision_pk):
@@ -232,15 +218,15 @@ def handle_forward_to_legal_action(*, decision_pk):
     entity_helper = CinderAddonHandledByLegal(decision.addon)
     job_id = entity_helper.workflow_recreate(notes=decision.notes, job=old_job)
 
+    new_job, _ = CinderJob.objects.update_or_create(
+        job_id=job_id,
+        defaults={
+            'resolvable_in_reviewer_tools': False,
+            'target_addon': decision.addon,
+        },
+    )
+
     if old_job:
-        old_job.handle_job_recreated(
-            new_job_id=job_id, resolvable_in_reviewer_tools=False
-        )
-    else:
-        CinderJob.objects.update_or_create(
-            job_id=job_id,
-            defaults={
-                'resolvable_in_reviewer_tools': False,
-                'target_addon': decision.addon,
-            },
-        )
+        # Update fks to connected objects
+        AbuseReport.objects.filter(cinder_job=old_job).update(cinder_job=new_job)
+        ContentDecision.objects.filter(appeal_job=old_job).update(appeal_job=new_job)

src/olympia/abuse/tasks.py

@@ -848,9 +848,7 @@ def test_forward_from_reviewers_with_job(self):
         new_cinder_job = CinderJob.objects.get(job_id='1234-xyz')
         assert new_cinder_job != self.cinder_job
         assert new_cinder_job.job_id == '1234-xyz'
-        # The old cinder_job should have a reference to the new job
-        assert self.cinder_job.reload().forwarded_to_job == new_cinder_job
-        # And the reports should now be part of the new job instead
+        # The reports should now be part of the new job instead
         assert self.abuse_report_auth.reload().cinder_job == new_cinder_job
         assert self.abuse_report_no_auth.reload().cinder_job == new_cinder_job
         request_body = json.loads(responses.calls[0].request.body)

src/olympia/abuse/tests/test_actions.py

@@ -1308,26 +1308,6 @@ def test_report_with_ongoing_appeal(self):
         # The add-on does not get flagged again while the appeal is ongoing.
         assert addon.current_version.needshumanreview_set.count() == 0
 
-    def test_report_with_ongoing_forwarded_appeal(self):
-        addon = self._create_dummy_target()
-        job = CinderJob.objects.create(job_id='1234-xyz')
-        CinderJob.objects.create(forwarded_to_job=job)
-        job.appealed_decisions.add(
-            ContentDecision.objects.create(
-                addon=addon,
-                cinder_id='1234-decision',
-                action=DECISION_ACTIONS.AMO_REJECT_VERSION_ADDON,
-            )
-        )
-        # Trigger switch_is_active to ensure it's cached to make db query
-        # count more predictable.
-        waffle.switch_is_active('dsa-abuse-reports-review')
-        self._test_report(addon)
-        cinder_instance = self.CinderClass(addon)
-        cinder_instance.post_report(job)
-        # The add-on does not get flagged again while the appeal is ongoing.
-        assert addon.current_version.needshumanreview_set.count() == 0
-
     def test_create_decision(self):
         target = self._create_dummy_target()
 

src/olympia/abuse/tests/test_cinder.py

@@ -4,80 +4,9 @@
 import pytest
 import responses
 
-from olympia.amo.tests import addon_factory, user_factory
-from olympia.constants.abuse import DECISION_ACTIONS
+from olympia.amo.tests import addon_factory
 
-from ..models import AbuseReport, CinderJob, ContentDecision
-
-
-@pytest.mark.django_db
-def test_backfill_cinder_escalations():
-    user = user_factory(pk=settings.TASK_USER_ID)
-    addon = addon_factory(users=[user])
-    job_with_reports = CinderJob.objects.create(
-        job_id='1',
-        decision=ContentDecision.objects.create(
-            action=DECISION_ACTIONS.AMO_ESCALATE_ADDON, addon=addon
-        ),
-    )
-    abuse = AbuseReport.objects.create(guid=addon.guid, cinder_job=job_with_reports)
-    appeal_job = CinderJob.objects.create(
-        job_id='2',
-        decision=ContentDecision.objects.create(
-            action=DECISION_ACTIONS.AMO_ESCALATE_ADDON, addon=addon
-        ),
-    )
-    appealled_decision = ContentDecision.objects.create(
-        action=DECISION_ACTIONS.AMO_DISABLE_ADDON, addon=addon, appeal_job=appeal_job
-    )
-
-    # And some jobs/decisions that should be skipped:
-    # decision that wasn't an escalation (or isn't any longer)
-    CinderJob.objects.create(
-        job_id='3',
-        decision=ContentDecision.objects.create(
-            action=DECISION_ACTIONS.AMO_APPROVE, addon=addon
-        ),
-    )
-    # decision without an associated cinder job (shouldn't occur, but its handled)
-    ContentDecision.objects.create(
-        action=DECISION_ACTIONS.AMO_ESCALATE_ADDON, addon=addon
-    )
-    # decision that already has a forwarded job created, so we don't need to backfill
-    CinderJob.objects.create(
-        job_id='4',
-        decision=ContentDecision.objects.create(
-            action=DECISION_ACTIONS.AMO_ESCALATE_ADDON, addon=addon
-        ),
-        forwarded_to_job=CinderJob.objects.create(job_id='5'),
-    )
-    assert CinderJob.objects.count() == 5
-    assert ContentDecision.objects.count() == 6
-    responses.add(
-        responses.POST,
-        f'{settings.CINDER_SERVER_URL}create_report',
-        json={'job_id': '6'},
-        status=201,
-    )
-    responses.add(
-        responses.POST,
-        f'{settings.CINDER_SERVER_URL}create_report',
-        json={'job_id': '7'},
-        status=201,
-    )
-
-    call_command('backfill_cinder_escalations')
-    assert CinderJob.objects.count() == 7
-    assert ContentDecision.objects.count() == 6
-
-    new_job_with_reports = job_with_reports.reload().forwarded_to_job
-    assert new_job_with_reports
-    assert new_job_with_reports.resolvable_in_reviewer_tools is True
-    assert abuse.reload().cinder_job == new_job_with_reports
-    new_appeal_job = appeal_job.reload().forwarded_to_job
-    assert new_appeal_job
-    assert new_appeal_job.resolvable_in_reviewer_tools is True
-    assert appealled_decision.reload().appeal_job == new_appeal_job
+from ..models import AbuseReport, CinderJob
 
 
 @pytest.mark.django_db