django-pfx 1.4.dev88__tar.gz → 1.4.dev92__tar.gz

{django_pfx-1.4.dev88 → django_pfx-1.4.dev92}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev88
+Version: 1.4.dev92
 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.4.dev88 → django_pfx-1.4.dev92}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev88
+Version: 1.4.dev92
 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.4.dev88 → django_pfx-1.4.dev92}/django_pfx.egg-info/SOURCES.txt

@@ -135,7 +135,8 @@ tests/tests/test_auth_api.py
 tests/tests/test_body_mixin.py
 tests/tests/test_cache.py
 tests/tests/test_client.py
-tests/tests/test_fields.py
+tests/tests/test_fields_choices.py
+tests/tests/test_fields_minutes_duration.py
 tests/tests/test_filters.py
 tests/tests/test_locale_api.py
 tests/tests/test_ordered_rest_view_mixin.py

{django_pfx-1.4.dev88 → django_pfx-1.4.dev92}/make_messages

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 (cd pfx/pfxcore && django-admin makemessages -a)
-(cd tests/tests && django-admin makemessages -a)
+(cd tests && django-admin makemessages -a)

{django_pfx-1.4.dev88 → django_pfx-1.4.dev92}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-05 08:33+0100\n"
+"POT-Creation-Date: 2025-02-17 14:15+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -59,11 +59,11 @@ msgstr ""
 "Format non valide, il peut s’agir d’un nombre en heures, « 1:05 », « :05 », "
 "« 1h 5m », « 1.5h » ou « 30m »."
 
-#: models/abstract_pfx_base_user.py:35
+#: models/abstract_pfx_base_user.py:49
 msgid "user"
 msgstr ""
 
-#: models/abstract_pfx_base_user.py:36
+#: models/abstract_pfx_base_user.py:50
 msgid "users"
 msgstr ""
 

{django_pfx-1.4.dev88 → django_pfx-1.4.dev92}/pfx/pfxcore/models/abstract_pfx_base_user.py

@@ -1,4 +1,8 @@
-from django.contrib.auth.models import AbstractBaseUser, AbstractUser
+from django.contrib.auth.models import (
+    AbstractBaseUser,
+    AbstractUser,
+    PermissionsMixin,
+)
 from django.utils.translation import gettext_lazy as _
 
 from .pfx_models import PFXModelMixin
@@ -10,8 +14,18 @@ class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
     class Meta:
         abstract = True
 
-    def auth_json_repr(self):
-        return self.json_repr()
+    def auth_json_repr(self, **kw):
+        res = self.json_repr(
+            username=self.get_username(),
+            is_active=self.is_active,
+            **kw)
+        email_field = self.get_email_field_name()
+        if email_field != self.USERNAME_FIELD and hasattr(self, email_field):
+            res['email'] = getattr(self, email_field)
+        if isinstance(self, PermissionsMixin):
+            res['is_superuser'] = self.is_superuser
+            res['permissions'] = list(self.get_all_permissions())
+        return res
 
     @classmethod
     def auth_json_repr_schema(cls):
@@ -35,3 +49,12 @@ class AbstractPFXUser(AbstractUser, AbstractPFXBaseUser):
         verbose_name = _("user")
         verbose_name_plural = _("users")
         abstract = True
+
+    def auth_json_repr(self, **kw):
+        res = super().auth_json_repr(
+            first_name=self.first_name,
+            last_name=self.last_name,
+            is_staff=self.is_staff,
+            date_joined=self.date_joined,
+            **kw)
+        return res

{django_pfx-1.4.dev88 → django_pfx-1.4.dev92}/pfx/pfxcore/views/fields.py

@@ -7,7 +7,6 @@ from django.db import models
 from django.db.models.constants import LOOKUP_SEP
 from django.utils.formats import date_format
 from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
 
 from apispec.utils import deepupdate
 from apispec.yaml_utils import load_yaml_from_docstring
@@ -119,7 +118,7 @@ class ViewField:
         res = dict(type=self.field_type, name=self.verbose_name)
         if self.choices:
             res['choices'] = [
-                dict(label=_(v), value=k) for k, v in self.choices.items()]
+                dict(label=str(v), value=k) for k, v in self.choices.items()]
         if self.related_model:
             res['model'] = self.related_model._meta.label
             res['api'] = self.related_model_api or getattr(
@@ -160,7 +159,7 @@ class ViewField:
             return [self._json_repr(o) for o in value.all()]
         if self.choices:
             if value in self.choices:
-                return dict(value=value, label=_(self.choices[value]))
+                return dict(value=value, label=str(self.choices[value]))
             else:
                 return None
         return value

{django_pfx-1.4.dev88 → django_pfx-1.4.dev92}/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: 2024-01-31 14:42+0100\n"
+"POT-Creation-Date: 2025-02-17 12:19+0100\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"
@@ -17,38 +17,51 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: models.py:113
+
+#: models.py:68
 msgid "First Name"
 msgstr "Prénom"
 
-#: models.py:114
+#: models.py:69
 msgid "Last Name"
 msgstr "Nom"
 
-#: views.py:62
+#: tests/test_fields_choices.py:16
+msgid "Value 2"
+msgstr "Valeur 2"
+
+#: tests/test_fields_choices.py:25
+msgid "Value 3"
+msgstr "Valeur 3"
+
+#: tests/test_fields_choices.py:26
+msgid "Value 4"
+msgstr "Valeur 4"
+
+#: views.py:65
 msgid "Book Type"
 msgstr "Type de livre"
 
-#: views.py:65
+#: views.py:68
 msgid "Heroic Fantasy"
 msgstr ""
 
-#: views.py:69 views.py:213
+#: views.py:72 views.py:224
 msgid "Custom"
 msgstr ""
 
-#: views.py:76
+#: views.py:79
 msgid "Tolkien or Asimov"
 msgstr ""
 
-#: views.py:220
+#: views.py:231
 msgid "Publication Date greater than"
 msgstr ""
 
-#: views.py:223
+#: views.py:234
 msgid "Author PK"
 msgstr ""
 
-#: views.py:272
+#: views.py:294
 msgid "Monday"
 msgstr ""

{django_pfx-1.4.dev88 → django_pfx-1.4.dev92}/tests/tests/__init__.py

@@ -6,7 +6,8 @@ from .test_auth_api import AuthAPITest
 from .test_body_mixin import TestBodyMixin
 from .test_cache import TestCache
 from .test_client import TestApiClient
-from .test_fields import FieldsTest
+from .test_fields_choices import TestFieldsChoices
+from .test_fields_minutes_duration import TestFieldsMinutesDuration
 from .test_filters import FiltersTest
 from .test_locale_api import LocaleAPITest
 from .test_ordered_rest_view_mixin import TestOrderedRestViewMixin

django_pfx-1.4.dev92/tests/tests/test_fields_choices.py

@@ -0,0 +1,88 @@
+from django.db import connection, models
+from django.test import TestCase
+from django.test.utils import override_settings
+from django.urls import include, path
+from django.utils.translation import gettext_lazy as _
+
+from pfx.pfxcore import register_views
+from pfx.pfxcore.decorator import rest_view
+from pfx.pfxcore.models import JSONReprMixin
+from pfx.pfxcore.test import APIClient, TestAssertMixin
+from pfx.pfxcore.views import RestView
+from tests.views import FakeViewMixin
+
+# Add i18n string for Value 2, to check this is not used to translate
+# the same value in choices.
+_("Value 2")
+
+
+class TestChoicesModel(JSONReprMixin, models.Model):
+    choice1 = models.CharField(max_length=30, choices=[
+        ('v1', "Value 1"),
+        ('v2', "Value 2"),
+    ])
+    choice2 = models.CharField(max_length=30, choices=[
+        ('v3', _("Value 3")),
+        ('v4', _("Value 4")),
+    ])
+
+    class Meta:
+        verbose_name = "TestModel"
+        verbose_name_plural = "TestModels"
+        ordering = ['pk']
+
+
+@rest_view("/test")
+class TestChoicesRestView(FakeViewMixin, RestView):
+    default_public = True
+    model = TestChoicesModel
+
+
+urlpatterns = [
+    path('api/', include(register_views(TestChoicesRestView))),
+    path('api/', include('pfx.pfxcore.urls'))
+]
+
+
+@override_settings(ROOT_URLCONF=__name__)
+class TestFieldsChoices(TestAssertMixin, TestCase):
+
+    def setUp(self):
+        self.client = APIClient(default_locale='en')
+
+    @classmethod
+    def setUpTestData(cls):
+        with connection.schema_editor() as schema_editor:
+            schema_editor.create_model(TestChoicesModel)
+
+    def test_meta(self):
+        response = self.client.get('/api/test/meta', locale='fr')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'fields.choice1.choices.@0.label', "Value 1")
+        self.assertJE(response, 'fields.choice1.choices.@1.label', "Value 2")
+        self.assertJE(response, 'fields.choice2.choices.@0.label', "Valeur 3")
+        self.assertJE(response, 'fields.choice2.choices.@1.label', "Valeur 4")
+
+    def test_meta_list(self):
+        response = self.client.get('/api/test/meta/list', locale='fr')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'fields.choice1.choices.@0.label', "Value 1")
+        self.assertJE(response, 'fields.choice1.choices.@1.label', "Value 2")
+        self.assertJE(response, 'fields.choice2.choices.@0.label', "Valeur 3")
+        self.assertJE(response, 'fields.choice2.choices.@1.label', "Valeur 4")
+
+    def test_get(self):
+        c1 = TestChoicesModel.objects.create(choice1='v2', choice2='v3')
+
+        response = self.client.get(f'/api/test/{c1.pk}', locale='fr')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'choice1.label', "Value 2")
+        self.assertJE(response, 'choice2.label', "Valeur 3")
+
+    def test_get_list(self):
+        TestChoicesModel.objects.create(choice1='v2', choice2='v3')
+
+        response = self.client.get('/api/test', locale='fr')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'items.@0.choice1.label', "Value 2")
+        self.assertJE(response, 'items.@0.choice2.label', "Valeur 3")

django_pfx-1.4.dev88/tests/tests/test_fields.py → django_pfx-1.4.dev92/tests/tests/test_fields_minutes_duration.py

@@ -10,7 +10,7 @@ from pfx.pfxcore.test import APIClient, TestAssertMixin
 from tests.models import Author, Book
 
 
-class FieldsTest(TestAssertMixin, TestCase):
+class TestFieldsMinutesDuration(TestAssertMixin, TestCase):
 
     def setUp(self):
         self.client = APIClient(default_locale='en')