Fix including policies text in emails of decisions coming from Cinder with notes (#23451)

* Fix including policies text in emails of decisions coming from Cinder with notes

When a decision has notes there could be another activity created before that
holds the private comments, so we should avoid grabbing that when generating
the context for the email, as it would cause the policies to not be included
in the email.

* Don't change ordering logic, just exclude private comment action

Author: diox

src/olympia/abuse/models.py

@@ -1391,7 +1391,9 @@ def send_notifications(self):
             return
 
         action_helper = self.get_action_helper()
-        log_entry = self.activities.last()
+        log_entry = self.activities.exclude(
+            action=amo.LOG.REVIEWER_PRIVATE_COMMENT.id
+        ).last()
         has_attachment = AttachmentLog.objects.filter(
             activity_log__contentdecisionlog__decision=self
         ).exists()

src/olympia/abuse/tests/test_models.py

@@ -3122,6 +3122,54 @@ def test_execute_action_disable_addon(self):
         assert 'An attachment was provided.' not in mail.outbox[0].body
         assert 'To respond or view the file,' not in mail.outbox[0].body
 
+    def test_execute_action_disable_addon_from_cinder_without_private_notes(self):
+        addon = addon_factory(users=[user_factory()])
+        decision = ContentDecision.objects.create(
+            addon=addon,
+            action=DECISION_ACTIONS.AMO_DISABLE_ADDON,
+            reviewer_user=None,
+        )
+        policy = CinderPolicy.objects.create(
+            uuid='1234',
+            name='Bad policy',
+            text='This is bad',
+            parent=CinderPolicy.objects.create(
+                uuid='p4r3nt',
+                name='Parent',
+                text='Parent policy text',
+            ),
+        )
+        decision.policies.add(policy)
+        assert decision.action_date is None
+        decision.execute_action()
+        self._test_execute_action_disable_addon_outcome(decision)
+        assert 'Parent, specifically Bad policy: This is bad' in mail.outbox[0].body
+
+    def test_execute_action_disable_addon_from_cinder_with_private_notes(self):
+        addon = addon_factory(users=[user_factory()])
+        decision = ContentDecision.objects.create(
+            addon=addon,
+            action=DECISION_ACTIONS.AMO_DISABLE_ADDON,
+            reviewer_user=None,
+            private_notes='some private notes',
+        )
+        policy = CinderPolicy.objects.create(
+            uuid='1234',
+            name='Bad policy',
+            text='This is bad',
+            parent=CinderPolicy.objects.create(
+                uuid='p4r3nt',
+                name='Parent',
+                text='Parent policy text',
+            ),
+        )
+        decision.policies.add(policy)
+        assert decision.action_date is None
+        decision.execute_action()
+        self._test_execute_action_disable_addon_outcome(decision)
+        assert 'Parent, specifically Bad policy: This is bad' in mail.outbox[0].body
+        assert 'some private notes' not in mail.outbox[0].body
+
     def _test_execute_action_reject_version_outcome(self, decision):
         decision.send_notifications()
         assert 'appeal' in mail.outbox[0].body