Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move DECISION_ACTIONS to constants #21973

Merged
merged 1 commit into from
Mar 11, 2024
Merged

move DECISION_ACTIONS to constants #21973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 19 additions & 62 deletions src/olympia/abuse/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from olympia import amo
from olympia.addons.models import Addon
from olympia.amo.models import BaseQuerySet, ManagerBase, ModelBase
from olympia.api.utils import APIChoicesWithDash, APIChoicesWithNone
from olympia.api.utils import APIChoicesWithNone
from olympia.bandwagon.models import Collection
from olympia.constants.abuse import APPEAL_EXPIRATION_DAYS
from olympia.constants.abuse import APPEAL_EXPIRATION_DAYS, DECISION_ACTIONS
from olympia.ratings.models import Rating
from olympia.users.models import UserProfile

Expand Down Expand Up @@ -44,7 +44,7 @@ def for_addon(self, addon):

def unresolved(self):
return self.filter(
decision_action__in=tuple(CinderJob.DECISION_ACTIONS.UNRESOLVED.values)
decision_action__in=tuple(DECISION_ACTIONS.UNRESOLVED.values)
)

def resolvable_in_reviewer_tools(self):
Expand All @@ -65,47 +65,6 @@ def resolvable_in_reviewer_tools(self):


class CinderJob(ModelBase):
DECISION_ACTIONS = APIChoicesWithDash(
('NO_DECISION', 0, 'No decision'),
('AMO_BAN_USER', 1, 'User ban'),
('AMO_DISABLE_ADDON', 2, 'Add-on disable'),
('AMO_ESCALATE_ADDON', 3, 'Escalate add-on to reviewers'),
# 4 is unused
('AMO_DELETE_RATING', 5, 'Rating delete'),
('AMO_DELETE_COLLECTION', 6, 'Collection delete'),
('AMO_APPROVE', 7, 'Approved (no action)'),
# Rejecting versions is not an available action for moderators in cinder
# - it is only handled by the reviewer tools by AMO Reviewers.
# It should not be sent by the cinder webhook, & does not have an action defined
('AMO_REJECT_VERSION_ADDON', 8, 'Add-on version reject'),
)
DECISION_ACTIONS.add_subset(
'APPEALABLE_BY_AUTHOR',
(
'AMO_BAN_USER',
'AMO_DISABLE_ADDON',
'AMO_DELETE_RATING',
'AMO_DELETE_COLLECTION',
'AMO_REJECT_VERSION_ADDON',
),
)
DECISION_ACTIONS.add_subset(
'APPEALABLE_BY_REPORTER',
('AMO_APPROVE',),
)
DECISION_ACTIONS.add_subset(
'UNRESOLVED',
('NO_DECISION', 'AMO_ESCALATE_ADDON'),
)
DECISION_ACTIONS.add_subset(
'REMOVING',
(
'AMO_BAN_USER',
'AMO_DISABLE_ADDON',
'AMO_DELETE_RATING',
'AMO_DELETE_COLLECTION',
),
)
job_id = models.CharField(max_length=36, unique=True)
decision_action = models.PositiveSmallIntegerField(
default=DECISION_ACTIONS.NO_DECISION, choices=DECISION_ACTIONS.choices
Expand Down Expand Up @@ -186,7 +145,7 @@ def can_be_appealed(self, *, is_reporter, abuse_report=None):
and abuse_report
and abuse_report.cinder_job == self
and not abuse_report.appellant_job
and self.decision_action in self.DECISION_ACTIONS.APPEALABLE_BY_REPORTER
and self.decision_action in DECISION_ACTIONS.APPEALABLE_BY_REPORTER
and not self.appealed_jobs.exists()
)
or
Expand All @@ -199,7 +158,7 @@ def can_be_appealed(self, *, is_reporter, abuse_report=None):
(
not is_reporter
and not self.appeal_job
and self.decision_action in self.DECISION_ACTIONS.APPEALABLE_BY_AUTHOR
and self.decision_action in DECISION_ACTIONS.APPEALABLE_BY_AUTHOR
)
)
return base_criteria and user_criteria
Expand Down Expand Up @@ -236,13 +195,13 @@ def get_entity_helper(cls, abuse_report):
@classmethod
def get_action_helper_class(cls, decision_action):
return {
cls.DECISION_ACTIONS.AMO_BAN_USER: CinderActionBanUser,
cls.DECISION_ACTIONS.AMO_DISABLE_ADDON: CinderActionDisableAddon,
cls.DECISION_ACTIONS.AMO_REJECT_VERSION_ADDON: CinderActionRejectVersion,
cls.DECISION_ACTIONS.AMO_ESCALATE_ADDON: CinderActionEscalateAddon,
cls.DECISION_ACTIONS.AMO_DELETE_COLLECTION: CinderActionDeleteCollection,
cls.DECISION_ACTIONS.AMO_DELETE_RATING: CinderActionDeleteRating,
cls.DECISION_ACTIONS.AMO_APPROVE: CinderActionApproveInitialDecision,
DECISION_ACTIONS.AMO_BAN_USER: CinderActionBanUser,
DECISION_ACTIONS.AMO_DISABLE_ADDON: CinderActionDisableAddon,
DECISION_ACTIONS.AMO_REJECT_VERSION_ADDON: CinderActionRejectVersion,
DECISION_ACTIONS.AMO_ESCALATE_ADDON: CinderActionEscalateAddon,
DECISION_ACTIONS.AMO_DELETE_COLLECTION: CinderActionDeleteCollection,
DECISION_ACTIONS.AMO_DELETE_RATING: CinderActionDeleteRating,
DECISION_ACTIONS.AMO_APPROVE: CinderActionApproveInitialDecision,
}.get(decision_action, CinderActionNotImplemented)

def get_action_helper(
Expand All @@ -253,8 +212,8 @@ def get_action_helper(

# But we use more specific actions for certain cases:
# Where there was an appeal/override from a remove action to approve
if self.decision_action == self.DECISION_ACTIONS.AMO_APPROVE and (
existing_decision in self.DECISION_ACTIONS.REMOVING
if self.decision_action == DECISION_ACTIONS.AMO_APPROVE and (
existing_decision in DECISION_ACTIONS.REMOVING
):
CinderActionClass = (
CinderActionOverrideApprove
Expand All @@ -264,7 +223,7 @@ def get_action_helper(

# Where there was an appeal/override which didn't change from a remove action
elif self.decision_action == existing_decision and (
self.decision_action in self.DECISION_ACTIONS.REMOVING
self.decision_action in DECISION_ACTIONS.REMOVING
):
CinderActionClass = (
CinderActionNotImplemented
Expand Down Expand Up @@ -327,7 +286,7 @@ def process_decision(
: self._meta.get_field('decision_notes').max_length
],
resolvable_in_reviewer_tools=self.resolvable_in_reviewer_tools
or decision_action == self.DECISION_ACTIONS.AMO_ESCALATE_ADDON,
or decision_action == DECISION_ACTIONS.AMO_ESCALATE_ADDON,
)
policies = CinderPolicy.objects.filter(
uuid__in=policy_ids
Expand All @@ -337,7 +296,7 @@ def process_decision(
action_occured = action_helper.process_action()
if (
existing_decision != decision_action
or decision_action == self.DECISION_ACTIONS.AMO_APPROVE
or decision_action == DECISION_ACTIONS.AMO_APPROVE
):
action_helper.notify_reporters()
if action_occured:
Expand Down Expand Up @@ -395,14 +354,12 @@ def appeal(self, *, abuse_report, appeal_text, user, is_reporter):
def resolve_job(self, *, log_entry):
"""This is called for reviewer tools originated decisions.
See process_decision for cinder originated decisions."""
if not self.DECISION_ACTIONS.has_api_value(
cinder_action_slug := getattr(log_entry.log, 'cinder_action', None)
):
if not hasattr(log_entry.log, 'cinder_action'):
raise ImproperlyConfigured(
'Missing or invalid cinder_action for activity log entry passed to '
'resolve_job'
)
decision_action = self.DECISION_ACTIONS.for_api_value(cinder_action_slug).value
decision_action = log_entry.log.cinder_action.value
entity_helper = self.get_entity_helper(self.abuse_reports[0])
policies = CinderPolicy.objects.filter(
pk__in=log_entry.reviewactionreasonlog_set.all()
Expand Down
Loading
Loading