Add asset image field

concordia/admin/actions.py

@@ -1,10 +1,13 @@
 import uuid
+from logging import getLogger
 
 from django.contrib import messages
 from django.utils.timezone import now
 
 from ..models import Asset, Transcription, TranscriptionStatus
 
+logger = getLogger(__name__)
+
 
 def anonymize_action(modeladmin, request, queryset):
     count = queryset.count()

concordia/migrations/0051_asset_storage_image.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.2.24 on 2022-01-11 18:14
+
+from django.db import migrations, models
+
+import concordia.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("concordia", "0050_auto_20210920_1544"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="asset",
+            name="storage_image",
+            field=models.ImageField(
+                blank=True,
+                max_length=255,
+                null=True,
+                upload_to=concordia.models.Asset.get_storage_path,
+            ),
+        ),
+    ]

concordia/models.py

@@ -1,3 +1,4 @@
+import os.path
 from logging import getLogger
 
 from django.conf import settings
@@ -301,6 +302,21 @@ def get_absolute_url(self):
     def latest_transcription(self):
         return self.transcription_set.order_by("-pk").first()
 
+    def get_storage_path(self, filename):
+        s3_relative_path = "/".join(
+            [
+                self.item.project.campaign.slug,
+                self.item.project.slug,
+                self.item.item_id,
+            ]
+        )
+        filename = self.media_url
+        return os.path.join(s3_relative_path, filename)
+
+    storage_image = models.ImageField(
+        upload_to=get_storage_path, max_length=255, blank=True, null=True
+    )
+
 
 class Tag(MetricsModelMixin("tag"), models.Model):
     TAG_VALIDATOR = RegexValidator(r"^[- _À-ž'\w]{1,50}$")

concordia/signals/handlers.py

@@ -8,7 +8,7 @@
 from django.contrib.auth.models import Group
 from django.contrib.auth.signals import user_logged_in, user_login_failed
 from django.core.mail import EmailMultiAlternatives
-from django.db.models.signals import post_save
+from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
 from django.template import loader
 from django_registration.signals import user_activated, user_registered
@@ -159,3 +159,8 @@ def send_asset_reservation_message(
             "sent": time(),
         },
     )
+
+
+@receiver(post_delete, sender=Asset)
+def remove_file_from_s3(sender, instance, using, **kwargs):
+    instance.storage_image.delete(save=False)

importer/tasks.py

@@ -401,6 +401,13 @@ def import_item(self, import_item):
     asset_urls, item_resource_url = get_asset_urls_from_item_resources(
         import_item.item.metadata.get("resources", [])
     )
+    relative_asset_file_path = "/".join(
+        [
+            import_item.item.project.campaign.slug,
+            import_item.item.project.slug,
+            import_item.item.item_id,
+        ]
+    )
 
     for idx, asset_url in enumerate(asset_urls, start=1):
         asset_title = f"{import_item.item.item_id}-{idx}"
@@ -413,6 +420,7 @@ def import_item(self, import_item):
             media_type=MediaType.IMAGE,
             download_url=asset_url,
             resource_url=item_resource_url,
+            storage_image="/".join([relative_asset_file_path, f"{idx}.jpg"]),
         )
         item_asset.full_clean()
         item_assets.append(item_asset)