Add triggers for new addons and metadata change to submit to Cinder (#24662)

* Add triggers for new addons and metadata change to submit to Cinder

* Handle updates and review requests for REJECTED state

* add waffle switch

Author: eviljeff

src/olympia/abuse/cinder.py

@@ -797,6 +797,21 @@ def get_context_generator(self):
             ],
         }
 
+    def send_entity(self):
+        """Send this entity to the Cinder graph API."""
+        generator = self.get_context_generator()
+        context = next(generator, self.get_empty_context())
+        data = {
+            'entities': [self.get_entity_data(), *context.get('entities', [])],
+            'relationships': context.get('relationships', []),
+        }
+        # Note: Cinder URLS are inconsistent. Per their documentation, that
+        # one needs a trailing slash.
+        url = f'{settings.CINDER_SERVER_URL}v1/graph/'
+        response = requests.post(url, json=data, headers=self.get_cinder_http_headers())
+        if response.status_code != 202:
+            raise HTTPError(response.content)
+
     def report(self, *args, **kwargs):
         # It doesn't make sense to report this, it's a holder for metadata, not a real
         # entity.

src/olympia/abuse/migrations/0063_create_content_review_in_cinder_switch.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.2.12 on 2026-03-27 10:56
+
+from django.db import migrations
+
+from olympia.core.db.migrations import CreateWaffleSwitch
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('abuse', '0062_rename_created_idx_abuse_reports_created_idx'),
+    ]
+
+    operations = [
+        CreateWaffleSwitch('content-review-in-cinder'),
+    ]

src/olympia/abuse/tasks.py

@@ -12,7 +12,7 @@
 import olympia.core.logger
 from olympia import amo
 from olympia.activity.models import ActivityLog
-from olympia.addons.models import Addon
+from olympia.addons.models import Addon, AddonApprovalsCounter
 from olympia.amo.celery import task
 from olympia.amo.decorators import use_primary_db
 from olympia.amo.utils import to_language
@@ -287,6 +287,9 @@ def submit_addon_for_content_review(*, addon_pk):
     addon = Addon.unfiltered.get(pk=addon_pk)
     entity_helper = CinderAddonContentReview(addon)
     entity_helper.send_event()
+    AddonApprovalsCounter.reset_content_for_addon(
+        addon, not_reviewed_status=AddonApprovalsCounter.CONTENT_REVIEW_STATUSES.PENDING
+    )
 
     # Additional context is submitted as separate api calls.
     try:
@@ -300,14 +303,29 @@ def submit_addon_for_content_review(*, addon_pk):
 @use_primary_db
 def submit_addon_change_for_content_review(*, activity_log_pk):
     activity = ActivityLog.objects.get(pk=activity_log_pk)
-    if activity.action != amo.LOG.EDIT_ADDON_PROPERTY.id:
+    if activity.action == amo.LOG.EDIT_ADDON_PROPERTY.id:
+        addon, field, changes_blob = activity.arguments
+        changes = json.loads(changes_blob or '{}')
+    elif activity.action == amo.LOG.REJECTED_LISTING_REVIEW_REQUEST.id:
+        (addon,) = activity.arguments
+        field = 'Listing Review Requested'
+        changes = {}
+    else:
         log.error(
             'Activity with id %s is not an EDIT_ADDON_PROPERTY, cannot submit for '
             'content review.',
             activity_log_pk,
         )
         return
-    addon, field, changes_blob = activity.arguments
-    changes = json.loads(changes_blob or '{}')
+
     entity_helper = CinderContentChange(addon, field, changes)
-    entity_helper.send_event()
+    if (
+        activity.action == amo.LOG.EDIT_ADDON_PROPERTY.id
+        and addon.status == amo.STATUS_REJECTED
+    ):
+        # if the add-on is rejected, the developer needs to request a new review first
+        # before we review it again, so we don't sent an event, which would create a
+        # job.  We just send the content change entity.
+        entity_helper.send_entity()
+    else:
+        entity_helper.send_event()

src/olympia/abuse/tests/test_cinder.py

@@ -2114,6 +2114,40 @@ def test_send_event(self):
         with self.assertRaises(requests.HTTPError):
             cinder_change.send_event()
 
+    def test_send_entity(self):
+        responses.add(
+            responses.POST,
+            f'{settings.CINDER_SERVER_URL}v1/graph/',
+            status=202,
+        )
+
+        instance = self.CinderClass(self._create_dummy_target())
+        instance.send_entity()
+
+        assert len(responses.calls) == 1
+        data = json.loads(responses.calls[0].request.body)
+        assert data == {
+            'entities': [
+                {
+                    'entity_type': 'amo_content_change',
+                    'attributes': instance.get_attributes(),
+                },
+                {
+                    'entity_type': 'amo_addon',
+                    'attributes': CinderAddon(instance.entity).get_attributes(),
+                },
+            ],
+            'relationships': [
+                {
+                    'source_id': instance.id,
+                    'source_type': 'amo_content_change',
+                    'target_id': str(instance.entity.pk),
+                    'target_type': 'amo_addon',
+                    'relationship_type': 'amo_content_metadata_change_of',
+                }
+            ],
+        }
+
     def test_build_report_payload(self):
         # report isn't implemented, so this won't be called
         pass

src/olympia/abuse/tests/test_tasks.py

@@ -13,6 +13,7 @@
 
 from olympia import amo
 from olympia.activity.models import ActivityLog
+from olympia.addons.models import AddonApprovalsCounter
 from olympia.amo.tests import TestCase, addon_factory, days_ago, user_factory
 from olympia.constants.abuse import (
     DECISION_ACTIONS,
@@ -1336,6 +1337,11 @@ def test_submit_addon_for_content_review():
     additional_call = json.loads(responses.calls[1].request.body)
     assert additional_call['entities'][0]['attributes']['id'] == str(author2.id)
 
+    assert (
+        AddonApprovalsCounter.objects.get(addon=addon).content_review_status
+        == AddonApprovalsCounter.CONTENT_REVIEW_STATUSES.PENDING
+    )
+
 
 @pytest.mark.django_db
 def test_submit_addon_change_for_content_review():
@@ -1364,3 +1370,83 @@ def test_submit_addon_change_for_content_review():
     assert event_call['entity']['attributes']['values_added'] == ['a new name']
     assert event_call['entity']['attributes']['values_removed'] == ['an old name']
     assert event_call['subgraph']['entities'][0]['attributes']['id'] == str(addon.id)
+
+
+@pytest.mark.django_db
+def test_submit_addon_change_for_content_review_while_rejected():
+    addon = addon_factory(status=amo.STATUS_REJECTED)
+    activity = ActivityLog.objects.create(
+        amo.LOG.EDIT_ADDON_PROPERTY,
+        addon,
+        'name',
+        '{"added": ["a new name"], "removed": ["an old name"]}',
+        user=user_factory(),
+    )
+    responses.add(
+        responses.POST,
+        f'{settings.CINDER_SERVER_URL}v1/graph/',
+        status=202,
+    )
+
+    with time_machine.travel(datetime.now(), tick=False):
+        now = datetime.now()
+        timestamp = int(now.timestamp())
+        submit_addon_change_for_content_review.delay(activity_log_pk=activity.id)
+
+    assert len(responses.calls) == 1
+    graph_call = json.loads(responses.calls[0].request.body)
+    assert graph_call == {
+        'entities': [
+            {
+                'entity_type': 'amo_content_change',
+                'attributes': {
+                    'datetime': str(now),
+                    'id': f'{addon.id}-name-{timestamp}',
+                    'reason': 'Addon name change',
+                    'values_added': ['a new name'],
+                    'values_removed': ['an old name'],
+                },
+            },
+            {
+                'entity_type': 'amo_addon',
+                'attributes': CinderAddon(addon).get_attributes(),
+            },
+        ],
+        'relationships': [
+            {
+                'relationship_type': 'amo_content_metadata_change_of',
+                'source_id': f'{addon.id}-name-{timestamp}',
+                'source_type': 'amo_content_change',
+                'target_id': str(addon.id),
+                'target_type': 'amo_addon',
+            }
+        ],
+    }
+
+
+@pytest.mark.django_db
+def test_submit_addon_change_for_content_review_with_request_review():
+    addon = addon_factory()
+    activity = ActivityLog.objects.create(
+        amo.LOG.REJECTED_LISTING_REVIEW_REQUEST, addon, user=user_factory()
+    )
+    responses.add(
+        responses.POST,
+        f'{settings.CINDER_SERVER_URL}v2/workflows/event',
+        json={'status': 'ok', 'event_id': '1234-xyz'},
+        status=200,
+    )
+
+    submit_addon_change_for_content_review.delay(activity_log_pk=activity.id)
+
+    assert len(responses.calls) == 1
+    event_call = json.loads(responses.calls[0].request.body)
+    assert event_call['event_name'] == CinderAddonContentReview.workflow_name
+    assert event_call['entity']['entity_schema'] == 'amo_content_change'
+    assert (
+        event_call['entity']['attributes']['reason']
+        == 'Addon Listing Review Requested change'
+    )
+    assert event_call['entity']['attributes']['values_added'] == []
+    assert event_call['entity']['attributes']['values_removed'] == []
+    assert event_call['subgraph']['entities'][0]['attributes']['id'] == str(addon.id)

src/olympia/addons/models.py

@@ -262,8 +262,8 @@ def not_disabled_by_mozilla(self):
 
     def get_base_queryset_for_queue(
         self,
+        *,
         admin_reviewer=False,
-        content_review=False,
         theme_review=False,
         select_related_fields_for_listed=True,
     ):
@@ -392,9 +392,7 @@ def get_queryset_for_pending_queues(
     def get_content_review_queue(self, admin_reviewer=False):
         """Return a queryset of Addon objects that need content review."""
         qs = (
-            self.get_base_queryset_for_queue(
-                admin_reviewer=admin_reviewer, content_review=True
-            )
+            self.get_base_queryset_for_queue(admin_reviewer=admin_reviewer)
             .valid()
             .filter(
                 _current_version__reviewerflags__pending_rejection__isnull=True,
@@ -2108,6 +2106,8 @@ def watch_status(old_attr=None, new_attr=None, instance=None, sender=None, **kwa
     If a version is rejected after nomination, the developer has to upload a
     new version.
     """
+    from olympia.abuse.tasks import submit_addon_for_content_review
+
     new_status = new_attr.get('status') if new_attr else None
     old_status = old_attr.get('status') if old_attr else None
     disabled_by_user = new_attr.get('disabled_by_user') if new_attr else None
@@ -2131,7 +2131,20 @@ def watch_status(old_attr=None, new_attr=None, instance=None, sender=None, **kwa
             status_disabled_reason=File.STATUS_DISABLED_REASONS.DEVELOPER,
         )
         instance.update_status()
-    elif old_status == amo.STATUS_NOMINATED:
+        return
+
+    if (
+        new_status in amo.VALID_ADDON_STATUSES
+        and waffle.switch_is_active('content-review-in-cinder')
+        and not AddonApprovalsCounter.objects.filter(addon_id=instance.id)
+        .exclude(
+            content_review_status=AddonApprovalsCounter.CONTENT_REVIEW_STATUSES.UNREVIEWED
+        )
+        .exists()
+    ):
+        submit_addon_for_content_review.delay(addon_pk=instance.pk)
+
+    if old_status == amo.STATUS_NOMINATED:
         # Update latest version due date if necessary for nominated add-ons.
         inherit_due_date_if_nominated(None, latest_version)
     else:
@@ -2427,11 +2440,10 @@ class CONTENT_REVIEW_STATUSES(EnumChoices):
         PASS = 2, 'Pass'
         FAIL = 3, 'Fail'
         REQUESTED = 4, 'Pending, New review requested'
+        # This status is set when the review is sent to Cinder
+        PENDING = 5, 'Pending first review after submission'
 
     CONTENT_REVIEW_STATUSES.add_subset('REJECTED', ('FAIL', 'REQUESTED'))
-    CONTENT_REVIEW_STATUSES.add_subset(
-        'PENDING', ('UNREVIEWED', 'CHANGED', 'REQUESTED')
-    )
     CONTENT_REVIEW_STATUSES.add_subset('COMPLETE', ('PASS', 'FAIL'))
 
     addon = models.OneToOneField(Addon, primary_key=True, on_delete=models.CASCADE)
@@ -2516,19 +2528,30 @@ def reject_content_for_addon(cls, addon):
         return obj
 
     @classmethod
-    def reset_content_for_addon(cls, addon):
+    def reset_content_for_addon(
+        cls, addon, *, not_reviewed_status=CONTENT_REVIEW_STATUSES.UNREVIEWED
+    ):
         """
         Reset the last_content_review date for this addon so it triggers
         another review.
         """
+        defaults = {'last_content_review': None}
         obj, created = cls.objects.update_or_create(
-            addon=addon, defaults={'last_content_review': None}
+            addon=addon,
+            defaults=defaults,
+            create_defaults={**defaults, 'content_review_status': not_reviewed_status},
         )
-        if (
-            not created
-            and obj.content_review_status == cls.CONTENT_REVIEW_STATUSES.PASS
-        ):
-            obj.update(content_review_status=cls.CONTENT_REVIEW_STATUSES.CHANGED)
+        if not created:
+            new_status = (
+                cls.CONTENT_REVIEW_STATUSES.CHANGED
+                if obj.content_review_status == cls.CONTENT_REVIEW_STATUSES.PASS
+                else not_reviewed_status
+                if obj.content_review_status == cls.CONTENT_REVIEW_STATUSES.UNREVIEWED
+                else None
+            )
+            # i.e. not None or cls.CONTENT_REVIEW_STATUSES.UNREVIEWED, which is 0
+            if new_status:
+                obj.update(content_review_status=new_status)
         assert obj.last_content_review is None
         return obj
 

src/olympia/addons/serializers.py

@@ -1319,6 +1319,8 @@ def _save_icon(self, uploaded_icon):
             self.instance.update(icon_type='')
 
     def log(self, instance, validated_data, changes):
+        from olympia.abuse.tasks import submit_addon_change_for_content_review
+
         validated_data = {**validated_data}  # we want to modify it, so take a copy
         user = self.context['request'].user
 
@@ -1340,13 +1342,15 @@ def log(self, instance, validated_data, changes):
             validated_data.pop('version')
 
         for field, addedremoved in changes.items():
-            ActivityLog.objects.create(
+            alog = ActivityLog.objects.create(
                 amo.LOG.EDIT_ADDON_PROPERTY,
                 instance,
                 field,
                 json.dumps(addedremoved),
                 user=user,
             )
+            if waffle.switch_is_active('content-review-in-cinder'):
+                submit_addon_change_for_content_review.delay(activity_log_pk=alog.pk)
             validated_data.pop(field)
         if validated_data:
             ActivityLog.objects.create(