django-pfx 1.7.3.dev8__tar.gz → 1.7.3.dev10__tar.gz

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.3.dev8
+Version: 1.7.3.dev10
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.3.dev8
+Version: 1.7.3.dev10
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/django_pfx.egg-info/SOURCES.txt

@@ -182,6 +182,7 @@ tests/migrations/0003_book_local_file.py
 tests/migrations/0004_mfausermixin_fields.py
 tests/migrations/0005_mfausermixin_fields_fix.py
 tests/migrations/0006_rename_otp_enabled_user_mfa_authenticator_enabled_and_more.py
+tests/migrations/0007_attachment.py
 tests/migrations/__init__.py
 tests/settings/__init__.py
 tests/settings/ci.py

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/pfx/pfxcore/storage/local_storage.py

@@ -39,7 +39,7 @@ class LocalStorage:
             }
 
     def delete(self, value):
-        if not value or 'key' not in value:
+        if not value or not value.get('key'):
             return value  # pragma: no cover
         path = Path(settings.STORAGE_LOCAL_ROOT, value['key'])
         path.unlink(missing_ok=True)

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/pfx/pfxcore/storage/s3_storage.py

@@ -23,8 +23,8 @@ class S3Storage:
             endpoint_url=settings.STORAGE_S3_AWS_ENDPOINT_URL)
 
     def to_python(self, value):
-        if 'key' not in value:
-            return value  # pragma: no cover
+        if not value or not value.get('key'):
+            return None
         try:
             response = self.s3_client().head_object(
                 Bucket=settings.STORAGE_S3_AWS_S3_BUCKET, Key=value['key'])
@@ -72,8 +72,8 @@ class S3Storage:
         return dict(key=key)
 
     def delete(self, value):
-        if 'key' not in value:
-            return value  # pragma: no cover
+        if not value or not value.get('key'):
+            return
         try:
             self.s3_client().delete_object(
                 Bucket=settings.STORAGE_S3_AWS_S3_BUCKET, Key=value['key'])

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/tests/locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-08 13:56+0200\n"
+"POT-Creation-Date: 2026-06-02 17:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: models.py:69
+#: models.py:70
 msgid "First Name"
 msgstr "Prénom"
 
-#: models.py:70
+#: models.py:71
 msgid "Last Name"
 msgstr "Nom"
 

django_pfx-1.7.3.dev10/tests/migrations/0007_attachment.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.30 on 2026-06-02 14:41
+# flake8: noqa
+
+from django.db import migrations, models
+
+import pfx.pfxcore.fields.media_field
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tests', '0006_rename_otp_enabled_user_mfa_authenticator_enabled_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Attachment',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('file', pfx.pfxcore.fields.media_field.MediaField(blank=True, max_length=255, null=True, validators=[pfx.pfxcore.fields.media_field.validate_media_json], verbose_name='File')),
+            ],
+            options={
+                'verbose_name': 'Attachment',
+                'verbose_name_plural': 'Attachments',
+            },
+        ),
+    ]

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/tests/models.py

@@ -8,6 +8,7 @@ from pfx.pfxcore.decorator import rest_property
 from pfx.pfxcore.fields import MediaField, MinutesDurationField
 from pfx.pfxcore.models import (
     AbstractPFXUser,
+    AttachmentMixin,
     CacheableMixin,
     CacheDependsMixin,
     JSONReprMixin,
@@ -172,3 +173,12 @@ class Book(CacheDependsMixin, PFXModelMixin, models.Model):
             type: string
         """
         return super().json_repr(author_name=str(self.author), **values)
+
+
+class Attachment(AttachmentMixin, models.Model):
+    class Meta:
+        verbose_name = "Attachment"
+        verbose_name_plural = "Attachments"
+
+    def get_file_key(self, filename):
+        return f"attachments/{self.pk}/{filename}"

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/tests/tests/basic_api_test.py

@@ -2,6 +2,7 @@ from datetime import date
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
+from django.conf import settings
 from django.db import connection
 from django.test import TestCase, override_settings
 
@@ -959,6 +960,32 @@ class BasicAPITest(TestAssertMixin, TestCase):
         self.assertJE(
             response, 'gender.@0', "Value 'writer' is not a valid choice.")
 
+    @override_settings(
+        STORAGE_S3_AWS_REGION="fake-region",
+        STORAGE_S3_AWS_ACCESS_KEY="FAKE",
+        STORAGE_S3_AWS_SECRET_KEY="FAKE-SECRET",
+        STORAGE_S3_AWS_S3_BUCKET="dragonfly.fake",
+        STORAGE_S3_AWS_GET_URL_EXPIRE=300,
+        STORAGE_S3_AWS_PUT_URL_EXPIRE=300)
+    def test_update_null_file(self):
+        """Empty keys will return None through API, then ensure we can
+        save with None as file."""
+        Path(settings.STORAGE_LOCAL_ROOT).mkdir(parents=True, exist_ok=True)
+
+        self.author1_book1.cover = dict(key="")
+        self.author1_book1.local_file = dict(key="")
+        self.author1_book1.save()
+
+        with self.captureOnCommitCallbacks(execute=True):
+            response = self.client.put(
+                f'/api/books/{self.author1_book1.pk}', dict(
+                    name="The Hobbit, Deluxe Edition",
+                    local_file=None,
+                    cover=None))
+        self.assertRC(response, 200)
+        self.assertJE(response, 'cover', None)
+        self.assertJE(response, 'local_file', None)
+
     def test_empty_number_fields(self):
         response = self.client.post(
             '/api/books', {

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/tests/tests/test_emails_email_api.py

@@ -24,6 +24,13 @@ class TestEmailsEmailApi(TestAssertMixin, TestCase):
 
     @classmethod
     def setUpTestData(cls):
+        cls.superuser = User.objects.create_user(
+            username='admin',
+            email="admin@example.org",
+            first_name='Admin',
+            last_name='User',
+            password='test',
+            is_superuser=True)
         cls.user = User.objects.create_user(
             username='jrr.tolkien',
             email="jrr.tolkien@oxford.com",
@@ -84,3 +91,16 @@ class TestEmailsEmailApi(TestAssertMixin, TestCase):
         response = self.client.get(f'/api/emails/emails/{m.pk}')
         self.assertRC(response, 200)
         self.assertJE(response, 'status.value', 'to_send')
+
+    @override_settings(PFX_EMAILS_USER_ACCESS='all')
+    @responses.activate
+    def test_delete(self):
+        m = self.create_mail()
+
+        self.client.login(username=self.user.username)
+        response = self.client.delete(f'/api/emails/emails/{m.pk}')
+        self.assertRC(response, 403)
+
+        self.client.login(username=self.superuser.username)
+        response = self.client.delete(f'/api/emails/emails/{m.pk}')
+        self.assertRC(response, 200)

{django_pfx-1.7.3.dev8 → django_pfx-1.7.3.dev10}/tests/tests/test_emails_send_email_message.py

@@ -5,7 +5,9 @@ from django.core import mail
 from django.test import TestCase, override_settings
 
 from pfx.emails.shortcuts import send_email_message
+from pfx.pfxcore.storage import LocalStorage
 from pfx.pfxcore.test import APIClient, TestAssertMixin
+from tests.models import Attachment
 
 logger = logging.getLogger(__name__)
 
@@ -15,6 +17,7 @@ logger = logging.getLogger(__name__)
     PFX_BASE_URL='http://example.org',
     PFX_EMAILS_LOGO_URL='http://example.org/logo.png',
     PFX_EMAILS_DEFAULT_SIGNATURE='PFX, a DJango rest framework',
+    STORAGE_LOCAL_ROOT='/tmp/django-pfx-filestore',
     MAIL_WHITELIST_ACTIVE=True,
     MAIL_WHITELIST_EMAILS=[],
     MAIL_WHITELIST_DOMAINS=[])
@@ -23,9 +26,15 @@ class TestEmailsSendEmailMessage(TestAssertMixin, TestCase):
         self.client = APIClient(with_cookie=True)
 
     def test_send_email_message(self):
+        Attachment._meta.get_field('file').storage = LocalStorage()
+        att = Attachment.objects.create()
+        att.file = Attachment._meta.get_field('file').upload(
+            att, b"A test file content.", "test.txt")
+        att.save()
+
         send_email_message(
             'test@example.org', 'base_template',
-            data={'subject': "Test message"})
+            data={'subject': "Test message"}, attachments=[att])
 
         # Test first message
         m = mail.outbox[0]
@@ -40,6 +49,9 @@ class TestEmailsSendEmailMessage(TestAssertMixin, TestCase):
         self.assertIn(
             'PFX, a DJango rest framework', txt_msg)
 
+        self.assertEqual(mail.outbox[0].attachments, [
+            ('test.txt', 'A test file content.', 'text/plain')])
+
     def test_send_email_message_to_formats(self):
         send_email_message(
             SimpleNamespace(full_email='"Test 1" <test1@example.org>'),