django-pfx 1.4.dev56__tar.gz → 1.4.dev60__tar.gz

{django_pfx-1.4.dev56 → django_pfx-1.4.dev60}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.4.dev56
+Version: 1.4.dev60
 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.dev56 → django_pfx-1.4.dev60}/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: 2024-12-10 13:34+0100\n"
+"POT-Creation-Date: 2024-12-11 12:51+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -275,11 +275,11 @@ msgstr "{model} {obj} créé."
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1086
+#: views/rest_views.py:1093
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."
 
-#: views/rest_views.py:1178 views/rest_views.py:1218
+#: views/rest_views.py:1185 views/rest_views.py:1225
 msgid "Unexpected storage error"
 msgstr "Erreur de stockage inattendue"

{django_pfx-1.4.dev56 → django_pfx-1.4.dev60}/pfx/pfxcore/views/filters_views.py

@@ -89,7 +89,20 @@ class Filter():
             [self.filter_func(v) for v in values])
 
     def _get_values(self, params):
-        values = [self._parse_value(v) for v in params.getlist(self.name)]
+        values = []
+        if (self.type == FieldType.ModelObject and self.related_model and
+                hasattr(self.related_model.objects, 'default_search')):
+            q = None
+            for search in params.getlist(f'{self.name}*'):
+                crit = self.related_model.objects.default_search(search)
+                if q is None:
+                    q = crit
+                q |= crit
+            if q:
+                values.extend(self.related_model.objects.filter(
+                    q).values_list('pk', flat=True) or [-1])
+        values.extend([
+            self._parse_value(v) for v in params.getlist(self.name)])
         return values or self.defaults
 
     def query(self, params):

{django_pfx-1.4.dev56 → django_pfx-1.4.dev60}/pfx/pfxcore/views/rest_views.py

@@ -550,6 +550,8 @@ class ListRestViewMixin(ModelResponseMixin):
         :returns: The django filters
         :rtype: :class:`django.db.models.Q`
         """
+        if hasattr(self.model.objects, 'default_search'):
+            return self.model.objects.default_search(search)
         return Q()
 
     def orderable_fields(self, model, models=None):
@@ -629,9 +631,14 @@ class ListRestViewMixin(ModelResponseMixin):
         :returns: The filtered queryset
         :rtype: :class:`django.db.models.QuerySet`
         """
-        search = self.request.GET.get('search')
-        if search:
-            return qs.filter(self.search_filter(search))
+        q = None
+        for search in self.request.GET.getlist('search'):
+            crit = self.search_filter(search)
+            if q is None:
+                q = crit
+            q |= crit
+        if q:
+            return qs.filter(q)
         return qs
 
     def get_order_mapping(self):

{django_pfx-1.4.dev56 → django_pfx-1.4.dev60}/tests/models.py

@@ -1,6 +1,7 @@
 from django.contrib.auth.base_user import BaseUserManager
 from django.core.mail import send_mail
 from django.db import models
+from django.db.models import Q
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
@@ -96,6 +97,13 @@ class User(CacheableMixin, JSONReprMixin, OtpUserMixin, AbstractPFXBaseUser):
         send_mail(subject, message, from_email, [self.email], **kwargs)
 
 
+class AuthorQuerySet(models.QuerySet):
+    def default_search(self, search):
+        return (
+            Q(first_name__unaccent__icontains=search) |
+            Q(last_name__unaccent__icontains=search))
+
+
 class BadUserAuthorQuerySet(UserFilteredQuerySetMixin, models.QuerySet):
     pass
 
@@ -127,7 +135,7 @@ class Author(CacheableMixin, JSONReprMixin, models.Model):
         'tests.BookType', related_name='authors',
         verbose_name="Types")
 
-    objects = models.QuerySet.as_manager()
+    objects = AuthorQuerySet.as_manager()
     bad_user_objects = BadUserAuthorQuerySet.as_manager()
     user_objects = UserAuthorQuerySet.as_manager()
 

{django_pfx-1.4.dev56 → django_pfx-1.4.dev60}/tests/tests/basic_api_test.py

@@ -197,6 +197,12 @@ class BasicAPITest(TestAssertMixin, TestCase):
         self.assertJE(response, 'items.@0.gender.value', 'male')
         self.assertJE(response, 'items.@0.gender.label', 'Male')
 
+        response = self.client.get(
+            '/api/authors?search=isaac&search=tolkien&items=1&count=1')
+
+        self.assertRC(response, 200)
+        self.assertJE(response, 'meta.count', 2)
+
     def test_meta_list(self):
         response = self.client.get('/api/authors/meta/list')
         self.assertRC(response, 200)
@@ -483,6 +489,24 @@ class BasicAPITest(TestAssertMixin, TestCase):
             self.assertTrue(
                 item['type'] is None or item['type']['pk'] == book_type.pk)
 
+    def test_model_filter_foreign_key_text_search(self):
+        response = self.client.get(
+            '/api/books?author*=asimov&items=1&count=1')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'meta.count', 3)
+
+        # Test multiple values
+        response = self.client.get(
+            '/api/books?author*=asimov&author*=tolkien&items=1&count=1')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'meta.count', 7)
+
+        # Test empty search
+        response = self.client.get(
+            '/api/books?author*=&items=1&count=1')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'meta.count', 7)
+
     def test_model_filter_char_choices(self):
         response = self.client.get('/api/authors?gender=male&items=1&count=1')
 

{django_pfx-1.4.dev56 → django_pfx-1.4.dev60}/tests/views.py

@@ -80,11 +80,6 @@ class AuthorRestView(AuthorRestViewMixin, SlugDetailRestViewMixin, RestView):
         ]),
     ]
 
-    def search_filter(self, search):
-        return (
-            Q(first_name__unaccent__icontains=search) |
-            Q(last_name__unaccent__icontains=search))
-
     @rest_api("/cache/<int:id>", method="get", groups=['cache'])
     def cache_get(self, id, *args, **kwargs):
         book = Author.cache_get(id)