constants/activity.py

@@ -10,7 +10,6 @@ class Verb:
     REPORTED_RATING = 'reported rating'
     REQUESTED_CHANGES = 'requested changes'
     REQUESTED_REVIEW = 'requested review'
-    UPLOADED_NEW_VERSION = 'uploaded new version'
 
 
 class Flag:

extensions/signals.py

@@ -8,7 +8,6 @@ from django.db.models.signals import m2m_changed, pre_save, post_save, pre_delet
 from django.dispatch import receiver
 
 from constants.activity import Flag
-from reviewers.models import ApprovalActivity
 import extensions.models
 import files.models
 
@@ -166,26 +165,3 @@ def _auto_approve_subsequent_uploads(
         args = {'f_id': file.pk, 'pk': instance.pk, 'sender': sender, 's': file.source.name}
         logger.info('Auto-approving file pk=%(f_id)s of %(sender)s pk=%(pk)s source=%(s)s', args)
         file.save(update_fields={'status', 'date_modified'})
-
-
-@receiver(post_save, sender=extensions.models.Version)
-def _create_approval_activity_for_new_version_if_listed(
-    sender: object,
-    instance: extensions.models.Version,
-    created: bool,
-    raw: bool,
-    **kwargs: object,
-):
-    if raw:
-        return
-    if not created:
-        return
-    extension = instance.extension
-    if not extension.is_listed or not instance.file:
-        return
-    ApprovalActivity(
-        type=ApprovalActivity.ActivityType.UPLOADED_NEW_VERSION,
-        user=instance.file.user,
-        extension=instance.extension,
-        message=f'uploaded new version: {instance.version}',
-    ).save()

extensions/tests/test_submit.py

@@ -10,7 +10,6 @@ from common.tests.factories.users import UserFactory
 from common.tests.utils import _get_all_form_errors
 from extensions.models import Extension, Version
 from files.models import File
-from reviewers.models import ApprovalActivity
 import utils
 
 
@@ -426,14 +425,6 @@ class NewVersionTest(TestCase):
             f'/add-ons/{self.extension.slug}/manage/versions/new/{file.pk}/',
         )
         self.assertEqual(self.extension.versions.count(), 1)
-        self.extension.approve()
-        self.assertEqual(
-            ApprovalActivity.objects.filter(
-                extension=self.extension,
-                type=ApprovalActivity.ActivityType.UPLOADED_NEW_VERSION,
-            ).count(),
-            0,
-        )
 
         # Check step 2: finalise new version and send to review
         url = response['Location']
@@ -453,10 +444,3 @@ class NewVersionTest(TestCase):
         self.assertEqual(new_version.schema_version, '1.0.0')
         self.assertEqual(new_version.release_notes, 'new version')
         self.assertEqual(new_version.file.get_status_display(), 'Approved')
-        self.assertEqual(
-            ApprovalActivity.objects.filter(
-                extension=self.extension,
-                type=ApprovalActivity.ActivityType.UPLOADED_NEW_VERSION,
-            ).count(),
-            1,
-        )

reviewers/models.py

@@ -80,7 +80,6 @@ class ApprovalActivity(CreatedModifiedMixin, RecordDeletionMixin, models.Model):
         APPROVED = "APR", _("Approved")
         AWAITING_CHANGES = "AWC", _("Awaiting Changes")
         AWAITING_REVIEW = "AWR", _("Awaiting Review")
-        UPLOADED_NEW_VERSION = "UNV", _("Uploaded New Version")
 
     user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True)
     extension = models.ForeignKey(

reviewers/signals.py

@@ -30,7 +30,6 @@ def _create_action_from_review_and_follow(
         ApprovalActivity.ActivityType.AWAITING_CHANGES: Verb.REQUESTED_CHANGES,
         ApprovalActivity.ActivityType.AWAITING_REVIEW: Verb.REQUESTED_REVIEW,
         ApprovalActivity.ActivityType.COMMENT: Verb.COMMENTED,
-        ApprovalActivity.ActivityType.UPLOADED_NEW_VERSION: Verb.UPLOADED_NEW_VERSION,
     }
     action.send(
         instance.user,