Expose new current_version after rejection in stakeholder email (#23534)

Author: eviljeff

src/olympia/abuse/actions.py

@@ -405,30 +405,41 @@ def notify_stakeholders(self, rejection_type):
             template = loader.get_template(self.stakeholder_template_path)
             versions = list(
                 self.target_versions.order_by('id').values_list(
-                    'version', 'channel', named=True
+                    'id', 'version', 'channel', named=True
                 )
             )
-            if any(ver.channel == amo.CHANNEL_LISTED for ver in versions):
-                review_urls = absolutify(
-                    reverse('reviewers.review', args=['listed', self.target.id])
-                )
-            else:
-                review_urls = ''
-            if any(ver.channel == amo.CHANNEL_UNLISTED for ver in versions):
-                if review_urls:
-                    review_urls += ' | '
-                review_urls += absolutify(
-                    reverse('reviewers.review', args=['unlisted', self.target.id])
+            review_urls = []
+            for arg, channel in amo.CHANNEL_CHOICES_LOOKUP.items():
+                if any(ver.channel == channel for ver in versions):
+                    review_urls += [
+                        absolutify(
+                            reverse('reviewers.review', args=[arg, self.target.id])
+                        )
+                    ]
+            new_current_version = (
+                self.target.versions.filter(
+                    channel=amo.CHANNEL_LISTED, file__status=amo.STATUS_APPROVED
                 )
+                .exclude(id__in=(ver.id for ver in versions))
+                .order_by('created')
+                .last()
+            )
             context_dict = {
-                'rejection_type': rejection_type,
-                'version_list': ', '.join(ver.version for ver in versions),
+                'new_current_version': new_current_version,
                 'private_notes': self.decision.private_notes,
                 'reasoning': self.decision.reasoning,
-                'review_urls': review_urls,
+                'rejection_type': rejection_type,
+                'review_urls': ' | '.join(reversed(review_urls)),
                 'target_url': self.target.get_absolute_url()
                 if self.target.get_url_path()
                 else '',
+                'type': self.decision.get_target_display(),
+                'version_list_listed': ', '.join(
+                    vr.version for vr in versions if vr.channel == amo.CHANNEL_LISTED
+                ),
+                'version_list_unlisted': ', '.join(
+                    vr.version for vr in versions if vr.channel == amo.CHANNEL_UNLISTED
+                ),
             }
             subject = f'{rejection_type} issued for {self.decision.get_target_name()}'
             message = template.render(context_dict)

src/olympia/abuse/templates/abuse/emails/stakeholder_notification.txt

@@ -1,5 +1,6 @@
 {{ rejection_type }} for versions:
-{{ version_list }}
+[Listed] {{ version_list_listed }}
+[Unlisted] {{ version_list_unlisted }}
 
 Reasoning:
 {{ reasoning }}
@@ -9,5 +10,13 @@ Private notes:
 {{ private_notes }}
 {% endif %}
 
+{% if version_list_listed %}
+  {% if new_current_version %}
+  {{ new_current_version.version }} will be the new current version of the {{ type }}; first approved {{ new_current_version.file.approval_date|date:"Y-m-d" }}.
+  {% else %}
+  The add-on will no longer be publicly viewable on AMO.
+  {% endif %}
+{% endif %}
+
 {{ review_urls }}
 {{ target_url }}

src/olympia/abuse/tests/test_actions.py

@@ -1269,11 +1269,16 @@ def test_execute_action_with_stakeholder_email(self):
             stakeholder
         )
         self.version.file.update(is_signed=True)
+        self.another_version.file.update(approval_date=datetime(2025, 2, 3))
         self.make_addon_promoted(self.addon, PROMOTED_GROUP_CHOICES.RECOMMENDED)
         self._test_reject_version(content_review=False, expected_emails_from_action=1)
         assert len(mail.outbox) == 4
         assert mail.outbox[0].recipients() == [stakeholder.email]
         assert mail.outbox[0].subject == f'Rejection issued for {self.addon.name}'
+        assert (
+            f'{self.another_version.version} will be the new current version of the '
+            'Extension; first approved 2025-02-03.' in mail.outbox[0].body
+        )
 
     def test_execute_action_after_reporter_appeal(self):
         original_job = CinderJob.objects.create(
@@ -1401,6 +1406,7 @@ def test_execute_action_delayed_with_stakeholder_email(self):
             stakeholder
         )
         self.version.file.update(is_signed=True)
+        self.another_version.file.update(approval_date=datetime(2025, 2, 3))
         self.make_addon_promoted(self.addon, PROMOTED_GROUP_CHOICES.RECOMMENDED)
         self._test_reject_version_delayed(
             content_review=False, expected_emails_from_action=1
@@ -1411,6 +1417,10 @@ def test_execute_action_delayed_with_stakeholder_email(self):
             mail.outbox[0].subject
             == f'14 day delayed rejection issued for {self.addon.name}'
         )
+        assert (
+            f'{self.another_version.version} will be the new current version of the '
+            'Extension; first approved 2025-02-03.' in mail.outbox[0].body
+        )
 
     def test_execute_action_delayed_after_reporter_appeal(self):
         original_job = CinderJob.objects.create(
@@ -1527,6 +1537,7 @@ def test_notify_stakeholders(self):
             stakeholder
         )
         self.decision.update(private_notes='', reasoning='Bad things!')
+        self.another_version.file.update(approval_date=datetime(2025, 1, 2))
 
         # the addon is not promoted
         assert self.addon.publicly_promoted_groups == []
@@ -1537,33 +1548,68 @@ def test_notify_stakeholders(self):
         self.make_addon_promoted(self.addon, PROMOTED_GROUP_CHOICES.RECOMMENDED)
         action.notify_stakeholders('teh reason')
         assert len(mail.outbox) == 1
+        body = mail.outbox[0].body
         assert mail.outbox[0].recipients() == [stakeholder.email]
         assert mail.outbox[0].subject == f'teh reason issued for {self.addon.name}'
-        assert 'Bad things!' in mail.outbox[0].body
-        assert 'Private notes:' not in mail.outbox[0].body
+        assert 'Bad things!' in body
+        assert 'Private notes:' not in body
         assert (
-            f'teh reason for versions:\n{listed_version.version}' in mail.outbox[0].body
+            f'teh reason for versions:\n'
+            f'[Listed] {listed_version.version}\n'
+            '[Unlisted] \n' in body
+        )
+        assert f'/review-listed/{self.addon.id}' in body
+        assert f'/review-unlisted/{self.addon.id}' not in body
+        assert self.addon.get_absolute_url() in body
+
+        assert (
+            f'{self.another_version.version} will be the new current version of the '
+            'Extension; first approved 2025-01-02' in body
         )
-        assert f'/review-listed/{self.addon.id}' in mail.outbox[0].body
-        assert f'/review-unlisted/{self.addon.id}' not in mail.outbox[0].body
-        assert self.addon.get_absolute_url() in mail.outbox[0].body
 
         # an unlisted version should result in second link to the unlisted review page
         self.decision.target_versions.add(unlisted_version)
         action.notify_stakeholders('teh reason')
         assert len(mail.outbox) == 2  # another email
+        body = mail.outbox[1].body
+        assert (
+            'teh reason for versions:\n'
+            f'[Listed] {listed_version.version}\n'
+            f'[Unlisted] {unlisted_version.version}\n'
+        ) in body
+        assert f'/review-listed/{self.addon.id} | ' in body
+        assert f'/review-unlisted/{self.addon.id}' in body
+        assert (
+            f'{self.another_version.version} will be the new current version of the '
+            'Extension; first approved 2025-01-02.' in body
+        )
+
+        # if the listed version(s) affected are the last approved versions indicate that
+        self.another_version.file.update(status=amo.STATUS_DISABLED)
+        self.old_version.file.update(status=amo.STATUS_AWAITING_REVIEW)
+        action.notify_stakeholders('teh reason')
+        assert len(mail.outbox) == 3  # another email
+        body = mail.outbox[2].body
         assert (
             'teh reason for versions:\n'
-            f'{listed_version.version}, {unlisted_version.version}'
-        ) in mail.outbox[1].body
-        assert f'/review-listed/{self.addon.id} | ' in mail.outbox[1].body
-        assert f'/review-unlisted/{self.addon.id}' in mail.outbox[1].body
+            f'[Listed] {listed_version.version}\n'
+            f'[Unlisted] {unlisted_version.version}\n'
+        ) in body
+        assert 'The add-on will no longer be publicly viewable on AMO.' in body
+
+        # if no listed versions are affected we don't mention about the current version
+        self.decision.target_versions.set([unlisted_version])
+        action.notify_stakeholders('teh reason')
+        assert len(mail.outbox) == 4  # another email
+        body = mail.outbox[3].body
+        assert 'will be the current' not in body
+        assert 'no longer' not in body
 
         # And check that if no versions were signed we don't send an email
         listed_version.file.update(is_signed=False)
         unlisted_version.file.update(is_signed=False)
         action.notify_stakeholders('teh reason')
-        assert len(mail.outbox) == 2  # still two
+        assert len(mail.outbox) == 4
 
     def test_notify_stakeholders_with_private_notes(self):
         stakeholder = user_factory()