Create sensitive and deleted media models for decisions

api/api/admin/media_report.py

@@ -440,6 +440,10 @@ def decision_create_view(self, request, object_id):
         if request.method == "POST":
             media_obj = self.get_object(request, object_id)
 
+            through_model = {
+                "image": ImageDecisionThrough,
+                "audio": AudioDecisionThrough,
+            }[self.media_type]
             form = get_decision_form(self.media_type)(request.POST)
             if form.is_valid():
                 decision = form.save(commit=False)
@@ -454,9 +458,13 @@ def decision_create_view(self, request, object_id):
                     moderator=request.user.get_username(),
                 )
 
-                decision.media_objs.add(media_obj)
+                through = through_model.objects.create(
+                    decision=decision,
+                    media_obj=media_obj,
+                )
                 logger.info(
-                    "Media linked to decision",
+                    "Through model created",
+                    through=through.id,
                     decision=decision.id,
                     media_obj=media_obj.id,
                 )

api/api/management/commands/backfillmoderationdecision.py

@@ -92,12 +92,16 @@ def handle(self, *args, **options):
             for report, decision in zip(reports_chunk, decisions):
                 report.decision = decision
             MediaReport.objects.bulk_update(reports_chunk, ["decision"])
-            MediaDecisionThrough.objects.bulk_create(
+            throughs = MediaDecisionThrough.objects.bulk_create(
                 [
                     MediaDecisionThrough(media_obj=report.media_obj, decision=decision)
                     for report, decision in zip(reports_chunk, decisions)
                 ]
             )
+            # Bulk create does not call ``save()`` so the mark-sensitive/deindex
+            # actions will not be undertaken.
+            for through in throughs:
+                through.perform_action()
             t.update(1)
 
         t.info(

api/api/migrations/0067_loosen_media_obj_in_through_model.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.11 on 2024-06-24 12:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0066_rename_contentprovider_to_contentsource'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='audiodecisionthrough',
+            name='media_obj',
+            field=models.ForeignKey(db_column='identifier', db_constraint=False, on_delete=django.db.models.deletion.DO_NOTHING, to='api.audio', to_field='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='imagedecisionthrough',
+            name='media_obj',
+            field=models.ForeignKey(db_column='identifier', db_constraint=False, on_delete=django.db.models.deletion.DO_NOTHING, to='api.image', to_field='identifier'),
+        ),
+    ]

api/api/models/audio.py

@@ -363,10 +363,15 @@ class AudioDecisionThrough(AbstractMediaDecisionThrough):
     be referenced by `identifier` rather than an arbitrary `id`.
     """
 
+    media_class = Audio
+    sensitive_media_class = SensitiveAudio
+    deleted_media_class = DeletedAudio
+
     media_obj = models.ForeignKey(
         Audio,
         to_field="identifier",
-        on_delete=models.CASCADE,
+        on_delete=models.DO_NOTHING,
+        db_constraint=False,
         db_column="identifier",
     )
     decision = models.ForeignKey(AudioDecision, on_delete=models.CASCADE)

api/api/models/image.py

@@ -166,10 +166,15 @@ class ImageDecisionThrough(AbstractMediaDecisionThrough):
     be referenced by `identifier` rather than an arbitrary `id`.
     """
 
+    media_class = Image
+    sensitive_media_class = SensitiveImage
+    deleted_media_class = DeletedImage
+
     media_obj = models.ForeignKey(
         Image,
         to_field="identifier",
-        on_delete=models.CASCADE,
+        on_delete=models.DO_NOTHING,
+        db_constraint=False,
         db_column="identifier",
     )
     decision = models.ForeignKey(ImageDecision, on_delete=models.CASCADE)

api/api/models/media.py

@@ -335,8 +335,6 @@ class AbstractMediaDecision(OpenLedgerModel):
     class Meta:
         abstract = True
 
-    # TODO: Implement ``clean`` and ``save``, if needed.
-
 
 class AbstractMediaDecisionThrough(models.Model):
     """
@@ -348,18 +346,39 @@ class AbstractMediaDecisionThrough(models.Model):
 
     media_class: type[models.Model] = None
     """the model class associated with this media type e.g. ``Image`` or ``Audio``"""
+    sensitive_media_class: type[models.Model] = None
+    """the model class associated with this media type e.g. ``SensitiveImage`` or ``SensitiveAudio``"""
+    deleted_media_class: type[models.Model] = None
+    """the model class associated with this media type e.g. ``DeletedImage`` or ``DeletedAudio``"""
 
     media_obj = models.ForeignKey(
         AbstractMedia,
         to_field="identifier",
-        on_delete=models.CASCADE,
+        on_delete=models.DO_NOTHING,
+        db_constraint=False,
         db_column="identifier",
     )
     decision = models.ForeignKey(AbstractMediaDecision, on_delete=models.CASCADE)
 
     class Meta:
         abstract = True
 
+    def perform_action(self):
+        """Perform the action specified in the decision."""
+
+        if self.decision.action in {
+            DecisionAction.DEINDEXED_SENSITIVE,
+            DecisionAction.DEINDEXED_COPYRIGHT,
+        }:
+            self.deleted_media_class.objects.create(media_obj=self.media_obj)
+
+        if self.decision.action == DecisionAction.MARKED_SENSITIVE:
+            self.sensitive_media_class.objects.create(media_obj=self.media_obj)
+
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        self.perform_action()
+
 
 class PerformIndexUpdateMixin:
     @property

api/latest_migrations/api

@@ -2,4 +2,4 @@
 # If you have a merge conflict in this file, it means you need to run:
 #     manage.py makemigrations --merge
 # in order to resolve the conflict between migrations.
-0066_contentsource_delete_contentprovider
+0067_do_nothing_in_through_model_media_obj

api/test/unit/management/commands/test_backfillmoderationdecision.py

@@ -1,4 +1,5 @@
 from io import StringIO
+from unittest.mock import patch
 
 from django.core.management import call_command
 
@@ -44,6 +45,7 @@ def make_reports(media_type, reason: str, status: str, count: int = 1):
         return ImageReportFactory.create_batch(count, status=status, reason=reason)
 
 
+@patch("django.conf.settings.ES")
 @pytest.mark.parametrize(
     ("reason", "status", "expected_action"),
     (
@@ -61,7 +63,7 @@ def make_reports(media_type, reason: str, status: str, count: int = 1):
 @pytest.mark.parametrize(("media_type"), ("image", "audio"))
 @pytest.mark.django_db
 def test_create_moderation_decision_for_reports(
-    media_type, reason, status, expected_action
+    mock_es, media_type, reason, status, expected_action
 ):
     username = "opener"
     UserFactory.create(username=username)
@@ -78,12 +80,13 @@ def test_create_moderation_decision_for_reports(
     assert f"Created 1 {media_type} moderation decisions from existing reports." in out
 
     decision = MediaDecision.objects.first()
-    assert decision.media_objs.count() == 1
     assert decision.action == expected_action
     assert decision.moderator.username == username
 
+    assert MediaDecisionThrough.objects.filter(decision=decision).count() == 1
+
     decision_through = MediaDecisionThrough.objects.first()
-    assert decision_through.media_obj == report.media_obj
+    assert str(decision_through.media_obj_id) == report.media_obj_id
     assert decision_through.decision == decision