django-pfx 1.4.dev116__tar.gz → 1.4.dev120__tar.gz

{django_pfx-1.4.dev116 → django_pfx-1.4.dev120}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev116
+Version: 1.4.dev120
 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.dev116 → django_pfx-1.4.dev120}/pfx/pfxcore/decorator/rest.py

@@ -54,10 +54,11 @@ def rest_api(
     return decorator
 
 
-def rest_property(string=None, type="CharField"):
+def rest_property(string=None, type="CharField", field=None):
     def decorator(func):
         func.short_description = string
         func.field_type = type
+        func.field = field
         return property(func)
     return decorator
 

{django_pfx-1.4.dev116 → django_pfx-1.4.dev120}/pfx/pfxcore/models/pfx_models.py

@@ -24,6 +24,7 @@ class JSONReprMixin():
     """A model mixin to manage JSON representation."""
     api = None
     url = None
+    URL_AUTO_PK = True
     apidoc = {}
 
     def __init__(self, *args, **kw):
@@ -51,7 +52,8 @@ class JSONReprMixin():
             res['resource_api'] = f"{self.api}/{self.pk}"
         url = self.get_url()
         if url:
-            res['resource_url'] = f"{url}/{self.pk}"
+            res['resource_url'] = (
+                self.URL_AUTO_PK and f"{url}/{self.pk}" or url)
         res.update(**values)
         return res
 

{django_pfx-1.4.dev116 → django_pfx-1.4.dev120}/pfx/pfxcore/views/fields.py

@@ -56,6 +56,7 @@ class FieldType:
         (models.URLField, CharField),
         (models.UUIDField, CharField),
         (models.ForeignObject, ModelObject),
+        (models.OneToOneRel, ModelObject),
         (models.ForeignObjectRel, ModelObjectList),
         (models.ManyToManyField, ModelObjectList),
         (models.JSONField, JsonObject),
@@ -111,6 +112,7 @@ class ViewField:
         self.related_model_api = related_model_api
         self.select_related = select_related or []
         self.prefetch_related = prefetch_related or []
+        self.model_field = None
 
     def is_readonly(self, created=False):
         return self.readonly_create if created else self.readonly_update
@@ -136,6 +138,10 @@ class ViewField:
             obj = operator.attrgetter(path)(obj)
         else:
             name = self.name
+        if (self.model_field and
+                'reverse_related' in str(type(self.model_field)) and
+                not hasattr(obj, name)):
+            return None
         return getattr(obj, name)
 
     def _json_repr(self, value):
@@ -173,6 +179,17 @@ class ViewField:
     @classmethod
     def from_property(cls, name, prop, **kwargs):
         if hasattr(prop, 'fget'):
+            field = getattr(prop.fget, 'field', None)
+            if field:
+                setifnone(
+                    kwargs, 'verbose_name',
+                    cls._get_model_verbose_name(field))
+                setifnone(
+                    kwargs, 'field_type',
+                    FieldType.from_model_field(field.__class__))
+                kwargs['readonly'] = True
+                return ViewModelField(
+                    name, model_field=field, **kwargs)
             verbose_name = getattr(
                 prop.fget, 'short_description', prop.fget.__name__)
             field_type = getattr(prop.fget, 'field_type', None)

{django_pfx-1.4.dev116 → django_pfx-1.4.dev120}/tests/tests/test_fields_decimal.py

@@ -6,7 +6,7 @@ from django.test.utils import override_settings
 from django.urls import include, path
 
 from pfx.pfxcore import register_views
-from pfx.pfxcore.decorator import rest_view
+from pfx.pfxcore.decorator import rest_property, rest_view
 from pfx.pfxcore.fields import DecimalField
 from pfx.pfxcore.models import JSONReprMixin
 from pfx.pfxcore.test import APIClient, TestAssertMixin
@@ -23,6 +23,12 @@ class TestDecimalModel(JSONReprMixin, models.Model):
         max_digits=10, decimal_places=5, json_decimal_places=2,
         currency="CHF")
 
+    @rest_property(field=DecimalField(
+        max_digits=10, decimal_places=5, json_decimal_places=2,
+        currency="CHF"))
+    def price_double(self):
+        return Decimal(self.monetary * 2)
+
     class Meta:
         verbose_name = "TestModel"
         verbose_name_plural = "TestModels"
@@ -33,7 +39,7 @@ class TestDecimalModel(JSONReprMixin, models.Model):
 class DecimalModelRestView(FakeViewMixin, RestView):
     default_public = True
     model = TestDecimalModel
-    fields = ['decimal', 'percent', 'monetary']
+    fields = ['decimal', 'percent', 'monetary', 'price_double']
 
 
 urlpatterns = [
@@ -62,6 +68,8 @@ class TestFieldsDecimal(TestAssertMixin, TestCase):
         self.assertJE(response, 'fields.percent.currency', None)
         self.assertJE(response, 'fields.monetary.percent', False)
         self.assertJE(response, 'fields.monetary.currency', "CHF")
+        self.assertJE(response, 'fields.price_double.percent', False)
+        self.assertJE(response, 'fields.price_double.currency', "CHF")
 
     def test_decimal(self):
         t = TestDecimalModel.objects.create(
@@ -75,6 +83,8 @@ class TestFieldsDecimal(TestAssertMixin, TestCase):
         self.assertRC(response, 200)
         self.assertJE(response, 'decimal', "3.14")
         self.assertJE(response, 'percent', "8.10")
+        self.assertJE(response, 'monetary', "100.00")
+        self.assertJE(response, 'price_double', "200.00")
 
         response = self.client.put(f'/api/test-decimal-model/{t.pk}', dict(
             decimal="3.12121",