django-ninja-aio-crud 2.12.0__tar.gz → 2.12.1__tar.gz

{django_ninja_aio_crud-2.12.0 → django_ninja_aio_crud-2.12.1}/.github/workflows/docs.yml

@@ -24,6 +24,7 @@ on:
           - "2.9"
           - "2.10"
           - "2.11"
+          - "2.12"
       make_latest:
         description: 'Set as "latest" and default?'
         type: boolean
@@ -51,6 +52,7 @@ on:
           - "2.9"
           - "2.10"
           - "2.11"
+          - "2.12"
       delete_confirm:
         description: 'Confirm deletion of the selected version'
         type: boolean

{django_ninja_aio_crud-2.12.0 → django_ninja_aio_crud-2.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-ninja-aio-crud
-Version: 2.12.0
+Version: 2.12.1
 Summary: Django Ninja AIO CRUD - Rest Framework
 Author: Giuseppe Casillo
 Requires-Python: >=3.10, <3.15

{django_ninja_aio_crud-2.12.0 → django_ninja_aio_crud-2.12.1}/ninja_aio/__init__.py

@@ -1,6 +1,6 @@
 """Django Ninja AIO CRUD - Rest Framework"""
 
-__version__ = "2.12.0"
+__version__ = "2.12.1"
 
 from .api import NinjaAIO
 

{django_ninja_aio_crud-2.12.0 → django_ninja_aio_crud-2.12.1}/ninja_aio/helpers/query.py

@@ -78,6 +78,11 @@ class QueryUtil:
         self.detail_config: ModelQuerySetSchema = self._configs.get(
             self.SCOPES.DETAIL, ModelQuerySetSchema()
         )
+        # Fallback detail config to read config if not explicitly set
+        if not self.detail_config.select_related:
+            self.detail_config.select_related = self.read_config.select_related.copy()
+        if not self.detail_config.prefetch_related:
+            self.detail_config.prefetch_related = self.read_config.prefetch_related.copy()
 
     def _get_config(self, conf_name: str) -> ModelQuerySetSchema:
         """Helper method to retrieve configuration attributes."""
@@ -103,7 +108,7 @@ class QueryUtil:
             raise ValueError(
                 f"Invalid scope '{scope}' for QueryUtil. Supported scopes: {valid_scopes}"
             )
-        config = self._configs.get(scope, ModelQuerySetSchema())
+        config: ModelQuerySetSchema = self._configs.get(scope, ModelQuerySetSchema())
         if config.select_related:
             queryset = queryset.select_related(*config.select_related)
         if config.prefetch_related:

{django_ninja_aio_crud-2.12.0 → django_ninja_aio_crud-2.12.1}/tests/test_query_util.py

@@ -96,6 +96,60 @@ class QueryUtilDedicatedTestCase(TestCase):
             m_pref.assert_not_called()
 
 
+    def test_detail_scope_fallback_to_read_select_related(self):
+        """Test that DETAIL scope falls back to READ's select_related when not configured."""
+        # TestModelSerializerForeignKey has read config but no detail config
+        qs = app_models.TestModelSerializerForeignKey.objects.all()
+        with mock.patch(
+            "django.db.models.query.QuerySet.select_related",
+            side_effect=lambda self, *args: self,
+            autospec=True,
+        ) as m_sel:
+            _ = self.query_util_fk.apply_queryset_optimizations(
+                qs, self.query_util_fk.SCOPES.DETAIL
+            )
+            sel_args = m_sel.call_args[0][1:]
+            # Should use read_config's select_related as fallback
+            self.assertEqual(sel_args, ("test_model_serializer",))
+
+    def test_detail_scope_fallback_to_read_prefetch_related(self):
+        """Test that DETAIL scope falls back to READ's prefetch_related when not configured."""
+        # TestModelSerializerManyToMany has queryset_request with prefetch but no detail
+        # We need to set up read config with prefetch to test fallback
+        qs = app_models.TestModelSerializerManyToMany.objects.all()
+        with mock.patch(
+            "django.db.models.query.QuerySet.prefetch_related",
+            side_effect=lambda self, *args: self,
+            autospec=True,
+        ) as m_pref:
+            _ = self.query_util_m2m.apply_queryset_optimizations(
+                qs, self.query_util_m2m.SCOPES.DETAIL
+            )
+            # M2M model has no read config, so detail should also have empty prefetch
+            m_pref.assert_not_called()
+
+    def test_detail_config_initialized_with_read_fallback(self):
+        """Test that detail_config is initialized with read_config values when not set."""
+        # FK model has read config with select_related but no detail config
+        self.assertEqual(
+            self.query_util_fk.detail_config.select_related,
+            self.query_util_fk.read_config.select_related,
+        )
+        self.assertEqual(
+            self.query_util_fk.detail_config.prefetch_related,
+            self.query_util_fk.read_config.prefetch_related,
+        )
+
+    def test_detail_config_independent_copy(self):
+        """Test that detail_config is a copy, not a reference to read_config lists."""
+        # Ensure modifying detail_config doesn't affect read_config
+        original_read_select = self.query_util_fk.read_config.select_related.copy()
+        self.query_util_fk.detail_config.select_related.append("test_field")
+        self.assertEqual(
+            self.query_util_fk.read_config.select_related, original_read_select
+        )
+
+
 @tag("scope_namespace")
 class ScopeNamespaceTestCase(TestCase):
     """Tests for ScopeNamespace class (covers line 17 - __iter__)."""