show mail attachments in frontend

core/files/media_v2.py

@@ -11,6 +11,7 @@ from rest_framework.response import Response
 
 from core.settings import MEDIA_ROOT
 from files.models import File
+from mail.models import EmailAttachment
 
 
 @swagger_auto_schema(method='GET', auto_schema=None)
@@ -21,7 +22,11 @@ def media_urls(request, hash):
         if request.META.get('HTTP_IF_NONE_MATCH') and request.META.get('HTTP_IF_NONE_MATCH') == hash:
             return HttpResponse(status=status.HTTP_304_NOT_MODIFIED)
 
-        file = File.objects.get(hash=hash)
+        file = File.objects.filter(hash=hash).first()
+        attachment = EmailAttachment.objects.filter(hash=hash).first()
+        file = file if file else attachment
+        if not file:
+            return Response(status=status.HTTP_404_NOT_FOUND)
         hash_path = file.file
         return HttpResponse(status=status.HTTP_200_OK,
                             content_type=file.mime_type,
@@ -33,9 +38,10 @@ def media_urls(request, hash):
                                 'Age': 0,
                                 'ETag': file.hash,
                             })
-
     except File.DoesNotExist:
         return Response(status=status.HTTP_404_NOT_FOUND)
+    except EmailAttachment.DoesNotExist:
+        return Response(status=status.HTTP_404_NOT_FOUND)
 
 
 @swagger_auto_schema(method='GET', auto_schema=None)
@@ -47,7 +53,11 @@ def thumbnail_urls(request, size, hash):
     if request.META.get('HTTP_IF_NONE_MATCH') and request.META.get('HTTP_IF_NONE_MATCH') == hash + "_" + str(size):
         return HttpResponse(status=status.HTTP_304_NOT_MODIFIED)
     try:
-        file = File.objects.get(hash=hash)
+        file = File.objects.filter(hash=hash).first()
+        attachment = EmailAttachment.objects.filter(hash=hash).first()
+        file = file if file else attachment
+        if not file:
+            return Response(status=status.HTTP_404_NOT_FOUND)
         hash_path = file.file
         if not os.path.exists(MEDIA_ROOT + f'/thumbnails/{size}/{hash_path}'):
             from PIL import Image
@@ -72,6 +82,8 @@ def thumbnail_urls(request, size, hash):
 
     except File.DoesNotExist:
         return Response(status=status.HTTP_404_NOT_FOUND)
+    except EmailAttachment.DoesNotExist:
+        return Response(status=status.HTTP_404_NOT_FOUND)
 
 
 urlpatterns = [

core/files/models.py

@@ -77,6 +77,13 @@ class AbstractFile(models.Model):
 
     objects = FileManager()
 
+    def save(self, *args, **kwargs):
+        from django.utils import timezone
+        if not self.created_at:
+            self.created_at = timezone.now()
+        self.updated_at = timezone.now()
+        super().save(*args, **kwargs)
+
     class Meta:
         abstract = True