Allow using multiple eav filters in QuerySet

CHANGELOG.md

@@ -8,6 +8,8 @@ We follow [Semantic Versions](https://semver.org/) starting at the `0.14.0` rele
 
 ### Bug Fixes
 
+- Fixes querying with multiple eav kwargs [#395](https://github.com/jazzband/django-eav2/issues/395)
+
 ## 1.4.0 (2023-07-07)
 
 ### Features

eav/queryset.py

@@ -26,6 +26,7 @@
 from django.db.models import Case, IntegerField, Q, When
 from django.db.models.query import QuerySet
 from django.db.utils import NotSupportedError
+from django.db.models import Subquery
 
 from eav.models import Attribute, EnumValue, Value
 
@@ -179,8 +180,10 @@ def wrapper(self, *args, **kwargs):
             nkey, nval = expand_eav_filter(self.model, key, value)
 
             if nkey in nkwargs:
-                # Apply AND to both querysets.
-                nkwargs[nkey] = (nkwargs[nkey] & nval).distinct()
+                # Add filter to check if matching entity_id is in the previous queryset with same nkey
+                nkwargs[nkey] = nval.filter(
+                    entity_id__in=nkwargs[nkey].values_list('entity_id', flat=True)
+                ).distinct()
             else:
                 nkwargs.update({nkey: nval})
 

tests/test_queries.py

@@ -298,3 +298,24 @@ def test_fk_filter(self):
         p = Patient.objects.get_or_create(name='Beth', example=e)[0]
         c = ExampleModel.objects.filter(patient=p)
         self.assertEqual(c.count(), 1)
+
+    def test_filter_with_multiple_eav_attributes(self):
+        """
+        Test filtering a model using both regular and multiple EAV attributes.
+
+        This test initializes test data and then filters the Patient test model
+        based on a combination of a regular attribute and multiple EAV attributes.
+        """
+        self.init_data()
+
+        # Use the filter method with 3 EAV attribute conditions
+        patients = Patient.objects.filter(
+            name='Anne',
+            eav__age=3,
+            eav__illness='cold',
+            eav__fever='no',
+        )
+
+        # Assert that the expected patient is returned
+        self.assertEqual(len(patients), 1)
+        self.assertEqual(patients[0].name, 'Anne')