reset file.status_disabled_reason when rejecting too (#22727)

mozilla · Oct 2, 2024 · 4b92370 · 4b92370
1 parent f1015a7
commit 4b92370
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/olympia/reviewers/tests/test_utils.py b/src/olympia/reviewers/tests/test_utils.py
@@ -3675,14 +3675,17 @@ def test_resolve_appeal_job(self):
     def test_reject_multiple_versions_resets_original_status_too(self):
         old_version = self.review_version
         old_version.file.update(
-            status=amo.STATUS_DISABLED, original_status=amo.STATUS_APPROVED
+            status=amo.STATUS_DISABLED,
+            original_status=amo.STATUS_APPROVED,
+            status_disabled_reason=File.STATUS_DISABLED_REASONS.DEVELOPER,
         )
         self.review_version = version_factory(
             addon=self.addon,
             version='3.0',
             file_kw={
                 'status': amo.STATUS_DISABLED,
                 'original_status': amo.STATUS_AWAITING_REVIEW,
+                'status_disabled_reason': File.STATUS_DISABLED_REASONS.DEVELOPER,
             },
         )
         self.file = self.review_version.file
@@ -3698,6 +3701,10 @@ def test_reject_multiple_versions_resets_original_status_too(self):
         assert self.review_version.file.reload().status == amo.STATUS_DISABLED
         assert old_version.file.original_status == amo.STATUS_NULL
         assert self.review_version.file.original_status == amo.STATUS_NULL
+        assert old_version.file.original_status == File.STATUS_DISABLED_REASONS.NONE
+        assert self.review_version.file.original_status == (
+            File.STATUS_DISABLED_REASONS.NONE
+        )
 
 
 @override_settings(ENABLE_ADDON_SIGNING=True)

diff --git a/src/olympia/reviewers/utils.py b/src/olympia/reviewers/utils.py
@@ -21,6 +21,7 @@
 from olympia.addons.models import Addon, AddonApprovalsCounter, AddonReviewerFlags
 from olympia.constants.abuse import DECISION_ACTIONS
 from olympia.constants.promoted import RECOMMENDED
+from olympia.files.models import File
 from olympia.lib.crypto.signing import sign_file
 from olympia.reviewers.models import (
     AutoApprovalSummary,
@@ -867,6 +868,7 @@ def set_file(self, status, file):
         file.status = status
         if status == amo.STATUS_DISABLED:
             file.original_status = amo.STATUS_NULL
+            file.status_disabled_reason = File.STATUS_DISABLED_REASONS.NONE
         file.save()
 
     def set_promoted(self, versions=None):